Merge tag '2.15.3' into ninja-main

# Conflicts: # build.gradle # src/conversations/res/layout/activity_pick_server.xml # src/conversations/res/values-it/strings.xml # src/main/AndroidManifest.xml # src/main/java/eu/siacs/conversations/Config.java # src/main/java/eu/siacs/conversations/ui/SettingsActivity.java # src/main/java/eu/siacs/conversations/ui/text/FixedURLSpan.java # src/main/res/menu/start_conversation_fab_submenu.xml # src/main/res/values-ca/strings.xml # src/main/res/values-da-rDK/strings.xml # src/main/res/values-de/strings.xml # src/main/res/values-es/strings.xml # src/main/res/values-fa-rIR/strings.xml # src/main/res/values-gl/strings.xml # src/main/res/values-hr/strings.xml # src/main/res/values-it/strings.xml # src/main/res/values-nb-rNO/strings.xml # src/main/res/values-pl/strings.xml # src/main/res/values-ro-rRO/strings.xml # src/main/res/values-sq-rAL/strings.xml # src/main/res/values-uk/strings.xml # src/main/res/values-zh-rCN/strings.xml # src/main/res/values/strings.xml # src/main/res/values/themes.xml # src/main/res/xml/preferences.xml # src/quicksy/res/layout/activity_tos.xml
christianrowlands · May 6, 2024 · aed976d · aed976d
2 parents a1a7efe + 23e88e6
commit aed976d
Show file tree

Hide file tree

Showing 1,630 changed files with 10,903 additions and 9,560 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Changelog
 
+### Version 2.15.3
+
+* fix call integration on some Android 14 devices
+* Introduce 'Invites from Strangers' setting
+
+### Version 2.15.2
+
+* Fix Quicksy registration on Android 6/7
+* Play incoming call ringtone on notification channel
+
+### Version 2.15.1
+
+* Show message status as icons
+* Introduce 'Large font' setting for message bubbles
+
+### Version 2.15.0
+
+* Use Material 3 theme
+* Reorganize settings
+* Synchronize read state across devices
+
+### Version 2.14.2
+
+* Restore access to Channel Discovery for Android 6+7
+* Improve logging for failed call integration
+
 ### Version 2.14.1
 
 * Fix A/V calls on Android 8

diff --git a/README.md b/README.md
@@ -8,7 +8,13 @@
   </a>
 </p>
 
-![screenshots](https://codeberg.org/iNPUTmice/Conversations/raw/branch/master/screenshots.png)
+<p align="center">
+<img src="https://codeberg.org/iNPUTmice/Conversations/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png" width="216"/>
+<img src="https://codeberg.org/iNPUTmice/Conversations/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png" width="216"/>
+<img src="https://codeberg.org/iNPUTmice/Conversations/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png" width="216"/>
+<img src="https://codeberg.org/iNPUTmice/Conversations/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png" width="216"/>
+<img src="https://codeberg.org/iNPUTmice/Conversations/raw/branch/master/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png" width="216"/>
+</p>
 
 ## Attribution
 

diff --git a/build.gradle b/build.gradle
@@ -51,6 +51,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.exifinterface:exifinterface:1.3.7'
     implementation 'androidx.cardview:cardview:1.0.0'
+    implementation "androidx.preference:preference:1.2.1"
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.google.android.material:material:1.11.0'
 
@@ -65,7 +66,7 @@ dependencies {
     implementation 'me.leolin:ShortcutBadger:1.1.22@aar'
     implementation 'org.whispersystems:signal-protocol-java:2.6.2'
     implementation 'com.makeramen:roundedimageview:2.3.0'
-    implementation "com.wefika:flowlayout:0.4.1"
+
     //noinspection GradleDependency
     implementation('com.github.natario1:Transcoder:v0.9.1') {
         exclude group: 'com.otaliastudios.opengl', module: 'egloo'
@@ -78,15 +79,15 @@ dependencies {
     implementation 'org.hsluv:hsluv:0.2'
     implementation 'org.conscrypt:conscrypt-android:2.5.2'
     implementation 'me.drakeet.support:toastcompat:1.1.0'
-    implementation "com.leinardi.android:speed-dial:3.2.0"
+    implementation "com.leinardi.android:speed-dial:3.3.0"
 
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.squareup.retrofit2:converter-gson:2.9.0"
     implementation "com.squareup.okhttp3:okhttp:4.12.0"
 
     implementation 'com.google.guava:guava:32.1.3-android'
     quicksyImplementation 'io.michaelrocks:libphonenumber-android:8.13.28'
-    implementation 'im.conversations.webrtc:webrtc-android:119.0.0'
+    implementation 'im.conversations.webrtc:webrtc-android:119.0.1'
 
     // Import the Firebase BoM
     implementation platform('com.google.firebase:firebase-bom:32.7.4')
@@ -107,7 +108,7 @@ android {
         minSdkVersion 23
         targetSdkVersion 34
         versionCode 42109
-        versionName "2.14.1"
+        versionName "2.15.3"
         archivesBaseName += "-$versionName"
         applicationId "com.ninja.chat"
         resValue "string", "applicationId", applicationId

diff --git a/fastlane/metadata/android/de-DE/changelogs/4210404.txt b/fastlane/metadata/android/de-DE/changelogs/4210404.txt
@@ -0,0 +1,3 @@
+* Behebung von A/V-Anrufen unter Android 8
+* Behebung von Problemen bei der Integration neuer Anrufe
+* Behebt das Problem mit der Videokompression
diff --git a/fastlane/metadata/android/de-DE/changelogs/4210504.txt b/fastlane/metadata/android/de-DE/changelogs/4210504.txt
@@ -0,0 +1,2 @@
+* Wiederherstellung des Zugangs zu Channel Discovery für Android 6+7
+* Verbesserte Protokollierung bei fehlgeschlagener Anrufintegration
diff --git a/fastlane/metadata/android/de-DE/changelogs/4210604.txt b/fastlane/metadata/android/de-DE/changelogs/4210604.txt
@@ -0,0 +1,3 @@
+* Nutzung des Material 3 Designs
+* Einstellungen umgestaltet
+* Lesestatus geräteübergreifend synchronisieren
diff --git a/fastlane/metadata/android/de-DE/changelogs/4210704.txt b/fastlane/metadata/android/de-DE/changelogs/4210704.txt
@@ -0,0 +1,3 @@
+* Nutzung des Material 3 Designs
+* Einstellungen umgestaltet
+* Lesestatus geräteübergreifend synchronisieren
diff --git a/fastlane/metadata/android/de-DE/changelogs/4210804.txt b/fastlane/metadata/android/de-DE/changelogs/4210804.txt
@@ -0,0 +1,2 @@
+* Nachrichtenstatus als Symbole anzeigen
+* Einstellung für Schriftgröße der Nachrichten hinzugefügt
diff --git a/fastlane/metadata/android/en-US/changelogs/4210504.txt b/fastlane/metadata/android/en-US/changelogs/4210504.txt
@@ -0,0 +1,2 @@
+* Restore access to Channel Discovery for Android 6+7
+* Improve logging for failed call integration
diff --git a/fastlane/metadata/android/en-US/changelogs/4210704.txt b/fastlane/metadata/android/en-US/changelogs/4210704.txt
@@ -0,0 +1,3 @@
+* Use Material 3 theme
+* Reorganize settings
+* Synchronize read state across devices
diff --git a/fastlane/metadata/android/en-US/changelogs/4210804.txt b/fastlane/metadata/android/en-US/changelogs/4210804.txt
@@ -0,0 +1,2 @@
+* Show message status as icons
+* Introduce 'Large font' setting for message bubbles
diff --git a/fastlane/metadata/android/en-US/changelogs/4210904.txt b/fastlane/metadata/android/en-US/changelogs/4210904.txt
@@ -0,0 +1,2 @@
+* Fix Quicksy registration on Android 6/7
+* Play incoming call ringtone on notification channel
diff --git a/fastlane/metadata/android/en-US/changelogs/4211004.txt b/fastlane/metadata/android/en-US/changelogs/4211004.txt
@@ -0,0 +1,2 @@
+* fix call integration on some Android 14 devices
+* Introduce 'Invites from Strangers' setting
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/09.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/09.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/01.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/01.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/02.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/02.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/03.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/03.png
diff --git a/fastlane/metadata/android/en-US/images/tenInchScreenshots/04.png b/fastlane/metadata/android/en-US/images/tenInchScreenshots/04.png
diff --git a/fastlane/metadata/android/es-ES/changelogs/4210404.txt b/fastlane/metadata/android/es-ES/changelogs/4210404.txt
@@ -0,0 +1,3 @@
+* Reparar llamadas de audio/vídeo en Android 8
+* Se corrigió la condición de carrera en la integración de nuevas llamadas.
+* Soluciona el problema de compresión de video
diff --git a/fastlane/metadata/android/es-ES/changelogs/4210504.txt b/fastlane/metadata/android/es-ES/changelogs/4210504.txt
@@ -0,0 +1,2 @@
+* Restaurar el acceso a Channel Discovery para Android 6+7
+* Mejorar el registro para la integración de llamadas fallidas
diff --git a/fastlane/metadata/android/es-ES/changelogs/4210704.txt b/fastlane/metadata/android/es-ES/changelogs/4210704.txt
@@ -0,0 +1,3 @@
+* Usar el tema Material 3
+* Reorganizar la configuración
+* Sincronizar el estado de lectura entre dispositivos
diff --git a/fastlane/metadata/android/gl-ES/changelogs/4210404.txt b/fastlane/metadata/android/gl-ES/changelogs/4210404.txt
@@ -0,0 +1,3 @@
+* Arranxo das chamadas de A/V en Android 8
+* Arranxo das prioridades na novas chamadas integradas
+* Arranxo do antigo problema coa compresión do vídeo
diff --git a/fastlane/metadata/android/gl-ES/changelogs/4210504.txt b/fastlane/metadata/android/gl-ES/changelogs/4210504.txt
@@ -0,0 +1,2 @@
+* Restablecer o acceso ao Descubrimento de Canles para Android 6+7
+* Mellorar o acceso para a integración de chamadas que fallou
diff --git a/fastlane/metadata/android/gl-ES/changelogs/4210704.txt b/fastlane/metadata/android/gl-ES/changelogs/4210704.txt
@@ -0,0 +1,3 @@
+* Uso do decorado Material 3
+* Reorganización dos Axustes
+* Sincronización entre dispositivos do estado de lectura
diff --git a/fastlane/metadata/android/gl-ES/changelogs/4210804.txt b/fastlane/metadata/android/gl-ES/changelogs/4210804.txt
@@ -0,0 +1,2 @@
+* Mostrar estado das mensaxes como iconas
+* Novo axuste para 'Tamaño de letra grande' nas mensaxes
diff --git a/fastlane/metadata/android/it-IT/changelogs/4209204.txt b/fastlane/metadata/android/it-IT/changelogs/4209204.txt
@@ -0,0 +1,2 @@
+* Accesso più facile alla 'Informativa sulla privacy' nella versione Play Store (Quicksy e Conversations)
+* Rimossa l'integrazione alla rubrica nella versione Play Store di Conversations
diff --git a/fastlane/metadata/android/it-IT/changelogs/4209404.txt b/fastlane/metadata/android/it-IT/changelogs/4209404.txt
@@ -0,0 +1 @@
+* Corrette regressioni minori introdotte con la 2.13.1
diff --git a/fastlane/metadata/android/it-IT/changelogs/4210104.txt b/fastlane/metadata/android/it-IT/changelogs/4210104.txt
@@ -0,0 +1 @@
+* Migliorata l'integrazione di chiamate A/V nel sistema operativo
diff --git a/fastlane/metadata/android/it-IT/changelogs/4210404.txt b/fastlane/metadata/android/it-IT/changelogs/4210404.txt
@@ -0,0 +1,3 @@
+* Corrette chiamate A/V su Android 8
+* Corretta race conditions nella nuova integrazione chiamate
+* Correzioni sulla compressione video
diff --git a/fastlane/metadata/android/it-IT/changelogs/4210504.txt b/fastlane/metadata/android/it-IT/changelogs/4210504.txt
@@ -0,0 +1,2 @@
+* Ripristinato l'accesso alla scoperta dei canali su Android 6+7
+* Migliorati i log per integrazione fallita di chiamate
diff --git a/fastlane/metadata/android/it-IT/changelogs/4210704.txt b/fastlane/metadata/android/it-IT/changelogs/4210704.txt
@@ -0,0 +1,3 @@
+* Utilizzo del tema Material 3
+* Riorganizzazione impostazioni
+* Sincronizzazione stato di lettura tra dispositivi
diff --git a/fastlane/metadata/android/it-IT/changelogs/4210804.txt b/fastlane/metadata/android/it-IT/changelogs/4210804.txt
@@ -0,0 +1,2 @@
+* Mostra lo stato dei messaggi come icone
+* Introdotta impostazione 'Caratteri grandi' per i messaggi
diff --git a/fastlane/metadata/android/pl-PL/changelogs/4210704.txt b/fastlane/metadata/android/pl-PL/changelogs/4210704.txt
@@ -0,0 +1,3 @@
+* Używanie motywu Material 3
+* Reorganizacja ustawień
+* Synchronizacja stanu przeczytania pomiędzy urządzeniami
diff --git a/fastlane/metadata/android/pl-PL/changelogs/4210804.txt b/fastlane/metadata/android/pl-PL/changelogs/4210804.txt
@@ -0,0 +1,2 @@
+* Pokazywanie stanu wiadomości poprzez ikony
+* Wprowadzenia ustawienia „Duża czcionka” dla baniek wiadomości
diff --git a/fastlane/metadata/android/sq/changelogs/4210404.txt b/fastlane/metadata/android/sq/changelogs/4210404.txt
@@ -0,0 +1,3 @@
+* Ndreqje thirrjesh A/V në Android 8
+* Ndreqje “race conditions” në integrim thirrjeje të re
+* Ndreqje ngjeshjeje videosh që mbetet
diff --git a/fastlane/metadata/android/sq/changelogs/4210504.txt b/fastlane/metadata/android/sq/changelogs/4210504.txt
@@ -0,0 +1,2 @@
+* Rikthim përdorimi i Pikasjes së Kanaleve për Android 6+7
+* Përmirësim regjistrimi për integrim thirrjesh të dështuara
diff --git a/fastlane/metadata/android/sq/changelogs/4210704.txt b/fastlane/metadata/android/sq/changelogs/4210704.txt
@@ -0,0 +1,3 @@
+* Përdorim teme Material 3
+* Risistemim rregullimesh
+* Njëkohësim nëpër pajisje gjendjeje “i lexuar”
diff --git a/fastlane/metadata/android/uk/changelogs/4210404.txt b/fastlane/metadata/android/uk/changelogs/4210404.txt
@@ -0,0 +1,3 @@
+* Виправлення голосових та відеовикликів на Android 8
+* Виправлення проблем у новій інтеграції дзвінків
+* Виправлення проблем зі стисненням відео
diff --git a/fastlane/metadata/android/uk/changelogs/4210504.txt b/fastlane/metadata/android/uk/changelogs/4210504.txt
@@ -0,0 +1,2 @@
+* Відновлено доступ до пошуку каналів на Android 6+7
+* Покращено ведення журналу для невдалої інтеграції викликів
diff --git a/fastlane/metadata/android/uk/changelogs/4210704.txt b/fastlane/metadata/android/uk/changelogs/4210704.txt
@@ -0,0 +1,3 @@
+* Використання теми Material 3
+* Реорганізація налаштувань
+* Синхронізація стану «Прочитано» між пристроями
diff --git a/fastlane/metadata/android/uk/changelogs/4210804.txt b/fastlane/metadata/android/uk/changelogs/4210804.txt
@@ -0,0 +1,2 @@
+* Показувати стан повідомлень у вигляді значків
+* Додано налаштування «Великий шрифт» для повідомлень
diff --git a/fastlane/metadata/android/zh-CN/changelogs/42018.txt b/fastlane/metadata/android/zh-CN/changelogs/42018.txt
@@ -1,3 +1,3 @@
 * 当远程视频与屏幕宽高比不匹配时显示黑条
 * 提高搜索性能
-* 添加防止截图的设置
+* 添加防止截屏的设置
diff --git a/fastlane/metadata/android/zh-CN/changelogs/42041.txt b/fastlane/metadata/android/zh-CN/changelogs/42041.txt
@@ -1,5 +1,5 @@
 * 实施可扩展 SASL Profile、Bind 2.0 和 Fast，以加快重新连接速度
-* 实现频道绑定
+* 实现通道绑定
 * 增加从音频通话切换到视频通话的功能
 * 增加删除自己头像的功能
 * 增加未接来电通知功能
diff --git a/fastlane/metadata/android/zh-CN/changelogs/4210404.txt b/fastlane/metadata/android/zh-CN/changelogs/4210404.txt
@@ -0,0 +1,3 @@
+* 修复安卓 8 上的音频/视频通话
+* 修复新呼叫集成中的竞态条件
+* 修复视频压缩问题
diff --git a/fastlane/metadata/android/zh-CN/changelogs/4210504.txt b/fastlane/metadata/android/zh-CN/changelogs/4210504.txt
@@ -0,0 +1,2 @@
+* 恢复对 Android 6 和 Android 7 频道发现的访问
+* 改进失败呼叫集成的日志记录
diff --git a/fastlane/metadata/android/zh-CN/changelogs/4210704.txt b/fastlane/metadata/android/zh-CN/changelogs/4210704.txt
@@ -0,0 +1,3 @@
+* 使用 Material 3 主题
+* 重组设置
+* 跨设备同步阅读状态
diff --git a/fastlane/metadata/android/zh-CN/changelogs/4210804.txt b/fastlane/metadata/android/zh-CN/changelogs/4210804.txt
@@ -0,0 +1,2 @@
+* 以图标形式显示消息状态
+* 为消息气泡引入“大字体”设置
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Sat Nov 14 09:59:55 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* Wiederherstellung des Zugangs zu Channel Discovery für Android 6+7
		* Verbesserte Protokollierung bei fehlgeschlagener Anrufintegration
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* Nachrichtenstatus als Symbole anzeigen
		* Einstellung für Schriftgröße der Nachrichten hinzugefügt
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* Restore access to Channel Discovery for Android 6+7
		* Improve logging for failed call integration
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* Show message status as icons
		* Introduce 'Large font' setting for message bubbles
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* Fix Quicksy registration on Android 6/7
		* Play incoming call ringtone on notification channel
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* fix call integration on some Android 14 devices
		* Introduce 'Invites from Strangers' setting
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* Restaurar el acceso a Channel Discovery para Android 6+7
		* Mejorar el registro para la integración de llamadas fallidas
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* Restablecer o acceso ao Descubrimento de Canles para Android 6+7
		* Mellorar o acceso para a integración de chamadas que fallou
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* Mostrar estado das mensaxes como iconas
		* Novo axuste para 'Tamaño de letra grande' nas mensaxes
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		* Accesso più facile alla 'Informativa sulla privacy' nella versione Play Store (Quicksy e Conversations)
		* Rimossa l'integrazione alla rubrica nella versione Play Store di Conversations