diff options
author | Christian Schneppe <christian@pix-art.de> | 2017-02-09 23:55:40 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2017-02-09 23:55:40 +0100 |
commit | ad7e8e76f0fad8b3887c332fbaddcc77daee8df0 (patch) | |
tree | 5540c85f0142c098eac0d4ec86205381cb80cbcc /src/main/java/de/pixart/messenger/ui/ConversationActivity.java | |
parent | e7b636019c7e9813a5e33c4eabdb39080a94009f (diff) |
move (un)mute settings to contact-/conference details
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ConversationActivity.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationActivity.java | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java index dadab9a72..6bcf9c631 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java @@ -512,8 +512,6 @@ public class ConversationActivity extends XmppActivity final MenuItem menuClearHistory = menu.findItem(R.id.action_clear_history); final MenuItem menuAdd = menu.findItem(R.id.action_add); final MenuItem menuInviteContact = menu.findItem(R.id.action_invite); - final MenuItem menuMute = menu.findItem(R.id.action_mute); - final MenuItem menuUnmute = menu.findItem(R.id.action_unmute); final MenuItem menuUpdater = menu.findItem(R.id.action_check_updates); final MenuItem menuInviteUser = menu.findItem(R.id.action_invite_user); @@ -524,8 +522,6 @@ public class ConversationActivity extends XmppActivity menuInviteContact.setVisible(false); menuAttach.setVisible(false); menuClearHistory.setVisible(false); - menuMute.setVisible(false); - menuUnmute.setVisible(false); } else { menuAdd.setVisible(!isConversationsOverviewHideable()); //hide settings, accounts and updater in all menus except in main window @@ -552,11 +548,6 @@ public class ConversationActivity extends XmppActivity } else { menuSecure.setVisible(Config.multipleEncryptionChoices()); } - if (this.getSelectedConversation().isMuted()) { - menuMute.setVisible(false); - } else { - menuUnmute.setVisible(false); - } } } if (Config.supportOmemo()) { @@ -842,12 +833,6 @@ public class ConversationActivity extends XmppActivity case R.id.action_clear_history: clearHistoryDialog(getSelectedConversation()); break; - case R.id.action_mute: - muteConversationDialog(getSelectedConversation()); - break; - case R.id.action_unmute: - unmuteConversation(getSelectedConversation()); - break; case R.id.action_block: BlockContactDialog.show(this, xmppConnectionService, getSelectedConversation()); break; @@ -1088,39 +1073,6 @@ public class ConversationActivity extends XmppActivity } } - protected void muteConversationDialog(final Conversation conversation) { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(R.string.disable_notifications); - final int[] durations = getResources().getIntArray(R.array.mute_options_durations); - builder.setItems(R.array.mute_options_descriptions, - new OnClickListener() { - - @Override - public void onClick(final DialogInterface dialog, final int which) { - final long till; - if (durations[which] == -1) { - till = Long.MAX_VALUE; - } else { - till = System.currentTimeMillis() + (durations[which] * 1000); - } - conversation.setMutedTill(till); - ConversationActivity.this.xmppConnectionService.updateConversation(conversation); - updateConversationList(); - ConversationActivity.this.mConversationFragment.updateMessages(); - invalidateOptionsMenu(); - } - }); - builder.create().show(); - } - - public void unmuteConversation(final Conversation conversation) { - conversation.setMutedTill(0); - this.xmppConnectionService.updateConversation(conversation); - updateConversationList(); - ConversationActivity.this.mConversationFragment.updateMessages(); - invalidateOptionsMenu(); - } - @Override public void onBackPressed() { if (!isConversationsOverviewVisable()) { |