sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't show snackbar when notifications are disabled or paused

This commit is contained in:
Daniel Gultsch 2016-01-08 21:35:20 +01:00
parent a3e136b550
commit 9dce42ac7f
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -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() { private OnClickListener mAnswerSmpClickListener = new OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
@ -805,8 +797,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
&& (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED) && (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED)
&& (!conversation.isOtrFingerprintVerified())) { && (!conversation.isOtrFingerprintVerified())) {
showSnackbar(R.string.unknown_otr_fingerprint, R.string.verify, clickToVerify); 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 { } else {
hideSnackbar(); hideSnackbar();
} }

1
src/main/res/values/strings.xml
View File

@ -266,7 +266,6 @@
<string name="skip">Skip</string> <string name="skip">Skip</string>
<string name="disable_notifications">Disable notifications</string> <string name="disable_notifications">Disable notifications</string>
<string name="disable_notifications_for_this_conversation">Disable notifications for this conversation</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="enable">Enable</string>
<string name="conference_requires_password">Conference requires password</string> <string name="conference_requires_password">Conference requires password</string>
<string name="enter_password">Enter password</string> <string name="enter_password">Enter password</string>