aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-02-22 15:19:06 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2016-02-22 15:19:06 +0100
commitf54f12c48c71d728f5a0cff7a750b34a345da5cf (patch)
treea4a3a5af9e8df27556fccb8259f7a75c627a2696 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
parent6379ce1faa3a0ebf5b88b5c20fd465119535554c (diff)
downloadopen-keychain-f54f12c48c71d728f5a0cff7a750b34a345da5cf.tar.gz
open-keychain-f54f12c48c71d728f5a0cff7a750b34a345da5cf.tar.bz2
open-keychain-f54f12c48c71d728f5a0cff7a750b34a345da5cf.zip
Extend documentation, proper method naming, use of deprecated method annotation
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.java4
1 files changed, 4 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 a42dbd083..f67c6a724 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -400,6 +400,10 @@ public class ImportKeysActivity extends BaseActivity
super.onActivityResult(requestCode, resultCode, data);
}
+ /**
+ * Defines how the result of this activity is returned.
+ * Is overwritten in RemoteImportKeysActivity
+ */
protected void handleResult(ImportKeyResult result) {
String intentAction = getIntent().getAction();