From 6df0d396471c4f5024f4e72d15ff07c9897cb555 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 29 Dec 2022 08:50:47 +0100
Subject: [PATCH] Prevent NPE

---
 .../eu/faircode/email/AdapterMessage.java     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 248df44dec..ee48aa0e0e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -4140,12 +4140,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 } else if (id == R.id.ibSearch) {
                     onSearchContact(message, false);
                 } else if (id == R.id.ibTranslate) {
-                    if (DeepL.canTranslate(context))
-                        onActionTranslate(message);
-                    else {
-                        DeepL.FragmentDialogDeepL fragment = new DeepL.FragmentDialogDeepL();
-                        fragment.show(parentFragment.getParentFragmentManager(), "deepl:configure");
-                    }
+                    onActionTranslate(message);
                 } else if (id == R.id.ibFullScreen)
                     onActionOpenFull(message);
                 else if (id == R.id.ibForceLight) {
@@ -6496,12 +6491,17 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         }
 
         private void onActionTranslate(TupleMessageEx message) {
-            Bundle args = new Bundle();
-            args.putLong("id", message.id);
+            if (DeepL.canTranslate(context)) {
+                Bundle args = new Bundle();
+                args.putLong("id", message.id);
 
-            FragmentDialogTranslate fragment = new FragmentDialogTranslate();
-            fragment.setArguments(args);
-            fragment.show(parentFragment.getParentFragmentManager(), "message:translate");
+                FragmentDialogTranslate fragment = new FragmentDialogTranslate();
+                fragment.setArguments(args);
+                fragment.show(parentFragment.getParentFragmentManager(), "message:translate");
+            } else {
+                DeepL.FragmentDialogDeepL fragment = new DeepL.FragmentDialogDeepL();
+                fragment.show(parentFragment.getParentFragmentManager(), "deepl:configure");
+            }
         }
 
         private void onActionForceLight(TupleMessageEx message) {