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 @@
View favorites
Undo boost
Undo favorite
- Could not reach the server. Make sure you\'re connected to the internet and try again.
- Connection timed out. Make sure you\'re connected to the internet and try again.
- There may be a problem with your instance or your internet. Make sure you have access to the internet and try again.
- Not found. It probably doesn\'t exist anymore.
- Unknown error: %s
+ Couldn’t reach the server. Check your connection and try again?
+ The request timed out. Check your connection and try again?
+ Something went wrong talking with your server. It’s probably not your fault. Try again?
+ It could’ve been deleted, or maybe it never existed at all.
\ No newline at end of file