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 bd451cec1..ef79897fa 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 >= 24; // TODO: Use Build.VERSION_CODES.N + return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N; } } 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 000bbbf2b..18defb767 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 < 24) // TODO: Use Build.VERSION_CODES.N + if ((Build.VERSION.SDK_INT < Build.VERSION_CODES.N) && (!uri.getScheme().equals("file"))) { throw new RuntimeException("PackageInstaller < Android N only supports file scheme!"); } - if ((Build.VERSION.SDK_INT >= 24) // TODO: Use Build.VERSION_CODES.N + if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) && (!uri.getScheme().equals("content"))) { throw new RuntimeException("PackageInstaller >= Android N only supports content scheme!"); } @@ -103,7 +103,7 @@ public class DefaultInstallerActivity extends FragmentActivity { 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 < 24) { // TODO: Use Build.VERSION_CODES.N + } else if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) { intent.setAction(Intent.ACTION_INSTALL_PACKAGE); intent.putExtra(Intent.EXTRA_RETURN_RESULT, true); intent.putExtra(Intent.EXTRA_NOT_UNKNOWN_SOURCE, true);