From 5433691b5e76078a42e0812c8dc39825ee9a1f5d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 12 Dec 2022 19:48:11 +0100
Subject: [PATCH] Small improvements

---
 app/src/main/java/eu/faircode/email/DeepL.java             | 7 +++----
 app/src/main/java/eu/faircode/email/FragmentCompose.java   | 3 +--
 .../java/eu/faircode/email/FragmentDialogTranslate.java    | 5 ++---
 app/src/main/java/eu/faircode/email/LanguageTool.java      | 3 +--
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/DeepL.java b/app/src/main/java/eu/faircode/email/DeepL.java
index 1dde6fe8b3..7811805c3a 100644
--- a/app/src/main/java/eu/faircode/email/DeepL.java
+++ b/app/src/main/java/eu/faircode/email/DeepL.java
@@ -50,7 +50,6 @@ import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -235,7 +234,7 @@ public class DeepL {
                 } catch (Throwable ex) {
                     Log.w(ex);
                 }
-                throw new FileNotFoundException(error);
+                throw new IOException(error);
             }
 
             String response = Helper.readStream(connection.getInputStream());
@@ -243,7 +242,7 @@ public class DeepL {
             JSONObject jroot = new JSONObject(response);
             JSONArray jtranslations = jroot.getJSONArray("translations");
             if (jtranslations.length() == 0)
-                throw new FileNotFoundException();
+                throw new IOException();
             JSONObject jtranslation = (JSONObject) jtranslations.get(0);
 
             Translation result = new Translation();
@@ -292,7 +291,7 @@ public class DeepL {
                 } catch (Throwable ex) {
                     Log.w(ex);
                 }
-                throw new FileNotFoundException(error);
+                throw new IOException(error);
             }
 
             String response = Helper.readStream(connection.getInputStream());
diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 7e2fc46a07..6d84fe5ef0 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -2471,8 +2471,7 @@ public class FragmentCompose extends FragmentBase {
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
                         etBody.setSelection(paragraph.second);
-                        Throwable exex = new Throwable("DeepL", ex);
-                        Log.unexpectedError(getParentFragmentManager(), exex, false);
+                        Log.unexpectedError(getParentFragmentManager(), ex, false);
                     }
                 }.setExecutor(executor).execute(FragmentCompose.this, args, "compose:translate");
             }
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogTranslate.java b/app/src/main/java/eu/faircode/email/FragmentDialogTranslate.java
index ae92ccf189..c6d43018b6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogTranslate.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogTranslate.java
@@ -133,7 +133,7 @@ public class FragmentDialogTranslate extends FragmentDialogBase {
 
                     @Override
                     protected void onException(Bundle args, Throwable ex) {
-                        tvText.setText(ex.toString());
+                        Log.unexpectedError(getParentFragmentManager(), ex);
                     }
                 }.execute(FragmentDialogTranslate.this, args, "translate:all");
             }
@@ -309,8 +309,7 @@ public class FragmentDialogTranslate extends FragmentDialogBase {
                                 ssb.removeSpan(mark);
                                 tvText.setText(ssb);
 
-                                Throwable exex = new Throwable("DeepL", ex);
-                                ToastEx.makeText(context, Log.formatThrowable(exex), Toast.LENGTH_LONG).show();
+                                Log.unexpectedError(getParentFragmentManager(), ex);
                             }
                         }.execute(FragmentDialogTranslate.this, args, "paragraph:translate");
                     }
diff --git a/app/src/main/java/eu/faircode/email/LanguageTool.java b/app/src/main/java/eu/faircode/email/LanguageTool.java
index c8b0ada0ab..17327fd439 100644
--- a/app/src/main/java/eu/faircode/email/LanguageTool.java
+++ b/app/src/main/java/eu/faircode/email/LanguageTool.java
@@ -40,7 +40,6 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
@@ -446,7 +445,7 @@ public class LanguageTool {
                 Log.w(ex);
             }
             Log.w("LT " + error);
-            throw new FileNotFoundException(error);
+            throw new IOException(error);
         }
     }