aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui
diff options
context:
space:
mode:
authorAshley Hughes <spirit.returned@gmail.com>2014-01-15 22:37:23 +0000
committerAshley Hughes <spirit.returned@gmail.com>2014-01-16 10:04:28 +0000
commit09caba36a00d74d593801f8a09b11fb600015828 (patch)
tree4fdb347d6e78945e6fb27643c9a2cab038013423 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui
parent9c0432d24c6aae6fb9420229666a9d1d60d95972 (diff)
downloadopen-keychain-09caba36a00d74d593801f8a09b11fb600015828.tar.gz
open-keychain-09caba36a00d74d593801f8a09b11fb600015828.tar.bz2
open-keychain-09caba36a00d74d593801f8a09b11fb600015828.zip
fix clipboard null crash
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui')
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java6
1 files changed, 4 insertions, 2 deletions
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);
}
});