diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-23 21:33:00 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-23 21:33:00 +0200 |
commit | 8e148f19ca3adf63a862192e79362677e8e1bdba (patch) | |
tree | 343632c6a695c58771af94a15a7b82ea73b0337f /src/main/java/de/pixart/messenger/ui | |
parent | 00174b878a2a1e0e8ee7175c18535f793cfc7e04 (diff) |
make error message for 'not encrypted for this device'
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 5 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java | 2 |
2 files changed, 7 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 8519c30cf..bc3a7c890 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -1325,6 +1325,11 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke relevantForCorrection = relevantForCorrection.next(); } if (m.getType() != Message.TYPE_STATUS) { + + if (m.getEncryption() == Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE) { + return; + } + final boolean treatAsFile = m.getType() != Message.TYPE_TEXT && m.getType() != Message.TYPE_PRIVATE && !(t instanceof TransferablePlaceholder); diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java index 0b464e096..2a8aabd8f 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java @@ -972,6 +972,8 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie } } else if (message.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) { displayDecryptionFailed(viewHolder, darkBackground); + } else if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE) { + displayInfoMessage(viewHolder, activity.getString(R.string.not_encrypted_for_this_device), darkBackground); } else { if (message.isGeoUri()) { displayLocationMessage(viewHolder, message); |