diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 17:38:48 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-06-12 17:38:48 +0200 |
| commit | dae503284f47eb7e5eed71140f9fceaa2ff420c2 (patch) | |
| tree | 3d39130410774624ba69905a54e91ff06ccb536d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | |
| parent | 466eddb0051d8b19576b60be7e3769f13b308a57 (diff) | |
| download | open-keychain-dae503284f47eb7e5eed71140f9fceaa2ff420c2.tar.gz open-keychain-dae503284f47eb7e5eed71140f9fceaa2ff420c2.tar.bz2 open-keychain-dae503284f47eb7e5eed71140f9fceaa2ff420c2.zip | |
canonicalize: more stuff
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index 7fa18406c..f389726ff 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -456,10 +456,12 @@ public class ImportKeysActivity extends ActionBarActivity implements ActionBar.O } */ + /* if (ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN.equals(getIntent().getAction())) { ImportKeysActivity.this.setResult(Activity.RESULT_OK, mPendingIntentData); finish(); } + */ } } }; |