diff --git a/app/build.gradle b/app/build.gradle index e56f819b2..49bfb35e1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,6 +29,7 @@ android { testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' minSdkVersion 14 + //noinspection ExpiredTargetSdkVersion targetSdkVersion 25 /* The Android Testing Support Library collects analytics to continuously improve the testing diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java index e7d98bfe0..b43626b6d 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapWorkflowActivity.java @@ -692,6 +692,7 @@ public class SwapWorkflowActivity extends AppCompatActivity { @Override public void onActivityResult(int requestCode, int resultCode, Intent intent) { + super.onActivityResult(requestCode, resultCode, intent); IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent); if (scanResult != null) { if (scanResult.getContents() != null) { diff --git a/app/src/main/java/org/fdroid/fdroid/CleanCacheService21.java b/app/src/main/java/org/fdroid/fdroid/CleanCacheService21.java index 66e3853bf..cd772b488 100644 --- a/app/src/main/java/org/fdroid/fdroid/CleanCacheService21.java +++ b/app/src/main/java/org/fdroid/fdroid/CleanCacheService21.java @@ -5,13 +5,15 @@ import android.system.ErrnoException; import android.system.Os; import android.system.StructStat; +import androidx.annotation.RequiresApi; + import java.io.File; /** * Helper class to prevent {@link VerifyError}s from occurring in {@link CleanCacheService#clearOldFiles(File, long)} * due to the fact that {@link Os} was only introduced in API 21. */ -@TargetApi(21) +@RequiresApi(21) class CleanCacheService21 { static void deleteIfOld(File file, long olderThan) { if (file == null || !file.exists()) { 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 6ad56b4c3..97b978d0b 100644 --- a/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java +++ b/app/src/main/java/org/fdroid/fdroid/compat/FileCompat.java @@ -5,6 +5,8 @@ import android.os.Build; import android.system.ErrnoException; import android.util.Log; +import androidx.annotation.RequiresApi; + import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.SanitizedFile; @@ -40,6 +42,7 @@ public class FileCompat { * not attempt to load this class at runtime. Otherwise, using the Os.symlink method will cause * a VerifyError to be thrown at runtime when the FileCompat class is first used. */ + @RequiresApi(Build.VERSION_CODES.LOLLIPOP) private static class Symlink21 { @TargetApi(21) 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 a9e82a383..b60b498c0 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/DefaultInstallerActivity.java @@ -158,6 +158,7 @@ public class DefaultInstallerActivity extends FragmentActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); switch (requestCode) { case REQUEST_CODE_INSTALL: switch (resultCode) { diff --git a/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java b/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java index 07964ec1f..df39d5b44 100644 --- a/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java +++ b/app/src/main/java/org/fdroid/fdroid/qr/CameraCharacteristicsMinApiLevel21.java @@ -1,15 +1,16 @@ package org.fdroid.fdroid.qr; -import android.annotation.TargetApi; import android.content.Context; import android.hardware.camera2.CameraAccessException; import android.hardware.camera2.CameraCharacteristics; import android.hardware.camera2.CameraManager; import android.os.Build; -import androidx.annotation.NonNull; import android.util.Log; -@TargetApi(Build.VERSION_CODES.LOLLIPOP) +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; + +@RequiresApi(Build.VERSION_CODES.LOLLIPOP) public class CameraCharacteristicsMinApiLevel21 extends CameraCharacteristicsChecker { private static final String TAG = "CameraCharMinApiLevel21"; diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java index 4dae4e34c..125cafa86 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java @@ -306,6 +306,7 @@ public class AppDetailsActivity extends AppCompatActivity @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); switch (requestCode) { case REQUEST_ENABLE_BLUETOOTH: fdroidApp.sendViaBluetooth(this, resultCode, app.packageName); diff --git a/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java b/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java index e0a931685..15dc3f34e 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java @@ -140,6 +140,7 @@ public class ManageReposActivity extends AppCompatActivity @Override protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); setIntent(intent); } diff --git a/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java b/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java index 6310344e5..28291685c 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java @@ -173,6 +173,7 @@ public class RepoDetailsActivity extends AppCompatActivity { @Override public void onNewIntent(Intent i) { + super.onNewIntent(i); // onResume gets called after this to handle the intent setIntent(i); } diff --git a/app/src/main/res/values-sw360dp-v13/values-preference.xml b/app/src/main/res/values-sw360dp-v13/values-preference.xml index 915e41a7d..c0908edd5 100644 --- a/app/src/main/res/values-sw360dp-v13/values-preference.xml +++ b/app/src/main/res/values-sw360dp-v13/values-preference.xml @@ -1,4 +1,5 @@ + - false - 0dp + false + 0dp