diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 9 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index b985a2c35..18c3cb5cf 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -988,6 +988,13 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa } }; + private OnClickListener mBlockClickListener = new OnClickListener() { + @Override + public void onClick(final View v) { + BlockContactDialog.show(activity, conversation); + } + }; + private OnClickListener mAddBackClickListener = new OnClickListener() { @Override @@ -1082,6 +1089,8 @@ 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.isWithStranger() && !conversation.isBlocked()) { + showSnackbar(R.string.received_message_from_stranger, R.string.block, mBlockClickListener); } else { hideSnackbar(); } diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index b569381c3..c16c7b921 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -751,4 +751,5 @@ <string name="contact_blocked_past_tense">Contact blocked.</string> <string name="pref_notifications_from_strangers">Notifications from strangers</string> <string name="pref_notifications_from_strangers_summary">Notify for messages received from strangers.</string> + <string name="received_message_from_stranger">Received message from stranger</string> </resources> |