diff --git a/app/build.gradle b/app/build.gradle index d85643a41..67b2ff5a9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,7 @@ def basicApplicationId = "org.fdroid.basic" def privilegedExtensionApplicationId = '"org.fdroid.fdroid.privileged"' android { - compileSdkVersion 29 + compileSdkVersion 30 defaultConfig { versionCode 1013001 @@ -142,10 +142,9 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.appcompat:appcompat:1.3.0' implementation 'androidx.preference:preference:1.1.1' implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation 'androidx.annotation:annotation:1.1.0' implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.vectordrawable:vectordrawable:1.1.0' diff --git a/app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java b/app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java index c068d8441..925e283d6 100644 --- a/app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java @@ -128,6 +128,7 @@ public class FileInstallerActivity extends FragmentActivity { @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); switch (requestCode) { case MY_PERMISSIONS_REQUEST_STORAGE: // If request is cancelled, the result arrays are empty. diff --git a/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java index ec2f37e73..022d22a3b 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java @@ -53,6 +53,7 @@ import org.fdroid.fdroid.work.CleanCacheWorker; import org.fdroid.fdroid.work.FDroidMetricsWorker; import androidx.appcompat.app.AppCompatActivity; +import androidx.core.app.ActivityCompat; import androidx.preference.CheckBoxPreference; import androidx.preference.EditTextPreference; import androidx.preference.ListPreference; @@ -291,7 +292,7 @@ public class PreferencesFragment extends PreferenceFragmentCompat AppCompatActivity activity = (AppCompatActivity) getActivity(); // Theme will be applied upon activity creation if (activity != null) { - activity.recreate(); + ActivityCompat.recreate(activity); } } break; diff --git a/gradle/verification-keyring.gpg b/gradle/verification-keyring.gpg index 809bc7020..500a18b50 100644 Binary files a/gradle/verification-keyring.gpg and b/gradle/verification-keyring.gpg differ diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 9e93bb9f8..1bf0cb21b 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -128,6 +128,11 @@ + + + + + @@ -136,6 +141,11 @@ + + + + + @@ -154,6 +164,11 @@ + + + + + @@ -167,6 +182,11 @@ + + + + + @@ -269,6 +289,11 @@ + + + + + @@ -335,6 +360,11 @@ + + + + + @@ -388,6 +418,11 @@ + + + + + @@ -409,6 +444,11 @@ + + + + + @@ -422,6 +462,11 @@ + + + + + @@ -435,6 +480,11 @@ + + + + + @@ -443,6 +493,11 @@ + + + + + @@ -517,6 +572,11 @@ + + + + + @@ -642,6 +702,11 @@ + + + + + @@ -674,6 +739,11 @@ + + + + + @@ -1716,6 +1786,11 @@ + + + + + @@ -1733,6 +1808,16 @@ + + + + + + + + + + @@ -2708,6 +2793,7 @@ +