From 47f58c36b08a27dfd27fd2e738258919b7033d2c Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 23 Jun 2019 17:13:06 +0200 Subject: [PATCH] Fix muting conversation issue --- .../android/drawers/NotificationsListAdapter.java | 12 ++++++++++++ .../fedilab/android/drawers/StatusListAdapter.java | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java index 62089ebee..c026f5a24 100644 --- a/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/NotificationsListAdapter.java @@ -855,8 +855,13 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On popup.getMenu().findItem(R.id.action_info).setVisible(false); popup.getMenu().findItem(R.id.action_report).setVisible(false); popup.getMenu().findItem(R.id.action_block_domain).setVisible(false); + popup.getMenu().findItem(R.id.action_mute_conversation).setVisible(false); } + if (status.isMuted()) + popup.getMenu().findItem(R.id.action_mute_conversation).setTitle(R.string.unmute_conversation); + else + popup.getMenu().findItem(R.id.action_mute_conversation).setTitle(R.string.mute_conversation); boolean custom_sharing = sharedpreferences.getBoolean(Helper.SET_CUSTOM_SHARING, false); if( custom_sharing && status.getVisibility().equals("public")) popup.getMenu().findItem(R.id.action_custom_sharing).setVisible(true); @@ -881,6 +886,13 @@ public class NotificationsListAdapter extends RecyclerView.Adapter implements On builderInner.setTitle(stringArrayConf[0]); doAction = API.StatusAction.MUTE; break; + case R.id.action_mute_conversation: + if( status.isMuted()) + doAction = API.StatusAction.UNMUTE_CONVERSATION; + else + doAction = API.StatusAction.MUTE_CONVERSATION; + new PostActionAsyncTask(context, doAction, status.getId(), NotificationsListAdapter.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + return true; case R.id.action_open_browser: Helper.openBrowser(context, status.getUrl()); return true; 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 680651370..4d014821c 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -2338,7 +2338,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct stringArrayConf = context.getResources().getStringArray(R.array.more_action_owner_confirm); } else { popup.getMenu().findItem(R.id.action_redraft).setVisible(false); - popup.getMenu().findItem(R.id.action_mute_conversation).setVisible(false); + //popup.getMenu().findItem(R.id.action_mute_conversation).setVisible(false); if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA && (isAdmin || isModerator)) { popup.getMenu().findItem(R.id.action_remove).setVisible(true); }else {