slightly nicer error reporting for reading from clipboard

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java

@@ -24,6 +24,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -105,23 +106,29 @@ public class ImportKeysFileFragment extends Fragment {
                         Uri.fromFile(Constants.Path.APP_DIR), "*/*", false, REQUEST_CODE_FILE);
                 return true;
             case R.id.menu_import_keys_file_paste:
-                CharSequence clipboardText = ClipboardReflection.getClipboardText(getActivity());
-                String sendText = "";
-                if (clipboardText != null) {
-                    sendText = clipboardText.toString();
-                    sendText = PgpHelper.getPgpKeyContent(sendText);
-                    if (sendText == null) {
-                        Notify.create(mActivity, R.string.error_bad_data, Style.ERROR).show();
-                    } else {
-                        mCallback.loadKeys(new BytesLoaderState(sendText.getBytes(), null));
-                    }
-                }
+                importFromClipboard();
                 return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
 
+    private void importFromClipboard() {
+        CharSequence clipboardText = ClipboardReflection.getClipboardText(getActivity());
+        if (TextUtils.isEmpty(clipboardText)) {
+            Notify.create(mActivity, R.string.error_clipboard_empty, Style.ERROR).show();
+            return;
+        }
+
+        String keyText = PgpHelper.getPgpPublicKeyContent(clipboardText);
+        if (keyText == null) {
+            Notify.create(mActivity, R.string.error_clipboard_bad, Style.ERROR).show();
+            return;
+        }
+
+        mCallback.loadKeys(new BytesLoaderState(keyText.getBytes(), null));
+    }
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {

OpenKeychain/src/main/res/values/strings.xml

@@ -1648,6 +1648,7 @@
     <string name="file_delete_exception">"Original file could not be deleted!"</string>
     <string name="error_clipboard_empty">"Clipboard is empty!"</string>
     <string name="error_clipboard_copy">"Error copying data to clipboard!"</string>
+    <string name="error_clipboard_bad">"Could not read keys from clipboard!"</string>
     <string name="error_scan_fp">"Error scanning fingerprint!"</string>
     <string name="error_scan_match">"Fingerprints did not match!"</string>
     <string name="error_expiry_past">"Expiry date is in the past!"</string>