From 1a2672e12adb1e0ef936281d961ee011a513d23f Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 19 Jan 2020 10:29:35 +0100 Subject: [PATCH] Some fixes --- .../android/activities/PixelfedComposeActivity.java | 5 +---- .../fedilab/android/activities/TootActivity.java | 5 +---- .../android/drawers/PixelfedListAdapter.java | 13 ++++--------- .../fedilab/android/drawers/StatusListAdapter.java | 9 ++------- 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java b/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java index fa0d22570..ed459f4b5 100644 --- a/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/PixelfedComposeActivity.java @@ -1498,10 +1498,7 @@ public class PixelfedComposeActivity extends BaseActivity implements UploadStatu public void onPostStatusAction(APIResponse apiResponse) { if (apiResponse.getError() != null) { toot_it.setEnabled(true); - if (apiResponse.getError().getError().contains("422")) { - showAToast(getString(R.string.toast_error_char_limit)); - return; - } else if (apiResponse.getError().getStatusCode() == -33) { + if (apiResponse.getError().getStatusCode() == -33) { storeToot(false, true); } else { showAToast(apiResponse.getError().getError()); diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java index 25f288962..837e6538a 100644 --- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java @@ -2677,10 +2677,7 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, public void onPostStatusAction(APIResponse apiResponse) { if (apiResponse.getError() != null) { toot_it.setEnabled(true); - if (apiResponse.getError().getError().contains("422")) { - showAToast(getString(R.string.toast_error_char_limit)); - return; - } else if (apiResponse.getError().getStatusCode() == -33) { + if (apiResponse.getError().getStatusCode() == -33) { storeToot(false, true); } else { showAToast(apiResponse.getError().getError()); diff --git a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java index f697b3dca..4d031b7d9 100644 --- a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java @@ -186,17 +186,12 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA @Override public void onPostStatusAction(APIResponse apiResponse) { if (apiResponse.getError() != null) { - if (apiResponse.getError().getError().contains("422")) { - Toasty.error(context, context.getString(R.string.toast_error_char_limit), Toast.LENGTH_SHORT).show(); - return; + if (apiResponse.getError().getError().length() < 100) { + 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, context.getString(R.string.long_api_error, "\ud83d\ude05"), Toast.LENGTH_LONG).show(); - } - return; + Toasty.error(context, context.getString(R.string.long_api_error, "\ud83d\ude05"), Toast.LENGTH_LONG).show(); } + return; } final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE); diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index 417411035..419c6c676 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -557,13 +557,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct @Override public void onPostStatusAction(APIResponse apiResponse) { if (apiResponse.getError() != null) { - if (apiResponse.getError().getError().contains("422")) { - Toasty.error(context, context.getString(R.string.toast_error_char_limit), Toast.LENGTH_SHORT).show(); - return; - } else { - Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_SHORT).show(); - return; - } + Toasty.error(context, apiResponse.getError().getError(), Toast.LENGTH_SHORT).show(); + return; } final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, MODE_PRIVATE); final String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);