From 19a033db325e43b6c1cf3e5bf6fd93fccca8293a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 27 Jul 2016 16:07:11 +0200 Subject: [PATCH] Use integers for SDK checks More consistent with other checks as introduced in e021eb5c --- .../org/fdroid/fdroid/compat/FileCompat.java | 2 +- .../fdroid/compat/SupportedArchitectures.java | 2 +- .../fdroid/installer/DefaultInstaller.java | 2 +- .../installer/DefaultInstallerActivity.java | 16 ++++++++-------- .../org/fdroid/fdroid/installer/Installer.java | 3 +-- .../net/bluetooth/BluetoothConnection.java | 2 +- .../privileged/views/AppSecurityPermissions.java | 8 ++++---- .../fdroid/fdroid/views/swap/ConfirmReceive.java | 3 +-- .../fdroid/views/swap/InitialLoadingView.java | 3 +-- .../fdroid/fdroid/views/swap/JoinWifiView.java | 3 +-- .../org/fdroid/fdroid/views/swap/NfcView.java | 3 +-- .../fdroid/fdroid/views/swap/SelectAppsView.java | 3 +-- .../fdroid/fdroid/views/swap/StartSwapView.java | 5 ++--- .../fdroid/fdroid/views/swap/SwapAppsView.java | 3 +-- .../fdroid/fdroid/views/swap/SwapConnecting.java | 5 ++--- .../org/fdroid/fdroid/views/swap/WifiQrView.java | 3 +-- 16 files changed, 28 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java b/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java index cf26ffd61..5612d6d05 100644 --- a/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java +++ b/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java @@ -42,7 +42,7 @@ public class FileCompat { */ private static class Symlink21 { - @TargetApi(Build.VERSION_CODES.LOLLIPOP) + @TargetApi(21) void symlink(SanitizedFile source, SanitizedFile dest) { try { android.system.Os.symlink(source.getAbsolutePath(), dest.getAbsolutePath()); diff --git a/app/src/main/java/org/fdroid/fdroid/compat/SupportedArchitectures.java b/app/src/main/java/org/fdroid/fdroid/compat/SupportedArchitectures.java index 216367ed6..12ea456c1 100644 --- a/app/src/main/java/org/fdroid/fdroid/compat/SupportedArchitectures.java +++ b/app/src/main/java/org/fdroid/fdroid/compat/SupportedArchitectures.java @@ -8,7 +8,7 @@ public class SupportedArchitectures { /** * The most preferred ABI is the first element in the list. */ - @TargetApi(Build.VERSION_CODES.LOLLIPOP) + @TargetApi(21) @SuppressWarnings("deprecation") public static String[] getAbis() { if (Build.VERSION.SDK_INT >= 21) { diff --git a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java index ef79897fa..cf440ae96 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstaller.java @@ -92,6 +92,6 @@ public class DefaultInstaller extends Installer { @Override protected boolean supportsContentUri() { // Android N only supports content Uris - return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N; + return Build.VERSION.SDK_INT >= 24; } } diff --git a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java index b022369ad..8c7769f41 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java @@ -79,11 +79,11 @@ public class DefaultInstallerActivity extends FragmentActivity { throw new RuntimeException("Set the data uri to point to an apk location!"); } // https://code.google.com/p/android/issues/detail?id=205827 - if ((Build.VERSION.SDK_INT < Build.VERSION_CODES.N) + if ((Build.VERSION.SDK_INT < 24) && (!uri.getScheme().equals("file"))) { throw new RuntimeException("PackageInstaller < Android N only supports file scheme!"); } - if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) + if ((Build.VERSION.SDK_INT >= 24) && (!uri.getScheme().equals("content"))) { throw new RuntimeException("PackageInstaller >= Android N only supports content scheme!"); } @@ -94,16 +94,16 @@ public class DefaultInstallerActivity extends FragmentActivity { // works only when being installed as system-app // https://code.google.com/p/android/issues/detail?id=42253 - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) { + if (Build.VERSION.SDK_INT < 14) { intent.setAction(Intent.ACTION_VIEW); intent.setDataAndType(uri, "application/vnd.android.package-archive"); - } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) { + } else if (Build.VERSION.SDK_INT < 16) { intent.setAction(Intent.ACTION_INSTALL_PACKAGE); intent.setData(uri); intent.putExtra(Intent.EXTRA_RETURN_RESULT, true); intent.putExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, true); intent.putExtra(Intent.EXTRA_ALLOW_REPLACE, true); - } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { + } else if (Build.VERSION.SDK_INT < 24) { intent.setAction(Intent.ACTION_INSTALL_PACKAGE); intent.setData(uri); intent.putExtra(Intent.EXTRA_RETURN_RESULT, true); @@ -144,7 +144,7 @@ public class DefaultInstallerActivity extends FragmentActivity { Intent intent = new Intent(); intent.setData(uri); - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) { + if (Build.VERSION.SDK_INT < 14) { intent.setAction(Intent.ACTION_DELETE); } else { intent.setAction(Intent.ACTION_UNINSTALL_PACKAGE); @@ -170,7 +170,7 @@ public class DefaultInstallerActivity extends FragmentActivity { * com.android.packageinstaller.PackageInstallerActivity: setResult is * never executed on Androids < 4.0 */ - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) { + if (Build.VERSION.SDK_INT < 14) { installer.sendBroadcastInstall(downloadUri, Installer.ACTION_INSTALL_COMPLETE); break; } @@ -196,7 +196,7 @@ public class DefaultInstallerActivity extends FragmentActivity { break; case REQUEST_CODE_UNINSTALL: // resultCode is always 0 on Android < 4.0. - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) { + if (Build.VERSION.SDK_INT < 14) { installer.sendBroadcastUninstall(uninstallPackageName, Installer.ACTION_UNINSTALL_COMPLETE); break; diff --git a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java index 791ca55c3..b6e6c4332 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/Installer.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/Installer.java @@ -24,7 +24,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.Uri; -import android.os.Build; import android.os.PatternMatcher; import android.support.v4.content.LocalBroadcastManager; import android.text.TextUtils; @@ -103,7 +102,7 @@ public abstract class Installer { } private int newPermissionCount(Apk apk) { - boolean supportsRuntimePermissions = apk.targetSdkVersion >= Build.VERSION_CODES.M; + boolean supportsRuntimePermissions = apk.targetSdkVersion >= 23; if (supportsRuntimePermissions) { return 0; } diff --git a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConnection.java b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConnection.java index 299eaca96..dc57e4628 100644 --- a/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConnection.java +++ b/app/src/main/java/org/fdroid/fdroid/net/bluetooth/BluetoothConnection.java @@ -32,7 +32,7 @@ public class BluetoothConnection { return output; } - @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) + @TargetApi(14) public void open() throws IOException { if (Build.VERSION.SDK_INT >= 14 && !socket.isConnected()) { // Server sockets will already be connected when they are passed to us, diff --git a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java index a743b0850..e4b2b1c4a 100644 --- a/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java +++ b/app/src/main/java/org/fdroid/fdroid/privileged/views/AppSecurityPermissions.java @@ -104,10 +104,10 @@ public class AppSecurityPermissions { super(info); } - @TargetApi(Build.VERSION_CODES.LOLLIPOP_MR1) + @TargetApi(22) public Drawable loadGroupIcon(Context context, PackageManager pm) { if (icon != 0) { - return (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) ? loadIcon(pm) : loadUnbadgedIcon(pm); + return (Build.VERSION.SDK_INT < 22) ? loadIcon(pm) : loadUnbadgedIcon(pm); } return ContextCompat.getDrawable(context, R.drawable.ic_perm_device_info); } @@ -325,9 +325,9 @@ public class AppSecurityPermissions { * doesn't currently hold this permission. On older devices that don't support * this concept, permissions are never "new permissions". */ - @TargetApi(Build.VERSION_CODES.JELLY_BEAN) + @TargetApi(16) private static boolean isNewPermission(PackageInfo installedPkgInfo, int existingFlags) { - if (installedPkgInfo == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) { + if (installedPkgInfo == null || Build.VERSION.SDK_INT < 16) { return false; } diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java b/app/src/main/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java index e35da2c55..2e23d4a05 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/ConfirmReceive.java @@ -2,7 +2,6 @@ package org.fdroid.fdroid.views.swap; import android.annotation.TargetApi; import android.content.Context; -import android.os.Build; import android.support.annotation.ColorRes; import android.support.annotation.NonNull; import android.util.AttributeSet; @@ -32,7 +31,7 @@ public class ConfirmReceive extends RelativeLayout implements SwapWorkflowActivi super(context, attrs, defStyleAttr); } - @TargetApi(Build.VERSION_CODES.LOLLIPOP) + @TargetApi(21) public ConfirmReceive(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); } diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java index ea2f6136e..56d2fba05 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/InitialLoadingView.java @@ -2,7 +2,6 @@ package org.fdroid.fdroid.views.swap; import android.annotation.TargetApi; import android.content.Context; -import android.os.Build; import android.support.annotation.ColorRes; import android.support.annotation.NonNull; import android.util.AttributeSet; @@ -27,7 +26,7 @@ public class InitialLoadingView extends RelativeLayout implements SwapWorkflowAc super(context, attrs, defStyleAttr); } - @TargetApi(Build.VERSION_CODES.LOLLIPOP) + @TargetApi(21) public InitialLoadingView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); } diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/JoinWifiView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/JoinWifiView.java index 29d27aa69..7577c3662 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/JoinWifiView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/JoinWifiView.java @@ -6,7 +6,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.wifi.WifiManager; -import android.os.Build; import android.support.annotation.ColorRes; import android.support.annotation.NonNull; import android.support.v4.content.LocalBroadcastManager; @@ -40,7 +39,7 @@ public class JoinWifiView extends RelativeLayout implements SwapWorkflowActivity super(context, attrs, defStyleAttr); } - @TargetApi(Build.VERSION_CODES.LOLLIPOP) + @TargetApi(21) public JoinWifiView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); } diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/NfcView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/NfcView.java index fc5a885bc..c0f093bce 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/NfcView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/NfcView.java @@ -2,7 +2,6 @@ package org.fdroid.fdroid.views.swap; import android.annotation.TargetApi; import android.content.Context; -import android.os.Build; import android.support.annotation.ColorRes; import android.support.annotation.NonNull; import android.support.v4.view.MenuItemCompat; @@ -32,7 +31,7 @@ public class NfcView extends RelativeLayout implements SwapWorkflowActivity.Inne super(context, attrs, defStyleAttr); } - @TargetApi(Build.VERSION_CODES.LOLLIPOP) + @TargetApi(21) public NfcView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); } diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SelectAppsView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SelectAppsView.java index b625c7ceb..33b0a519e 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/SelectAppsView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SelectAppsView.java @@ -7,7 +7,6 @@ import android.database.Cursor; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.support.annotation.ColorRes; import android.support.annotation.NonNull; @@ -56,7 +55,7 @@ public class SelectAppsView extends ListView implements super(context, attrs, defStyleAttr); } - @TargetApi(Build.VERSION_CODES.LOLLIPOP) + @TargetApi(21) public SelectAppsView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); } diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/StartSwapView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/StartSwapView.java index f0b170dfb..a7ff0b855 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/StartSwapView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/StartSwapView.java @@ -7,7 +7,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.wifi.WifiConfiguration; -import android.os.Build; import android.support.annotation.ColorRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -60,12 +59,12 @@ public class StartSwapView extends RelativeLayout implements SwapWorkflowActivit super(context, attrs); } - @TargetApi(Build.VERSION_CODES.HONEYCOMB) + @TargetApi(11) public StartSwapView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); } - @TargetApi(Build.VERSION_CODES.LOLLIPOP) + @TargetApi(21) public StartSwapView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); } diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java index 3165f7de9..aa930c15c 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapAppsView.java @@ -9,7 +9,6 @@ import android.content.IntentFilter; import android.database.ContentObserver; import android.database.Cursor; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -76,7 +75,7 @@ public class SwapAppsView extends ListView implements super(context, attrs, defStyleAttr); } - @TargetApi(Build.VERSION_CODES.LOLLIPOP) + @TargetApi(21) public SwapAppsView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); } diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapConnecting.java b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapConnecting.java index 387ffdceb..d35ea3492 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/SwapConnecting.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/SwapConnecting.java @@ -5,7 +5,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.os.Build; import android.support.annotation.ColorRes; import android.support.annotation.NonNull; import android.support.v4.content.LocalBroadcastManager; @@ -35,12 +34,12 @@ public class SwapConnecting extends LinearLayout implements SwapWorkflowActivity super(context, attrs); } - @TargetApi(Build.VERSION_CODES.HONEYCOMB) + @TargetApi(11) public SwapConnecting(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); } - @TargetApi(Build.VERSION_CODES.LOLLIPOP) + @TargetApi(21) public SwapConnecting(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); } diff --git a/app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java b/app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java index 3f5342fcf..9212addde 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java +++ b/app/src/main/java/org/fdroid/fdroid/views/swap/WifiQrView.java @@ -7,7 +7,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.graphics.LightingColorFilter; import android.net.Uri; -import android.os.Build; import android.support.annotation.ColorRes; import android.support.annotation.NonNull; import android.support.v4.content.LocalBroadcastManager; @@ -51,7 +50,7 @@ public class WifiQrView extends ScrollView implements SwapWorkflowActivity.Inner super(context, attrs, defStyleAttr); } - @TargetApi(Build.VERSION_CODES.LOLLIPOP) + @TargetApi(21) public WifiQrView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); }