Merge branch 'master' of github.com:open-keychain/open-keychain

1 files changed, 15 insertions, 2 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 7cb6361eb..dce0d3aaf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -21,6 +21,7 @@ import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.view.View;
@@ -89,10 +90,15 @@ public class ImportKeysActivity extends BaseSecurityTokenNfcActivity
 
     private CryptoOperationHelper<ImportKeyringParcel, ImportKeyResult> mOperationHelper;
 
+    private boolean mFreshIntent;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        // we're started with a new Intent that needs to be handled by onResumeFragments
+        mFreshIntent = true;
+
         setFullScreenDialogClose(Activity.RESULT_CANCELED, true);
         findViewById(R.id.import_import).setOnClickListener(new OnClickListener() {
             @Override
@@ -116,15 +122,22 @@ public class ImportKeysActivity extends BaseSecurityTokenNfcActivity
     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();
-        handleActions(getIntent());
+        if (mFreshIntent) {
+            handleActions(getIntent());
+            // we've consumed this Intent, we don't want to repeat the action it represents
+            // every time the activity is resumed
+            mFreshIntent = false;
+        }
     }
 
-    protected void handleActions(Intent intent) {
+    protected void handleActions(@NonNull Intent intent) {
         String action = intent.getAction();
         Bundle extras = intent.getExtras();
         Uri dataUri = intent.getData();