wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cache activity result if provider isn't ready yet

Browse source
This commit is contained in:
Vincent Breitmoser 2018-04-02 23:29:01 +02:00
parent ec4e704c32
commit f0c438e2d4
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
plugins/openpgp-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpKeyPreference.java
View file

@ -42,6 +42,7 @@ public class OpenPgpKeyPreference extends Preference implements OpenPgpApiManage
private long keyId;
private String defaultUserId;
private OpenPgpApiManager openPgpApiManager;
private Intent cachedActivityResultData;
private PendingIntent pendingIntentSelectKey;
private boolean pendingIntentRunImmediately;
@ -111,7 +112,13 @@ public class OpenPgpKeyPreference extends Preference implements OpenPgpApiManage
}
private void apiRetrievePendingIntentAndKeyInfo() {
Intent data = new Intent();
Intent data;
if (cachedActivityResultData != null) {
data = cachedActivityResultData;
cachedActivityResultData = null;
} else {
data = new Intent();
}
apiRetrievePendingIntentAndKeyInfo(data);
}
@ -294,7 +301,12 @@ public class OpenPgpKeyPreference extends Preference implements OpenPgpApiManage
return true;
case REQUEST_CODE_KEY_PREFERENCE:
if (resultCode == Activity.RESULT_OK) {
apiRetrievePendingIntentAndKeyInfo(data);
cachedActivityResultData = data;
// this might happen early in the lifecycle (e.g. before onResume). if the provider isn't connected
// here, apiRetrievePendingIntentAndKeyInfo() will be called as soon as it is.
if (openPgpApiManager.getOpenPgpProviderState() == OpenPgpProviderState.OK) {
apiRetrievePendingIntentAndKeyInfo();
}
}
return true;
}