From 629e65edbad246f4c90dca20e20b9ff4f957bec8 Mon Sep 17 00:00:00 2001
From: NorbiPeti <norbipeti@norbipeti.eu>
Date: Mon, 13 May 2024 00:08:18 +0200
Subject: [PATCH] Update error messages and remove the unknown error text

---
 .../android/api/MastodonErrorResponse.java    | 20 +++++++++++++++----
 mastodon/src/main/res/values/strings.xml      |  9 ++++-----
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonErrorResponse.java b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonErrorResponse.java
index 70b21d6d..f7d69066 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/api/MastodonErrorResponse.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/api/MastodonErrorResponse.java
@@ -32,23 +32,35 @@ public class MastodonErrorResponse extends ErrorResponse{
 			this.messageResource=R.string.connection_timed_out;
 		}else if(exception instanceof JsonSyntaxException || exception instanceof JsonIOException || httpStatus>=500){
 			this.messageResource=R.string.server_error;
-		}else if(httpStatus == 404){
+		}else if(httpStatus==404){
 			this.messageResource=R.string.not_found;
 		}else{
-			this.messageResource=R.string.unknown_error;
+			this.messageResource=0;
 		}
 	}
 
 	@Override
 	public void bindErrorView(View view){
 		TextView text=view.findViewById(R.id.error_text);
-		text.setText(view.getContext().getString(messageResource, error));
+		String message;
+		if(messageResource>0){
+			message=view.getContext().getString(messageResource, error);
+		}else{
+			message=error;
+		}
+		text.setText(message);
 	}
 
 	@Override
 	public void showToast(Context context){
 		if(context==null)
 			return;
-		Toast.makeText(context, context.getString(messageResource, error), Toast.LENGTH_SHORT).show();
+		String message;
+		if(messageResource>0){
+			message=context.getString(messageResource, error);
+		}else{
+			message=error;
+		}
+		Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
 	}
 }
diff --git a/mastodon/src/main/res/values/strings.xml b/mastodon/src/main/res/values/strings.xml
index b36247e1..5f3886ff 100644
--- a/mastodon/src/main/res/values/strings.xml
+++ b/mastodon/src/main/res/values/strings.xml
@@ -755,9 +755,8 @@
 	<string name="view_favorites">View favorites</string>
 	<string name="undo_reblog">Undo boost</string>
 	<string name="undo_favorite">Undo favorite</string>
-	<string name="could_not_reach_server">Could not reach the server. Make sure you\'re connected to the internet and try again.</string>
-	<string name="connection_timed_out">Connection timed out. Make sure you\'re connected to the internet and try again.</string>
-	<string name="server_error">There may be a problem with your instance or your internet. Make sure you have access to the internet and try again.</string>
-	<string name="not_found">Not found. It probably doesn\'t exist anymore.</string>
-	<string name="unknown_error">Unknown error: %s</string>
+	<string name="could_not_reach_server">Couldn’t reach the server. Check your connection and try again?</string>
+	<string name="connection_timed_out">The request timed out. Check your connection and try again?</string>
+	<string name="server_error">Something went wrong talking with your server. It’s probably not your fault. Try again?</string>
+	<string name="not_found">It could’ve been deleted, or maybe it never existed at all.</string>
 </resources>
\ No newline at end of file