diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-01-08 21:35:20 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-01-08 21:35:20 +0100 |
| commit | 9dce42ac7f5270614fdc89282f2799fd92378dbe (patch) | |
| tree | f7d57b2b9627c564dbbcf43120d99305e205608b /src | |
| parent | a3e136b5504641f9782b9d94e35311dad19fbc1d (diff) | |
don't show snackbar when notifications are disabled or paused
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 10 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
2 files changed, 0 insertions, 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 94d16f33..b9dd7439 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 b0d630a9..049a5dc6 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -266,7 +266,6 @@ <string name="skip">Skip</string> <string name="disable_notifications">Disable notifications</string> <string name="disable_notifications_for_this_conversation">Disable notifications for this conversation</string> - <string name="notifications_disabled">Notifications are disabled</string> <string name="enable">Enable</string> <string name="conference_requires_password">Conference requires password</string> <string name="enter_password">Enter password</string> |