Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 'Use_ActivityCompat_recreate' into 'master'

Browse Source 
* Use_ActivityCompat_recreate:
  resync gradle verification metadata
  Use ActivityCompat.recreate().

fdroid/fdroidclient!1028
This commit is contained in:
Hans-Christoph Steiner 2021-06-16 14:37:07 +02:00
commit 42b0b576d1
No known key found for this signature in database
GPG Key ID: 3E177817BA1B9BFA
5 changed files with 91 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle
View File

@ -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'

1
app/src/main/java/org/fdroid/fdroid/installer/FileInstallerActivity.java
View File

@ -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.

3
app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java
View File

@ -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;

BIN
gradle/verification-keyring.gpg
View File

Binary file not shown.

86
gradle/verification-metadata.xml
View File

@ -128,6 +128,11 @@
<sha256 value="3690001fc5a57ad176cacf7a13f56219bffb73b93c7978dbac1e1e5db082d6c0" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.activity" name="activity" version="1.2.3">
<artifact name="activity-1.2.3.aar">
<sha256 value="1dce0705c334a6b2ef03382418dc7586f4e57ee23817267b403ea8cfc36c824e" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.annotation" name="annotation" version="1.1.0">
<artifact name="annotation-1.1.0.jar">
<sha256 value="d38d63edb30f1467818d50aaf05f8a692dea8b31392a049bfa991b159ad5b692" origin="Generated by Gradle because artifact wasn't signed"/>
@ -136,6 +141,11 @@
<sha256 value="2e9372ba7780ef44952adbf86b66e1f08682c1e5277c926185f6564a13799efe" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.annotation" name="annotation" version="1.2.0">
<artifact name="annotation-1.2.0.jar">
<sha256 value="9029262bddce116e6d02be499e4afdba21f24c239087b76b3b57d7e98b490a36" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.annotation" name="annotation-experimental" version="1.0.0">
<artifact name="annotation-experimental-1.0.0.aar">
<sha256 value="b219d2b568e7e4ba534e09f8c2fd242343df6ccbdfbbe938846f5d740e6b0b11" origin="Generated by Gradle because artifact wasn't signed"/>
@ -154,6 +164,11 @@
<sha256 value="3d2131a55a61a777322e2126e0018011efa6339e53b44153eb651b16020cca70" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.appcompat" name="appcompat" version="1.3.0">
<artifact name="appcompat-1.3.0.aar">
<sha256 value="1a2b6c4c63fe0df594648c07bea664f22905fed27c66dc34612fd0c4d2bd877e" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.appcompat" name="appcompat-resources" version="1.1.0">
<artifact name="appcompat-resources-1.1.0.aar">
<sha256 value="19944d32b46551a17c347e21894b95837fbd7baaafc9e2082794344f222f7361" origin="Generated by Gradle because artifact wasn't signed"/>
@ -167,6 +182,11 @@
<sha256 value="c470297c03ff3de1c3d15dacf0be0cae63abc10b52f021dd07ae28daa3100fe5" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.appcompat" name="appcompat-resources" version="1.3.0">
<artifact name="appcompat-resources-1.3.0.aar">
<sha256 value="b2e199c9139b127533ddea6b4a8eb76f3dd69557bb852cab2d208367b6808d06" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.arch.core" name="core-common" version="2.0.0">
<artifact name="core-common-2.0.0.pom">
<sha256 value="4b6f1d459ddd146b4e85ed6d46e86eb8c2639c5de47904e6db4d698721334220" origin="Generated by Gradle because artifact wasn't signed"/>
@ -269,6 +289,11 @@
<sha256 value="e92ea65a37d589943d405a6a54d1be9d12a225948f26c4e41e511dd55e81efb6" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.core" name="core" version="1.5.0">
<artifact name="core-1.5.0.aar">
<sha256 value="2b279712795689069cfb63e48b3ab63c32a5649bdda44c482eb8f81ca1a72161" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.cursoradapter" name="cursoradapter" version="1.0.0">
<artifact name="cursoradapter-1.0.0.aar">
<sha256 value="a81c8fe78815fa47df5b749deb52727ad11f9397da58b16017f4eb2c11e28564" origin="Generated by Gradle because artifact wasn't signed"/>
@ -335,6 +360,11 @@
<sha256 value="ac10f808a89691fff793a1e180125e8651c48b67a36d2b1d6a7ee360287b153b" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.fragment" name="fragment" version="1.3.4">
<artifact name="fragment-1.3.4.aar">
<sha256 value="c023c0ab666456885284d8e88519a743bc863c2b2effb92741fc789cbdb10db4" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.gridlayout" name="gridlayout" version="1.0.0">
<artifact name="gridlayout-1.0.0.aar">
<sha256 value="a7e5dc6f39dbc3dc6ac6d57b02a9c6fd792e80f0e45ddb3bb08e8f03d23c8755" origin="Generated by Gradle because artifact wasn't signed"/>
@ -388,6 +418,11 @@
<sha256 value="cc30a8a2a97d3767bd169b747c078727308096dd3ab7917d80b2f1f42d118bd6" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.lifecycle" name="lifecycle-common" version="2.3.1">
<artifact name="lifecycle-common-2.3.1.jar">
<sha256 value="15848fb56db32f4c7cdc72b324003183d52a4884d6bf09be708ac7f587d139b5" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.lifecycle" name="lifecycle-livedata" version="2.0.0">
<artifact name="lifecycle-livedata-2.0.0.aar">
<sha256 value="c82609ced8c498f0a701a30fb6771bb7480860daee84d82e0a81ee86edf7ba39" origin="Generated by Gradle because artifact wasn't signed"/>
@ -409,6 +444,11 @@
<sha256 value="aa51621be3817d1f5d21336b0c0525fe96ae899cec656c13d8ea18a51ea32c2f" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.lifecycle" name="lifecycle-livedata-core" version="2.3.1">
<artifact name="lifecycle-livedata-core-2.3.1.aar">
<sha256 value="e55d38c372460f0a03997ddc950c67227511340fd74f8634d99d29653cd81ab1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.lifecycle" name="lifecycle-runtime" version="2.0.0">
<artifact name="lifecycle-runtime-2.0.0.pom">
<sha256 value="a92a46fa7aec8ac326a5d578734a2d5b63206976996b9e06cae171b35b0ab6de" origin="Generated by Gradle because artifact wasn't signed"/>
@ -422,6 +462,11 @@
<sha256 value="7f154066fed1c9162870f728b208352831b3d1f8f23f5d388958a50ca4e9f441" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.lifecycle" name="lifecycle-runtime" version="2.3.1">
<artifact name="lifecycle-runtime-2.3.1.aar">
<sha256 value="dd294f4a689c71ff877fd41f3b67a3a62f7760d44ce420e6130f1fc3569d8f00" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.lifecycle" name="lifecycle-service" version="2.1.0">
<artifact name="lifecycle-service-2.1.0.aar">
<sha256 value="23516745f34f16ff7850bb1eadd55cf193dd789cba428de4bca120433e3bfd69" origin="Generated by Gradle because artifact wasn't signed"/>
@ -435,6 +480,11 @@
<sha256 value="aaa3afaa49ff47e2bc9b2389f939d3e8137616c4616684e2dfb53ba8366aa11d" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.lifecycle" name="lifecycle-viewmodel" version="2.3.1">
<artifact name="lifecycle-viewmodel-2.3.1.aar">
<sha256 value="b6db4c274a12ff85a4747e1e6669c7e98aefa2571ace9d1f1a6fa6be417ce838" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.2.0">
<artifact name="lifecycle-viewmodel-savedstate-2.2.0.aar">
<sha256 value="3ce866fb822b20fe2f188f974992869a0a6233fe40acbefcff090d6def5e7f33" origin="Generated by Gradle because artifact wasn't signed"/>
@ -443,6 +493,11 @@
<sha256 value="9f31254e547b214257067611f18fc8a3c08f8df9eba634f6e21badc848596db1" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.lifecycle" name="lifecycle-viewmodel-savedstate" version="2.3.1">
<artifact name="lifecycle-viewmodel-savedstate-2.3.1.aar">
<sha256 value="97137a8af6a31776a14e4866ab808c7c0a791b484bdbc788bbd83e66407564c0" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.loader" name="loader" version="1.0.0">
<artifact name="loader-1.0.0.aar">
<sha256 value="11f735cb3b55c458d470bed9e25254375b518b4b1bad6926783a7026db0f5025" origin="Generated by Gradle because artifact wasn't signed"/>
@ -517,6 +572,11 @@
<sha256 value="844d7d22fcea798c78bf5559229daf88ec9cad8136f5eea0a29aa76b3f8fde7c" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.savedstate" name="savedstate" version="1.1.0">
<artifact name="savedstate-1.1.0.aar">
<sha256 value="d60bbe44c2c08083a17c5dc678a6d6b4d0a2d664858016ab5c049cbea90a63b7" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.slidingpanelayout" name="slidingpanelayout" version="1.0.0">
<artifact name="slidingpanelayout-1.0.0.aar">
<sha256 value="76bffb7cefbf780794d8817002dad1562f3e27c0a9f746d62401c8edb30aeede" origin="Generated by Gradle because artifact wasn't signed"/>
@ -642,6 +702,11 @@
<sha256 value="e134946ac5916554d8e7873f4b59034ec039138cc118a84ed1e9f700628163da" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.tracing" name="tracing" version="1.0.0">
<artifact name="tracing-1.0.0.aar">
<sha256 value="07b8b6139665b884a162eccf97891ca50f7f56831233bf25168ae04f7b568612" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.transition" name="transition" version="1.2.0">
<artifact name="transition-1.2.0.aar">
<sha256 value="a1e059b3bc0b43a58dec0efecdcaa89c82d2bca552ea5bacf6656c46e853157e" origin="Generated by Gradle because artifact wasn't signed"/>
@ -674,6 +739,11 @@
<sha256 value="c729c7be0cc06323bda829d460666e79dbd43b799a21089a44bd3b293dc253b5" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.versionedparcelable" name="versionedparcelable" version="1.1.1">
<artifact name="versionedparcelable-1.1.1.aar">
<sha256 value="57e8d93260d18d5b9007c9eed3c64ad159de90c8609ebfc74a347cbd514535a4" origin="Generated by Gradle because artifact wasn't signed"/>
</artifact>
</component>
<component group="androidx.viewpager" name="viewpager" version="1.0.0">
<artifact name="viewpager-1.0.0.aar">
<sha256 value="147af4e14a1984010d8f155e5e19d781f03c1d70dfed02a8e0d18428b8fc8682" origin="Generated by Gradle because artifact wasn't signed"/>
@ -1716,6 +1786,11 @@
<sha256 value="b686eb38dd11c54d3bf900ee8465918835f53281d66abf57193242db9159655a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="info.guardianproject.netcipher" name="netcipher" version="2.2.0-alpha">
<artifact name="netcipher-2.2.0-alpha.jar">
<sha256 value="86a7b8cb066bc66a8eef69ef8f16cc51b3a4e4bcbbf2bd5edc37167e86b5d553" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="info.guardianproject.panic" name="panic" version="1.0">
<artifact name="panic-1.0.jar">
<sha256 value="35116ab95212e67f94577faf67b88c11a6b21cbf9178b3f5b51d3dff45203ffd" origin="Generated by Gradle"/>
@ -1733,6 +1808,16 @@
<sha256 value="8479c1973dc45f067742ef8096744bdb515d973bdd88d3aafd3a9f30fe48e517" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.reactivex.rxjava3" name="rxandroid" version="3.0.0">
<artifact name="rxandroid-3.0.0.aar">
<sha256 value="5b3582a1e9fd9e9037ee933ab9486ff323d6244b5f1b6ff6ebadc2bfa957ce5b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="io.reactivex.rxjava3" name="rxjava" version="3.0.9">
<artifact name="rxjava-3.0.9.jar">
<sha256 value="f359465f042caca7528a809ddcbe2ef6626907a7f4388ea6ee0dbae9c2d39cb1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="it.unimi.dsi" name="fastutil" version="7.2.0">
<artifact name="fastutil-7.2.0.jar">
<pgp value="8254180bfc943b816e0b5e2e5e2f2b3d474efe6b"/>
@ -2708,6 +2793,7 @@
<component group="org.reactivestreams" name="reactive-streams" version="1.0.3">
<artifact name="reactive-streams-1.0.3.jar">
<pgp value="a33a0b49a4c1ab590b0a4ddc1364c5e2df3e99c5"/>
<sha256 value="1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.robolectric" name="annotations" version="4.3">