aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-07-09 01:14:12 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-07-09 01:14:12 +0200
commit3c239bfb34e67f78ea1a50374045ca5a50b84e9c (patch)
tree0591b75a39b994c7e866cbb565562f968b8d7938 /OpenKeychain/src/main/java/org
parent20cebc2788ef409e64727e5f9da393704224af70 (diff)
downloadopen-keychain-3c239bfb34e67f78ea1a50374045ca5a50b84e9c.tar.gz
open-keychain-3c239bfb34e67f78ea1a50374045ca5a50b84e9c.tar.bz2
open-keychain-3c239bfb34e67f78ea1a50374045ca5a50b84e9c.zip
use onResumeFragments instead of onResume for fragment initialization
Diffstat (limited to 'OpenKeychain/src/main/java/org')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
index 3471ef80a..1ca1ec046 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
@@ -136,8 +136,8 @@ public class PassphraseDialogActivity extends FragmentActivity {
}
@Override
- protected void onResume() {
- super.onResume();
+ protected void onResumeFragments() {
+ super.onResumeFragments();
/* Show passphrase dialog to cache a new passphrase the user enters for using it later for
* encryption. Based on mSecretKeyId it asks for a passphrase to open a private key or it asks