diff options
| -rw-r--r-- | build.gradle | 5 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle index b95ae8b88..84a79d07c 100644 --- a/build.gradle +++ b/build.gradle @@ -23,9 +23,6 @@ repositories { maven { url "http://jitsi.github.com/otr4j/repository/" } - maven { - url "https://oss.sonatype.org/content/repositories/releases/" - } jcenter() mavenCentral() } @@ -37,7 +34,7 @@ dependencies { compile 'com.android.support:support-v13:19.1.0' compile 'org.bouncycastle:bcprov-jdk15on:1.50' compile 'net.java:otr4j:0.21' - compile 'org.jxmpp:jxmpp-stringprep-libidn:0.4.0' + compile 'org.gnu.inet:libidn:1.15' compile 'com.google.zxing:core:3.1.0' compile 'com.google.zxing:android-integration:3.1.0' } diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index 550474bbc..421f20f03 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -307,6 +307,7 @@ public class Message extends AbstractEntity { && message.getEncryption() != Message.ENCRYPTION_PGP && this.getType() == message.getType() && this.getEncryption() == message.getEncryption() + && this.getCounterpart() != null && this.getCounterpart().equals(message.getCounterpart()) && (message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) && ((this .getStatus() == message.getStatus() || ((this.getStatus() == Message.STATUS_SEND || this |