From 5e3e6e2d62159eac6fb0e2c9d6f30afe941407d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 11 Jan 2016 18:04:09 +0100
Subject: Fix singleTop definitions

---
 .../keychain/ui/ImportKeysActivity.java                | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'OpenKeychain/src/main/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 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;
@@ -118,14 +118,6 @@ public class ImportKeysActivity extends BaseSecurityTokenNfcActivity
         setContentView(R.layout.import_keys_activity);
     }
 
-    @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();
@@ -411,12 +403,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 &&
-- 
cgit v1.2.3