diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-05 21:49:02 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-05 21:49:02 +0200 |
commit | 7e83900d6ccd20ad9ae4f10515989c0d1754bb98 (patch) | |
tree | 49ff2823044f6d4f6c7e9ca2c5750cbb38796556 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility | |
parent | bd78166c668f979fe0ad4bcdaab13eeea7ca2520 (diff) | |
download | open-keychain-7e83900d6ccd20ad9ae4f10515989c0d1754bb98.tar.gz open-keychain-7e83900d6ccd20ad9ae4f10515989c0d1754bb98.tar.bz2 open-keychain-7e83900d6ccd20ad9ae4f10515989c0d1754bb98.zip |
make sure clipboard service retrieval is always null-proof
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java | 20 |
1 files changed, 7 insertions, 13 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 403e654e4..abf16851d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java @@ -17,28 +17,22 @@ package org.sufficientlysecure.keychain.compatibility; + import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; +import android.support.annotation.Nullable; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.util.Log; -import java.lang.reflect.Method; - public class ClipboardReflection { - private static final String clipboardLabel = "Keychain"; - - public static void copyToClipboard(Context context, String text) { - ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); - - ClipData clip = ClipData.newPlainText(clipboardLabel, text); - clipboard.setPrimaryClip(clip); - - } - - public static String getClipboardText(Context context) { + @Nullable + public static String getClipboardText(@Nullable Context context) { + if (context == null) { + return null; + } ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); ClipData clip = clipboard.getPrimaryClip(); |