From 15488c544584f5515c83c9fbcf4d09055ba7af3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 15 Feb 2016 16:29:23 +0100 Subject: Split remote methods from activities for better seperation --- .../keychain/ui/ImportKeysActivity.java | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java') 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 4c3ebb447..a42dbd083 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -57,8 +57,6 @@ public class ImportKeysActivity extends BaseActivity = Constants.INTENT_PREFIX + "IMPORT_KEY_FROM_FACEBOOK"; public static final String ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN_RESULT = Constants.INTENT_PREFIX + "IMPORT_KEY_FROM_KEY_SERVER_AND_RETURN_RESULT"; - public static final String ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN_TO_SERVICE = Constants.INTENT_PREFIX - + "IMPORT_KEY_FROM_KEY_SERVER_AND_RETURN"; public static final String ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN = Constants.INTENT_PREFIX + "IMPORT_KEY_FROM_FILE_AND_RETURN"; @@ -77,10 +75,6 @@ public class ImportKeysActivity extends BaseActivity public static final String EXTRA_KEY_ID = Constants.EXTRA_PREFIX + "EXTRA_KEY_ID"; public static final String EXTRA_FINGERPRINT = OpenKeychainIntents.IMPORT_KEY_FROM_KEYSERVER_EXTRA_FINGERPRINT; - // only used by ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN_TO_SERVICE when used from OpenPgpService - public static final String EXTRA_PENDING_INTENT_DATA = "data"; - private Intent mPendingIntentData; - public static final String TAG_FRAG_LIST = "frag_list"; public static final String TAG_FRAG_TOP = "frag_top"; @@ -106,11 +100,6 @@ public class ImportKeysActivity extends BaseActivity importSelectedKeys(); } }); - - // only used for OpenPgpService - if (getIntent().hasExtra(EXTRA_PENDING_INTENT_DATA)) { - mPendingIntentData = getIntent().getParcelableExtra(EXTRA_PENDING_INTENT_DATA); - } } @Override @@ -172,7 +161,6 @@ public class ImportKeysActivity extends BaseActivity break; } case ACTION_IMPORT_KEY_FROM_KEYSERVER: - case ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN_TO_SERVICE: case ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN_RESULT: { if (extras.containsKey(EXTRA_QUERY) || extras.containsKey(EXTRA_KEY_ID)) { @@ -412,7 +400,7 @@ public class ImportKeysActivity extends BaseActivity super.onActivityResult(requestCode, resultCode, data); } - public void handleResult(ImportKeyResult result) { + protected void handleResult(ImportKeyResult result) { String intentAction = getIntent().getAction(); if (ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN_RESULT.equals(intentAction) @@ -424,15 +412,10 @@ public class ImportKeysActivity extends BaseActivity return; } - if (ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN_TO_SERVICE.equals(intentAction)) { - setResult(RESULT_OK, mPendingIntentData); - finish(); - return; - } - result.createNotify(ImportKeysActivity.this) .show((ViewGroup) findViewById(R.id.import_snackbar)); } + // methods from CryptoOperationHelper.Callback @Override -- cgit v1.2.3