From f54f12c48c71d728f5a0cff7a750b34a345da5cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 22 Feb 2016 15:19:06 +0100 Subject: Extend documentation, proper method naming, use of deprecated method annotation --- .../java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | 4 ++++ .../sufficientlysecure/keychain/ui/PassphraseDialogActivity.java | 4 ++++ .../keychain/ui/SecurityTokenOperationActivity.java | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui') 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(); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java index 3a5291966..fd4f27176 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java @@ -514,6 +514,10 @@ public class PassphraseDialogActivity extends FragmentActivity { } + /** + * Defines how the result of this activity is returned. + * Is overwritten in RemotePassphraseDialogActivity + */ protected void handleResult(CryptoInputParcel inputParcel) { // also return passphrase back to activity Intent returnIntent = new Intent(); 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 -- cgit v1.2.3