aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-06-26 22:55:39 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-06-29 14:59:48 +0200
commit853964670b5b52a8b26864dff9c19f2f8c3fc8c9 (patch)
treeb01bb1799cf945508dc1df65ee0f3b896df59abd /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility
parentc43e29b621d5a0d2071a10d4033df25251b3ea23 (diff)
downloadopen-keychain-853964670b5b52a8b26864dff9c19f2f8c3fc8c9.tar.gz
open-keychain-853964670b5b52a8b26864dff9c19f2f8c3fc8c9.tar.bz2
open-keychain-853964670b5b52a8b26864dff9c19f2f8c3fc8c9.zip
instrument: add tests for adv key share fragment
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java8
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;
}
}