From cfeffef80d8c204aba90b477741128f297fcad06 Mon Sep 17 00:00:00 2001 From: Adithya Abraham Philip Date: Sun, 31 May 2015 02:36:45 +0530 Subject: prevent NaN dialog on import with no selected keys --- .../org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'OpenKeychain/src/main/java/org') 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)); } } -- cgit v1.2.3