From 24a6a1fd8eade8961135634ff5130b17627d9202 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 23 Feb 2020 11:16:40 +0100
Subject: [PATCH] Small improvements

---
 app/src/main/java/eu/faircode/email/EditTextCompose.java | 6 +++---
 app/src/main/java/eu/faircode/email/FragmentAnswer.java  | 4 ++--
 app/src/main/java/eu/faircode/email/FragmentCompose.java | 2 +-
 app/src/main/res/menu/action_answer.xml                  | 1 -
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/EditTextCompose.java b/app/src/main/java/eu/faircode/email/EditTextCompose.java
index 58d9f2cdad..bab7e5d7b9 100644
--- a/app/src/main/java/eu/faircode/email/EditTextCompose.java
+++ b/app/src/main/java/eu/faircode/email/EditTextCompose.java
@@ -67,9 +67,9 @@ public class EditTextCompose extends AppCompatEditText {
         try {
             if (id == android.R.id.paste) {
                 Context context = getContext();
-                ClipboardManager clipboard = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-                if (clipboard.hasPrimaryClip()) {
-                    ClipData.Item item = clipboard.getPrimaryClip().getItemAt(0);
+                ClipboardManager cbm = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+                if (cbm != null && cbm.hasPrimaryClip()) {
+                    ClipData.Item item = cbm.getPrimaryClip().getItemAt(0);
 
                     String html = item.getHtmlText();
                     if (html == null) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentAnswer.java b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
index 9e43acfc7a..053b49c256 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAnswer.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAnswer.java
@@ -332,7 +332,7 @@ public class FragmentAnswer extends FragmentBase {
             Uri uri = null;
 
             ClipboardManager cbm = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
-            if (cbm.hasPrimaryClip()) {
+            if (cbm != null && cbm.hasPrimaryClip()) {
                 String link = cbm.getPrimaryClip().getItemAt(0).coerceToText(getContext()).toString();
                 uri = Uri.parse(link);
                 if (uri.getScheme() == null)
@@ -345,7 +345,7 @@ public class FragmentAnswer extends FragmentBase {
             FragmentDialogLink fragment = new FragmentDialogLink();
             fragment.setArguments(args);
             fragment.setTargetFragment(this, REQUEST_LINK);
-            fragment.show(getParentFragmentManager(), "compose:link");
+            fragment.show(getParentFragmentManager(), "answer:link");
 
             return true;
         } else
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 4f1ede186a..c8ba9a0fc2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -1356,7 +1356,7 @@ public class FragmentCompose extends FragmentBase {
         Uri uri = null;
 
         ClipboardManager cbm = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
-        if (cbm.hasPrimaryClip()) {
+        if (cbm != null && cbm.hasPrimaryClip()) {
             String link = cbm.getPrimaryClip().getItemAt(0).coerceToText(getContext()).toString();
             uri = Uri.parse(link);
             if (uri.getScheme() == null)
diff --git a/app/src/main/res/menu/action_answer.xml b/app/src/main/res/menu/action_answer.xml
index 11299f84b7..f3bbeedb85 100644
--- a/app/src/main/res/menu/action_answer.xml
+++ b/app/src/main/res/menu/action_answer.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/baseline_delete_24"