diff options
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure')
3 files changed, 7 insertions, 5 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java index 69415c4c2..704448e47 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java @@ -50,7 +50,7 @@ public class ClipboardReflection { methodNewPlainText.invoke(clipboard, clip); } } catch (Exception e) { - Log.e("ProjectsException", "There was and error copying the text to the clipboard: " + Log.e("ProjectsException", "There was an error copying the text to the clipboard: " + e.getMessage()); } } @@ -89,7 +89,7 @@ public class ClipboardReflection { return null; } } catch (Exception e) { - Log.e("ProjectsException", "There was and error getting the text from the clipboard: " + Log.e("ProjectsException", "There was an error getting the text from the clipboard: " + e.getMessage()); return null; diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java index 31f758395..04671587a 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java @@ -59,8 +59,10 @@ public class ImportKeysClipboardFragment extends Fragment { @Override public void onClick(View v) { CharSequence clipboardText = ClipboardReflection.getClipboardText(getActivity()); - - mImportActivity.loadCallback(clipboardText.toString().getBytes(), null); + String sendText = ""; + if (clipboardText != null) + sendText = clipboardText.toString(); + mImportActivity.loadCallback(sendText.getBytes(), null); } }); diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java index ea76d2898..a02bfd678 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java @@ -93,7 +93,7 @@ public class ImportKeysFileFragment extends Fragment { @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { - switch (requestCode) { + switch (requestCode & 0xFFFF) { case Id.request.filename: { if (resultCode == Activity.RESULT_OK && data != null) { String path = null; |