Raise minSdk to 21 (Lollipop)

9 files changed, 41 insertions, 81 deletions

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
index 5785f081..74b066b6 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
@@ -111,16 +111,9 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 
 		/*
 		//make full transparent statusBar
-		if (Build.VERSION.SDK_INT >= 19 && Build.VERSION.SDK_INT < 21) {
-			setWindowFlag(this, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, true);
-		}
-		if (Build.VERSION.SDK_INT >= 19) {
-			getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
-		}
-		if (Build.VERSION.SDK_INT >= 21) {
-			setWindowFlag(this, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, false);
-			getWindow().setStatusBarColor(Color.TRANSPARENT);
-		}
+		getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+		setWindowFlag(this, WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, false);
+		getWindow().setStatusBarColor(Color.TRANSPARENT);
 
 
 		getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
@@ -132,16 +125,12 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
 			getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
 		}
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-			getWindow().setStatusBarColor(Color.WHITE);
-		}
+		getWindow().setStatusBarColor(Color.WHITE);
 		*/
 
 		// For Debugging the WebView using Chrome Remote Debugging
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-			if (0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)) {
-				WebView.setWebContentsDebuggingEnabled(true);
-			}
+		if (0 != (getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE)) {
+			WebView.setWebContentsDebuggingEnabled(true);
 		}
 
 
@@ -632,31 +621,28 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
 		ThemeUtils.colorizeToolbar(binding.toolbarLayout.toolbar, color);
 		//ThemeUtils.colorizeToolbar(bottomAppBar, color);
 		//ThemeUtils.changeStatusBarColor(this, color);
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-			//getWindow().setNavigationBarColor(color);
-			getWindow().setStatusBarColor(color);
-
-			/*
-			switch (ThemeChooser.getSelectedTheme()) {
-				case LIGHT:
-					Log.d(TAG, "initIncognitoMode: LIGHT");
-					setLightStatusBar(getWindow().getDecorView());
-					getWindow().setStatusBarColor(Color.WHITE);
-					break;
-				case DARK:
-					clearLightStatusBar(getWindow().getDecorView());
-					Log.d(TAG, "initIncognitoMode: DARK");
-					getWindow().setStatusBarColor(getResources().getColor(R.color.material_grey_900));
-					break;
-				case OLED:
-					clearLightStatusBar(getWindow().getDecorView());
-					Log.d(TAG, "initIncognitoMode: OLED");
-					getWindow().setStatusBarColor(Color.BLACK);
-					break;
-			}
-			*/
-		}
+		//getWindow().setNavigationBarColor(color);
+		getWindow().setStatusBarColor(color);
 
+		/*
+		switch (ThemeChooser.getSelectedTheme()) {
+			case LIGHT:
+				Log.d(TAG, "initIncognitoMode: LIGHT");
+				setLightStatusBar(getWindow().getDecorView());
+				getWindow().setStatusBarColor(Color.WHITE);
+				break;
+			case DARK:
+				clearLightStatusBar(getWindow().getDecorView());
+				Log.d(TAG, "initIncognitoMode: DARK");
+				getWindow().setStatusBarColor(getResources().getColor(R.color.material_grey_900));
+				break;
+			case OLED:
+				clearLightStatusBar(getWindow().getDecorView());
+				Log.d(TAG, "initIncognitoMode: OLED");
+				getWindow().setStatusBarColor(Color.BLACK);
+				break;
+		}
+		*/
 	}
 
 	/*
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
index 755349ea..d6c5e326 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java
@@ -261,7 +261,7 @@ public class NewsDetailFragment extends Fragment implements RssItemToHtmlTask.Li
      */
     private void setSoftwareRenderModeForWebView(String htmlPage, WebView webView) {
         if (htmlPage.contains(".gif")) {
-            if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
                 // Workaround some playback issues with gifs on devices below android oreo
                 webView.setLayerType(WebView.LAYER_TYPE_SOFTWARE, null);
             }
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailImageDialogFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailImageDialogFragment.java
index a2c22a76..2fcc3151 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailImageDialogFragment.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailImageDialogFragment.java
@@ -326,7 +326,7 @@ public class NewsDetailImageDialogFragment extends DialogFragment {
     }
 
     public boolean haveStoragePermission() {
-        if (Build.VERSION.SDK_INT >= 23) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (checkSelfPermission(requireContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) == PermissionChecker.PERMISSION_GRANTED) {
                 Log.v("Permission error","You have permission");
                 return true;
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
index 07c51c93..173492ee 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
@@ -827,7 +827,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
 	}
 
 	private void checkAndStartDownloadWebPagesForOfflineReadingPermission() {
-        if (Build.VERSION.SDK_INT >= 23) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED &&
                     checkSelfPermission(Manifest.permission.FOREGROUND_SERVICE) == PackageManager.PERMISSION_GRANTED) {
                 Log.v("Permission error","You have permission");
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PiPVideoPlaybackActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PiPVideoPlaybackActivity.java
index f7d685a2..da1856cf 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PiPVideoPlaybackActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PiPVideoPlaybackActivity.java
@@ -149,10 +149,8 @@ public class PiPVideoPlaybackActivity extends AppCompatActivity {
 
         super.onStop();
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
-                finishAndRemoveTask();
-            }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && getPackageManager().hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE)) {
+            finishAndRemoveTask();
         }
     }
 
@@ -164,11 +162,7 @@ public class PiPVideoPlaybackActivity extends AppCompatActivity {
     @Subscribe
     public void onEvent(CollapsePodcastView event) {
         Log.d(TAG, "onEvent() called with: event = [" + event + "]");
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            finishAndRemoveTask();
-        } else {
-            finish();
-        }
+        finishAndRemoveTask();
     }
     */
 
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SettingsFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SettingsFragment.java
index aaab8c9e..4e440deb 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SettingsFragment.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SettingsFragment.java
@@ -11,8 +11,8 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
-import android.provider.Settings;
 import android.widget.Toast;
 
 import androidx.appcompat.app.AlertDialog;
@@ -210,24 +210,6 @@ public class SettingsFragment extends PreferenceFragmentCompat {
             return result;
         }
 
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            // If we're running pre-L, we need to 'inject' our tint aware Views in place of the
-            // standard framework versions
-            switch (name) {
-                case "EditText":
-                    return new AppCompatEditText(this, attrs);
-                case "Spinner":
-                    return new AppCompatSpinner(this, attrs);
-                case "CheckBox":
-                    return new AppCompatCheckBox(this, attrs);
-                case "RadioButton":
-                    return new AppCompatRadioButton(this, attrs);
-                case "CheckedTextView":
-                    return new AppCompatCheckedTextView(this, attrs);
-                default:
-                    Log.v(TAG, "Error. Didn't find view of type: " + name);
-            }
-        }
         return null;
     }
     */
@@ -364,10 +346,10 @@ public class SettingsFragment extends PreferenceFragmentCompat {
 
 
         debugInfo += "\n\n---\n";
-        debugInfo += "\nOS Version: " + System.getProperty("os.version") + "(" + android.os.Build.VERSION.INCREMENTAL + ")";
-        debugInfo += "\nOS API Level: " + android.os.Build.VERSION.SDK_INT;
-        debugInfo += "\nDevice: " + android.os.Build.DEVICE;
-        debugInfo += "\nModel (and Product): " + android.os.Build.MODEL + " ("+ android.os.Build.PRODUCT + ")";
+        debugInfo += "\nOS Version: " + System.getProperty("os.version") + "(" + Build.VERSION.INCREMENTAL + ")";
+        debugInfo += "\nOS API Level: " + Build.VERSION.SDK_INT;
+        debugInfo += "\nDevice: " + Build.DEVICE;
+        debugInfo += "\nModel (and Product): " + Build.MODEL + " ("+ Build.PRODUCT + ")";
 
         debugInfo += "\n\n---\n\n";
 
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java
index 61d2416b..0aa0e0c7 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeUtils.java
@@ -130,8 +130,6 @@ public class ThemeUtils {
         window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
         // add FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS flag to the window
         window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            window.setStatusBarColor(statusBarColor);
-        }
+        window.setStatusBarColor(statusBarColor);
     }
 }
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/notification/NextcloudNotificationManager.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/notification/NextcloudNotificationManager.java
index 8cfa2468..224d0294 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/notification/NextcloudNotificationManager.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/notification/NextcloudNotificationManager.java
@@ -332,7 +332,7 @@ public class NextcloudNotificationManager {
 
     private static NotificationManager getNotificationManagerAndCreateChannel(Context context, String channelId) {
         NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             int importance = NotificationManager.IMPORTANCE_DEFAULT;
             NotificationChannel mChannel = new NotificationChannel(channelId, channelId, importance);
             mChannel.setSound(null, null);
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/PodcastPlaybackService.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/PodcastPlaybackService.java
index 3e16256c..86df912c 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/PodcastPlaybackService.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/PodcastPlaybackService.java
@@ -201,7 +201,7 @@ public class PodcastPlaybackService extends MediaBrowserServiceCompat {
             Log.v(TAG, "Stopping PodcastPlaybackService because of inactivity");
             stopSelf();
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && mSession != null) {
+            if (mSession != null) {
                 mSession.release();
             }
         }