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/utils | |
| parent | 00174b878a2a1e0e8ee7175c18535f793cfc7e04 (diff) | |
make error message for 'not encrypted for this device'
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/de/pixart/messenger/utils/CryptoHelper.java | 1 | ||||
| -rw-r--r-- | src/main/java/de/pixart/messenger/utils/UIHelper.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/utils/CryptoHelper.java b/src/main/java/de/pixart/messenger/utils/CryptoHelper.java index f75201b78..8cb68b34d 100644 --- a/src/main/java/de/pixart/messenger/utils/CryptoHelper.java +++ b/src/main/java/de/pixart/messenger/utils/CryptoHelper.java @@ -240,6 +240,7 @@ public final class CryptoHelper { case Message.ENCRYPTION_OTR: return R.string.encryption_choice_otr; case Message.ENCRYPTION_AXOLOTL: + case Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE: return R.string.encryption_choice_omemo; case Message.ENCRYPTION_NONE: return R.string.encryption_choice_unencrypted; diff --git a/src/main/java/de/pixart/messenger/utils/UIHelper.java b/src/main/java/de/pixart/messenger/utils/UIHelper.java index 13a08aedd..217425cad 100644 --- a/src/main/java/de/pixart/messenger/utils/UIHelper.java +++ b/src/main/java/de/pixart/messenger/utils/UIHelper.java @@ -272,6 +272,8 @@ public class UIHelper { return new Pair<>(context.getString(R.string.pgp_message), true); } else if (message.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) { return new Pair<>(context.getString(R.string.decryption_failed), true); + } else if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE) { + return new Pair<>(context.getString(R.string.not_encrypted_for_this_device), true); } else if (message.getType() == Message.TYPE_FILE || message.getType() == Message.TYPE_IMAGE) { if (message.getStatus() == Message.STATUS_RECEIVED) { return new Pair<>(context.getString(R.string.received_x_file, |