Merge pull request #1318 from adithyaphilip/remove-nan

Prevent NaN Progress Dialog on import with no selected keys

1 files changed, 7 insertions, 3 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 ee57dd319..d02030cbf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -384,6 +384,13 @@ public class ImportKeysActivity extends BaseNfcActivity {
      */
     public void importKeys() {
         ImportKeysListFragment.LoaderState ls = mListFragment.getLoaderState();
+
+        if (mListFragment.getSelectedEntries().size() == 0) {
+            Notify.create(this, R.string.error_nothing_import_selected, Notify.Style.ERROR)
+                    .show((ViewGroup) findViewById(R.id.import_snackbar));
+            return;
+        }
+
         if (ls instanceof ImportKeysListFragment.BytesLoaderState) {
             Log.d(Constants.TAG, "importKeys started");
 
@@ -488,9 +495,6 @@ public class ImportKeysActivity extends BaseNfcActivity {
 
             // start service with intent
             startService(intent);
-        } else {
-            Notify.create(this, R.string.error_nothing_import, Notify.Style.ERROR)
-                    .show((ViewGroup) findViewById(R.id.import_snackbar));
         }
     }