aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-04-03 15:02:55 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-04-03 15:02:55 +0200
commit2df4ccafb5cab2963bde1f2d54293b6c3579d0f8 (patch)
treeefb321417634bdd8183dee5577afef2df4efc22e /OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
parent11b08c4d985854ded125d5a43e8a13207dee393d (diff)
downloadopen-keychain-2df4ccafb5cab2963bde1f2d54293b6c3579d0f8.tar.gz
open-keychain-2df4ccafb5cab2963bde1f2d54293b6c3579d0f8.tar.bz2
open-keychain-2df4ccafb5cab2963bde1f2d54293b6c3579d0f8.zip
Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN
Diffstat (limited to 'OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java')
-rw-r--r--OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
index 4387f3d53..ca97e2867 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
@@ -252,7 +252,6 @@ public class EncryptAsymmetricFragment extends Fragment {
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) {
-
case RESULT_CODE_PUBLIC_KEYS: {
if (resultCode == Activity.RESULT_OK) {
Bundle bundle = data.getExtras();
@@ -273,11 +272,11 @@ public class EncryptAsymmetricFragment extends Fragment {
}
default: {
+ super.onActivityResult(requestCode, resultCode, data);
+
break;
}
}
-
- super.onActivityResult(requestCode, resultCode, data);
}
}