1 files changed, 2 insertions, 6 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 0ec9b445b..18f805360 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -463,7 +463,8 @@ public class ImportKeysActivity extends ActionBarActivity {
                         return;
                     }
 
-                    if (ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN_RESULT.equals(getIntent().getAction())) {
+                    if (ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN_RESULT.equals(getIntent().getAction())
+                            || ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN.equals(getIntent().getAction())) {
                         Intent intent = new Intent();
                         intent.putExtra(ImportKeyResult.EXTRA_RESULT, result);
                         ImportKeysActivity.this.setResult(RESULT_OK, intent);
@@ -475,11 +476,6 @@ public class ImportKeysActivity extends ActionBarActivity {
                         ImportKeysActivity.this.finish();
                         return;
                     }
-                    if (ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN.equals(getIntent().getAction())) {
-                        ImportKeysActivity.this.setResult(RESULT_OK);
-                        ImportKeysActivity.this.finish();
-                        return;
-                    }
 
                     result.createNotify(ImportKeysActivity.this).show();
                 }