Added handler for FileHasNoContent exception, some clean up

1 files changed, 13 insertions, 6 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
index 1118f0264..abc594b39 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
@@ -219,27 +219,34 @@ public class ImportKeysListFragment extends ListFragment implements
         } else {
             setListShownNoAnimation(true);
         }
+
+        Exception error = data.getError();
+
         switch (loader.getId()) {
             case LOADER_ID_BYTES:
+                error = data.getError();
+
+                if(error instanceof ImportKeysListLoader.FileHasNoContent) {
+                    AppMsg.makeText(getActivity(), R.string.error_import_file_no_content,
+                            AppMsg.STYLE_ALERT).show();
+                }
                 break;
 
             case LOADER_ID_SERVER_QUERY:
 
-                Exception error = data.getError();
-
-                if(error == null){
+                if(error == null) {
                     AppMsg.makeText(
                             getActivity(), getResources().getQuantityString(R.plurals.keys_found,
                             mAdapter.getCount(), mAdapter.getCount()),
                             AppMsg.STYLE_INFO
                     ).show();
-                } else if(error instanceof KeyServer.InsufficientQuery){
+                } else if(error instanceof KeyServer.InsufficientQuery) {
                     AppMsg.makeText(getActivity(), R.string.error_keyserver_insufficient_query,
                             AppMsg.STYLE_ALERT).show();
-                }else if(error instanceof  KeyServer.QueryException){
+                } else if(error instanceof  KeyServer.QueryException) {
                     AppMsg.makeText(getActivity(), R.string.error_keyserver_query,
                             AppMsg.STYLE_ALERT).show();
-                }else if(error instanceof KeyServer.TooManyResponses){
+                } else if(error instanceof KeyServer.TooManyResponses) {
                     AppMsg.makeText(getActivity(), R.string.error_keyserver_too_many_responses,
                             AppMsg.STYLE_ALERT).show();
                 }