diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-02-11 22:36:17 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-02-11 22:40:48 +0100 |
| commit | 9c87e2269cc1d427fab42047cd8993b6bfb07b6f (patch) | |
| tree | cff8d8c37e416b43c8eb84216116883bdf1655fa /src/main/java/eu/siacs/conversations/entities/Message.java | |
| parent | d38b3c2cf2134738781da626fa7ed49046c9a00f (diff) | |
Compilation errors and merge mixups fixed
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Message.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index 8d0571a4..d7a4ef18 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -419,7 +419,7 @@ public class Message extends AbstractEntity { message.treatAsDownloadable() == Decision.NEVER && this.treatAsDownloadable() == Decision.NEVER && !message.getBody().startsWith(ME_COMMAND) && - !this.getBody().startsWith(ME_COMMAND) + !this.getBody().startsWith(ME_COMMAND) && this.isTrusted() == message.isTrusted() ); } |