diff options
| author | Christian S <christian@pix-art.de> | 2016-01-10 15:48:38 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-01-10 15:48:38 +0100 |
| commit | 1515d31682ad75a50c5c06b9569ac21dbd15070c (patch) | |
| tree | ad068c0b693b7b02f786729b08ee59840570fc4e /src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | |
| parent | 5d0c80ee5bef204b1bdefcb45adc9f2cb283553e (diff) | |
| parent | 95db6db935ff58ce2731ab535e3758a13dd5b68b (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/ConversationFragment.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 6391241ec..365083f84 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -742,14 +742,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa } }; - private OnClickListener mUnmuteClickListener = new OnClickListener() { - - @Override - public void onClick(final View v) { - activity.unmuteConversation(conversation); - } - }; - private OnClickListener mAnswerSmpClickListener = new OnClickListener() { @Override public void onClick(View view) { @@ -805,8 +797,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa && (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED) && (!conversation.isOtrFingerprintVerified())) { showSnackbar(R.string.unknown_otr_fingerprint, R.string.verify, clickToVerify); - } else if (conversation.isMuted()) { - showSnackbar(R.string.notifications_disabled, R.string.enable, this.mUnmuteClickListener); } else { hideSnackbar(); } |