aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.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/SecurityTokenOperationActivity.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/SecurityTokenOperationActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
index 06810ab9f..78d82d436 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
@@ -267,7 +267,7 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
}
@Override
- protected void onNfcPostExecute() {
+ protected final void onNfcPostExecute() {
handleResult(mInputParcel);
// show finish
@@ -299,6 +299,10 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
}.execute();
}
+ /**
+ * Defines how the result of this activity is returned.
+ * Is overwritten in RemoteSecurityTokenOperationActivity
+ */
protected void handleResult(CryptoInputParcel inputParcel) {
Intent result = new Intent();
// send back the CryptoInputParcel we received