From cf4e9794317463309b93d154ac237d3e9c28743a Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 21 Apr 2022 18:31:53 +0200 Subject: [PATCH 1/5] version bump firebasse-messaging lib --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 85d62121cca628a00950a76aa288ecafacca3d18..86b0314c0664c22c979fecae9a98afd3c2253fe9 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ configurations { dependencies { implementation 'androidx.viewpager:viewpager:1.0.0' - playstoreImplementation('com.google.firebase:firebase-messaging:23.0.2') { + playstoreImplementation('com.google.firebase:firebase-messaging:23.0.3') { exclude group: 'com.google.firebase', module: 'firebase-core' exclude group: 'com.google.firebase', module: 'firebase-analytics' exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' From 85f06f1cd6a3e019a2ec8c8b664b823bf1989a80 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 2 May 2022 08:29:51 +0200 Subject: [PATCH 2/5] do not merge failed decryptions fixes #4314 --- .../java/eu/siacs/conversations/entities/Message.java | 10 ++++++++-- .../conversations/services/XmppConnectionService.java | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index fa1819124eb3d3ab7c534a2ed135c7210b7ccbd9..e50ffc73c00e83360e8c742ea0d0c4fd161bde6d 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -14,6 +14,7 @@ import org.json.JSONException; import java.lang.ref.WeakReference; import java.util.ArrayList; +import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -633,9 +634,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable message.getEncryption() != Message.ENCRYPTION_PGP && message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED && this.getType() == message.getType() && - //this.getStatus() == message.getStatus() && isStatusMergeable(this.getStatus(), message.getStatus()) && - this.getEncryption() == message.getEncryption() && + isEncryptionMergeable(this.getEncryption(),message.getEncryption()) && this.getCounterpart() != null && this.getCounterpart().equals(message.getCounterpart()) && this.edited() == message.edited() && @@ -668,6 +668,12 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable ); } + private static boolean isEncryptionMergeable(final int a, final int b) { + return a == b + && Arrays.asList(ENCRYPTION_NONE, ENCRYPTION_DECRYPTED, ENCRYPTION_AXOLOTL) + .contains(a); + } + public void setCounterparts(List counterparts) { this.counterparts = counterparts; } diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 0f121b0b383797f49c26b97f3fa0137118fa1e37..7965a4e31ea2d75ef938668afe3e86394262d4ae 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -4128,7 +4128,7 @@ public class XmppConnectionService extends Service { } public void updateAccountUi() { - for (OnAccountUpdate listener : threadSafeList(this.mOnAccountUpdates)) { + for (final OnAccountUpdate listener : threadSafeList(this.mOnAccountUpdates)) { listener.onAccountUpdate(); } } From 86bb3df8d4ebd0c2d50422d80479cfeccd813ed7 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 2 May 2022 08:32:58 +0200 Subject: [PATCH 3/5] pulled translations from transifex --- src/main/res/values-it/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 6fb2bc8239e62c29f3d232ecf5dcc7ff8b2ab990..af7c4b93df38a7cde2770fab35c466be84aea9cc 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -465,6 +465,7 @@ Scaricamento fallito: file non trovato Scaricamento fallito: impossibile connettersi all\'host Scaricamento fallito: scrittura del file impossibile + Scaricamento fallito: file non valido Rete Tor non disponibile Bind fallito Il server non รจ responsabile per questo dominio From d1dcc577106a18996aa15e7a43afc636fcf30d0d Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 2 May 2022 08:33:27 +0200 Subject: [PATCH 4/5] version bump to 2.10.6 --- CHANGELOG.md | 4 ++++ build.gradle | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 81c2d9e1f3278f474f1d0740f469b7b26d74ece9..304fac6d97c9cb00922b127db2e726351c2f52c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +### Version 2.10.6 + +* Minor bug fixes + ### Version 2.10.5 * Security: Stop downloading files that exceed advertised file size diff --git a/build.gradle b/build.gradle index 86b0314c0664c22c979fecae9a98afd3c2253fe9..371b1ea871d5677aafba9a060fa23ef0e8fde871 100644 --- a/build.gradle +++ b/build.gradle @@ -90,8 +90,8 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 30 - versionCode 42031 - versionName "2.10.5" + versionCode 42032 + versionName "2.10.6" archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" resValue "string", "applicationId", applicationId From d5ac6e35fcc62c886ae6cca1e58899eb1cb4f869 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 13 May 2022 08:28:06 +0200 Subject: [PATCH 5/5] bump agp --- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- src/conversations/AndroidManifest.xml | 3 +-- src/main/AndroidManifest.xml | 3 +-- src/playstore/AndroidManifest.xml | 1 - src/quicksy/AndroidManifest.xml | 3 +-- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 371b1ea871d5677aafba9a060fa23ef0e8fde871..2e1870b2f4cf545f939c3f950c2ebda4a101d755 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' + classpath 'com.android.tools.build:gradle:7.2.0' } } @@ -85,6 +85,7 @@ ext { } android { + namespace 'eu.siacs.conversations' compileSdkVersion 31 defaultConfig { @@ -229,7 +230,6 @@ android { disable 'MissingTranslation', 'InvalidPackage', 'AppCompatResource' } - android.applicationVariants.all { variant -> variant.outputs.each { output -> def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter(com.android.build.OutputFile.ABI)) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 162dd9b7f25a2ebf7f029a7f7d681aeca4074879..e639f29f374c17fdf67dee47e7c8e96c951a546b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip diff --git a/src/conversations/AndroidManifest.xml b/src/conversations/AndroidManifest.xml index 62396bed1af27fcdcac16db152115fbd362223ec..bf2297949f60c8fe268877ed4bca753a0b097169 100644 --- a/src/conversations/AndroidManifest.xml +++ b/src/conversations/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools"> diff --git a/src/playstore/AndroidManifest.xml b/src/playstore/AndroidManifest.xml index 6e65b581c79664e254f97fea6d7680c9c94673d9..6deb7d2a43c1c65e0332c1a12225bc3c1b1d145b 100644 --- a/src/playstore/AndroidManifest.xml +++ b/src/playstore/AndroidManifest.xml @@ -1,6 +1,5 @@ diff --git a/src/quicksy/AndroidManifest.xml b/src/quicksy/AndroidManifest.xml index 1c30d2f28ea7ff1266c128bf939f0c159322337f..f82377f0147ae3436d32be99cdd54408edbe5e91 100644 --- a/src/quicksy/AndroidManifest.xml +++ b/src/quicksy/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools">