From 52e4d6f3e37eb6490c9cc6e822b921959f6da255 Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Mon, 6 Nov 2023 23:16:25 +0100
Subject: [PATCH] translation fix, added error message for translation

---
 .../twidda/backend/api/mastodon/Mastodon.java |  3 +--
 .../backend/async/TranslationLoader.java      | 26 ++++++++++++++-----
 .../twidda/ui/activities/StatusActivity.java  |  5 ++--
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java b/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java
index fc37ba9f..55a9f4ba 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/api/mastodon/Mastodon.java
@@ -83,7 +83,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -1366,7 +1365,7 @@ public class Mastodon implements Connection {
 	public Translation getStatusTranslation(long id) throws ConnectionException {
 		try {
 			List<String> params = new ArrayList<>();
-			params.add("lang=" + Locale.getDefault().getLanguage()); // set system language as destiny for translation
+			// params.add("lang=" + Locale.getDefault().getLanguage()); // set system language as destiny for translation
 			Response response = post(ENDPOINT_STATUS + id + "/translate", params);
 			ResponseBody body = response.body();
 			if (response.code() == 200 && body != null) {
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/async/TranslationLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/async/TranslationLoader.java
index 3d4253c8..59aae821 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/async/TranslationLoader.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/async/TranslationLoader.java
@@ -15,7 +15,7 @@ import org.nuclearfog.twidda.model.Translation;
  *
  * @author nuclearfog
  */
-public class TranslationLoader extends AsyncExecutor<Long, TranslationLoader.Result> {
+public class TranslationLoader extends AsyncExecutor<TranslationLoader.Param, TranslationLoader.Result> {
 
 	private Connection connection;
 
@@ -28,11 +28,22 @@ public class TranslationLoader extends AsyncExecutor<Long, TranslationLoader.Res
 
 
 	@Override
-	protected Result doInBackground(@NonNull Long param) {
+	protected Result doInBackground(@NonNull Param param) {
 		try {
-			return new Result(connection.getStatusTranslation(param));
+			return new Result(connection.getStatusTranslation(param.id), null);
 		} catch (ConnectionException exception) {
-			return new Result(null);
+			return new Result(null, exception);
+		}
+	}
+
+	/**
+	 *
+	 */
+	public static class Param {
+		final long id;
+
+		public Param(long id) {
+			this.id = id;
 		}
 	}
 
@@ -42,10 +53,13 @@ public class TranslationLoader extends AsyncExecutor<Long, TranslationLoader.Res
 	public static class Result {
 
 		@Nullable
-		public Translation translation;
+		public final Translation translation;
+		@Nullable
+		public final ConnectionException exception;
 
-		Result(@Nullable Translation translation) {
+		Result(@Nullable Translation translation, @Nullable ConnectionException exception) {
 			this.translation = translation;
+			this.exception = exception;
 		}
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java b/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
index 55d3b2c8..62879397 100644
--- a/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
+++ b/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
@@ -597,7 +597,8 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
 					status_text.setText(spannableText);
 					translated = false;
 				} else if (translationLoader.isIdle()) {
-					translationLoader.execute(status.getId(), translationResult);
+					TranslationLoader.Param param = new TranslationLoader.Param(status.getId());
+					translationLoader.execute(param, translationResult);
 				}
 			}
 		}
@@ -1099,7 +1100,7 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
 			translate_text.append(result.translation.getOriginalLanguage());
 			translated = true;
 		} else {
-			Toast.makeText(getApplicationContext(), R.string.error_translating_status, Toast.LENGTH_SHORT).show();
+			ErrorUtils.showErrorMessage(getApplicationContext(), result.exception);
 		}
 	}