diff options
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | 18 |
1 files changed, 2 insertions, 16 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 dce0d3aaf..4c3ebb447 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -36,7 +36,7 @@ import org.sufficientlysecure.keychain.keyimport.ImportKeysListEntry; import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing; import org.sufficientlysecure.keychain.operations.results.ImportKeyResult; import org.sufficientlysecure.keychain.service.ImportKeyringParcel; -import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenNfcActivity; +import org.sufficientlysecure.keychain.ui.base.BaseActivity; import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.ui.util.Notify; @@ -48,7 +48,7 @@ import org.sufficientlysecure.keychain.util.Preferences; import java.io.IOException; import java.util.ArrayList; -public class ImportKeysActivity extends BaseSecurityTokenNfcActivity +public class ImportKeysActivity extends BaseActivity implements CryptoOperationHelper.Callback<ImportKeyringParcel, ImportKeyResult> { public static final String ACTION_IMPORT_KEY = OpenKeychainIntents.IMPORT_KEY; @@ -119,14 +119,6 @@ public class ImportKeysActivity extends BaseSecurityTokenNfcActivity } @Override - public void onNewIntent(Intent intent) { - super.onNewIntent(intent); - setIntent(intent); - // new Intent, so onResumeFragments needs to handle it with handleActions(Intent) - mFreshIntent = true; - } - - @Override protected void onResumeFragments() { super.onResumeFragments(); if (mFreshIntent) { @@ -412,12 +404,6 @@ public class ImportKeysActivity extends BaseSecurityTokenNfcActivity } @Override - protected void onNfcPostExecute() { - // either way, finish after NFC AsyncTask - finish(); - } - - @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { if (mOperationHelper != null && mOperationHelper.handleActivityResult(requestCode, resultCode, data)) { |