From d529a779953864118e24d681f364d02df4e169b2 Mon Sep 17 00:00:00 2001 From: tom79 Date: Fri, 22 Nov 2019 19:33:32 +0100 Subject: [PATCH] Remove useless methods --- .../activities/ShowConversationActivity.java | 2 +- .../android/drawers/ArtListAdapter.java | 13 ------------ .../android/drawers/PixelfedListAdapter.java | 12 ----------- .../android/drawers/StatusListAdapter.java | 21 +------------------ .../fragments/DisplayStatusFragment.java | 2 +- 5 files changed, 3 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java index 56632b579..88bed7f5a 100644 --- a/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ShowConversationActivity.java @@ -119,7 +119,7 @@ public class ShowConversationActivity extends BaseActivity implements OnRetrieve assert b != null; Status status = b.getParcelable("status"); if (status != null && statusListAdapter != null) { - statusListAdapter.notifyStatusWithActionChanged(status); + statusListAdapter.notifyStatusChanged(status); } } }; diff --git a/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java index 386467bd2..7e4d57a14 100644 --- a/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/ArtListAdapter.java @@ -280,19 +280,6 @@ public class ArtListAdapter extends RecyclerView.Adapter implements OnPostAction } } - public void notifyStatusWithActionChanged(Status status) { - for (int i = 0; i < statusListAdapter.getItemCount(); i++) { - //noinspection ConstantConditions - if (statusListAdapter.getItemAt(i) != null && statusListAdapter.getItemAt(i).getId().equals(status.getId())) { - try { - statuses.set(i, status); - statusListAdapter.notifyItemChanged(i); - } catch (Exception ignored) { - } - } - } - } - @Override public void onRetrieveEmoji(Status status, boolean fromTranslation) { if (status != null) { 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 dd2ec57ce..7a36ff166 100644 --- a/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/PixelfedListAdapter.java @@ -1411,18 +1411,6 @@ public class PixelfedListAdapter extends RecyclerView.Adapter implements OnPostA } } - public void notifyStatusWithActionChanged(Status status) { - for (int i = 0; i < pixelfedListAdapter.getItemCount(); i++) { - //noinspection ConstantConditions - if (pixelfedListAdapter.getItemAt(i) != null && pixelfedListAdapter.getItemAt(i).getId().equals(status.getId())) { - try { - statuses.set(i, status); - pixelfedListAdapter.notifyItemChanged(i); - } catch (Exception ignored) { - } - } - } - } @Override public void onRetrieveEmoji(Status status, boolean fromTranslation) { 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 8f23c879d..0064c8bb0 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -352,7 +352,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct new TimelineCacheDAO(context, db).remove(refreshedStatus.getId()); new PostActionAsyncTask(context, API.StatusAction.UNSTATUS, refreshedStatus.getId(), StatusListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } - statusListAdapter.notifyStatusWithActionChanged(refreshedStatus); + statusListAdapter.notifyStatusChanged(refreshedStatus); } @Override @@ -4045,25 +4045,6 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct } } - public void notifyStatusWithActionChanged(Status status) { - if (status == null) - return; - for (int i = 0; i < statusListAdapter.getItemCount(); i++) { - //noinspection ConstantConditions - if (statusListAdapter.getItemAt(i) != null && statusListAdapter.getItemAt(i).getId().equals(status.getId())) { - try { - statuses.get(i).setFavourites_count(status.getFavourites_count()); - statuses.get(i).setReblogs_count(status.getReblogs_count()); - statuses.get(i).setFavourited(status.isFavourited()); - statuses.get(i).setReblogged(status.isReblogged()); - statuses.get(i).setReplies_count(status.getReplies_count()); - statusListAdapter.notifyItemChanged(i); - } catch (Exception ignored) { - } - break; - } - } - } @Override public void onRetrieveImage(Status status, boolean fromTranslation) { 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 8a76cd9b6..c73d44d95 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayStatusFragment.java @@ -257,7 +257,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn Status status = b.getParcelable("status"); String delete_statuses_from = b.getString("delete_statuses_for_id", null); if (status != null && statusListAdapter != null) { - statusListAdapter.notifyStatusWithActionChanged(status); + statusListAdapter.notifyStatusChanged(status); } else if (delete_statuses_from != null) { List statusesToRemove = new ArrayList<>(); for (Status status_temp : statuses) {