diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-04 18:50:20 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-04-04 18:50:20 +0200 |
commit | 54f20e1cd501fc6e29c0e7cc2a43857b1361ac4e (patch) | |
tree | 20d971bbb66505d30a42073aae2f4f2a78bcff5b /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java | |
parent | d7c2488a0f08c8314706f76c22b53166309bcdf0 (diff) | |
parent | e65de650a47cf7b48bf4104cc9ef2b324e2c9c0d (diff) | |
download | open-keychain-54f20e1cd501fc6e29c0e7cc2a43857b1361ac4e.tar.gz open-keychain-54f20e1cd501fc6e29c0e7cc2a43857b1361ac4e.tar.bz2 open-keychain-54f20e1cd501fc6e29c0e7cc2a43857b1361ac4e.zip |
Merge remote-tracking branch 'origin/master' into db-overhaul
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java')
-rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java index b2ab75cea..307c9c61a 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java @@ -178,9 +178,23 @@ public class RemoteServiceActivity extends ActionBarActivity { mAccSettingsFragment.setAccSettings(settings); } else if (ACTION_CACHE_PASSPHRASE.equals(action)) { long secretKeyId = extras.getLong(EXTRA_SECRET_KEY_ID); - Intent resultData = extras.getParcelable(EXTRA_DATA); + final Intent resultData = extras.getParcelable(EXTRA_DATA); + + PassphraseDialogFragment.show(this, secretKeyId, + new Handler() { + @Override + public void handleMessage(Message message) { + if (message.what == PassphraseDialogFragment.MESSAGE_OKAY) { + // return given params again, for calling the service method again + RemoteServiceActivity.this.setResult(RESULT_OK, resultData); + } else { + RemoteServiceActivity.this.setResult(RESULT_CANCELED); + } + + RemoteServiceActivity.this.finish(); + } + }); - showPassphraseDialog(resultData, secretKeyId); } else if (ACTION_SELECT_PUB_KEYS.equals(action)) { long[] selectedMasterKeyIds = intent.getLongArrayExtra(EXTRA_SELECTED_MASTER_KEY_IDS); ArrayList<String> missingUserIds = intent |