Merge branch 'master' of github.com:open-keychain/open-keychain

1 files changed, 6 insertions, 2 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java
index 0ac27833c..403e654e4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java
@@ -38,7 +38,7 @@ public class ClipboardReflection {
 
     }
 
-    public static CharSequence getClipboardText(Context context) {
+    public static String getClipboardText(Context context) {
         ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
 
         ClipData clip = clipboard.getPrimaryClip();
@@ -48,6 +48,10 @@ public class ClipboardReflection {
         }
 
         ClipData.Item item = clip.getItemAt(0);
-        return item.coerceToText(context);
+        CharSequence seq = item.coerceToText(context);
+        if (seq != null) {
+            return seq.toString();
+        }
+        return null;
     }
 }