From e487c27fb56bd42a5d30f25d49fff7424a06df52 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 7 Apr 2021 18:26:07 +0200
Subject: [PATCH] Refactoring

---
 .../eu/faircode/email/AdapterMessage.java     | 25 +++++++++++--------
 .../eu/faircode/email/FragmentCompose.java    | 19 +++++++-------
 .../email/FragmentDialogOpenLink.java         | 11 ++++----
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 5e8a3b068a..cb9b56b5f1 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2557,11 +2557,12 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         private void onCopy() {
                             ClipboardManager clipboard =
                                     (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-                            if (clipboard != null) {
-                                ClipData clip = ClipData.newPlainText(title, text);
-                                clipboard.setPrimaryClip(clip);
-                                ToastEx.makeText(context, R.string.title_clipboard_copied, Toast.LENGTH_LONG).show();
-                            }
+                            if (clipboard == null)
+                                return;
+
+                            ClipData clip = ClipData.newPlainText(title, text);
+                            clipboard.setPrimaryClip(clip);
+                            ToastEx.makeText(context, R.string.title_clipboard_copied, Toast.LENGTH_LONG).show();
                         }
                     });
 
@@ -3718,13 +3719,17 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private void onActionCopyNote(TupleMessageEx message) {
+            if (TextUtils.isEmpty(message.notes))
+                return;
+
             ClipboardManager clipboard =
                     (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-            if (clipboard != null && !TextUtils.isEmpty(message.notes)) {
-                ClipData clip = ClipData.newPlainText(context.getString(R.string.app_name), message.notes);
-                clipboard.setPrimaryClip(clip);
-                ToastEx.makeText(context, R.string.title_clipboard_copied, Toast.LENGTH_LONG).show();
-            }
+            if (clipboard == null)
+                return;
+
+            ClipData clip = ClipData.newPlainText(context.getString(R.string.app_name), message.notes);
+            clipboard.setPrimaryClip(clip);
+            ToastEx.makeText(context, R.string.title_clipboard_copied, Toast.LENGTH_LONG).show();
         }
 
         private void onShow(final TupleMessageEx message, boolean full) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 847a77bc77..8f510241f7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -655,15 +655,16 @@ public class FragmentCompose extends FragmentBase {
 
                 ClipboardManager clipboard =
                         (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
-                if (clipboard != null) {
-                    ClipData clip = ClipData.newHtmlText(
-                            getContext().getString(R.string.title_edit_signature_text),
-                            HtmlHelper.getText(getContext(), identity.signature),
-                            identity.signature);
-                    clipboard.setPrimaryClip(clip);
-
-                    ToastEx.makeText(getContext(), R.string.title_clipboard_copied, Toast.LENGTH_LONG).show();
-                }
+                if (clipboard == null)
+                    return;
+
+                ClipData clip = ClipData.newHtmlText(
+                        getContext().getString(R.string.title_edit_signature_text),
+                        HtmlHelper.getText(getContext(), identity.signature),
+                        identity.signature);
+                clipboard.setPrimaryClip(clip);
+
+                ToastEx.makeText(getContext(), R.string.title_clipboard_copied, Toast.LENGTH_LONG).show();
             }
         });
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
index 5fd3faccc2..0fbf2cfbd6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogOpenLink.java
@@ -211,12 +211,13 @@ public class FragmentDialogOpenLink extends FragmentDialogBase {
             public void onClick(View v) {
                 ClipboardManager clipboard =
                         (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-                if (clipboard != null) {
-                    ClipData clip = ClipData.newPlainText(title, etLink.getText().toString());
-                    clipboard.setPrimaryClip(clip);
+                if (clipboard == null)
+                    return;
 
-                    ToastEx.makeText(context, R.string.title_clipboard_copied, Toast.LENGTH_LONG).show();
-                }
+                ClipData clip = ClipData.newPlainText(title, etLink.getText().toString());
+                clipboard.setPrimaryClip(clip);
+
+                ToastEx.makeText(context, R.string.title_clipboard_copied, Toast.LENGTH_LONG).show();
             }
         });