aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/entities
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-23 21:33:00 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-23 21:33:00 +0200
commit8e148f19ca3adf63a862192e79362677e8e1bdba (patch)
tree343632c6a695c58771af94a15a7b82ea73b0337f /src/main/java/de/pixart/messenger/entities
parent00174b878a2a1e0e8ee7175c18535f793cfc7e04 (diff)
make error message for 'not encrypted for this device'
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities')
-rw-r--r--src/main/java/de/pixart/messenger/entities/Message.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java
index 7bf94e599..ee9023c54 100644
--- a/src/main/java/de/pixart/messenger/entities/Message.java
+++ b/src/main/java/de/pixart/messenger/entities/Message.java
@@ -44,6 +44,7 @@ public class Message extends AbstractEntity {
public static final int ENCRYPTION_DECRYPTED = 3;
public static final int ENCRYPTION_DECRYPTION_FAILED = 4;
public static final int ENCRYPTION_AXOLOTL = 5;
+ public static final int ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE = 6;
public static final int TYPE_TEXT = 0;
public static final int TYPE_IMAGE = 1;
@@ -904,6 +905,9 @@ public class Message extends AbstractEntity {
if (encryption == ENCRYPTION_DECRYPTED || encryption == ENCRYPTION_DECRYPTION_FAILED) {
return ENCRYPTION_PGP;
}
+ if (encryption == ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE) {
+ return ENCRYPTION_AXOLOTL;
+ }
return encryption;
}
} \ No newline at end of file