cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix singleTop definitions

Browse Source
This commit is contained in:
Dominik Schürmann
2016-01-11 18:04:09 +01:00
parent c68b39211e
commit 5e3e6e2d62
2 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
View File

@@ -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 &&