From 318bd9cb58966b4fb89231c43ae38274f0344dae Mon Sep 17 00:00:00 2001 From: tom79 Date: Mon, 30 Sep 2019 18:14:46 +0200 Subject: [PATCH] Truncate long error messages --- .../activities/MutedInstanceActivity.java | 6 +++++- .../activities/SearchResultActivity.java | 6 +++++- .../activities/ShowAccountActivity.java | 18 +++++++++++++--- .../fragments/DisplayAccountsFragment.java | 12 +++++++++-- .../DisplayAdminAccountsFragment.java | 6 +++++- .../DisplayAdminReportsFragment.java | 6 +++++- .../fragments/DisplayFiltersFragment.java | 6 +++++- .../DisplayFollowRequestSentFragment.java | 6 +++++- .../fragments/DisplayHowToFragment.java | 6 +++++- .../fragments/DisplayListsFragment.java | 6 +++++- .../fragments/DisplayMediaFragment.java | 6 +++++- .../DisplayMutedInstanceFragment.java | 6 +++++- .../DisplayNotificationsFragment.java | 6 +++++- .../DisplayPeertubeNotificationsFragment.java | 6 +++++- .../fragments/DisplayPlaylistsFragment.java | 18 +++++++++++++--- .../DisplayScheduledTootsFragment.java | 6 +++++- .../fragments/DisplaySearchTagsFragment.java | 6 +++++- .../fragments/DisplayStatusFragment.java | 21 +++++++++++++++---- app/src/main/res/values/strings.xml | 1 + 19 files changed, 128 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/MutedInstanceActivity.java b/app/src/main/java/app/fedilab/android/activities/MutedInstanceActivity.java index 7bfa40908..1cb6c041e 100644 --- a/app/src/main/java/app/fedilab/android/activities/MutedInstanceActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/MutedInstanceActivity.java @@ -387,7 +387,11 @@ public class MutedInstanceActivity extends BaseActivity implements OnRetrieveDom @Override public void onPostAction(int statusCode, API.StatusAction statusAction, String userId, Error error) { if (error != null) { - Toasty.error(getApplicationContext(), error.getError(), Toast.LENGTH_LONG).show(); + if(error.getError().length() < 100) { + Toasty.error(getApplicationContext(), error.getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(getApplicationContext(), getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } return; } Helper.manageMessageStatusCode(MutedInstanceActivity.this, statusCode, statusAction); diff --git a/app/src/main/java/app/fedilab/android/activities/SearchResultActivity.java b/app/src/main/java/app/fedilab/android/activities/SearchResultActivity.java index d490b98ad..ae0d2ed47 100644 --- a/app/src/main/java/app/fedilab/android/activities/SearchResultActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/SearchResultActivity.java @@ -168,7 +168,11 @@ public class SearchResultActivity extends BaseActivity implements OnRetrieveSear public void onRetrieveSearchStatus(APIResponse apiResponse, Error error) { loader.setVisibility(View.GONE); if (apiResponse.getError() != null) { - Toasty.error(getApplicationContext(), error.getError(), Toast.LENGTH_LONG).show(); + if(error.getError().length() < 100) { + Toasty.error(getApplicationContext(), error.getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(getApplicationContext(), getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } return; } lv_search.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java index 00f7be507..2996f982c 100644 --- a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java @@ -1000,7 +1000,11 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt public void onRetrieveRelationship(Relationship relationship, Error error) { if (error != null) { - Toasty.error(getApplicationContext(), error.getError(), Toast.LENGTH_LONG).show(); + if(error.getError().length() < 100) { + Toasty.error(getApplicationContext(), error.getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(getApplicationContext(), getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } return; } this.relationship = relationship; @@ -1613,7 +1617,11 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt public void onPostAction(int statusCode, API.StatusAction statusAction, String targetedId, Error error) { if (error != null) { - Toasty.error(getApplicationContext(), error.getError(), Toast.LENGTH_LONG).show(); + if(error.getError().length() < 100) { + Toasty.error(getApplicationContext(), error.getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(getApplicationContext(), getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } return; } if (addToList != null) { @@ -1642,7 +1650,11 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt if (error == null) Toasty.error(getApplicationContext(), getString(R.string.toast_error), Toast.LENGTH_LONG).show(); else - Toasty.error(getApplicationContext(), error.getError(), Toast.LENGTH_LONG).show(); + if(error.getError().length() < 100) { + Toasty.error(getApplicationContext(), error.getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(getApplicationContext(), getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } return; } this.account = account; diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayAccountsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayAccountsFragment.java index 03a98fcf4..a7bc0da7f 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayAccountsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayAccountsFragment.java @@ -208,7 +208,11 @@ public class DisplayAccountsFragment extends Fragment implements OnRetrieveAccou mainLoader.setVisibility(View.GONE); nextElementLoader.setVisibility(View.GONE); if (apiResponse.getError() != null) { - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } swipeRefreshLayout.setRefreshing(false); swiped = false; flag_loading = false; @@ -259,7 +263,11 @@ public class DisplayAccountsFragment extends Fragment implements OnRetrieveAccou @Override public void onRetrieveRelationship(APIResponse apiResponse) { if (apiResponse.getError() != null) { - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } return; } SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayAdminAccountsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayAdminAccountsFragment.java index 0682e7f6d..4667e7cd2 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayAdminAccountsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayAdminAccountsFragment.java @@ -224,7 +224,11 @@ public class DisplayAdminAccountsFragment extends Fragment implements OnAdminAct mainLoader.setVisibility(View.GONE); nextElementLoader.setVisibility(View.GONE); if (apiResponse.getError() != null) { - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } swipeRefreshLayout.setRefreshing(false); swiped = false; flag_loading = false; diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayAdminReportsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayAdminReportsFragment.java index 575a2da3b..a57fa8748 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayAdminReportsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayAdminReportsFragment.java @@ -231,7 +231,11 @@ public class DisplayAdminReportsFragment extends Fragment implements OnAdminActi }); builderInner.show(); } else { - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } } return; } diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java index 6ba082852..abc50d299 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayFiltersFragment.java @@ -241,7 +241,11 @@ public class DisplayFiltersFragment extends Fragment implements OnFilterActionIn mainLoader.setVisibility(View.GONE); add_new.setEnabled(true); if (apiResponse.getError() != null) { - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } return; } if (actionType == ManageFiltersAsyncTask.action.GET_ALL_FILTER) { diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayFollowRequestSentFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayFollowRequestSentFragment.java index 6f628b687..b5cdd55de 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayFollowRequestSentFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayFollowRequestSentFragment.java @@ -179,7 +179,11 @@ public class DisplayFollowRequestSentFragment extends Fragment implements OnRetr mainLoader.setVisibility(View.GONE); nextElementLoader.setVisibility(View.GONE); if (apiResponse.getError() != null) { - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } flag_loading = false; swipeRefreshLayout.setRefreshing(false); swiped = false; diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayHowToFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayHowToFragment.java index a15247561..c2ec450f3 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayHowToFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayHowToFragment.java @@ -94,7 +94,11 @@ public class DisplayHowToFragment extends Fragment implements OnRetrieveHowToInt public void onRetrieveHowTo(APIResponse apiResponse) { mainLoader.setVisibility(View.GONE); if (apiResponse.getError() != null) { - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } return; } List howToVideos = apiResponse.getHowToVideos(); diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayListsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayListsFragment.java index 8dfe0b94d..4efabdf3d 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayListsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayListsFragment.java @@ -177,7 +177,11 @@ public class DisplayListsFragment extends Fragment implements OnListActionInterf mainLoader.setVisibility(View.GONE); add_new.setEnabled(true); if (apiResponse.getError() != null) { - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } return; } if (actionType == ManageListsAsyncTask.action.GET_LIST) { diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayMediaFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayMediaFragment.java index 2eba27912..bddfb7ead 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayMediaFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayMediaFragment.java @@ -179,7 +179,11 @@ public class DisplayMediaFragment extends Fragment implements OnRetrieveFeedsInt //Discards 404 - error which can often happen due to toots which have been deleted if (apiResponse == null || apiResponse.getError() != null && apiResponse.getError().getStatusCode() != 404) { if (apiResponse != null && apiResponse.getError() != null && apiResponse.getError().getError() != null) - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } else Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show(); flag_loading = false; diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayMutedInstanceFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayMutedInstanceFragment.java index ebb83ab29..11b01a9c1 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayMutedInstanceFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayMutedInstanceFragment.java @@ -239,7 +239,11 @@ public class DisplayMutedInstanceFragment extends Fragment implements OnRetrieve mainLoader.setVisibility(View.GONE); nextElementLoader.setVisibility(View.GONE); if (apiResponse.getError() != null) { - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } swipeRefreshLayout.setRefreshing(false); swiped = false; flag_loading = false; diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java index a52a7e46b..4eef1e99f 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayNotificationsFragment.java @@ -305,7 +305,11 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve String lastReadNotifications = sharedpreferences.getString(Helper.LAST_NOTIFICATION_MAX_ID + userId + instance, null); if (apiResponse.getError() != null) { - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } flag_loading = false; swipeRefreshLayout.setRefreshing(false); swiped = false; diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayPeertubeNotificationsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayPeertubeNotificationsFragment.java index 5e6884cf1..98b302528 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayPeertubeNotificationsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayPeertubeNotificationsFragment.java @@ -249,7 +249,11 @@ public class DisplayPeertubeNotificationsFragment extends Fragment implements On nextElementLoader.setVisibility(View.GONE); String lastReadNotifications = sharedpreferences.getString(Helper.LAST_NOTIFICATION_MAX_ID + userId + instance, null); if (apiResponse.getError() != null) { - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } flag_loading = false; swipeRefreshLayout.setRefreshing(false); swiped = false; diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java index 143cabedb..9c0a43a50 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java @@ -319,7 +319,11 @@ public class DisplayPlaylistsFragment extends Fragment implements OnPlaylistActi mainLoader.setVisibility(View.GONE); add_new.setEnabled(true); if (apiResponse.getError() != null) { - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } return; } @@ -342,7 +346,11 @@ public class DisplayPlaylistsFragment extends Fragment implements OnPlaylistActi playlistAdapter.notifyDataSetChanged(); textviewNoAction.setVisibility(View.GONE); } else { - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } } } else if (actionType == ManagePlaylistsAsyncTask.action.DELETE_PLAYLIST) { if (this.playlists.size() == 0) @@ -365,7 +373,11 @@ public class DisplayPlaylistsFragment extends Fragment implements OnPlaylistActi public void onRetrievePeertubeChannels(APIResponse apiResponse) { if (apiResponse.getError() != null || apiResponse.getAccounts() == null || apiResponse.getAccounts().size() == 0) { if (apiResponse.getError() != null && apiResponse.getError().getError() != null) - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } else Toasty.error(context, getString(R.string.toast_error), Toast.LENGTH_LONG).show(); return; diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayScheduledTootsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayScheduledTootsFragment.java index 96bd9669c..606e22786 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayScheduledTootsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayScheduledTootsFragment.java @@ -118,7 +118,11 @@ public class DisplayScheduledTootsFragment extends Fragment implements OnRetriev @Override public void onRetrieveFeeds(APIResponse apiResponse) { if (apiResponse.getError() != null && apiResponse.getError().getStatusCode() != 404) { - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } return; } mainLoader.setVisibility(View.GONE); diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java index e5911957b..05a50bb40 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplaySearchTagsFragment.java @@ -191,7 +191,11 @@ public class DisplaySearchTagsFragment extends Fragment implements OnRetrieveSea swipeRefreshLayout.setRefreshing(false); if (apiResponse.getError() != null) { if (apiResponse.getError().getError() != null) - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } else Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show(); return; diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java index 4febf65b4..3dde396c9 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java @@ -487,8 +487,13 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn if (this.peertubes == null || this.statuses == null || apiResponse == null || (apiResponse.getError() != null && apiResponse.getError().getStatusCode() != 404)) { if (apiResponse == null) Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show(); - else - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + else { + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } + } swipeRefreshLayout.setRefreshing(false); flag_loading = false; return; @@ -974,7 +979,11 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn if (apiResponse == null) Toasty.error(context, context.getString(R.string.toast_error), Toast.LENGTH_LONG).show(); else - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } swipeRefreshLayout.setRefreshing(false); flag_loading = false; return; @@ -1108,7 +1117,11 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn //Discards 404 - error which can often happen due to toots which have been deleted if (apiResponse.getError() != null) { if (!apiResponse.getError().getError().startsWith("404 -")) - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + if(apiResponse.getError().getError().length() < 100) { + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_LONG).show(); + }else{ + Toasty.error(context, getString(R.string.long_api_error,"\ud83d\ude05"), Toast.LENGTH_LONG).show(); + } swipeRefreshLayout.setRefreshing(false); isSwipped = false; flag_loading = false; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8aa203ecb..a6fb0e1dd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1232,4 +1232,5 @@ Accepted Formats: jpeg, png, gif \n\nMax File Size: 15 MB \n\nAlbums can contain up to 4 photos or videos Upload media Add an optional caption + The app received a very long error message from the API %1$s \ No newline at end of file