From 7e83900d6ccd20ad9ae4f10515989c0d1754bb98 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sun, 5 Jul 2015 21:49:02 +0200 Subject: make sure clipboard service retrieval is always null-proof --- .../keychain/compatibility/ClipboardReflection.java | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java') 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(); -- cgit v1.2.3