diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java index eb9fcf2ca..99a932196 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java @@ -104,7 +104,7 @@ protected void onCreate(Bundle savedInstanceState) { } Boolean prefUseRoot = PreferenceManager.getDefaultSharedPreferences(this).getBoolean(Constants.PREF_USE_ROOT, false); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && !prefUseRoot) { + if (!prefUseRoot) { Toast.makeText(this, R.string.kitkat_external_storage_warning, Toast.LENGTH_LONG) .show(); } @@ -118,10 +118,8 @@ protected void onCreate(Bundle savedInstanceState) { @SuppressLint("NewApi") private void populateRoots() { ArrayList roots = new ArrayList<>(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - roots.addAll(Arrays.asList(getExternalFilesDirs(null))); - roots.remove(getExternalFilesDir(null)); - } + roots.addAll(Arrays.asList(getExternalFilesDirs(null))); + roots.remove(getExternalFilesDir(null)); String rootDir = getIntent().getStringExtra(EXTRA_ROOT_DIRECTORY); if (getIntent().hasExtra(EXTRA_ROOT_DIRECTORY) && !TextUtils.isEmpty(rootDir)) { @@ -132,9 +130,7 @@ private void populateRoots() { roots.add(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES)); roots.add(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)); roots.add(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM)); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - roots.add(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS)); - } + roots.add(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS)); // Add paths that might not be accessible to Syncthing. SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this); diff --git a/app/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java b/app/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java index 5385a9c54..db64881c6 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java @@ -77,13 +77,6 @@ public class WebGuiActivity extends StateDialogActivity @Override public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) { try { - int sdk = android.os.Build.VERSION.SDK_INT; - if (sdk < Build.VERSION_CODES.ICE_CREAM_SANDWICH) { - // The mX509Certificate field is not available for ICS- devices - Log.w(TAG, "Skipping certificate check for devices = 21) { - mActivity.finishAndRemoveTask(); - } else { - mActivity.finish(); - } + mActivity.finishAndRemoveTask(); } } diff --git a/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java b/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java index fb30197dc..1b8c32dc6 100644 --- a/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java +++ b/app/src/main/java/com/nutomic/syncthingandroid/util/Util.java @@ -218,7 +218,7 @@ public static void dismissDialogSafe(Dialog dialog, Activity activity) { if (activity.isFinishing()) return; - if (Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN && activity.isDestroyed()) + if (activity.isDestroyed()) return; dialog.dismiss();