From 9dce42ac7f5270614fdc89282f2799fd92378dbe Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 8 Jan 2016 21:35:20 +0100 Subject: [PATCH] don't show snackbar when notifications are disabled or paused --- .../siacs/conversations/ui/ConversationFragment.java | 10 ---------- src/main/res/values/strings.xml | 1 - 2 files changed, 11 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 94d16f330..b9dd7439e 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(); } diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index b0d630a96..049a5dc61 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -266,7 +266,6 @@ Skip Disable notifications Disable notifications for this conversation - Notifications are disabled Enable Conference requires password Enter password