Fix muting conversation issue
This commit is contained in:
parent
985a652354
commit
47f58c36b0
|
@ -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_info).setVisible(false);
|
||||||
popup.getMenu().findItem(R.id.action_report).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_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);
|
boolean custom_sharing = sharedpreferences.getBoolean(Helper.SET_CUSTOM_SHARING, false);
|
||||||
if( custom_sharing && status.getVisibility().equals("public"))
|
if( custom_sharing && status.getVisibility().equals("public"))
|
||||||
popup.getMenu().findItem(R.id.action_custom_sharing).setVisible(true);
|
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]);
|
builderInner.setTitle(stringArrayConf[0]);
|
||||||
doAction = API.StatusAction.MUTE;
|
doAction = API.StatusAction.MUTE;
|
||||||
break;
|
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:
|
case R.id.action_open_browser:
|
||||||
Helper.openBrowser(context, status.getUrl());
|
Helper.openBrowser(context, status.getUrl());
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -2338,7 +2338,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
stringArrayConf = context.getResources().getStringArray(R.array.more_action_owner_confirm);
|
stringArrayConf = context.getResources().getStringArray(R.array.more_action_owner_confirm);
|
||||||
} else {
|
} else {
|
||||||
popup.getMenu().findItem(R.id.action_redraft).setVisible(false);
|
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)) {
|
if( MainActivity.social == UpdateAccountInfoAsyncTask.SOCIAL.PLEROMA && (isAdmin || isModerator)) {
|
||||||
popup.getMenu().findItem(R.id.action_remove).setVisible(true);
|
popup.getMenu().findItem(R.id.action_remove).setVisible(true);
|
||||||
}else {
|
}else {
|
||||||
|
|
Loading…
Reference in New Issue