From 6ee2b9c9dede47c508adc4aa932e62c07726228d Mon Sep 17 00:00:00 2001
From: Licaon_Kter <licaon.kter@protonmail.com>
Date: Mon, 30 Sep 2024 13:32:57 +0300
Subject: [PATCH 001/357] Upgrade transcoding lib

---
 build.gradle | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index e1fc3a11742c86c5dec65936df14994d2ef932e3..1fb7053fab4a17cf2f993471ce1343e28b734f44 100644
--- a/build.gradle
+++ b/build.gradle
@@ -69,10 +69,7 @@ dependencies {
     implementation 'com.makeramen:roundedimageview:2.3.0'
 
     //noinspection GradleDependency
-    implementation('com.github.natario1:Transcoder:v0.9.1') {
-        exclude group: 'com.otaliastudios.opengl', module: 'egloo'
-    }
-    implementation 'com.github.natario1:Egloo:v0.4.0'
+    implementation 'io.deepmedia.community:transcoder-android:0.11.1'
 
     implementation 'org.jxmpp:jxmpp-jid:1.0.3'
     implementation 'org.jxmpp:jxmpp-stringprep-libidn:1.0.3'

From c83259188e1bd92369db30187e4631ac7c55b027 Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Sat, 28 Sep 2024 10:55:49 +0000
Subject: [PATCH 002/357] Translated using Weblate (Polish)

Currently translated at 100.0% (1041 of 1041 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pl/
---
 src/main/res/values-pl/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 3718ee2d679db7eabdcfc581210c0c57156ad593..2ca80077e01d8b8963b3d1f62bbb6d6228f6e867 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -1121,4 +1121,6 @@
     <string name="server_info_sasl2">XEP-0388: rozszerzalny profil SASL</string>
     <string name="server_info_bind2">XEP-0386: uproszczone nawiązywanie połączenia</string>
     <string name="server_info_login_mechanism">Mechanizm logowania</string>
+    <string name="could_not_add_reaction">Nie można dodać reakcji</string>
+    <string name="add_reaction">Dodaj reakcję…</string>
 </resources>
\ No newline at end of file

From 96b1b1ec8d996f2b2f4c9cdc2de7404549cf218c Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Sun, 29 Sep 2024 17:05:58 +0000
Subject: [PATCH 003/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1041 of 1041 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index c59f6d8b1a9670f4680ffbd42960582c49a2fa75..29df77299edb1e9f3fdc2a575d9e7c9d4276c16b 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -390,8 +390,8 @@
     <string name="remove_membership">Снять права участника</string>
     <string name="grant_admin_privileges">Назначить администратором</string>
     <string name="remove_admin_privileges">Снять административные права</string>
-    <string name="grant_owner_privileges">Назначить администратором</string>
-    <string name="remove_owner_privileges">Снять права администратора</string>
+    <string name="grant_owner_privileges">Назначить владельцем</string>
+    <string name="remove_owner_privileges">Снять права владельца</string>
     <string name="remove_from_room">Убрать из конференции</string>
     <string name="remove_from_channel">Исключить</string>
     <string name="could_not_change_affiliation">Невозможно изменить принадлежность %s</string>
@@ -1136,4 +1136,6 @@
     <string name="pref_backup_summary">Создание разовых и повторяющихся резервных копий</string>
     <string name="server_info_sasl2">XEP-0388: расширяемый профиль SASL</string>
     <string name="server_info_bind2">XEP-0386: привязка 2</string>
+    <string name="could_not_add_reaction">Невозможно добавить реакцию</string>
+    <string name="add_reaction">Добавить реакцию…</string>
 </resources>
\ No newline at end of file

From 9b08010429e2f7018a4dc3ba61ed09ee2ae468af Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Sun, 29 Sep 2024 17:09:47 +0000
Subject: [PATCH 004/357] Translated using Weblate (Russian)

Currently translated at 50.0% (1 of 2 strings)

Translation: Conversations/App Store Metadata (Conversations)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata-conversations/ru/
---
 .../fastlane/metadata/android/ru-RU/short_description.txt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conversations/fastlane/metadata/android/ru-RU/short_description.txt b/src/conversations/fastlane/metadata/android/ru-RU/short_description.txt
index 059ec9eb73419eb1821d52281dfecbdc1b403352..5c6dacbe88fc8c8fdcc30253e4ee170809141fe5 100644
--- a/src/conversations/fastlane/metadata/android/ru-RU/short_description.txt
+++ b/src/conversations/fastlane/metadata/android/ru-RU/short_description.txt
@@ -1 +1 @@
-Зашифрованный и простой в использовании XMPP мессенджер для вашего мобильного
+Зашифрованный и простой в использовании XMPP-мессенджер для мобильного

From 93733a259beded4f136bd5edac10ccd413f8eb03 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Sun, 29 Sep 2024 17:11:34 +0000
Subject: [PATCH 005/357] Translated using Weblate (Russian)

Currently translated at 100.0% (2 of 2 strings)

Translation: Conversations/App Store Metadata (Quicksy)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata-quicksy/ru/
---
 .../fastlane/metadata/android/ru-RU/short_description.txt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/quicksy/fastlane/metadata/android/ru-RU/short_description.txt b/src/quicksy/fastlane/metadata/android/ru-RU/short_description.txt
index 57eed896e40e578785f1132778f610b59946afdc..361fb2a1b3a1fbfca105c5fd93c827486875dde6 100644
--- a/src/quicksy/fastlane/metadata/android/ru-RU/short_description.txt
+++ b/src/quicksy/fastlane/metadata/android/ru-RU/short_description.txt
@@ -1 +1 @@
-Jabber/XMPP клиент с простым присоединением и простым нахождением контактов
+Клиент Jabber/XMPP с простым присоединением и нахождением контактов

From a692d163adfbce4b017aed7a5266dee36801e0f6 Mon Sep 17 00:00:00 2001
From: user11 <user11@users.noreply.translate.codeberg.org>
Date: Mon, 30 Sep 2024 18:27:48 +0000
Subject: [PATCH 006/357] Translated using Weblate (Serbian)

Currently translated at 100.0% (1041 of 1041 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sr/
---
 src/main/res/values-sr/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index e943409f41715470d8049f48d7555c1d19b98831..4bbf96623be9ef5453a62ae751334eaf26269f0e 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -1123,4 +1123,6 @@
     <string name="rtp_state_security_error">Проблем са овером</string>
     <string name="mtm_accept_cert">Прихвати непознат сертификат?</string>
     <string name="pref_dynamic_colors_summary">Системске боје (Material You)</string>
+    <string name="could_not_add_reaction">Није могуће ставити реакцију</string>
+    <string name="add_reaction">Стави реакцију…</string>
 </resources>
\ No newline at end of file

From 633019b4f1408f6348d458a607dfc5acb8276209 Mon Sep 17 00:00:00 2001
From: "lucasmz.dev" <git@lucasmz.dev>
Date: Tue, 1 Oct 2024 06:38:03 +0000
Subject: [PATCH 007/357] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1041 of 1041 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pt_BR/
---
 src/main/res/values-pt-rBR/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 1eab24375b642d59398a7f7c64ea5c898672cf79..4bbff515c00e62d985912e0a05383fa57876e4fa 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -1109,4 +1109,6 @@
     <string name="pref_keyboard_options">Teclado</string>
     <string name="pref_category_engagement_notifications">Notificações de engajamento</string>
     <string name="pref_category_application">Aplicação</string>
+    <string name="could_not_add_reaction">Não pôde adicionar reação</string>
+    <string name="add_reaction">Adicionar reação…</string>
 </resources>
\ No newline at end of file

From 156dedee18634a374fd4d3163e4e97eba15b53a6 Mon Sep 17 00:00:00 2001
From: user11 <user11@users.noreply.translate.codeberg.org>
Date: Mon, 30 Sep 2024 18:19:18 +0000
Subject: [PATCH 008/357] Translated using Weblate (Serbian)

Currently translated at 100.0% (2 of 2 strings)

Translation: Conversations/App Store Metadata (Conversations)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata-conversations/sr/
---
 .../fastlane/metadata/android/sr/full_description.txt           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conversations/fastlane/metadata/android/sr/full_description.txt b/src/conversations/fastlane/metadata/android/sr/full_description.txt
index 10f602f71998e6e17c4b4cbfa9d271cc2d285c98..da2c4a60ee49438fd5c26aab58593aebd170c36f 100644
--- a/src/conversations/fastlane/metadata/android/sr/full_description.txt
+++ b/src/conversations/fastlane/metadata/android/sr/full_description.txt
@@ -28,7 +28,7 @@ Conversations ради уз сваки XMPP сервер. Међутим XMPP ј
 
 Ови XEP-ови су - за сада:
 
-* XEP-0065: SOCKS5 Bytestreams (или mod_proxy65). Користи се за пребацивање фајлова ако су обе стране иза firewall-а (NAT).
+* XEP-0065: SOCKS5 Bytestreams (или mod_proxy65). Користи се за пребацивање фајлова ако су обе стране иза firewall-а или NAT-а).
 * XEP-0163: Personal Eventing Protocol за аватаре
 * XEP-0191: Blocking command омогућава blacklist-овање спамера или блокирање контаката без њиховог уклањања из твог списка.
 * XEP-0198: Stream Management омогућава да XMPP преживи мање прекиде на мрежи и промене у TCP веза.

From 2bba4e4ca3bc75f8a45674ce6486a591bdafc6aa Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 2 Oct 2024 19:04:59 +0200
Subject: [PATCH 009/357] improve logging for message/reactions restore

---
 src/main/java/eu/siacs/conversations/entities/Message.java  | 2 +-
 src/main/java/eu/siacs/conversations/entities/Reaction.java | 6 +++++-
 .../eu/siacs/conversations/persistance/DatabaseBackend.java | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 7fae1b9b4ba9608dd12786048e2080012f3f95d4..237525a0859ba010d807f8e9d7f2db746451e378 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -227,7 +227,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         this.reactions = reactions;
     }
 
-    public static Message fromCursor(Cursor cursor, Conversation conversation) {
+    public static Message fromCursor(final Cursor cursor, final Conversation conversation) {
         return new Message(conversation,
                 cursor.getString(cursor.getColumnIndexOrThrow(UUID)),
                 cursor.getString(cursor.getColumnIndexOrThrow(CONVERSATION)),
diff --git a/src/main/java/eu/siacs/conversations/entities/Reaction.java b/src/main/java/eu/siacs/conversations/entities/Reaction.java
index eff7be74b096c1acc7c6020a992d452e025009b4..28e0dbd85ebcca3a364bebd3e141a8271b15e72f 100644
--- a/src/main/java/eu/siacs/conversations/entities/Reaction.java
+++ b/src/main/java/eu/siacs/conversations/entities/Reaction.java
@@ -1,5 +1,7 @@
 package eu.siacs.conversations.entities;
 
+import android.util.Log;
+
 import androidx.annotation.NonNull;
 
 import com.google.common.base.MoreObjects;
@@ -19,6 +21,7 @@ import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.xmpp.Jid;
 
 import java.io.IOException;
@@ -76,8 +79,9 @@ public class Reaction {
             return Collections.emptyList();
         }
         try {
-            return GSON.fromJson(asString, new TypeToken<ArrayList<Reaction>>() {}.getType());
+            return GSON.fromJson(asString, new TypeToken<List<Reaction>>() {}.getType());
         } catch (final JsonSyntaxException e) {
+            Log.e(Config.LOGTAG,"could not restore reactions", e);
             return Collections.emptyList();
         }
     }
diff --git a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
index 40ee39e2f3e6c856876eb1ffb12dea0d51b742a7..f21a7af9e7b5b79e5fe10c2eeb426348aef53281 100644
--- a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
@@ -820,8 +820,8 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         while (cursor.moveToNext()) {
             try {
                 list.add(0, Message.fromCursor(cursor, conversation));
-            } catch (Exception e) {
-                Log.e(Config.LOGTAG, "unable to restore message");
+            } catch (final Exception e) {
+                Log.e(Config.LOGTAG, "unable to restore message", e);
             }
         }
         cursor.close();

From 9fc32cd2210dbe90a9f2ef344c2751005780fee2 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 3 Oct 2024 13:43:13 +0200
Subject: [PATCH 010/357] add proguard rules for TypeToken

---
 proguard-rules.pro                                          | 5 +++++
 src/main/java/eu/siacs/conversations/entities/Reaction.java | 5 ++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/proguard-rules.pro b/proguard-rules.pro
index c23fd72ae9e0740cf9826edbedf5784c2a836e2b..41f383ba7f6356edda802e376a39d7b1d6de0d1c 100644
--- a/proguard-rules.pro
+++ b/proguard-rules.pro
@@ -41,6 +41,11 @@
   !transient <fields>;
 }
 
+# Needed for proper GSON deserialization
+-keep class com.google.gson.reflect.TypeToken
+-keep class * extends com.google.gson.reflect.TypeToken
+-keep public class * implements java.lang.reflect.Type
+
 # Retrofit does reflection on generic parameters. InnerClasses is required to use Signature and
 # EnclosingMethod is required to use InnerClasses.
 -keepattributes Signature, InnerClasses, EnclosingMethod
diff --git a/src/main/java/eu/siacs/conversations/entities/Reaction.java b/src/main/java/eu/siacs/conversations/entities/Reaction.java
index 28e0dbd85ebcca3a364bebd3e141a8271b15e72f..54166a318a3cb4f6146027191c532c605a45725e 100644
--- a/src/main/java/eu/siacs/conversations/entities/Reaction.java
+++ b/src/main/java/eu/siacs/conversations/entities/Reaction.java
@@ -12,11 +12,11 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.Ordering;
-import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.TypeAdapter;
+import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
@@ -25,7 +25,6 @@ import eu.siacs.conversations.Config;
 import eu.siacs.conversations.xmpp.Jid;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -80,7 +79,7 @@ public class Reaction {
         }
         try {
             return GSON.fromJson(asString, new TypeToken<List<Reaction>>() {}.getType());
-        } catch (final JsonSyntaxException e) {
+        } catch (final IllegalArgumentException | JsonSyntaxException e) {
             Log.e(Config.LOGTAG,"could not restore reactions", e);
             return Collections.emptyList();
         }

From 53f719e98d80099dfe75b64cb43b11efa660b6d3 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 4 Oct 2024 12:06:35 +0200
Subject: [PATCH 011/357] add ability to add arbitrary emojis

---
 src/main/AndroidManifest.xml                  |  1 +
 .../conversations/ui/AddReactionActivity.java | 63 +++++++++++++++++++
 .../siacs/conversations/ui/XmppActivity.java  |  8 +++
 src/main/res/layout/activity_add_reaction.xml | 25 ++++++++
 src/main/res/layout/dialog_add_reaction.xml   | 31 ++++++---
 src/main/res/values/strings.xml               |  2 +
 6 files changed, 121 insertions(+), 9 deletions(-)
 create mode 100644 src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java
 create mode 100644 src/main/res/layout/activity_add_reaction.xml

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 382f0ebd9a9ab39c92fa7a58bbaa16e20bb2873d..b621147724ca0088d4bf5aad295d37e79b867d75 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -354,6 +354,7 @@
         <activity
             android:name=".ui.MediaBrowserActivity"
             android:label="@string/media_browser" />
+        <activity android:name=".ui.AddReactionActivity" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
diff --git a/src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java b/src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..9b50817547daa4f4d7d0a17a6aa0aeda8cb857e4
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java
@@ -0,0 +1,63 @@
+package eu.siacs.conversations.ui;
+
+import android.os.Bundle;
+import android.widget.Toast;
+
+import androidx.databinding.DataBindingUtil;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableSet;
+
+import eu.siacs.conversations.R;
+import eu.siacs.conversations.databinding.ActivityAddReactionBinding;
+
+public class AddReactionActivity extends XmppActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final ActivityAddReactionBinding binding =
+                DataBindingUtil.setContentView(this, R.layout.activity_add_reaction);
+        Activities.setStatusAndNavigationBarColors(this, binding.getRoot());
+
+        setSupportActionBar(binding.toolbar);
+        binding.toolbar.setNavigationIcon(R.drawable.ic_clear_24dp);
+        binding.toolbar.setNavigationOnClickListener(v -> finish());
+        setTitle(R.string.add_reaction_title);
+        binding.emojiPicker.setOnEmojiPickedListener(
+                emojiViewItem -> addReaction(emojiViewItem.getEmoji()));
+    }
+
+    private void addReaction(final String emoji) {
+        final var intent = getIntent();
+        final var conversation = intent == null ? null : intent.getStringExtra("conversation");
+        final var message = intent == null ? null : intent.getStringExtra("message");
+        if (Strings.isNullOrEmpty(conversation) || Strings.isNullOrEmpty(message)) {
+            Toast.makeText(this, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show();
+            return;
+        }
+        final var c = xmppConnectionService.findConversationByUuid(conversation);
+        final var m = c == null ? null : c.findMessageWithUuid(message);
+        if (m == null) {
+            Toast.makeText(this, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show();
+            return;
+        }
+        final var aggregated = m.getAggregatedReactions();
+        if (aggregated.ourReactions.contains(emoji)) {
+            xmppConnectionService.sendReactions(m, aggregated.ourReactions);
+        } else {
+            final ImmutableSet.Builder<String> reactionBuilder = new ImmutableSet.Builder<>();
+            reactionBuilder.addAll(aggregated.ourReactions);
+            reactionBuilder.add(emoji);
+            xmppConnectionService.sendReactions(m, reactionBuilder.build());
+        }
+        finish();
+    }
+
+    @Override
+    protected void refreshUiReal() {}
+
+    @Override
+    protected void onBackendConnected() {}
+}
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 25d334915d86710184c0d3742b1505b011556cb0..0798994f6adc1d49be6a869f05a9da9d345fac1a 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -326,6 +326,14 @@ public abstract class XmppActivity extends ActionBarActivity {
                         dialog.dismiss();
                     });
         }
+        viewBinding.more.setOnClickListener(
+                v -> {
+                    dialog.dismiss();
+                    final var intent = new Intent(this, AddReactionActivity.class);
+                    intent.putExtra("conversation", message.getConversation().getUuid());
+                    intent.putExtra("message", message.getUuid());
+                    startActivity(intent);
+                });
         dialog.show();
     }
 
diff --git a/src/main/res/layout/activity_add_reaction.xml b/src/main/res/layout/activity_add_reaction.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0a963b02c6b2385a3de0369be310100dbea25b8c
--- /dev/null
+++ b/src/main/res/layout/activity_add_reaction.xml
@@ -0,0 +1,25 @@
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="?attr/actionBarSize" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.emoji2.emojipicker.EmojiPickerView
+            android:id="@+id/emoji_picker"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+    </LinearLayout>
+</layout>
\ No newline at end of file
diff --git a/src/main/res/layout/dialog_add_reaction.xml b/src/main/res/layout/dialog_add_reaction.xml
index 4eda335e28bb81040dc78443985edd032887e113..6546f37f85f4c8dbad55928b331c011f605adb5b 100644
--- a/src/main/res/layout/dialog_add_reaction.xml
+++ b/src/main/res/layout/dialog_add_reaction.xml
@@ -1,18 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <RelativeLayout
         android:layout_width="wrap_content"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        android:padding="?dialogPreferredPadding">
 
-    <com.google.android.material.button.MaterialButtonGroup
-        android:layout_centerInParent="true"
+        <com.google.android.material.button.MaterialButtonGroup
+            android:id="@+id/emojis"
+
+            style="@style/Widget.Material3.MaterialButtonGroup.Connected"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true" />
+
+        <Button
+            android:id="@+id/more"
+            style="?attr/materialIconButtonFilledStyle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/emojis"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="8dp"
+            android:contentDescription="@string/more_reactions"
+            app:icon="@drawable/ic_more_horiz_24dp" />
 
-        android:id="@+id/emojis"
-        style="@style/Widget.Material3.MaterialButtonGroup.Connected"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="?dialogPreferredPadding" />
     </RelativeLayout>
 
 </layout>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e7237085d6ad21ff7d38580d98068543f79ecfb3..627106a3569d8985f59653f67d334403dddbfdf4 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1084,4 +1084,6 @@
     <string name="server_info_login_mechanism">Login mechanism</string>
     <string name="could_not_add_reaction">Could not add reaction</string>
     <string name="add_reaction">Add reaction…</string>
+    <string name="add_reaction_title">Add reaction</string>
+    <string name="more_reactions">More reactions</string>
 </resources>

From c1af7d08e4b1deba13cbefce1cb633bca7049c51 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 4 Oct 2024 13:28:45 +0200
Subject: [PATCH 012/357] look up older messages in DB for reactions

---
 .../conversations/parser/MessageParser.java   | 58 ++++++++++++++-----
 .../persistance/DatabaseBackend.java          | 40 +++++++++++++
 2 files changed, 82 insertions(+), 16 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 5f05f0a73276e5a50a51611f8f9c88e279fce34d..e073d9b0a1df515fb3c71dcdc7da648547a741d2 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -1120,25 +1120,49 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
                     final var occupant =
                             mucOptions.occupantId() ? packet.getExtension(OccupantId.class) : null;
                     final var occupantId = occupant == null ? null : occupant.getId();
-                    final var message = conversation.findMessageWithServerMsgId(reactingTo);
-                    // TODO use occupant id for isSelf assessment
-                    final boolean isReceived = !mucOptions.isSelf(counterpart);
-                    if (occupantId != null && message != null) {
-                        final var combinedReactions =
-                                Reaction.withOccupantId(
-                                        message.getReactions(),
-                                        reactions.getReactions(),
-                                        isReceived,
-                                        counterpart,
-                                        null,
-                                        occupantId);
-                        message.setReactions(combinedReactions);
-                        mXmppConnectionService.updateMessage(message, false);
+                    if (occupantId != null) {
+                        // TODO use occupant id for isSelf assessment
+                        final boolean isReceived = !mucOptions.isSelf(counterpart);
+                        final Message message;
+                        final var inMemoryMessage =
+                                conversation.findMessageWithServerMsgId(reactingTo);
+                        if (inMemoryMessage != null) {
+                            message = inMemoryMessage;
+                        } else {
+                            message =
+                                    mXmppConnectionService.databaseBackend
+                                            .getMessageWithServerMsgId(conversation, reactingTo);
+                        }
+                        if (message != null) {
+                            final var combinedReactions =
+                                    Reaction.withOccupantId(
+                                            message.getReactions(),
+                                            reactions.getReactions(),
+                                            isReceived,
+                                            counterpart,
+                                            null,
+                                            occupantId);
+                            message.setReactions(combinedReactions);
+                            mXmppConnectionService.updateMessage(message, false);
+                        } else {
+                            Log.d(Config.LOGTAG, "message with id " + reactingTo + " not found");
+                        }
                     } else {
-                        Log.d(Config.LOGTAG,"not found occupant or message");
+                        Log.d(
+                                Config.LOGTAG,
+                                "received reaction in channel w/o occupant ids. ignoring");
                     }
                 } else if (conversation.getMode() == Conversational.MODE_SINGLE) {
-                    final var message = conversation.findMessageWithUuidOrRemoteId(reactingTo);
+                    final Message message;
+                    final var inMemoryMessage =
+                            conversation.findMessageWithUuidOrRemoteId(reactingTo);
+                    if (inMemoryMessage != null) {
+                        message = inMemoryMessage;
+                    } else {
+                        message =
+                                mXmppConnectionService.databaseBackend.getMessageWithUuidOrRemoteId(
+                                        conversation, reactingTo);
+                    }
                     final boolean isReceived;
                     final Jid reactionFrom;
                     if (packet.fromAccount(account)) {
@@ -1158,6 +1182,8 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
                                         reactionFrom);
                         message.setReactions(combinedReactions);
                         mXmppConnectionService.updateMessage(message, false);
+                    } else {
+                        Log.d(Config.LOGTAG, "message with id " + reactingTo + " not found");
                     }
                 }
             }
diff --git a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
index f21a7af9e7b5b79e5fe10c2eeb426348aef53281..ddfbae34262d06abb49aabcb4191372f14063b80 100644
--- a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
@@ -925,6 +925,46 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         return filesPaths;
     }
 
+    public Message getMessageWithServerMsgId(
+            final Conversation conversation, final String messageId) {
+        final var db = this.getReadableDatabase();
+        final String sql =
+                "select * from messages where conversationUuid=? and serverMsgId=? LIMIT 1";
+        final String[] args = {conversation.getUuid(), messageId};
+        final Cursor cursor = db.rawQuery(sql, args);
+        if (cursor == null) {
+            return null;
+        }
+        final Message message;
+        if (cursor.moveToFirst()) {
+            message = Message.fromCursor(cursor, conversation);
+        } else {
+            message = null;
+        }
+        cursor.close();
+        return message;
+    }
+
+    public Message getMessageWithUuidOrRemoteId(
+            final Conversation conversation, final String messageId) {
+        final var db = this.getReadableDatabase();
+        final String sql =
+                "select * from messages where conversationUuid=? and (uuid=? OR remoteMsgId=?) LIMIT 1";
+        final String[] args = {conversation.getUuid(), messageId, messageId};
+        final Cursor cursor = db.rawQuery(sql, args);
+        if (cursor == null) {
+            return null;
+        }
+        final Message message;
+        if (cursor.moveToFirst()) {
+            message = Message.fromCursor(cursor, conversation);
+        } else {
+            message = null;
+        }
+        cursor.close();
+        return message;
+    }
+
     public static class FilePath {
         public final UUID uuid;
         public final String path;

From 6113a4c76d4850a74c3238f6b4fe23c200069620 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 4 Oct 2024 15:08:33 +0200
Subject: [PATCH 013/357] show add reaction only when room has occupant id

---
 .../siacs/conversations/ui/ConversationFragment.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 3d4b54e621fbd0ce3b7b1459f17ccafb4667aed9..aad680b0f02f9c0016a44cd0c5b8d49d1f8e1e1c 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1341,7 +1341,15 @@ public class ConversationFragment extends XmppFragment
                     reportAndBlock.setVisible(true);
                 }
             }
-            addReaction.setVisible(!showError && !m.isDeleted());
+            if (conversational instanceof Conversation c) {
+                addReaction.setVisible(
+                        !showError
+                                && !m.isDeleted()
+                                && (c.getMode() == Conversational.MODE_SINGLE
+                                        || c.getMucOptions().occupantId()));
+            } else {
+                addReaction.setVisible(false);
+            }
             if (!m.isFileOrImage()
                     && !encrypted
                     && !m.isGeoUri()

From 6a78fd36499e03d799b404ec6aab497eb79e3e72 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 4 Oct 2024 16:15:28 +0200
Subject: [PATCH 014/357] show who has reacted when long pressing reaction

---
 .../conversations/entities/MucOptions.java    | 45 +++++++++++++++++--
 .../conversations/ui/BindingAdapters.java     | 12 +++--
 .../ui/adapter/MessageAdapter.java            | 27 ++++++++++-
 3 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 0acca4600d7df8d3fd7cb5f8364dd9a024985b7c..524164bba0aa2d7949ed67dfecde830f824e2a61 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -5,6 +5,10 @@ import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.services.AvatarService;
@@ -20,6 +24,7 @@ import eu.siacs.conversations.xmpp.pep.Avatar;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -331,12 +336,19 @@ public class MucOptions {
         return null;
     }
 
+    public User findUserByOccupantId(final String occupantId) {
+        synchronized (this.users) {
+            return Strings.isNullOrEmpty(occupantId) ? null : Iterables.find(this.users, u -> occupantId.equals(u.occupantId),null);
+        }
+    }
+
     public User findOrCreateUserByRealJid(Jid jid, Jid fullJid) {
-        User user = findUserByRealJid(jid);
-        if (user == null) {
-            user = new User(this, fullJid);
-            user.setRealJid(jid);
+        final User existing = findUserByRealJid(jid);
+        if (existing != null) {
+            return existing;
         }
+        final var user = new User(this, fullJid);
+        user.setRealJid(jid);
         return user;
     }
 
@@ -350,6 +362,31 @@ public class MucOptions {
         }
     }
 
+    private User findUser(final Reaction reaction) {
+        if (reaction.trueJid != null) {
+            return findOrCreateUserByRealJid(reaction.trueJid.asBareJid(), reaction.from);
+        }
+        final var existing = findUserByOccupantId(reaction.occupantId);
+        if (existing != null) {
+            return existing;
+        } else if (reaction.from != null) {
+            return new User(this,reaction.from);
+        } else {
+            return null;
+        }
+    }
+
+    public List<User> findUsers(final Collection<Reaction> reactions) {
+        final ImmutableList.Builder<User> builder = new ImmutableList.Builder<>();
+        for(final Reaction reaction : reactions) {
+            final var user = findUser(reaction);
+            if (user != null) {
+                builder.add(user);
+            }
+        }
+        return builder.build();
+    }
+
     public boolean isContactInRoom(Contact contact) {
         return contact != null && findUserByRealJid(contact.getJid().asBareJid()) != null;
     }
diff --git a/src/main/java/eu/siacs/conversations/ui/BindingAdapters.java b/src/main/java/eu/siacs/conversations/ui/BindingAdapters.java
index 6f6b4e8bebba341dbc61ca9c81ec7cb747167b95..e8d860daae4248090c753e70e4289019befe3d5f 100644
--- a/src/main/java/eu/siacs/conversations/ui/BindingAdapters.java
+++ b/src/main/java/eu/siacs/conversations/ui/BindingAdapters.java
@@ -16,6 +16,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.function.Consumer;
+import java.util.function.Function;
 
 public class BindingAdapters {
 
@@ -23,15 +24,18 @@ public class BindingAdapters {
             final ChipGroup chipGroup,
             final Reaction.Aggregated reactions,
             final Consumer<Collection<String>> onModifiedReactions,
+            final Function<String, Boolean> onDetailsClicked,
             final Runnable addReaction) {
-        setReactions(chipGroup, reactions, true, onModifiedReactions, addReaction);
+        setReactions(
+                chipGroup, reactions, true, onModifiedReactions, onDetailsClicked, addReaction);
     }
 
     public static void setReactionsOnSent(
             final ChipGroup chipGroup,
             final Reaction.Aggregated reactions,
-            final Consumer<Collection<String>> onModifiedReactions) {
-        setReactions(chipGroup, reactions, false, onModifiedReactions, null);
+            final Consumer<Collection<String>> onModifiedReactions,
+            final Function<String, Boolean> onDetailsClicked) {
+        setReactions(chipGroup, reactions, false, onModifiedReactions, onDetailsClicked, null);
     }
 
     private static void setReactions(
@@ -39,6 +43,7 @@ public class BindingAdapters {
             final Reaction.Aggregated aggregated,
             final boolean onReceived,
             final Consumer<Collection<String>> onModifiedReactions,
+            final Function<String, Boolean> onDetailsClicked,
             final Runnable addReaction) {
         final var context = chipGroup.getContext();
         final List<Map.Entry<String, Integer>> reactions = aggregated.reactions;
@@ -89,6 +94,7 @@ public class BindingAdapters {
                                                 .build());
                             }
                         });
+                chip.setOnLongClickListener(v -> onDetailsClicked.apply(emoji));
                 chipGroup.addView(chip);
             }
             if (onReceived) {
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index caa0d3667bf930dcffda0ff3376db6b1efbb54b1..5ed24dfb12b6c7196a0c1f3366fdc01b0ac07767 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -45,8 +45,10 @@ import com.google.android.material.color.MaterialColors;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
+import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Lists;
 
 import eu.siacs.conversations.AppSettings;
 import eu.siacs.conversations.Config;
@@ -1077,18 +1079,41 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                     viewHolder.reactions,
                     message.getAggregatedReactions(),
                     reactions -> sendReactions(message, reactions),
+                    emoji -> showDetailedReaction(message, emoji),
                     () -> addReaction(message));
         } else if (type == SENT) {
             BindingAdapters.setReactionsOnSent(
                     viewHolder.reactions,
                     message.getAggregatedReactions(),
-                    reactions -> sendReactions(message, reactions));
+                    reactions -> sendReactions(message, reactions),
+                    emoji -> showDetailedReaction(message, emoji));
         }
 
         displayStatus(viewHolder, message, type, bubbleColor);
         return view;
     }
 
+    private boolean showDetailedReaction(final Message message, final String emoji) {
+        final var c = message.getConversation();
+        if (c instanceof Conversation conversation && c.getMode() == Conversational.MODE_MULTI) {
+            final var reactions =
+                    Collections2.filter(message.getReactions(), r -> r.reaction.equals(emoji));
+            final var mucOptions = conversation.getMucOptions();
+            final var users = mucOptions.findUsers(reactions);
+            if (users.isEmpty()) {
+                return true;
+            }
+            final MaterialAlertDialogBuilder dialogBuilder =
+                    new MaterialAlertDialogBuilder(activity);
+            dialogBuilder.setTitle(emoji);
+            dialogBuilder.setMessage(UIHelper.concatNames(users));
+            dialogBuilder.create().show();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     private void sendReactions(final Message message, final Collection<String> reactions) {
         if (activity.xmppConnectionService.sendReactions(message, reactions)) {
             return;

From 555eb2149e2d7c05a60ea93bd6cf525d512094cb Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 4 Oct 2024 20:21:50 +0200
Subject: [PATCH 015/357] include true jid in muc reactions

---
 .../conversations/entities/MucOptions.java    |  6 ++-
 .../conversations/parser/MessageParser.java   | 42 ++++++++++++++-----
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 524164bba0aa2d7949ed67dfecde830f824e2a61..7464af3adb6aa65c63cb472ca1b318b05248887c 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -95,10 +95,14 @@ public class MucOptions {
         return mAutoPushConfiguration;
     }
 
-    public boolean isSelf(Jid counterpart) {
+    public boolean isSelf(final Jid counterpart) {
         return counterpart.equals(self.getFullJid());
     }
 
+    public boolean isSelf(final String occupantId) {
+        return occupantId.equals(self.getOccupantId());
+    }
+
     public void resetChatState() {
         synchronized (users) {
             for (User user : users) {
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index e073d9b0a1df515fb3c71dcdc7da648547a741d2..9c0778151a984e6f6e7042870619d83b5936c693 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -453,6 +453,7 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
         final Reactions reactions = packet.getExtension(Reactions.class);
         final LocalizedContent body = packet.getBody();
         final Element mucUserElement = packet.findChild("x", Namespace.MUC_USER);
+        final boolean isTypeGroupChat = packet.getType() == im.conversations.android.xmpp.model.stanza.Message.Type.GROUPCHAT;
         final String pgpEncrypted = packet.findChildContent("x", "jabber:x:encrypted");
         final Element replaceElement = packet.findChild("replace", "urn:xmpp:message-correct:0");
         final Element oob = packet.findChild("x", Namespace.OOB);
@@ -476,12 +477,36 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
             Log.e(Config.LOGTAG, "encountered invalid message from='" + from + "' to='" + to + "'");
             return;
         }
-
-        boolean isTypeGroupChat = packet.getType() == im.conversations.android.xmpp.model.stanza.Message.Type.GROUPCHAT;
         if (query != null && !query.muc() && isTypeGroupChat) {
             Log.e(Config.LOGTAG, account.getJid().asBareJid() + ": received groupchat (" + from + ") message on regular MAM request. skipping");
             return;
         }
+        final Jid mucTrueCounterPart;
+        final OccupantId occupant;
+        if (isTypeGroupChat) {
+            final Conversation conversation =
+                    mXmppConnectionService.find(account, from.asBareJid());
+            final Jid mucTrueCounterPartByPresence;
+            if (conversation != null) {
+                final var mucOptions = conversation.getMucOptions();
+                occupant = mucOptions.occupantId() ? packet.getExtension(OccupantId.class) : null;
+                final var user =
+                        occupant == null ? null : mucOptions.findUserByOccupantId(occupant.getId());
+                mucTrueCounterPartByPresence = user == null ? null : user.getRealJid();
+            } else {
+                occupant = null;
+                mucTrueCounterPartByPresence = null;
+            }
+            mucTrueCounterPart =
+                    getTrueCounterpart(
+                            (query != null && query.safeToExtractTrueCounterpart())
+                                    ? mucUserElement
+                                    : null,
+                            mucTrueCounterPartByPresence);
+        } else {
+            mucTrueCounterPart = null;
+            occupant = null;
+        }
         boolean isMucStatusMessage = InvalidJid.hasValidFrom(packet) && from.isBareJid() && mucUserElement != null && mucUserElement.hasChild("status");
         boolean selfAddressed;
         if (packet.fromAccount(account)) {
@@ -637,10 +662,8 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
             message.markable = packet.hasChild("markable", "urn:xmpp:chat-markers:0");
             if (conversationMultiMode) {
                 final var mucOptions = conversation.getMucOptions();
-                final var occupantId =
-                        mucOptions.occupantId() ? packet.getExtension(OccupantId.class) : null;
-                if (occupantId != null) {
-                    message.setOccupantId(occupantId.getId());
+                if (occupant != null) {
+                    message.setOccupantId(occupant.getId());
                 }
                 message.setMucUser(mucOptions.findUserByFullJid(counterpart));
                 final Jid fallback = mucOptions.getTrueCounterpart(counterpart);
@@ -1117,12 +1140,9 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
             if (conversation != null) {
                 if (isTypeGroupChat && conversation.getMode() == Conversational.MODE_MULTI) {
                     final var mucOptions = conversation.getMucOptions();
-                    final var occupant =
-                            mucOptions.occupantId() ? packet.getExtension(OccupantId.class) : null;
                     final var occupantId = occupant == null ? null : occupant.getId();
                     if (occupantId != null) {
-                        // TODO use occupant id for isSelf assessment
-                        final boolean isReceived = !mucOptions.isSelf(counterpart);
+                        final boolean isReceived = !mucOptions.isSelf(occupantId);
                         final Message message;
                         final var inMemoryMessage =
                                 conversation.findMessageWithServerMsgId(reactingTo);
@@ -1140,7 +1160,7 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
                                             reactions.getReactions(),
                                             isReceived,
                                             counterpart,
-                                            null,
+                                            mucTrueCounterPart,
                                             occupantId);
                             message.setReactions(combinedReactions);
                             mXmppConnectionService.updateMessage(message, false);

From b2b091b02282042995951b46976cc37756b61788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Wed, 2 Oct 2024 17:55:30 +0000
Subject: [PATCH 016/357] Translated using Weblate (Estonian)

Currently translated at 100.0% (2 of 2 strings)

Translation: Conversations/App Store Metadata (Quicksy)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata-quicksy/et/
---
 .../metadata/android/et/full_description.txt       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 src/quicksy/fastlane/metadata/android/et/full_description.txt

diff --git a/src/quicksy/fastlane/metadata/android/et/full_description.txt b/src/quicksy/fastlane/metadata/android/et/full_description.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f954ffeba6c364b0fb46ee921bc3563097702f2f
--- /dev/null
+++ b/src/quicksy/fastlane/metadata/android/et/full_description.txt
@@ -0,0 +1,14 @@
+Quicksy on variatsioon populaarsest Jabber/XMPP kliendist Conversationsist, kuhu on lisandunud kontaktide automaatne tuvastus.
+
+Sa lisad liitumisel oma telefoninumbri ja Quicksyautomaatselt telefoniraamatus leiduvate numbrite alusel pakub sulle välja võimalikke suhtluspartnereid.
+
+Olemuselt on Quicksy tavaline täisfunktsionaalne Jabberi klient, mis lubab sul suhelda kasutajatega ükspuha missuguses muus avalikus XMPP/Jabberi serveris. Samamoodi saad ükspuha missuguse Quicksy kasutajaga suhelda lisades +telefoninumber@quicksy.im oma kontaktide loendisse.
+
+Kui kontaktide sünkroniseerimine välja arvata, siis kasutajaliides on teadlikult võimalikult sarnane Conversationsiga. See võimaldab soovi korral hiljem Quicksy asemel asuda kasutama Conversationsit ning olulist ümberõppimist pole vaja ette võtta.
+
+Suhtlusparterite soovitused leitakse teiste Quicksy kasutajate hulgast ja tavaliste Jabber/XMPP kasutajate seast, kes on oma Jabberi kasutajatunnuse lisanud Quicksy kataloogi (https://quicksy.im/#get-listed).
+
+MÄRKUS: Oma Jabberi kasutajatunnuse lisamine (https://quicksy.im/enter/) Quicksy kataloogi
+eeldab ühekordse registreerimistasu maksmist.
+
+Lisateavet leiad meie privaatsuspoliitkast (https://quicksy.im/#privacy).

From 00277f6a9f7a94e0345f7b5c09affe38a7fa1045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Wed, 2 Oct 2024 17:22:02 +0000
Subject: [PATCH 017/357] Translated using Weblate (Estonian)

Currently translated at 13.4% (140 of 1041 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 02465e529f16863b9dbd7bf3b6a08bffa323c9a0..6705aa0ce4a52b57b4c46ef3c4668b1665647b3a 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -128,4 +128,25 @@
     <string name="contacts_have_no_pgp_keys">Kuna sõnumi saajad pole avaldanud oma avalikke võtmeid, siis sinu sõnumi krüptimine ei õnnestu.
 \n
 \n<small>Palu, et nad seadistaks OpenPGP.</small></string>
+    <string name="pref_advanced_options">Täiendavad seadistused</string>
+    <string name="pref_send_crash_reports">Saada krahhiaruandeid</string>
+    <string name="pref_never_send_crash_summary">Saates rakenduse kokkujooksmise korral arendajatele teavet, aitad sa vigu parandada ja rakendust edasi arendada</string>
+    <string name="pref_confirm_messages">Lugemisteatised</string>
+    <string name="pref_confirm_messages_summary">Luba oma kontaktidel teada saada, kui oled saanud ja lugenud nende sõnumeid</string>
+    <string name="pref_prevent_screenshots">Keela ekraanitõmmised</string>
+    <string name="pref_prevent_screenshots_summary">Peida rakenduste vahetajast selle rakenduse sisu ja blokeeri ekraanitõmmiste tegemine</string>
+    <string name="pref_ui_options">Kasutajaliides</string>
+    <string name="openpgp_error">OpenKeychaini viga.</string>
+    <string name="bad_key_for_encryption">Võti ei sobi krüptimiseks.</string>
+    <string name="accept">Nõustu</string>
+    <string name="error">Tekkis viga</string>
+    <string name="recording_error">Viga</string>
+    <string name="your_account">Sinu kasutajakonto</string>
+    <string name="send_presence_updates">Saada olekuteateid</string>
+    <string name="receive_presence_updates">Luba vastu võtta teiste kasutajate olekuteateid</string>
+    <string name="ask_for_presence_updates">Küsi olekuteateid</string>
+    <string name="attach_choose_picture">Vali pilt</string>
+    <string name="attach_take_picture">Tee foto</string>
+    <string name="pref_notification_grace_period">Teavituste keelamise viiteaeg</string>
+    <string name="pref_notification_grace_period_summary">Kui mõnes muus sinu seadmes tuvastatakse mõni tegevus, siis selle aja möödumisel enam siin seadmes ei kuvata teavitusi.</string>
 </resources>
\ No newline at end of file

From 7df50cd5231658760a791969bf244a26f1cffaa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Wed, 2 Oct 2024 17:57:18 +0000
Subject: [PATCH 018/357] Translated using Weblate (Estonian)

Currently translated at 100.0% (9 of 9 strings)

Translation: Conversations/Android App (Quicksy)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-quicksy/et/
---
 src/quicksy/res/values-et/strings.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/quicksy/res/values-et/strings.xml b/src/quicksy/res/values-et/strings.xml
index a6b3daec9354f9ae75cdf8d94a67446c6227dd96..fa8a4c98c14510b063501813886a1e01359cf376 100644
--- a/src/quicksy/res/values-et/strings.xml
+++ b/src/quicksy/res/values-et/strings.xml
@@ -1,2 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="pref_notification_grace_period_summary">Ajavahemik tegevuse tuvastamise järel mõnes sinu teises seadmes, peale mida Quicksy jääb vaikseks</string>
+    <string name="pref_never_send_crash_summary">Saates rakenduse kokkujooksmise korral arendajatele teavet, aitad sa vigu parandada ja Quicksy rakendust edasi arendada</string>
+    <string name="pref_broadcast_last_activity_summary">Luba kõikidel oma kontaktidel teada, kui kasutad Quicksyt</string>
+    <string name="huawei_protected_apps_summary">Kui soovid saada teavitusi ka siis, kui ekraan on välja lülitatud, pead Quicksy lisama kaitstud rakenduste loendisse.</string>
+    <string name="set_profile_picture">Quicksy profiilipilt</string>
+    <string name="not_available_in_your_country">Quicksy pole sinu riigis saadaval.</string>
+    <string name="unable_to_verify_server_identity">Serveri identiteedi verifitseerimine ei õnnestu.</string>
+    <string name="unknown_security_error">Tundmatu turvaviga.</string>
+    <string name="timeout_while_connecting_to_server">Ühenduse loomisel serveriga päring aegus.</string>
+</resources>
\ No newline at end of file

From dfb15db58b47982fb5ad1ab69edd511a4a991fd8 Mon Sep 17 00:00:00 2001
From: Besnik_b <Besnik_b@users.noreply.translate.codeberg.org>
Date: Thu, 3 Oct 2024 08:36:38 +0000
Subject: [PATCH 019/357] Translated using Weblate (Albanian)

Currently translated at 100.0% (2 of 2 strings)

Translation: Conversations/App Store Metadata (Conversations)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata-conversations/sq/
---
 .../fastlane/metadata/android/sq/full_description.txt           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conversations/fastlane/metadata/android/sq/full_description.txt b/src/conversations/fastlane/metadata/android/sq/full_description.txt
index f6f03b1513984e54293cbc4cd04fcc3ee0ab9cef..00260d588233ec04f50e5a29a50db662437e361c 100644
--- a/src/conversations/fastlane/metadata/android/sq/full_description.txt
+++ b/src/conversations/fastlane/metadata/android/sq/full_description.txt
@@ -36,4 +36,4 @@ Këto XEP-e janë - deri sot:
 * XEP-0237: Roster Versioning kryesisht për të kursyer sasi trafiku në lidhje celulare të dobëta
 * XEP-0313: Message Archive Management njëkohëson historik mesazhesh me shërbyesin. Ndiqni mesazhet që qenë dërguar ndërkohë që Conversations s’qe në linjë.
 * XEP-0352: Client State Indication i lejon shërbyesit të dijë nëse është apo jo në prapaskenë Conversations. I lejon shërbyesit të kursejë sasi trafiku, duke mbajtur paketa pa rëndësi.
-* XEP-0363: HTTP File Upload ju lejon të ndani me të tjerë kartela në konferenca dhe me kontakte jo në linjë. Lyp një përbërë shtesë në shërbyesin tuaj.
+* XEP-0363: HTTP File Upload ju lejon të ndani me të tjerë kartela në konferenca dhe me kontakte jo në linjë. Lyp një përbërës shtesë në shërbyesin tuaj.

From 303d8be46911fc0a16eef1305b93b0f43e245280 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Thu, 3 Oct 2024 10:17:33 +0000
Subject: [PATCH 020/357] Translated using Weblate (Estonian)

Currently translated at 39.1% (408 of 1041 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 277 ++++++++++++++++++++++++++++-
 1 file changed, 276 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 6705aa0ce4a52b57b4c46ef3c4668b1665647b3a..308d7a4633f12b08d6bce36c6999020c8f41ce9f 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -6,7 +6,7 @@
     <string name="title_activity_choose_contacts">Vali kontaktid</string>
     <string name="minute_ago">1 minut tagasi</string>
     <string name="action_contact_details">Kontaktandmed</string>
-    <string name="action_muc_details">Rühmavestluse üksikasjad</string>
+    <string name="action_muc_details">Vestlusrühma üksikasjad</string>
     <string name="channel_details">Kanali teave</string>
     <string name="action_delete_contact">Kustuta serveri kontaktiloendist</string>
     <string name="action_block_contact">Blokeeri kontakt</string>
@@ -149,4 +149,279 @@
     <string name="attach_take_picture">Tee foto</string>
     <string name="pref_notification_grace_period">Teavituste keelamise viiteaeg</string>
     <string name="pref_notification_grace_period_summary">Kui mõnes muus sinu seadmes tuvastatakse mõni tegevus, siis selle aja möödumisel enam siin seadmes ei kuvata teavitusi.</string>
+    <string name="conference_unknown_error">Sa ei osale enam vestlusrühmas</string>
+    <string name="conference_technical_problems">Sa lahkusid sellest vestlusrühmast tehnilistel põhjustel</string>
+    <string name="contact_has_read_up_to_this_point">%s on siiamaani lugenud</string>
+    <string name="preemptively_grant">Ennetavalt luba tellimuste päringud</string>
+    <string name="error_not_an_image_file">Sinu valitud fail pole pilt</string>
+    <string name="error_compressing_image">Pildifaili konverteerimine ei õnnestunud</string>
+    <string name="error_file_not_found">Faili ei leidu</string>
+    <string name="error_io_exception">Üldine sisend/väljundviga. Võibolla on sinu nutiseadme andmeruum täis saanud?</string>
+    <string name="error_security_exception_during_image_copy">Rakendus, millega sa selle faili valisid, ei jaganud piisavalt õigusi faili lugemiseks.
+\n
+\n<small>Pildi valimiseks palun kasuta mõnda muud failihaldurit</small>.</string>
+    <string name="error_security_exception">Rakendus, mida sa kasutasid faili jagamisel, ei edastanud piisavalt õigusi faili lugemiseks.</string>
+    <string name="account_status_unknown">Teadmata</string>
+    <string name="account_status_disabled">Ajutiselt pole kasutusel</string>
+    <string name="account_state_logged_out">Väljalogitud</string>
+    <string name="account_status_online">Võrgus</string>
+    <string name="account_status_connecting">Ühendame…</string>
+    <string name="account_status_offline">Pole võrgus</string>
+    <string name="account_status_unauthorized">Pole lubatud</string>
+    <string name="account_status_not_found">Serverit ei leidu</string>
+    <string name="account_status_no_internet">Ühenduvust pole</string>
+    <string name="account_status_regis_fail">Registreerumine ei õnnestunud</string>
+    <string name="account_status_regis_conflict">Selline kasutajanimi on juba olemas</string>
+    <string name="account_status_regis_success">Registreerimine õnnestus</string>
+    <string name="account_status_regis_not_sup">Server ei toeta registreerumise võimalust</string>
+    <string name="account_status_regis_invalid_token">Vigane registreerimistunnus</string>
+    <string name="account_status_tls_error">TLS-ühenduse alustamine ei õnnestunud</string>
+    <string name="account_status_tls_error_domain">Domeen pole verifitseeritav</string>
+    <string name="account_status_policy_violation">Reeglite rikkumine</string>
+    <string name="account_status_incompatible_server">Mitteühilduv server</string>
+    <string name="account_status_incompatible_client">Mitteühilduv klient</string>
+    <string name="account_status_stream_error">Meediavoo viga</string>
+    <string name="account_status_stream_opening_error">Meediavoo avamise viga</string>
+    <string name="encryption_choice_unencrypted">Krüptimata</string>
+    <string name="encryption_choice_otr">OTR-krüptimine</string>
+    <string name="encryption_choice_pgp">OpenPGP-krüptimine</string>
+    <string name="encryption_choice_omemo">OMEMO-krüptimine</string>
+    <string name="mgmt_account_publish_avatar">Avalda profiilipilt</string>
+    <string name="mgmt_account_publish_pgp">Avalda oma OpenPGP avalik võti</string>
+    <string name="unpublish_pgp">Eemalda oma OpenPGP avalik võti</string>
+    <string name="unpublish_pgp_message">Kas sa oled kindel, et soovid eemaldada oma OpenPGP avaliku võtme oma olekuteatest?
+\nSeejärel sinu vestlusparterid enam ei saa sulle saata OpenPGP abil krüptitud sõnumeid.</string>
+    <string name="openpgp_has_been_published">OpenPGP avalik võti on avaldatud.</string>
+    <string name="mgmt_account_delete">Kustuta kasutajakonto</string>
+    <string name="mgmt_account_disable">Eemalda ajutiselt kasutusest</string>
+    <string name="mgmt_account_enable">Võta konto kasutusele</string>
+    <string name="mgmt_account_delete_confirm_text">Kas sa oled kindel, et soovid oma kasutajakonto kustutada? Sellega kustub ka kogu sinu vestluste ajalugu</string>
+    <string name="attach_record_voice">Salvesta häälsõnum</string>
+    <string name="account_settings_jabber_id">XMPP aadress</string>
+    <string name="block_jabber_id">Blokeeri XMPP aadress</string>
+    <string name="account_settings_example_jabber_id">kasutajanimi@toredomeen.ee</string>
+    <string name="password">Salasõna</string>
+    <string name="invalid_jid">See pole korrektne XMPP aadress</string>
+    <string name="error_out_of_memory">Mälu sa otsa. Pilt on liiga suur</string>
+    <string name="add_phone_book_text">Kas sa soovid lisada %s oma aadressiraamatusse?</string>
+    <string name="server_info_show_more">Serveri teave</string>
+    <string name="server_info_mam">XEP-0313: MAM (sõnumite arhiivi haldus)</string>
+    <string name="server_info_carbon_messages">XEP-0280: Message Carbons (sõnumite koopiad)</string>
+    <string name="server_info_csi">XEP-0352: Client State Indication (klientide olekuteated)</string>
+    <string name="server_info_blocking">XEP-0191: Blocking Command (blokeerimised)</string>
+    <string name="server_info_roster_version">XEP-0237: Roster Versioning (kontaktiloendite versioonid)</string>
+    <string name="server_info_stream_management">XEP-0198: Stream Management (andmevoog otspunktide vahel)</string>
+    <string name="server_info_external_service_discovery">XEP-0215: External Service Discovery (XMPP-väliste teenuste tuvastamine)</string>
+    <string name="server_info_pep">XEP-0163: PEP (kasutajate olekud, teated, andmed, profiilipildid, võtmed)</string>
+    <string name="server_info_http_upload">XEP-0363: HTTP File Upload (failide üleslaadimine http vahendusel)</string>
+    <string name="trust_omemo_fingerprints">Usalda OMEMO sõrmejälgi</string>
+    <string name="topic">Teema</string>
+    <string name="publish">Avalda</string>
+    <string name="error_publish_avatar_server_reject">Server keeldus sinu profiilipildi avaldamisest</string>
+    <string name="error_saving_avatar">Profiilipildi salvestamine andmekandjale ei õnenstunud</string>
+    <string name="error_publish_avatar_no_server_support">Sinu server ei toeta profiilipiltide avaldamist</string>
+    <string name="publishing">Avaldame…</string>
+    <string name="or_long_press_for_default">(vaikimisi väärtuse taastamiseks vajuta pikalt)</string>
+    <string name="error_publish_avatar_converting">Pildi konverteerimine ei õnnestunud</string>
+    <string name="private_message_to">kasutajale %s</string>
+    <string name="pref_autojoin">Sünkroniseeri järjehoidjad</string>
+    <string name="conference_creation_failed">Vestlusrühma loomine ei õnnestunud</string>
+    <string name="account_image_description">Kasutajakonto profiilipilt</string>
+    <string name="non_anonymous">Muuda XMPP-aadressid kõikidele nähtavaks</string>
+    <string name="your_full_jid_will_be">Sinu terviklik XMPP-aadress saab olema selline: %s</string>
+    <string name="report_jid_as_spammer">Anna sellest XMPP-aadressist teada kui spämmijast.</string>
+    <string name="error_publish_avatar_offline">Profiilipildi avaldamiseks peab sinu nutiseadmes olema võrguühendus.</string>
+    <string name="certificate_does_not_contain_jid">Sertifikaadis ei leidu XMPP-aadressi</string>
+    <string name="create_dialog_group_chat_name">Vestlusrühma nimi</string>
+    <string name="conference_destroyed">See vestlusrühm on kustutatud</string>
+    <string name="nickname">Hüüdnimi</string>
+    <string name="group_chat_name">Nimi</string>
+    <string name="channel_discover_opt_in_message">Kanalite leidmiseks on kasutusel kolmandate osapoole hallatav teenus &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Selle kasutamisel edastatakse teenusele sinu nutiseadme IP-aadress ja otsingusõnad. Lisateavet leiad teenuse &lt;a href=https://search.jabber.network/privacy&gt;privaatsustingimustest&lt;/a&gt;.</string>
+    <string name="channel_discovery_opt_in_title">Võimalik privaatsuse rikkumine!</string>
+    <string name="i_already_have_an_account">Mul juba on kasutajakonto olemas</string>
+    <string name="delete_avatar">Kustuta profiilipilt</string>
+    <string name="no_xmpp_adddress_found">XMPP-aadressi ei leidu</string>
+    <string name="server_info_available">saadaval</string>
+    <string name="missing_public_keys">Avalikke võtmeid pole avaldatud</string>
+    <string name="last_seen_now">viimati nähtud just nüüd</string>
+    <string name="server_info_unavailable">pole saadaval</string>
+    <string name="last_seen_min">viimati nähtud ühe minuti eest</string>
+    <string name="last_seen_mins">viimati nähtud %d minutit tagasi</string>
+    <string name="last_seen_hour">viimati nähtud ühe tunni eest</string>
+    <string name="last_seen_hours">viimati nähtud %d tundi tagasi</string>
+    <string name="last_seen_day">viimati nähtud ühe päeva eest</string>
+    <string name="last_seen_days">viimati nähtud %d päeva tagasi</string>
+    <string name="install_openkeychain">Krüptitud sõnum. Dekrüptimiseks palun paigalda OpenKeychain.</string>
+    <string name="openpgp_messages_found">Leidub uus OpenPGPga krüptitud sõnum</string>
+    <string name="openpgp_key_id">OpenPGP võtme tunnus</string>
+    <string name="omemo_fingerprint">OMEMO sõrmejälg</string>
+    <string name="omemo_fingerprint_x509">v\\OMEMO sõrmejälg</string>
+    <string name="omemo_fingerprint_selected_message">OMEMO sõrmejälg (sõnumi allikas)</string>
+    <string name="server_info_bind2">XEP-0386: Bind 2 (tegevused käivitamisel)</string>
+    <string name="server_info_sasl2">XEP-0388: Extensible SASL Profile (SASL autentimis- ja andmeturbeprotokolli laiendused)</string>
+    <string name="server_info_push">XEP-0357: Push (tõuketeavitused)</string>
+    <string name="other_devices">Muud seadmed</string>
+    <string name="fetching_keys">Laadime võtmeid…</string>
+    <string name="done">Valmis</string>
+    <string name="decrypt">Dekrüpti</string>
+    <string name="group_chats">Vestlusrühmad</string>
+    <string name="search">Otsi</string>
+    <string name="enter_contact">Sisesta kontakt</string>
+    <string name="delete_contact">Kustuta kontakt</string>
+    <string name="view_contact_details">Vaata kontakti teavet</string>
+    <string name="block_contact">Blokeeri kontakt</string>
+    <string name="create">Loo</string>
+    <string name="select">Vali</string>
+    <string name="contact_already_exists">Selline kontakt on juba olemas</string>
+    <string name="join">Liitu</string>
+    <string name="channel_full_jid_example">kanalinimi@conference.toredomeen.ee/hüüdnimi</string>
+    <string name="channel_bare_jid_example">kanalinimi@conference.toredomeen.ee</string>
+    <string name="save_as_bookmark">Salvesta järjehoidjana</string>
+    <string name="delete_bookmark">Kustuta järjehoidja</string>
+    <string name="destroy_room">Kustuta vestlusrühm</string>
+    <string name="destroy_channel">Kustuta kanal</string>
+    <string name="destroy_room_dialog">Kas sa oled kindel, et soovid selle vestlusrühma kustutada?
+\n
+\n<b>Hoiatus:</b> Selle käigus vestlusrühm tervikuna kustutatakse ka serverist.</string>
+    <string name="destroy_channel_dialog">Kas sa oled kindel, et soovid selle kanali kustutada?
+\n
+\n<b>Hoiatus:</b> Selle käigus kanal tervikuna kustutatakse ka serverist.</string>
+    <string name="could_not_destroy_room">Vestlusrühma kustutamine ei õnnestunud</string>
+    <string name="could_not_destroy_channel">Kanali kustutamine ei õnnestunud</string>
+    <string name="action_edit_subject">Muuda vestlusrühma teemat</string>
+    <string name="joining_conference">Liitume vestlusrühmaga…</string>
+    <string name="leave">Lahku</string>
+    <string name="add_back">Lisa tagasi</string>
+    <string name="contacts_have_read_up_to_this_point">%s on siiamaani lugenud</string>
+    <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s ja %2$d muud kasutajat on siiamaani lugenud</string>
+    <string name="everyone_has_read_up_to_this_point">Kõik on lugenud siiamaani</string>
+    <string name="enter_password">Sisesta salasõna</string>
+    <string name="conference_requires_password">Vestlusrühm eeldab salasõna</string>
+    <string name="conference_banned">Sulle on ligipääs siia vestlusrühma keelatud</string>
+    <string name="conference_members_only">See vestlusrühm on mõeldud vaid liikmetele</string>
+    <string name="conference_shutdown">Vestlusrühm on suletud</string>
+    <string name="touch_to_choose_picture">Pildi valimiseks galeriist klõpsi profiilipildil</string>
+    <string name="private_message">sosistas</string>
+    <string name="send_private_message_to">Saada privaatne sõnum kasutajale %s</string>
+    <string name="connect">Ühenda</string>
+    <string name="account_already_exists">Selline kasutajakonto on juba olemas</string>
+    <string name="next">Edasi</string>
+    <string name="server_info_session_established">Sessioon on loodud</string>
+    <string name="skip">Jäta vahele</string>
+    <string name="enable">Luba</string>
+    <string name="jabber_id_copied_to_clipboard">Kopeerisime XMPP-aadressi lõikelauale</string>
+    <string name="web_address">veebiaadress</string>
+    <string name="could_not_change_password">Salasõna muutmine ei õnnestunud</string>
+    <string name="password_changed">Salasõna on muudetud!</string>
+    <string name="change_password">Muuda salasõna</string>
+    <string name="current_password">Senine salasõna</string>
+    <string name="new_password">Uus salasõna</string>
+    <string name="password_should_not_be_empty">Salasõna ei saa tühi olla</string>
+    <string name="remove_from_room">Eemalda vestlusrühmast</string>
+    <string name="ban_from_conference">Keela ligipääs vestlusrühma</string>
+    <string name="conference_options">Privaatse vestlusrühma seadistused</string>
+    <string name="modified_conference_options">Vestlusrühma seadistused on muudetud!</string>
+    <string name="could_not_modify_conference_options">Vestlusrühma seadistuste muutmine ei õnnestunud</string>
+    <string name="avatar_has_been_published">Profiilipilt on avaldatud!</string>
+    <string name="title_undo_swipe_out_group_chat">Lahkusid privaatest vestlusrühmast</string>
+    <string name="search_group_chats">Otsi vestlusrühmi</string>
+    <string name="action_add_account_with_certificate">Logi sisse sertifikaadi alusel</string>
+    <string name="jid_does_not_match_certificate">XMPP-aadress ei vasta sertifikaadile</string>
+    <string name="hostname_or_onion">Serveri või .onion-teenuse aadress</string>
+    <string name="secure_password_generated">Tekitasime turvalise salasõna</string>
+    <string name="no_keys_just_confirm">Sa juba oled usaldanud selle kasutaja sõrmejälge. Valides „Done“ sa vaid kinnitad, et %s osaleb selles vestlusrühmas.</string>
+    <string name="registration_password_too_weak">Registreerimine ei õnnestunud: salasõna on liiga nõrk</string>
+    <string name="creating_conference">Loome vestlusrühma…</string>
+    <string name="group_chat_avatar">Vestlusrühma profiilipilt</string>
+    <string name="copy_link">Kopeeri veebiaadress</string>
+    <string name="copy_jabber_id">Kopeeri XMPP-aadress</string>
+    <string name="pref_omemo_setting_summary_always">OMEMO on alati kasutusel kahepoolsetes vestlustes ja privaatsetes vestlusrühmades.</string>
+    <string name="p1_s3_filetransfer">Http-põhine failijagamine teenuses S3</string>
+    <string name="pref_start_search">Otseotsing</string>
+    <string name="group_chat_members">Osalejad</string>
+    <string name="only_the_owner_can_change_group_chat_avatar">Vaid omanik võib muuta vestlusrühma profiilipilte</string>
+    <string name="contact_name">Kontakti nimi</string>
+    <string name="set_profile_picture">Conversationsi profiilipilt</string>
+    <string name="enter_password_to_restore">Varukoopia taastamiseks sisesta %s kasutajakonto salasõna.</string>
+    <string name="enter_your_name_instructions">Selleks, et need, kellel pole sind oma aadressiraamatus, saaksid teada, kes sa oled, siis palun lisa oma nimi.</string>
+    <string name="group_chat_will_make_your_jabber_id_public">See kanal teeb sinu XMPP-aadressi avalikuks</string>
+    <string name="enter_jabber_id">Sisesta XMPP-aadress</string>
+    <string name="xmpp_address">XMPP-aadress</string>
+    <string name="please_enter_xmpp_address">Palun lisa XMPP-aadress</string>
+    <string name="this_is_an_xmpp_address">See on XMPP-aadress. Palun lisa nimi.</string>
+    <string name="jabber_ids_are_visible_to_anyone">XMPP-aadressid on nähtavad kõikidele.</string>
+    <string name="create_group_chat">Loo vestlusrühm</string>
+    <string name="create_private_group_chat">Loo privaatne vestlusrühm</string>
+    <string name="allow_participants_to_edit_subject">Luba kõigil muuta teemat</string>
+    <string name="anyone_can_edit_subject">Kõik võivad seda teemat muuta.</string>
+    <string name="owners_can_edit_subject">Vaid omanikud võivad seda teemat muuta.</string>
+    <string name="admins_can_edit_subject">Vaid peakasutajad võivad seda teemat muuta.</string>
+    <string name="please_enter_name">Palun sisesta kanali nimi</string>
+    <string name="creating_channel">Loome avalikku kanalit…</string>
+    <string name="channel_already_exists">Selline kanal on juba olemas</string>
+    <string name="joined_an_existing_channel">Sa oled liitunud olemasoleva kanaliga</string>
+    <string name="unable_to_set_channel_configuration">Kanali seadistuste salvestamine ei õnnestunud</string>
+    <string name="allow_participants_to_invite_others">Luba kõigil saata teistel kutseid</string>
+    <string name="owners_can_invite_others">Omanikud võivad saata teistele kasutajatele kutseid.</string>
+    <string name="file_too_large">Fail on liiga suur</string>
+    <string name="no_users_hint_group_chat">Selles privaatses vestlusrühmas pole osalejaid.</string>
+    <string name="manage_permission">Halda õigusi</string>
+    <string name="search_participants">Otsi osalejaid</string>
+    <string name="attach">Lisa manusena</string>
+    <string name="discover_channels">Leia kanaleid</string>
+    <string name="share_backup_files">Jaga varukoopia faile</string>
+    <string name="please_enter_password">Palun sisesta selle kasutajakonto salasõna</string>
+    <string name="add_existing_account">Lisa olemasolev kasutajakonto</string>
+    <string name="this_looks_like_a_domain">See tundub olema domeeni aadressi moodi</string>
+    <string name="add_anway">Lisa ikkagi</string>
+    <string name="this_looks_like_channel">See tundub olema kanali aadressi moodi</string>
+    <string name="rtp_state_content_add_video">Kas lülitad ümber videokõnele?</string>
+    <string name="group_chats_and_channels">Vestlusrühmad ja kanalid</string>
+    <string name="search_channels">Otsi kanaleid</string>
+    <string name="register_new_account">Registreeri uus kasutajakonto</string>
+    <string name="conversations_backup">Conversationsi varukoopia</string>
+    <string name="event">Sündmus</string>
+    <string name="open_backup">Ava varukoopia</string>
+    <string name="not_a_backup_file">See fail ei ole Conversationsi varukoopia fail</string>
+    <string name="outdated_backup_file_format">Sa proovid importida aegunud vorminguga varukoopia failist</string>
+    <string name="account_already_setup">See kasutajakonto on juba seadistatud</string>
+    <string name="add_to_favorites">Tõsta ülal esile</string>
+    <string name="add_contact_or_create_or_join_group_chat">Lisa kontakte, loo mõni uus vestlusrühm või liitu olemasolevaga ning tutvu kanalitega</string>
+    <string name="your_avatar">Sinu profiilipilt</string>
+    <string name="your_avatar_tap_to_select_new_avatar">Sinu profiilipilt. Klõpsi siin uue pildi valimiseks galeriist.</string>
+    <string name="avatar_for_x">Kasutaja %s profiilipilt</string>
+    <string name="account_status_temporary_auth_failure">Ajutine viga autentimisel</string>
+    <string name="audio_video_disabled_tor">Tor-võrgu kasutamisel ei tööta kõnede funktsionaalsus</string>
+    <string name="switch_to_video">Lülitu ümber video kasutamisele</string>
+    <string name="reject_switch_to_video">Keeldu päringust videole ümberlülitumiseks</string>
+    <string name="encrypted_with_omemo">Krüptitud OMEMO abil</string>
+    <string name="encrypted_with_openpgp">Krüptitud OpenPGP abil</string>
+    <string name="not_encrypted">Pole krüptitud</string>
+    <string name="exit">Välju</string>
+    <string name="record_voice_mail">Salvesta kõneteade</string>
+    <string name="play_audio">Esita heli</string>
+    <string name="pause_audio">Peata heli esitamine</string>
+    <string name="log_out">Logi välja</string>
+    <string name="log_in">Logi sisse</string>
+    <string name="pref_allow_screenshots_summary">Näita rakenduse sisu rakenduste vahetajas ning luba teha ekraanitõmmiseid</string>
+    <string name="pref_category_e2ee">Läbiv krüptimine</string>
+    <string name="pref_title_trust_system_ca_store">Sertifitseerimiskeskused</string>
+    <string name="pref_title_trust_system_ca_store_summary">Usalda süsteemi sertifitseerimiskeskuseid</string>
+    <string name="pref_allow_screenshots">Luba ekraanitõmmiste tegemine</string>
+    <string name="pref_accept_invites_from_strangers_summary">Nõustu kutsetega võõrastelt vestlusrühmas osalemiseks</string>
+    <string name="edit_name_and_topic">Muuda nime ja teemat</string>
+    <string name="could_not_add_reaction">Reaktsiooni lisamine ei õnnestunud</string>
+    <string name="add_reaction">Lisa reaktsioon…</string>
+    <string name="jabber_ids_are_visible_to_admins">XMPP-aadressid on nähtavad serverite haldajatele.</string>
+    <string name="no_users_hint_channel">Selles avalikus kanalis pole ühtegi osalejat. Saad kutse oma kontaktidela või kasuta selle kanali XMPP-aadressi levitamiseks Jaga-nuppu.</string>
+    <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO sõrmejälg (sõnumi allikas)</string>
+    <string name="unblock_contact">Eemalda kontakti blokeering</string>
+    <string name="unable_to_decrypt_backup">Varukoopia dekrüptimine ei õnnestunud. Kas salasõna on ikka õige?</string>
+    <string name="contact_added_you">Vestluspartner lisas sind kontaktide loendisse</string>
+    <string name="no_conference_server_found">Vestlusrühma serverit ei leidu</string>
+    <string name="disable_notifications">Keela teavitused</string>
+    <string name="conference_kicked">Sa oled sellest vestlusrühmast välja müksatud</string>
+    <string name="user_has_left_conference">%1$s on lahkunud vestlusrühmast</string>
+    <string name="host_does_not_support_group_chat_avatars">Server ei toeta vestlusrühma profiilipilte</string>
+    <string name="anyone_can_invite_others">Kõik võivad saata teistele kasutajatele kutseid.</string>
 </resources>
\ No newline at end of file

From eb29d5439b61011ecf127a39818af1a050721338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Wed, 2 Oct 2024 18:06:57 +0000
Subject: [PATCH 021/357] Translated using Weblate (Estonian)

Currently translated at 50.0% (1 of 2 strings)

Translation: Conversations/App Store Metadata (Conversations)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata-conversations/et/
---
 .../fastlane/metadata/android/et/short_description.txt           | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 src/conversations/fastlane/metadata/android/et/short_description.txt

diff --git a/src/conversations/fastlane/metadata/android/et/short_description.txt b/src/conversations/fastlane/metadata/android/et/short_description.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1bf55355b80b6a8d33545d23ebbe73d1ef4047c7
--- /dev/null
+++ b/src/conversations/fastlane/metadata/android/et/short_description.txt
@@ -0,0 +1 @@
+Krüptitud ja lihtsaltkasutatav XMPP klient sinu nutiseadme jaoks

From c4093e9c45b5a5ce2b777e5d0ca8e6d1cf8cd14d Mon Sep 17 00:00:00 2001
From: licaon-kter <licaon-kter@users.noreply.translate.codeberg.org>
Date: Fri, 4 Oct 2024 11:38:11 +0000
Subject: [PATCH 022/357] Translated using Weblate (Romanian)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ro/
---
 src/main/res/values-ro-rRO/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 0592e1f21051fc2a70894c52ad7b721c18669541..cf6061dcee7a5c7f2a214762bfd259701671f930 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -1110,4 +1110,6 @@
     <string name="server_info_login_mechanism">Mecanism autentificare</string>
     <string name="add_reaction">Adaugă reacție…</string>
     <string name="could_not_add_reaction">Nu s-a putut adăuga o reacție</string>
+    <string name="add_reaction_title">Adaugă reacție</string>
+    <string name="more_reactions">Mai multe reacții</string>
 </resources>
\ No newline at end of file

From 508a9a161e6ee4fe98b149cd130d5701b7102d82 Mon Sep 17 00:00:00 2001
From: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Date: Fri, 4 Oct 2024 12:38:59 +0000
Subject: [PATCH 023/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/zh_Hans/
---
 src/main/res/values-zh-rCN/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 9af0c92b8af8223c4af6503d98cb0feaff277196..2e931f88a825f0e4cef9bc89943e093c24e401ef 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -1097,4 +1097,6 @@
     <string name="server_info_sasl2">XEP-0388：可扩展 SASL 配置文件</string>
     <string name="could_not_add_reaction">无法添加回应</string>
     <string name="add_reaction">添加回应…</string>
+    <string name="more_reactions">更多回应</string>
+    <string name="add_reaction_title">添加回应</string>
 </resources>
\ No newline at end of file

From 4e6c8add3b558f059928ff2bcf69d621c81ead24 Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Fri, 4 Oct 2024 13:23:30 +0000
Subject: [PATCH 024/357] Translated using Weblate (German)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/de/
---
 src/main/res/values-de/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 61fff6843ec2ee7e4c9390fc8364b7347ea9f6c4..6d820a8ede50325585eb43f2cba488598da440b0 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -1091,4 +1091,6 @@
     <string name="server_info_login_mechanism">Anmeldeverfahren</string>
     <string name="could_not_add_reaction">Reaktion konnte nicht hinzugefügt werden</string>
     <string name="add_reaction">Reaktion hinzufügen…</string>
+    <string name="add_reaction_title">Reaktion hinzufügen</string>
+    <string name="more_reactions">Weitere Reaktionen</string>
 </resources>
\ No newline at end of file

From c8d4138be59e5394fd2ea79c3aff59a129f975c4 Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Fri, 4 Oct 2024 14:13:59 +0000
Subject: [PATCH 025/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/uk/
---
 src/main/res/values-uk/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 301246b3940c41702415b8f9c006ff92b1353d76..6655ef7887f52067de368f7edf80dc01d4e09e83 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -1139,4 +1139,6 @@
     <string name="server_info_sasl2">XEP-0388: Розширюваний профіль SASL</string>
     <string name="could_not_add_reaction">Не вдалося додати реакцію</string>
     <string name="add_reaction">Додати реакцію…</string>
+    <string name="more_reactions">Більше реакцій</string>
+    <string name="add_reaction_title">Додати реакцію</string>
 </resources>
\ No newline at end of file

From 92b39787a503b6e75c93fcff89b05433b5430b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Fri, 4 Oct 2024 18:50:32 +0000
Subject: [PATCH 026/357] Translated using Weblate (Estonian)

Currently translated at 43.0% (449 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 41 ++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 308d7a4633f12b08d6bce36c6999020c8f41ce9f..4450f5b8441cb53d7b845c167e62cbe72d6c160a 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -424,4 +424,45 @@
     <string name="user_has_left_conference">%1$s on lahkunud vestlusrühmast</string>
     <string name="host_does_not_support_group_chat_avatars">Server ei toeta vestlusrühma profiilipilte</string>
     <string name="anyone_can_invite_others">Kõik võivad saata teistele kasutajatele kutseid.</string>
+    <string name="scan_qr_code">Skaneeri QR-kood</string>
+    <string name="show_qr_code">Näita QR-koodi</string>
+    <string name="show_block_list">Näita blokeeringute loendit</string>
+    <string name="account_details">Kasutajakonto üksikasjad</string>
+    <string name="confirm">Kinnita</string>
+    <string name="regenerate_omemo_key">Loo OMEMO-võti uuesti</string>
+    <string name="copy_omemo_clipboard_description">Kopeeri OMEMO sõrmejälg lõikelauale</string>
+    <string name="using_account">kasutades kontot %s</string>
+    <string name="hosted_on">serveris %s</string>
+    <string name="checking_x">Kontrollime HTTP-serveris: %s</string>
+    <string name="not_connected_try_again">Sul hetkel puudub ühendus. Proovi hiljem uuesti</string>
+    <string name="url_copied_to_clipboard">Kopeerisime võrguaadressi lõikelauale</string>
+    <string name="error_message_copied_to_clipboard">Kopeerisime veateate lõikelauale</string>
+    <string name="try_again">Proovi uuesti</string>
+    <string name="pref_keep_foreground_service">Teenus esiplaanil</string>
+    <string name="pref_keep_foreground_service_summary">See eelistus takistab operatsioonisüsteemil sinu võrguühenduse sulgemist</string>
+    <string name="pref_create_backup">Tee varukoopia</string>
+    <string name="pref_create_backup_summary">Varukoopia failide salvestamise asukoht: %s</string>
+    <string name="notification_backup_created_title">Sinu varukoopia on tehtud</string>
+    <string name="notification_create_backup_title">Teeme varukoopiat</string>
+    <string name="notification_backup_created_subtitle">Varukoopia failid on salvestatud siin kaustas: %s</string>
+    <string name="restoring_backup">Taastame varukoopiast</string>
+    <string name="notification_restored_backup_title">Andmed sinu varukoopiast on taastatud</string>
+    <string name="notification_restored_backup_subtitle">Ära unusta seda kontot kasutusele võtta.</string>
+    <string name="choose_file">Vali fail</string>
+    <string name="receiving_x_file">Laadime alla %1$s (%2$d%% valmis)</string>
+    <string name="download_x_file">Laadi %s alla</string>
+    <string name="delete_x_file">Kustuta %s</string>
+    <string name="file">fail</string>
+    <string name="open_x_file">Ava %s</string>
+    <string name="sending_file">laadime üles (%1$d%% valmis)</string>
+    <string name="preparing_file">Valmistume faili jagamiseks</string>
+    <string name="x_file_offered_for_download">%s on allalaadimiseks saadaval</string>
+    <string name="cancel_transmission">Katkesta laadimine</string>
+    <string name="audiobook">Heliraamat</string>
+    <string name="vcard">Kontakt</string>
+    <string name="server_side_mam_prefs">Serveris arhiveerimise eelistused</string>
+    <string name="error_trustkey_bundle">Krüptimisvõtmete laadimine ei õnnestunud</string>
+    <string name="enter_your_name">Sisesta oma nimi</string>
+    <string name="your_name">Sinu nimi</string>
+    <string name="change_notification_settings">Muuda teavituse seadistusi</string>
 </resources>
\ No newline at end of file

From 04532a4e619bff3e594b71f0c2658f9d14e17149 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 5 Oct 2024 07:55:16 +0200
Subject: [PATCH 027/357] version bump to 2.17.0-beta.2

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1fb7053fab4a17cf2f993471ce1343e28b734f44..3b459f7390287c321089116cf80fdd4c0febcc6a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,8 +100,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 42119
-        versionName "2.17.0-beta"
+        versionCode 42120
+        versionName "2.17.0-beta.2"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId

From f594f4bc1aab7ecef4852dff631c662ab83656ab Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Fri, 4 Oct 2024 21:45:23 -0500
Subject: [PATCH 028/357] Ignore fallback content in reaction messages

Don't produce a message as well as storing the reactions, just store the
reactions and ignore the fallback content.
---
 src/main/java/eu/siacs/conversations/parser/MessageParser.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 9c0778151a984e6f6e7042870619d83b5936c693..22c9cf64c824da4b958d2844edc578ada07bd310 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -537,7 +537,7 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
             }
         }
 
-        if ((body != null || pgpEncrypted != null || (axolotlEncrypted != null && axolotlEncrypted.hasChild("payload")) || oobUrl != null) && !isMucStatusMessage) {
+        if (reactions == null && (body != null || pgpEncrypted != null || (axolotlEncrypted != null && axolotlEncrypted.hasChild("payload")) || oobUrl != null) && !isMucStatusMessage) {
             final boolean conversationIsProbablyMuc = isTypeGroupChat || mucUserElement != null || account.getXmppConnection().getMucServersWithholdAccount().contains(counterpart.getDomain().toEscapedString());
             final Conversation conversation = mXmppConnectionService.findOrCreateConversation(account, counterpart.asBareJid(), conversationIsProbablyMuc, false, query, false);
             final boolean conversationMultiMode = conversation.getMode() == Conversation.MODE_MULTI;

From a2eac4909a7300b73df1c256340708b44377377c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 6 Oct 2024 17:00:26 +0200
Subject: [PATCH 029/357] add xep-0444 to doap file

---
 CHANGELOG.md       | 4 ++++
 conversations.doap | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5d72e162f7f1b7103e1eedf4cdfb0dd140484f8..726b2ca78137ea0da0e51ae2e0a74f71a7a6eda4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 2.17.0
+
+* Support Message Reactions
+
 ### Version 2.16.7
 
 * Add timeout to call initiation
diff --git a/conversations.doap b/conversations.doap
index 56ada7b96ebee0b29816dbb990ce9a8560ace3f2..58ff08a9712f12bfe9a2ee91dbcdff12f81cf1f0 100644
--- a/conversations.doap
+++ b/conversations.doap
@@ -467,6 +467,14 @@
             <xmpp:version>0.4.0</xmpp:version>
         </xmpp:SupportedXep>
     </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0444.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.2.1</xmpp:version>
+            <xmpp:since>2.17.0</xmpp:since>
+        </xmpp:SupportedXep>
+    </implements>
     <implements>
         <xmpp:SupportedXep>
             <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0454.html"/>

From 67714b1ec3347ff0b027d11ba5911097bc971230 Mon Sep 17 00:00:00 2001
From: DrManhattanMR <DrManhattanMR@users.noreply.translate.codeberg.org>
Date: Sat, 5 Oct 2024 03:18:14 +0000
Subject: [PATCH 030/357] Translated using Weblate (Spanish)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/es/
---
 src/main/res/values-es/strings.xml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 2bc1809ea691b316ccfb17cdfeb4c46e342bfc46..ad6406713504fc954a78691acc5040751604d4e0 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -1084,4 +1084,27 @@
     <string name="pref_fullscreen_notification">Notificaciones a pantalla completa</string>
     <string name="pref_fullscreen_notification_summary">Permite que esta aplicación muestre notificaciones de llamadas entrantes que ocupan toda la pantalla cuando el dispositivo está bloqueado.</string>
     <string name="allow_private_messages">Permitir mensajes privados</string>
+    <string name="more_reactions">Más reacciones</string>
+    <string name="your_avatar_tap_to_select_new_avatar">Tu avatar. Toca para seleccionar un nuevo avatar de la galería.</string>
+    <string name="server_info_bind2">XEP-0386: Vinculación 2</string>
+    <string name="server_info_sasl2">XEP-0388: Perfil SASL Extensible</string>
+    <string name="could_not_disable_video">No se pudo desactivar el video.</string>
+    <string name="flip_camera">Voltear la cámara</string>
+    <string name="video_is_enabled_tap_to_disable">Video activado. Toca para desactivar.</string>
+    <string name="edit_nick">Editar apodo</string>
+    <string name="delete_pgp_key">Eliminar clave OpenPGP</string>
+    <string name="edit_name_and_topic">Editar nombre y tema</string>
+    <string name="edit_configuration">Cambiar configuración</string>
+    <string name="change_notification_settings">Cambiar la configuración de notificaciones</string>
+    <string name="call_is_using_earpiece_tap_to_switch_to_speaker">La llamada está utilizando el auricular. Toca para cambiar al altavoz.</string>
+    <string name="call_is_using_earpiece">La llamada está utilizando el auricular.</string>
+    <string name="call_is_using_wired_headset">La llamada está utilizando auriculares con cable</string>
+    <string name="call_is_using_speaker_tap_to_switch_to_earpiece">La llamada está utilizando altavoz. Toca para cambiar a auricular.</string>
+    <string name="call_is_using_speaker">La llamada está usando el altavoz.</string>
+    <string name="call_is_using_bluetooth">La llamada está usando bluetooth.</string>
+    <string name="video_is_disabled_tap_to_enable">Video desactivado. Toca para activar.</string>
+    <string name="server_info_login_mechanism">Apartado de inicio de sesión</string>
+    <string name="could_not_add_reaction">No se pudo agregar la reacción</string>
+    <string name="add_reaction">Agregar reacción…</string>
+    <string name="add_reaction_title">Agregar reacción</string>
 </resources>
\ No newline at end of file

From 501b20ff02be07427aa210c8d926c4e0634bc452 Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Sat, 5 Oct 2024 02:13:13 +0000
Subject: [PATCH 031/357] Translated using Weblate (Galician)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/gl/
---
 src/main/res/values-gl/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 7467ecaec6f4b16bb7a94743864e53ee757633cb..dd4db7504cf4f83be420f2a8dcc68a38c208b227 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -1095,4 +1095,6 @@
     <string name="server_info_bind2">XEP-0386: Bind 2</string>
     <string name="could_not_add_reaction">Non se puido engadir a reacción</string>
     <string name="add_reaction">Engadir reacción…</string>
+    <string name="more_reactions">Outras reaccións</string>
+    <string name="add_reaction_title">Engadir reacción</string>
 </resources>
\ No newline at end of file

From 2b5c345df2155ca6252abbe8238aee437160c471 Mon Sep 17 00:00:00 2001
From: Stephan-P <Stephan-P@users.noreply.translate.codeberg.org>
Date: Sat, 5 Oct 2024 02:46:30 +0000
Subject: [PATCH 032/357] Translated using Weblate (Dutch)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/nl/
---
 src/main/res/values-nl/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 2c666e6aab1c49c6be3263d4ae6ba4a1418902bd..30e2b04024166f30b2b3cf19f5201d4fabf38bf5 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -1107,4 +1107,6 @@
     <string name="server_info_bind2">XEP-0386: Bind 2</string>
     <string name="add_reaction">Reactie toevoegen…</string>
     <string name="could_not_add_reaction">Kan reactie niet toevoegen</string>
+    <string name="add_reaction_title">Reactie toevoegen</string>
+    <string name="more_reactions">Meer reacties</string>
 </resources>
\ No newline at end of file

From 1d326395bbd88b0d9c9e0e0ca4ce6e0d35561adb Mon Sep 17 00:00:00 2001
From: "lucasmz.dev" <git@lucasmz.dev>
Date: Sat, 5 Oct 2024 02:27:55 +0000
Subject: [PATCH 033/357] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pt_BR/
---
 src/main/res/values-pt-rBR/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 4bbff515c00e62d985912e0a05383fa57876e4fa..4a4b675a8e1918b5860993e5b3368812c8ebb4be 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -1111,4 +1111,6 @@
     <string name="pref_category_application">Aplicação</string>
     <string name="could_not_add_reaction">Não pôde adicionar reação</string>
     <string name="add_reaction">Adicionar reação…</string>
+    <string name="add_reaction_title">Adicionar reação</string>
+    <string name="more_reactions">Mais reações</string>
 </resources>
\ No newline at end of file

From d63cd7251306d4d2c28ef72b9b714def2344c1da Mon Sep 17 00:00:00 2001
From: Besnik_b <Besnik_b@users.noreply.translate.codeberg.org>
Date: Fri, 4 Oct 2024 21:33:25 +0000
Subject: [PATCH 034/357] Translated using Weblate (Albanian)

Currently translated at 99.1% (1034 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sq/
---
 src/main/res/values-sq-rAL/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index 0c29aa92e71a515e268be2ef2d0284023f40248b..676a43305953da3feb75935e96c909411bb381b9 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -1102,4 +1102,6 @@
     <string name="server_info_login_mechanism">Mekanizëm hyrjesh</string>
     <string name="could_not_add_reaction">S’u shtua dot reagim</string>
     <string name="add_reaction">Shtoni reagim…</string>
+    <string name="add_reaction_title">Shtoni reagim</string>
+    <string name="more_reactions">Më tepër reagime</string>
 </resources>
\ No newline at end of file

From a21224b8d489cd35abeb20a5bf7fa4ec80507b87 Mon Sep 17 00:00:00 2001
From: DrManhattanMR <DrManhattanMR@users.noreply.translate.codeberg.org>
Date: Sat, 5 Oct 2024 03:35:26 +0000
Subject: [PATCH 035/357] Translated using Weblate (Spanish)

Currently translated at 100.0% (2 of 2 strings)

Translation: Conversations/App Store Metadata (Conversations)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata-conversations/es/
---
 .../android/es-ES/full_description.txt        | 56 +++++++++----------
 .../android/es-ES/short_description.txt       |  2 +-
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/src/conversations/fastlane/metadata/android/es-ES/full_description.txt b/src/conversations/fastlane/metadata/android/es-ES/full_description.txt
index 8535495474703dfcc474ead02580c91a8ead8b85..8c314f3f0cef64263bab72b783c17c0052faea48 100644
--- a/src/conversations/fastlane/metadata/android/es-ES/full_description.txt
+++ b/src/conversations/fastlane/metadata/android/es-ES/full_description.txt
@@ -1,39 +1,37 @@
-Fácil de usar, fiable y con poca batería. Con soporte integrado para imágenes, chats de grupo y cifrado e2e.
+Fácil de usar, confiable y amigable con la batería. Con soporte integrado para imágenes, chats grupales y cifrado de extremo a extremo.
 
 Principios de diseño:
 
-* Ser lo más bonito y fácil de usar posible sin sacrificar la seguridad ni la privacidad.
-* Basarse en protocolos existentes y bien establecidos.
-* No requerir una cuenta de Google o, específicamente, Google Cloud Messaging (GCM).
-* Requerir el menor número de permisos posible
-
+Ser tan bello y fácil de usar como sea posible, sin sacrificar la seguridad o la privacidad.
+Confiar en protocolos existentes y bien establecidos.
+No requerir una cuenta de Google ni Google Cloud Messaging (GCM).
+Requerir la menor cantidad de permisos posible.
 Características:
 
-* Cifrado de extremo a extremo con <a href="http://conversations.im/omemo/">OMEMO</a> o <a href="http://openpgp.org/about/">OpenPGP</a>.
-* Envío y recepción de imágenes
-* Llamadas de audio y vídeo cifradas (DTLS-SRTP)
-* Interfaz de usuario intuitiva que sigue las directrices de diseño de Android
-* Imágenes / Avatares para tus contactos
-* Sincronización con el cliente de escritorio
-* Conferencias (con soporte para marcadores)
-* Integración de la libreta de direcciones
-* Múltiples cuentas / bandeja de entrada unificada
-* Muy bajo impacto en la duración de la batería
-
-Conversations hace que sea muy fácil crear una cuenta en el servidor gratuito conversations.im. Sin embargo, Conversations también funciona con cualquier otro servidor XMPP. Muchos servidores XMPP están gestionados por voluntarios y son gratuitos.
+Cifrado de extremo a extremo con <a href="http://conversations.im/omemo/">OMEMO</a> o <a href="http://openpgp.org/about/">OpenPGP</a>.
+Envío y recepción de imágenes.
+Llamadas de audio y video cifradas (DTLS-SRTP).
+Interfaz intuitiva que sigue las pautas de diseño de Android.
+Imágenes / Avatares para tus contactos.
+Sincronización con el cliente de escritorio.
+Conferencias (con soporte para marcadores).
+Integración con la agenda de contactos.
+Múltiples cuentas / bandeja de entrada unificada.
+Muy bajo impacto en la duración de la batería.
+Conversations facilita mucho la creación de una cuenta en el servidor gratuito conversations.im. Sin embargo, Conversations también funcionará con cualquier otro servidor XMPP. Muchos servidores XMPP son gestionados por voluntarios y son gratuitos.
 
 Características de XMPP:
 
-Conversations funciona con todos los servidores XMPP existentes. Sin embargo, XMPP es un protocolo extensible. Estas extensiones también están estandarizadas en los llamados XEP. Conversations soporta un par de ellas para mejorar la experiencia general del usuario. Existe la posibilidad de que su actual servidor XMPP no soporte estas extensiones. Por lo tanto, para sacar el máximo provecho de Conversaciones deberías considerar o bien cambiar a un servidor XMPP que lo haga o - mejor aún - ejecutar tu propio servidor XMPP para ti y tus amigos.
+Conversations funciona con todos los servidores XMPP disponibles. Sin embargo, XMPP es un protocolo extensible. Estas extensiones también están estandarizadas en lo que se llaman XEP. Conversations admite algunas de estas para mejorar la experiencia general del usuario. Existe la posibilidad de que tu servidor XMPP actual no soporte estas extensiones. Por lo tanto, para aprovechar al máximo Conversations, deberías considerar cambiar a un servidor XMPP que sí lo haga o, aún mejor, configurar tu propio servidor XMPP para ti y tus amigos.
 
-Estos XEPs son (por el momento):
+Estos XEP son, hasta ahora:
 
-* XEP-0065: SOCKS5 Bytestreams (o mod_proxy65). Se utilizará para transferir archivos si ambas partes están detrás de un cortafuegos (NAT).
-* XEP-0163: Protocolo de Evento Personal para avatares
-* XEP-0191: El comando de bloqueo te permite hacer una lista negra de spammers o bloquear contactos sin eliminarlos de tu lista.
-* XEP-0198: Stream Management permite a XMPP sobrevivir a pequeños cortes de red y cambios de la conexión TCP subyacente.
-* XEP-0280: Message Carbons que sincroniza automáticamente los mensajes que envías a tu cliente de escritorio y por lo tanto te permite cambiar sin problemas de tu cliente móvil a tu cliente de escritorio y viceversa en una sola conversación.
-* XEP-0237: Versionado de listas, principalmente para ahorrar ancho de banda en conexiones móviles deficientes.
-* XEP-0313: Gestión de Archivo de Mensajes sincroniza el historial de mensajes con el servidor. Ponerse al día con los mensajes que fueron enviados mientras Conversaciones estaba fuera de línea.
-* XEP-0352: Indicación del Estado del Cliente permite al servidor saber si Conversaciones está o no en segundo plano. Permite al servidor ahorrar ancho de banda reteniendo paquetes sin importancia.
-* XEP-0363: Carga de Archivos HTTP permite compartir archivos en conferencias y con contactos sin conexión. Requiere un componente adicional en su servidor.
+XEP-0065: SOCKS5 Bytestreams (o mod_proxy65). Se utilizará para transferir archivos si ambas partes están detrás de un firewall o NAT.
+XEP-0163: Protocolo de Eventos Personales para avatares.
+XEP-0191: El comando de bloqueo te permite poner en la lista negra a spammers o bloquear contactos sin eliminarlos de tu lista de contactos.
+XEP-0198: La gestión de flujos permite que XMPP sobreviva a pequeñas interrupciones de red y cambios en la conexión TCP subyacente.
+XEP-0280: Message Carbons que sincroniza automáticamente los mensajes que envías a tu cliente de escritorio, lo que te permite cambiar sin problemas entre tu cliente móvil y el de escritorio dentro de una conversación.
+XEP-0237: Versionado de Roster, principalmente para ahorrar ancho de banda en conexiones móviles deficientes.
+XEP-0313: Gestión del Archivo de Mensajes que sincroniza el historial de mensajes con el servidor. Pone al día los mensajes que se enviaron mientras Conversations estaba fuera de línea.
+XEP-0352: Indicación de Estado del Cliente que informa al servidor si Conversations está en segundo plano o no. Permite al servidor ahorrar ancho de banda al retener paquetes no importantes.
+XEP-0363: Carga de Archivos HTTP que permite compartir archivos en conferencias y con contactos fuera de línea. Requiere un componente adicional en tu servidor.
diff --git a/src/conversations/fastlane/metadata/android/es-ES/short_description.txt b/src/conversations/fastlane/metadata/android/es-ES/short_description.txt
index 11f7274bdebebf58375141e69e3b5a2fa1c70449..7ed04767246cd7fab459ea0ebc43836a01ddd32f 100644
--- a/src/conversations/fastlane/metadata/android/es-ES/short_description.txt
+++ b/src/conversations/fastlane/metadata/android/es-ES/short_description.txt
@@ -1 +1 @@
-Mensajería instantánea XMPP cifrada y fácil de usar para tu teléfono inteligente
+Mensajería instantánea XMPP cifrada y fácil de usar para tu dispositivo móvil

From 919cf0410d75d46f00e387150569da5fad62c178 Mon Sep 17 00:00:00 2001
From: DrManhattanMR <DrManhattanMR@users.noreply.translate.codeberg.org>
Date: Sat, 5 Oct 2024 03:34:50 +0000
Subject: [PATCH 036/357] Translated using Weblate (Spanish)

Currently translated at 100.0% (2 of 2 strings)

Translation: Conversations/App Store Metadata (Quicksy)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata-quicksy/es/
---
 .../metadata/android/es-ES/full_description.txt   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/quicksy/fastlane/metadata/android/es-ES/full_description.txt b/src/quicksy/fastlane/metadata/android/es-ES/full_description.txt
index b57fd6c1cbf47fa40776d93bf47663b51d410061..f5141df4cb763c48d4e239fa315dd4a169294c33 100644
--- a/src/quicksy/fastlane/metadata/android/es-ES/full_description.txt
+++ b/src/quicksy/fastlane/metadata/android/es-ES/full_description.txt
@@ -1,14 +1,13 @@
-Quicksy es una bifurcación del popular cliente Jabber/XMPP Conversations con busqueda automático de contactos.
+Quicksy es un spin-off del popular cliente Jabber/XMPP Conversations, que ofrece descubrimiento automático de contactos.
 
-Te registras con tu número de teléfono y Quicksy automáticamente, basándose en los números de teléfono de tu agenda, te sugerirá posibles contactos.
+Te registras con tu número de teléfono y Quicksy, basándose en los números de teléfono de tu agenda, te sugerirá automáticamente posibles contactos.
 
-Quicksy es un cliente Jabber completo que te permite comunicarte con cualquier usuario en cualquier servidor público. Asimismo, puedes contactar a los usuarios de Quicksy desde el exterior simplemente agregando +phonenumber@quicksy.im a tu lista de contactos.
+Bajo el capó, Quicksy es un cliente Jabber completamente funcional que te permite comunicarte con cualquier usuario en cualquier servidor público que federé. Asimismo, los usuarios de Quicksy pueden ser contactados desde el exterior simplemente agregando +número de teléfono@quicksy.im a tu lista de contactos.
 
-Aparte de la sincronización de contactos, la interfaz de usuario se parece lo más posible a Conversations. Esto permite que los usuarios puedan migrar de Quicksy a Conversations sin tener que volver a aprender cómo funciona la aplicación.
+Aparte de la sincronización de contactos, la interfaz de usuario está diseñada para ser lo más parecida posible a la de Conversations. Esto permite a los usuarios migrar eventualmente de Quicksy a Conversations sin tener que volver a aprender cómo funciona la aplicación.
 
-Los contactos sugeridos consisten en otros usuarios de Quicksy y usuarios habituales de Jabber/XMPP que han ingresado su ID de Jabber en el Directorio de Quicksy (https://quicksy.im/#get-listed).
+Los contactos sugeridos consisten en otros usuarios de Quicksy y usuarios regulares de Jabber/XMPP que han ingresado su ID Jabber en el Directorio Quicksy (https://quicksy.im/#get-listed).
 
-NOTA: Para ingresar (https://quicksy.im/enter/) tu ID de Jabber en Quicksy
-Directorio se requiere un único pago de registro.
+NOTA: Para ingresar tu ID Jabber en el Directorio Quicksy (https://quicksy.im/enter/), se requiere un pago de registro único.
 
-Lee la Política de privacidad (https://quicksy.im/#privacy) para obtener más información.
+Lee la Política de Privacidad para más información.

From 7b7835936aee016bc441cf8b013bf6c16bdd43f6 Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Sat, 5 Oct 2024 20:56:20 +0000
Subject: [PATCH 037/357] Translated using Weblate (Polish)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pl/
---
 src/main/res/values-pl/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 2ca80077e01d8b8963b3d1f62bbb6d6228f6e867..759d250d0920373f1a71874ab29c32dc8d0c8c3d 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -1123,4 +1123,6 @@
     <string name="server_info_login_mechanism">Mechanizm logowania</string>
     <string name="could_not_add_reaction">Nie można dodać reakcji</string>
     <string name="add_reaction">Dodaj reakcję…</string>
+    <string name="add_reaction_title">Dodaj reakcję</string>
+    <string name="more_reactions">Więcej reakcji</string>
 </resources>
\ No newline at end of file

From 6629c4cfa27fc9a56c2a7ec0e1eeebf322be41f1 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Sat, 5 Oct 2024 20:33:00 +0000
Subject: [PATCH 038/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 29df77299edb1e9f3fdc2a575d9e7c9d4276c16b..97bf11a8604a76a8d78519f40e300e916c48c885 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -1067,7 +1067,7 @@
     <string name="pref_keyboard_options">Клавиатура</string>
     <string name="title_activity_share_with">Поделиться с…</string>
     <string name="pref_use_colorful_bubbles">Цветные пузырьки сообщений</string>
-    <string name="pref_use_colorful_bubbles_summary">Различайте отправленные сообщения и фон беседы</string>
+    <string name="pref_use_colorful_bubbles_summary">Различные цвета фона для отправленных и полученных сообщений</string>
     <string name="pref_dynamic_colors">Динамичные цвета</string>
     <string name="pref_dynamic_colors_summary">Цвет системы (Material You)</string>
     <string name="channel_discover_opt_in_message">Обзор каналов использует сторонний сервис &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Эта функция передаст ваш IP-адрес и поисковый запрос этому сервису. Ознакомьтесь с его &lt;a href=https://search.jabber.network/privacy&gt;политикой конфиденциальности&lt;/a&gt; для получения подробностей.</string>
@@ -1106,7 +1106,7 @@
     <string name="pref_accept_invites_from_strangers_summary">Принимать приглашения в групповые беседы от неизвестных</string>
     <string name="unsupported_operation">Операция не поддерживается</string>
     <string name="pref_fullscreen_notification">Полноэкранные уведомления</string>
-    <string name="pref_backup_recurring">Повторяющиеся резервные копии</string>
+    <string name="pref_backup_recurring">Регулярные резервные копии</string>
     <string name="pref_fullscreen_notification_summary">Разрешить приложению показывать экраны входящих звонков при заблокированном экране.</string>
     <string name="pref_up_long_summary">Conversations, будучи распределителем UnifiedPush, будет использовать стойкое, надёжное и малопотребляющее подключение XMPP для пробуждения других совместимых с UnifiedPush приложений, таких как Tusky, Ltt.rs, FluffyChat и др.</string>
     <string name="detect_mim">Требовать привязку канала</string>
@@ -1133,9 +1133,11 @@
     <string name="edit_configuration">Изменить настройки</string>
     <string name="edit_nick">Изменить имя</string>
     <string name="edit_name_and_topic">Изменить имя и тему</string>
-    <string name="pref_backup_summary">Создание разовых и повторяющихся резервных копий</string>
+    <string name="pref_backup_summary">Создание разовых и регулярных резервных копий</string>
     <string name="server_info_sasl2">XEP-0388: расширяемый профиль SASL</string>
     <string name="server_info_bind2">XEP-0386: привязка 2</string>
     <string name="could_not_add_reaction">Невозможно добавить реакцию</string>
     <string name="add_reaction">Добавить реакцию…</string>
+    <string name="add_reaction_title">Добавить реакцию</string>
+    <string name="more_reactions">Другие реакции</string>
 </resources>
\ No newline at end of file

From 15c32b72ace083be3c36a8e3362383f4cce80806 Mon Sep 17 00:00:00 2001
From: user11 <user11@users.noreply.translate.codeberg.org>
Date: Sat, 5 Oct 2024 18:00:36 +0000
Subject: [PATCH 039/357] Translated using Weblate (Serbian)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sr/
---
 src/main/res/values-sr/strings.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 4bbf96623be9ef5453a62ae751334eaf26269f0e..bdc9da7ee4b6340c21a9a66af5dcd2d9570ad7f5 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -603,7 +603,7 @@
     <plurals name="seconds">
         <item quantity="one">%d секунда</item>
         <item quantity="few">%d секунде</item>
-        <item quantity="other">%d скунди</item>
+        <item quantity="other">%d секунди</item>
     </plurals>
     <plurals name="minutes">
         <item quantity="one">%d минута</item>
@@ -822,7 +822,7 @@
 \nСада ћеш добити упит да је искључиш.</string>
     <string name="magic_create_text">Припремљено је упутство за отварање налога на conversations.im.
 \nАко одабереш conversations.im као провајдера можеш да комуницираш са корисницима других провајдера тако што им проследиш своју пуну XMPP адресу.</string>
-    <string name="pref_use_colorful_bubbles">Разнобојни балончићи преписке</string>
+    <string name="pref_use_colorful_bubbles">Разнобојни балончићи порука</string>
     <string name="no_permission_to_place_call">Недостатак пермисија за обављање позива</string>
     <string name="pref_validate_hostname">Валидирај назив сервера користећи DNSSEC</string>
     <string name="foreground_service_channel_description">Ова категорија обавештења се користи за трајни приказ обавештења да %1$s ради.</string>
@@ -1125,4 +1125,6 @@
     <string name="pref_dynamic_colors_summary">Системске боје (Material You)</string>
     <string name="could_not_add_reaction">Није могуће ставити реакцију</string>
     <string name="add_reaction">Стави реакцију…</string>
+    <string name="add_reaction_title">Стави реакцију</string>
+    <string name="more_reactions">Још реакција</string>
 </resources>
\ No newline at end of file

From d29a80ba0750491ed786ba72c4762fd36c6bc303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Sat, 5 Oct 2024 11:28:05 +0000
Subject: [PATCH 040/357] Translated using Weblate (Estonian)

Currently translated at 53.9% (563 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 121 +++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 4450f5b8441cb53d7b845c167e62cbe72d6c160a..4bdac3546c9feb85eb6dc67a16f45437e446b53d 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -465,4 +465,125 @@
     <string name="enter_your_name">Sisesta oma nimi</string>
     <string name="your_name">Sinu nimi</string>
     <string name="change_notification_settings">Muuda teavituse seadistusi</string>
+    <string name="pref_security_settings">Turvalisus</string>
+    <string name="fetching_history_from_server">Laadime serverist ajalugu</string>
+    <string name="moderated">Muuda kanal modereeritavaks</string>
+    <string name="you_are_not_participating">Sina ei osale</string>
+    <string name="channel_options">Avaliku kanali seadistused</string>
+    <string name="members_only">Privaatne, vaid liikmetele</string>
+    <string name="vector_graphic">vektorgraafika</string>
+    <string name="unable_to_start_recording">Ei õnnestunud alustada salvestamist</string>
+    <string name="start_orbot">Käivita Orbot</string>
+    <plurals name="toast_delete_certificates">
+        <item quantity="one">%d sertifikaat on kustutatud</item>
+        <item quantity="other">%d sertifikaati on kustutatud</item>
+    </plurals>
+    <string name="request_presence_updates">Esmalt palu oma kontakti, et ta lubaks olekuteadete saatmise.
+\n
+\n<small>Seda kasutatakse sinu kontakti XMPP-kliendi tuvastamiseks</small>.</string>
+    <string name="request_now">Palu nüüd</string>
+    <string name="ignore">Eira</string>
+    <string name="without_mutual_presence_updates"><b>Hoiatus:</b> Selle saatmine ilma selleta, et mõlemal poolel on olekuteated sisse lülitatud, võib tekitada ootamatuid probleeme.
+\n
+\n<small>Ava „Kontakti üksikasjad“ ja kontrolli oma olekuteadete staatust.</small></string>
+    <string name="pref_allow_message_correction">Sõnumite muutmine</string>
+    <string name="pref_allow_message_correction_summary">Luba, et sinu kontaktid saavad tagantjärgi sõnumeid muuta</string>
+    <string name="pref_expert_options">Seadistused asjatundjatele</string>
+    <string name="pref_expert_options_summary">Palun ole nendega ettevaatlik</string>
+    <string name="title_activity_about_x">Rakenduse teave: %s</string>
+    <string name="title_pref_quiet_hours">Aeg, mil sa ei soovi segamist</string>
+    <string name="title_pref_quiet_hours_start_time">Algus</string>
+    <string name="title_pref_quiet_hours_end_time">Lõpp</string>
+    <string name="title_pref_enable_quiet_hours">Kasuta aega, millal sa ei soovi segamist</string>
+    <string name="pref_quiet_hours_summary">Nendel vaiksetel tundidel on teavitused välja lülitatud</string>
+    <string name="pref_expert_options_other">Muud seadistused</string>
+    <string name="pref_autojoin_summary">Kui liitud või lahkud vestlusrühmast või reageerid teistes klientides tehtud muudatustele, siis lisa päringusse „autojoin“ tingimus.</string>
+    <string name="toast_message_omemo_fingerprint">OMEMO sõrmejälg on kopeeritud lõikelauale</string>
+    <string name="conference_resource_constraint">Ressursside piirangud</string>
+    <string name="check_x_filesize">Kontrolli %s faili suurust</string>
+    <string name="check_x_filesize_on_host">Kontrolli %1$s faili suurust serveris %2$s</string>
+    <string name="message_options">Sõnumi valikud</string>
+    <string name="quote">Tsiteeri</string>
+    <string name="paste_as_quote">Aseta tsitaadina</string>
+    <string name="copy_original_url">Kopeeri algne URL</string>
+    <string name="send_again">Saada uuesti</string>
+    <string name="file_url">Faili võrguaadress</string>
+    <string name="pref_show_dynamic_tags">Dünaamilised sildid</string>
+    <string name="pref_show_dynamic_tags_summary">Kuva mittemuudetavaid silte kontaktkirjete all</string>
+    <string name="enable_notifications">Võta teavitused kasutusele</string>
+    <string name="file_transmission_failed">faili jagamine ei õnnestunud</string>
+    <string name="file_transmission_cancelled">faili saatmine või vastuvõtmine on katkestatud</string>
+    <string name="file_deleted">Fail on kustutatud</string>
+    <string name="no_application_found_to_open_file">Faili avamiseks ei leidu sobivat rakendust</string>
+    <string name="no_application_found_to_open_link">Lingi avamiseks ei leidu sobivat rakendust</string>
+    <string name="no_application_found_to_view_contact">Kontaktkirje vaatamiseks ei leidu sobivat rakendust</string>
+    <string name="no_more_history_on_server">Serveris ei leidu rohkem ajalugu</string>
+    <string name="updating">Uuendame…</string>
+    <string name="enable_all_accounts">Võta kõik kontod kasutusele</string>
+    <string name="disable_all_accounts">Eemalda kõik kontod kasutuselt</string>
+    <string name="perform_action_with">Tee toiming...</string>
+    <string name="no_affiliation">Kuuluvusi pole</string>
+    <string name="could_not_change_affiliation">Kasutaja „%s“ kuuluvuse muutmine ei õnnestunud</string>
+    <string name="remove_owner_privileges">Võta omaniku õigused ära</string>
+    <string name="remove_from_channel">Eemalda kanalilt</string>
+    <string name="ban_from_channel">Keela ligipääs kanalile</string>
+    <string name="could_not_change_role">Kasutaja „%s“ rolli muutmine ei õnnestunud</string>
+    <string name="removing_from_public_conference">Sa üritad eemaldada kasutajat „%s“ avalikult kanalilt. Ainus viis seda teha on talle igavese suhtluskeelu seadmine.</string>
+    <string name="ban_now">Keela ligipääs nüüd</string>
+    <string name="sending_x_file">Saadame faili „%s“</string>
+    <string name="offering_x_file">Pakume faili „%s“</string>
+    <string name="pref_display_enter_key">Näita sisestusklahvi</string>
+    <string name="pref_display_enter_key_summary">Vaheta emotikonide klahv sisestusklahviks</string>
+    <string name="audio">heli</string>
+    <string name="video">video</string>
+    <string name="image">pilt</string>
+    <string name="multimedia_file">multimeediafail</string>
+    <string name="pdf_document">pdf-dokument</string>
+    <string name="apk">Androidi rakendus</string>
+    <string name="hide_offline">Peida võrgus mitteolevad kasutajad</string>
+    <string name="contact_is_typing">%s kirjutab…</string>
+    <string name="contact_has_stopped_typing">%s on lõpetanud kirjutamise</string>
+    <string name="contacts_are_typing">%s kirjutavad…</string>
+    <string name="contacts_have_stopped_typing">%s on lõpetanud kirjutamise</string>
+    <string name="pref_chat_states">Kirjutamise teavitused</string>
+    <string name="pref_chat_states_summary">Luba teistel osapooltel teada saada, kui neile kirjutad</string>
+    <string name="send_location">Saada oma asukoht</string>
+    <string name="show_location">Näita oma asukohta</string>
+    <string name="no_application_found_to_display_location">Asukoha näitamiseks ei leidu ühtegi rakendust</string>
+    <string name="location">Asukoht</string>
+    <string name="title_undo_swipe_out_chat">Vestlus on arhiveeritud</string>
+    <string name="title_undo_swipe_out_channel">Lahkusid avalikult kanalilt</string>
+    <string name="pref_dont_trust_system_cas_title">Ära usalda operatsioonisüsteemis kirjeldatud sertifitseerimiskeskuseid</string>
+    <string name="pref_dont_trust_system_cas_summary">Kõik sertifikaadid peavad olema käsitsi kinnitatud</string>
+    <string name="pref_remove_trusted_certificates_title">Eemalda sertifikaadid</string>
+    <string name="pref_remove_trusted_certificates_summary">Kustuta käsitsi kinnitatud sertifikaadid</string>
+    <string name="toast_no_trusted_certs">Käsitsi kinnitatud sertifikaate pole</string>
+    <string name="dialog_manage_certs_title">Eemalda sertifikaadid</string>
+    <string name="dialog_manage_certs_positivebutton">Kustuta valik</string>
+    <string name="pref_quick_action">Kiirtoiming</string>
+    <string name="send_private_message">Saada privaatne sõnum</string>
+    <string name="username">Kasutajanimi</string>
+    <string name="username_hint">Kasutajanimi</string>
+    <string name="invalid_username">See pole korrektne kasutajanimi</string>
+    <string name="download_failed_server_not_found">Allalaadimine ei õnnestunud: serverit ei leidu</string>
+    <string name="download_failed_file_not_found">Allalaadimine ei õnnestunud: faili ei leidu</string>
+    <string name="pref_start_search_summary">Vaates „Uus vestlus“ ava klahvistik ning aseta kursor otsinguväljale</string>
+    <string name="media_browser">Meediabrauser</string>
+    <string name="security_violation_not_attaching_file">Fail on vahele jäetud turvareeglite rikkumise tõttu.</string>
+    <string name="pref_video_compression">Video kvaliteet</string>
+    <string name="pref_video_compression_summary">Madalam kvaliteet tähendab väiksemaid faile</string>
+    <string name="video_360p">Keskmine (360p)</string>
+    <string name="video_720p">Kõrge (720p)</string>
+    <string name="cancelled">katkestatud</string>
+    <string name="already_drafting_message">Sa juba oled koostamas sõnumit.</string>
+    <string name="feature_not_implemented">Funktsionaalsus pole implementeeritud</string>
+    <string name="invalid_country_code">Vigane riigikood</string>
+    <string name="choose_a_country">Vali riik</string>
+    <string name="phone_number">telefoninimber</string>
+    <string name="backup_started_message">Varundamine on alanud. Saad teavituse, kui ta on lõppenud.</string>
+    <string name="start_chat">Alusta vestlust</string>
+    <string name="pref_quick_action_summary">Asenda „Saada“ nupp kiirtoimingutega</string>
+    <string name="download_failed_could_not_connect">Allalaadimine ei õnnestunud: ühendus serveriga ei õnnestunud</string>
+    <string name="download_failed_could_not_write_file">Allalaadimine ei õnnestunud: faili salvestamine ei õnnestunud</string>
+    <string name="download_failed_invalid_file">Allalaadimine ei õnnestunud: vigane fail</string>
 </resources>
\ No newline at end of file

From c0b401aa580c807167e569f5cba9236e92575cb6 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 7 Oct 2024 12:58:11 +0200
Subject: [PATCH 041/357] do not purge offline messages when using bind 2

---
 .../conversations/xmpp/XmppConnection.java    |  5 ++-
 .../android/xmpp/processor/BindProcessor.java | 39 ++++++++++++-------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index aa2e8878cd4cfe4ddbed937fd5cecb939206e524..f6650abbfc6a84f866431ac3940e9ba68b526c24 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -2103,7 +2103,10 @@ public class XmppConnection implements Runnable {
             Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": server caps came from cache");
             disco.put(account.getDomain(), discoveryResult);
         }
-        discoverMamPreferences();
+        final var features = getFeatures();
+        if (!features.bind2()) {
+            discoverMamPreferences();
+        }
         sendServiceDiscoveryInfo(account.getJid().asBareJid());
         if (!requestDiscoItemsFirst) {
             sendServiceDiscoveryItems(account.getDomain());
diff --git a/src/main/java/im/conversations/android/xmpp/processor/BindProcessor.java b/src/main/java/im/conversations/android/xmpp/processor/BindProcessor.java
index bc8097fda6620d6f7a1e51cab4e529fb837eab28..1423df7f50239d8511b511e3cb25c94c5a9fdd2f 100644
--- a/src/main/java/im/conversations/android/xmpp/processor/BindProcessor.java
+++ b/src/main/java/im/conversations/android/xmpp/processor/BindProcessor.java
@@ -13,7 +13,6 @@ import im.conversations.android.xmpp.model.stanza.Iq;
 
 public class BindProcessor implements Runnable {
 
-
     private final XmppConnectionService service;
     private final Account account;
 
@@ -26,15 +25,22 @@ public class BindProcessor implements Runnable {
     public void run() {
         final XmppConnection connection = account.getXmppConnection();
         service.cancelAvatarFetches(account);
-        final boolean loggedInSuccessfully = account.setOption(Account.OPTION_LOGGED_IN_SUCCESSFULLY, true);
-        final boolean gainedFeature = account.setOption(Account.OPTION_HTTP_UPLOAD_AVAILABLE, connection.getFeatures().httpUpload(0));
+        final boolean loggedInSuccessfully =
+                account.setOption(Account.OPTION_LOGGED_IN_SUCCESSFULLY, true);
+        final boolean gainedFeature =
+                account.setOption(
+                        Account.OPTION_HTTP_UPLOAD_AVAILABLE,
+                        connection.getFeatures().httpUpload(0));
         if (loggedInSuccessfully || gainedFeature) {
             service.databaseBackend.updateAccount(account);
         }
 
         if (loggedInSuccessfully) {
             if (!TextUtils.isEmpty(account.getDisplayName())) {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": display name wasn't empty on first log in. publishing");
+                Log.d(
+                        Config.LOGTAG,
+                        account.getJid().asBareJid()
+                                + ": display name wasn't empty on first log in. publishing");
                 service.publishDisplayName(account);
             }
         }
@@ -49,7 +55,6 @@ public class BindProcessor implements Runnable {
         service.getJingleConnectionManager().notifyRebound(account);
         service.getQuickConversationsService().considerSyncBackground(false);
 
-
         connection.fetchRoster();
 
         if (connection.getFeatures().bookmarks2()) {
@@ -61,18 +66,25 @@ public class BindProcessor implements Runnable {
         if (connection.getFeatures().mds()) {
             service.fetchMessageDisplayedSynchronization(account);
         } else {
-            Log.d(Config.LOGTAG,account.getJid()+": server has no support for mds");
+            Log.d(Config.LOGTAG, account.getJid() + ": server has no support for mds");
         }
-        final boolean flexible = connection.getFeatures().flexibleOfflineMessageRetrieval();
+        final var features = connection.getFeatures();
+        final boolean bind2 = features.bind2();
+        final boolean flexible = features.flexibleOfflineMessageRetrieval();
         final boolean catchup = service.getMessageArchiveService().inCatchup(account);
         final boolean trackOfflineMessageRetrieval;
-        if (flexible && catchup && connection.isMamPreferenceAlways()) {
+        if (!bind2 && flexible && catchup && connection.isMamPreferenceAlways()) {
             trackOfflineMessageRetrieval = false;
-            connection.sendIqPacket(IqGenerator.purgeOfflineMessages(), (packet) -> {
-                if (packet.getType() == Iq.Type.RESULT) {
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": successfully purged offline messages");
-                }
-            });
+            connection.sendIqPacket(
+                    IqGenerator.purgeOfflineMessages(),
+                    (packet) -> {
+                        if (packet.getType() == Iq.Type.RESULT) {
+                            Log.d(
+                                    Config.LOGTAG,
+                                    account.getJid().asBareJid()
+                                            + ": successfully purged offline messages");
+                        }
+                    });
         } else {
             trackOfflineMessageRetrieval = true;
         }
@@ -85,6 +97,5 @@ public class BindProcessor implements Runnable {
         service.syncDirtyContacts(account);
 
         service.getUnifiedPushBroker().renewUnifiedPushEndpointsOnBind(account);
-
     }
 }

From c31fa2024970fcddbd479073a750438883a42775 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 8 Oct 2024 09:34:07 +0200
Subject: [PATCH 042/357] hide UP settings when default push server is empty

---
 .../ui/fragment/settings/MainSettingsFragment.java           | 4 +++-
 src/main/res/xml/preferences_main.xml                        | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/fragment/settings/MainSettingsFragment.java b/src/main/java/eu/siacs/conversations/ui/fragment/settings/MainSettingsFragment.java
index 4ab8ade3ceb472b2762017306aacda450ab2e82c..a335b724c4d9651d06b31e1183a0d2cb2fd4e1db 100644
--- a/src/main/java/eu/siacs/conversations/ui/fragment/settings/MainSettingsFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/fragment/settings/MainSettingsFragment.java
@@ -18,7 +18,8 @@ public class MainSettingsFragment extends PreferenceFragmentCompat {
         setPreferencesFromResource(R.xml.preferences_main, rootKey);
         final var about = findPreference("about");
         final var connection = findPreference("connection");
-        if (about == null || connection == null) {
+        final var up = findPreference("up");
+        if (about == null || connection == null || up == null) {
             throw new IllegalStateException(
                     "The preference resource file is missing some preferences");
         }
@@ -35,6 +36,7 @@ public class MainSettingsFragment extends PreferenceFragmentCompat {
         if (ConnectionSettingsFragment.hideChannelDiscovery()) {
             connection.setSummary(R.string.pref_connection_summary);
         }
+        up.setVisible(!Strings.isNullOrEmpty(getString(R.string.default_push_server)));
     }
 
     @Override
diff --git a/src/main/res/xml/preferences_main.xml b/src/main/res/xml/preferences_main.xml
index 013f2506cd98a685155e200d0eae5dc16a032ec5..a1bd6fde1723fdd3b6b60272ccf03b5dfa42bde7 100644
--- a/src/main/res/xml/preferences_main.xml
+++ b/src/main/res/xml/preferences_main.xml
@@ -35,11 +35,12 @@
     <Preference
         android:icon="@drawable/ic_archive_24dp"
         android:key="backup"
-        app:fragment="eu.siacs.conversations.ui.fragment.settings.BackupSettingsFragment"
         android:summary="@string/pref_backup_summary"
-        android:title="@string/backup" />
+        android:title="@string/backup"
+        app:fragment="eu.siacs.conversations.ui.fragment.settings.BackupSettingsFragment" />
     <Preference
         android:icon="@drawable/ic_cloud_sync_24dp"
+        android:key="up"
         app:fragment="eu.siacs.conversations.ui.fragment.settings.UpSettingsFragment"
         app:summary="@string/unified_push_summary"
         app:title="@string/unified_push_distributor" />

From c01a1f01ddf1136b1115aedd3ef668ebc502d341 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 8 Oct 2024 17:54:41 +0200
Subject: [PATCH 043/357] version bump to 2.17.0 + changelog

---
 build.gradle                                           | 6 +++---
 fastlane/metadata/android/en-US/changelogs/4212104.txt | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/4212104.txt

diff --git a/build.gradle b/build.gradle
index 3b459f7390287c321089116cf80fdd4c0febcc6a..1acf698171fc90db1c8c7837ff1d93bc44870856 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ dependencies {
 
     implementation 'androidx.viewpager:viewpager:1.0.0'
 
-    playstoreImplementation('com.google.firebase:firebase-messaging:24.0.1') {
+    playstoreImplementation('com.google.firebase:firebase-messaging:24.0.2') {
         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'
@@ -100,8 +100,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 42120
-        versionName "2.17.0-beta.2"
+        versionCode 42121
+        versionName "2.17.0"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/4212104.txt b/fastlane/metadata/android/en-US/changelogs/4212104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f4c551c06919a689142583fbf1cd60fa7c83d5ef
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/4212104.txt
@@ -0,0 +1 @@
+* Support Message Reactions

From fb7f0ceef26022656f600dc96f1a343a04173760 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 12 Oct 2024 00:05:57 +0200
Subject: [PATCH 044/357] add TODOs for camera permission

---
 .../java/eu/siacs/conversations/ui/ContactDetailsActivity.java  | 1 +
 .../java/eu/siacs/conversations/ui/EditAccountActivity.java     | 1 +
 .../eu/siacs/conversations/ui/StartConversationActivity.java    | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 80b82763c4805a5768bc7c1c3c822a3ceb75a838..5eb368b7e8c38e32ab10463610faabe0a2894ddd 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -258,6 +258,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
 
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        // TODO check for Camera / Scan permission
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (grantResults.length > 0)
             if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 0e710eaed96d083449b127829ef68ea57202b262..e76bfb3e64ef72ec85258590463c393e1b55057b 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -562,6 +562,7 @@ public class EditAccountActivity extends OmemoActivity
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        // TODO check for Camera / Scan permission
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == REQUEST_BATTERY_OP || requestCode == REQUEST_DATA_SAVER) {
             updateAccountInformation(mAccount == null);
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index e086b3bbb7a50d3ba2deae68b9b518f8652e949f..a8a0cb05886823fceeafec4f9005d92f204a1c64 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -974,7 +974,7 @@ public class StartConversationActivity extends XmppActivity
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (grantResults.length > 0)
             if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                ScanActivity.onRequestPermissionResult(this, requestCode, grantResults);
+                UriHandlerActivity.onRequestPermissionResult(this, requestCode, grantResults);
                 if (requestCode == REQUEST_SYNC_CONTACTS && xmppConnectionServiceBound) {
                     if (QuickConversationsService.isQuicksy()) {
                         setRefreshing(true);

From d10bb20f6b0057686a69a2874576e47911d72fd9 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 12 Oct 2024 00:06:16 +0200
Subject: [PATCH 045/357] add occupant ids to doap file

---
 conversations.doap | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/conversations.doap b/conversations.doap
index 58ff08a9712f12bfe9a2ee91dbcdff12f81cf1f0..653cb9fc7ba55acda35529294365055fb3b7c153 100644
--- a/conversations.doap
+++ b/conversations.doap
@@ -460,6 +460,14 @@
             <xmpp:version>0.2.0</xmpp:version>
         </xmpp:SupportedXep>
     </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0421.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.2.0</xmpp:version>
+            <xmpp:since>2.17.0</xmpp:since>
+        </xmpp:SupportedXep>
+    </implements>
     <implements>
         <xmpp:SupportedXep>
             <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0440.html"/>

From fb5a160f1d36d3a805f72ce78b0f65be095801da Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Tue, 8 Oct 2024 17:17:47 +0000
Subject: [PATCH 046/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 80 +++++++++++++++---------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 97bf11a8604a76a8d78519f40e300e916c48c885..dad1c9b39a2fa48d4fb922dd65e7e8426f971f70 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -41,7 +41,7 @@
     <string name="moderator">Модератор</string>
     <string name="participant">Участник</string>
     <string name="visitor">Посетитель</string>
-    <string name="remove_contact_text">Удалить %s из своего списка контактов? Чат с этим контактом удалён не будет.</string>
+    <string name="remove_contact_text">Удалить %s из своего списка контактов? Беседа с этим контактом удалена не будет.</string>
     <string name="block_contact_text">Заблокировать дальнейшие сообщения от %s?</string>
     <string name="unblock_contact_text">Разблокировать пользователя %s?</string>
     <string name="block_domain_text">Заблокировать всех пользователей домена %s?</string>
@@ -79,7 +79,7 @@
     <string name="preparing_images">Подготовка к передаче изображений</string>
     <string name="sharing_files_please_wait">Обмен файлами. Подождите…</string>
     <string name="action_clear_history">Очистить историю</string>
-    <string name="clear_conversation_history">Очистить историю чата</string>
+    <string name="clear_conversation_history">Очистить историю</string>
     <string name="clear_histor_msg">Удалить все сообщения в этой беседе? 
 \n 
 \n<b>Внимание:</b> данная операция не повлияет на сообщения, хранящиеся на других устройствах или серверах.</string>
@@ -93,7 +93,7 @@
     <string name="send_message_to_x">Сообщение для %s</string>
     <string name="send_omemo_x509_message">v\\Зашифрованное OMEMO сообщение</string>
     <string name="your_nick_has_been_changed">Используется новое имя</string>
-    <string name="send_unencrypted">Отправить чистый текст</string>
+    <string name="send_unencrypted">Отправить в незашифрованном виде</string>
     <string name="decryption_failed">Расшифровка невозможна. Вероятно, у вас нет надлежащего ключа.</string>
     <string name="openkeychain_required">Установите OpenKeychain</string>
     <string name="openkeychain_required_long"><![CDATA[%1$s использует <b>OpenKeychain</b> для шифрования и дешифрования сообщений и управления открытыми ключами.<br><br>OpenKeychain распространяется под лицензией GPLv3+ и доступна для загрузки через F-Droid или Google Play.<br><br><small>(Потребуется перезапуск %1$s после установки.)</small>]]></string>
@@ -171,7 +171,7 @@
     <string name="account_status_incompatible_server">Несовместимый сервер</string>
     <string name="account_status_stream_error">Ошибка потока</string>
     <string name="account_status_stream_opening_error">Ошибка открытия потока</string>
-    <string name="encryption_choice_unencrypted">Чистый текст</string>
+    <string name="encryption_choice_unencrypted">Без шифра</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
@@ -179,12 +179,12 @@
     <string name="mgmt_account_disable">Временно отключить</string>
     <string name="mgmt_account_publish_avatar">Разместить аватар</string>
     <string name="mgmt_account_publish_pgp">Анонсировать ключ OpenPGP</string>
-    <string name="unpublish_pgp">Удалить открытый ключ OpenPGP</string>
+    <string name="unpublish_pgp">Удалить публичный ключ OpenPGP</string>
     <string name="unpublish_pgp_message">Удалить ваш публичный ключ OpenPGP из опубликованных?
 \nВаши собеседники не смогут больше отправлять вам зашифрованные OpenPGP сообщения.</string>
     <string name="openpgp_has_been_published">Публичный ключ OpenPGP опубликован.</string>
     <string name="mgmt_account_enable">Включить аккаунт</string>
-    <string name="mgmt_account_delete_confirm_text">Удалить свой аккаунт? Удаление аккаунта также сотрёт все истории диалогов.</string>
+    <string name="mgmt_account_delete_confirm_text">Удалить свой аккаунт? Удаление аккаунта также сотрёт все беседы.</string>
     <string name="attach_record_voice">Запись голоса</string>
     <string name="account_settings_jabber_id">XMPP-адрес</string>
     <string name="block_jabber_id">Заблокировать XMPP-адрес</string>
@@ -206,7 +206,7 @@
     <string name="server_info_push">XEP-0357: push-уведомления</string>
     <string name="server_info_available">доступно</string>
     <string name="server_info_unavailable">недоступно</string>
-    <string name="missing_public_keys">Отсутствие анонсирования открытых ключей</string>
+    <string name="missing_public_keys">Отсутствие анонсирования публичных ключей</string>
     <string name="last_seen_now">Присутствие: только что</string>
     <string name="last_seen_min">Присутствие: минуту назад</string>
     <string name="last_seen_mins">Присутствие: %d мин. назад</string>
@@ -256,7 +256,7 @@
     <string name="leave">Покинуть</string>
     <string name="contact_added_you">Собеседник добавил вас в список контактов</string>
     <string name="add_back">Добавить в ответ</string>
-    <string name="contact_has_read_up_to_this_point">%s прочитал до этого момента</string>
+    <string name="contact_has_read_up_to_this_point">%s прочитал(а) до этого момента</string>
     <string name="contacts_have_read_up_to_this_point">%s прочитали до этого момента</string>
     <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s + ещё %2$d прочитали до этого момента</string>
     <string name="everyone_has_read_up_to_this_point">Все прочитали сообщения до этого момента</string>
@@ -266,7 +266,7 @@
     <string name="error_publish_avatar_server_reject">Сервер отклонил размещение аватара</string>
     <string name="error_publish_avatar_converting">Невозможно преобразовать вашу фотографию</string>
     <string name="error_saving_avatar">Невозможно сохранить аватар</string>
-    <string name="or_long_press_for_default">(Или долгое прикосновение, чтобы вернуть значения по умолчанию)</string>
+    <string name="or_long_press_for_default">(Или долгое нажатие, чтобы вернуть значения по умолчанию)</string>
     <string name="error_publish_avatar_no_server_support">Ваш сервер не поддерживает публикацию аватаров</string>
     <string name="private_message">шёпотом</string>
     <string name="private_message_to">отправить %s</string>
@@ -351,7 +351,7 @@
     <string name="cancel_transmission">Отменить передачу</string>
     <string name="file_transmission_failed">передача файла не выполнена</string>
     <string name="file_transmission_cancelled">передача файла отменена</string>
-    <string name="file_deleted">Файл был удалён</string>
+    <string name="file_deleted">Файл удалён</string>
     <string name="no_application_found_to_open_file">Не найдено приложения для открытия файла</string>
     <string name="no_application_found_to_open_link">Не найдено приложения, способного открыть эту ссылку</string>
     <string name="no_application_found_to_view_contact">Не найдено приложения для просмотра контакта</string>
@@ -392,11 +392,11 @@
     <string name="remove_admin_privileges">Снять административные права</string>
     <string name="grant_owner_privileges">Назначить владельцем</string>
     <string name="remove_owner_privileges">Снять права владельца</string>
-    <string name="remove_from_room">Убрать из конференции</string>
-    <string name="remove_from_channel">Исключить</string>
+    <string name="remove_from_room">Исключить из конференции</string>
+    <string name="remove_from_channel">Исключить из канала</string>
     <string name="could_not_change_affiliation">Невозможно изменить принадлежность %s</string>
     <string name="ban_from_conference">Заблокировать в конференции</string>
-    <string name="ban_from_channel">Заблокировать</string>
+    <string name="ban_from_channel">Заблокировать в канале</string>
     <string name="removing_from_public_conference">Вы пытаетесь исключить %s из публичного канала. Единственный способ это сделать — навсегда заблокировать этого пользователя. </string>
     <string name="ban_now">Заблокировать</string>
     <string name="could_not_change_role">Невозможно сменить роль %s</string>
@@ -430,7 +430,7 @@
     <string name="offering_x_file">Предложен %s</string>
     <string name="hide_offline">Скрыть не в сети</string>
     <string name="contact_is_typing">%s печатает…</string>
-    <string name="contact_has_stopped_typing">%s перестал печатать</string>
+    <string name="contact_has_stopped_typing">%s перестал(а) печатать</string>
     <string name="contacts_are_typing">%s печатают…</string>
     <string name="contacts_have_stopped_typing">%s перестали печатать</string>
     <string name="pref_chat_states">Оповещения о наборе</string>
@@ -439,8 +439,8 @@
     <string name="show_location">Показать местоположение</string>
     <string name="no_application_found_to_display_location">Не найдено приложения для отображения местоположения</string>
     <string name="location">Местоположение</string>
-    <string name="title_undo_swipe_out_group_chat">Покинул приватную конференцию</string>
-    <string name="title_undo_swipe_out_channel">Покинул публичный канал</string>
+    <string name="title_undo_swipe_out_group_chat">Покинул(а) приватную конференцию</string>
+    <string name="title_undo_swipe_out_channel">Покинул(а) публичный канал</string>
     <string name="pref_dont_trust_system_cas_title">Не доверять системным УЦ</string>
     <string name="pref_dont_trust_system_cas_summary">Все сертификаты должны быть подтверждены вручную</string>
     <string name="pref_remove_trusted_certificates_title">Удалить сертификаты</string>
@@ -461,7 +461,7 @@
     <string name="choose_quick_action">Выбрать быстрое действие</string>
     <string name="search_contacts">Поиск контактов</string>
     <string name="send_private_message">Отправить личное сообщение</string>
-    <string name="user_has_left_conference">%1$s покинул конференцию</string>
+    <string name="user_has_left_conference">%1$s покинул(а) конференцию</string>
     <string name="username">Имя пользователя</string>
     <string name="username_hint">Имя пользователя</string>
     <string name="invalid_username">Недопустимое имя пользователя</string>
@@ -494,7 +494,7 @@
     <string name="certificate_chain_is_not_trusted">Ненадёжная цепь сертификатов</string>
     <string name="jid_does_not_match_certificate">XMPP-адрес не соответствует сертификату</string>
     <string name="action_renew_certificate">Обновить сертификат</string>
-    <string name="error_fetching_omemo_key">Ошибка при получении OMEMO-ключа!</string>
+    <string name="error_fetching_omemo_key">Ошибка при получении ключа OMEMO!</string>
     <string name="verified_omemo_key_with_certificate">Ключ OMEMO проверен с сертификатом!</string>
     <string name="device_does_not_support_certificates">Ваше устройство не поддерживает выбор клиентских сертификатов!</string>
     <string name="pref_connection_options">Подключение</string>
@@ -531,7 +531,7 @@
     <string name="pref_picture_compression_summary">Подсказка: используйте \"Выбрать файл\" вместо \"Выбрать изображение\", чтобы отправлять изображения в несжатом виде, независимо от этой настройки.</string>
     <string name="always">Всегда</string>
     <string name="large_images_only">Только большие изображения</string>
-    <string name="battery_optimizations_enabled">Оптимизации энергопотребления разрешены</string>
+    <string name="battery_optimizations_enabled">Включена оптимизация энергопотребления</string>
     <string name="battery_optimizations_enabled_explained">Ваше устройство использует агрессивную оптимизацию энергопотребления %1$s, что может привести к задержке уведомлений и даже потере сообщений.
 \nРекомендуется её отключить.</string>
     <string name="battery_optimizations_enabled_dialog">Ваше устройство использует агрессивную оптимизацию энергопотребления %1$s, что может привести к задержке уведомлений и даже потере сообщений.
@@ -706,7 +706,7 @@
     <string name="mtm_accept_cert">Принять неизвестный сертификат?</string>
     <string name="mtm_trust_anchor">Этот сертификат сервера не подписан ни одним из известных центров сертификации.</string>
     <string name="mtm_accept_servername">Принять несовпадающее имя сервера?</string>
-    <string name="mtm_hostname_mismatch">Сервер может аутентифицироваться в качестве \"%s\". Сертификат подходит только для:</string>
+    <string name="mtm_hostname_mismatch">Сервер не может аутентифицироваться в качестве \"%s\". Сертификат подходит только для:</string>
     <string name="mtm_connect_anyway">Всё равно подключиться?</string>
     <string name="mtm_cert_details">Детали сертификата:</string>
     <string name="once">Один раз</string>
@@ -716,18 +716,18 @@
     <string name="edit_status_message_title">Изменить статусное сообщение</string>
     <string name="edit_status_message">Изменить статусное сообщение</string>
     <string name="disable_encryption">Отключить шифрование</string>
-    <string name="error_trustkey_general">%1$s может отправить зашифрованные сообщения для %2$s. Причиной этому может быть использование получателем устаревшего сервера или клиента, которые не поддерживают OMEMO.</string>
+    <string name="error_trustkey_general">%1$s не может отправить зашифрованные сообщения для %2$s. Причиной этому может быть использование получателем устаревшего сервера или клиента, которые не поддерживают OMEMO.</string>
     <string name="error_trustkey_device_list">Невозможно получить список устройств</string>
     <string name="error_trustkey_bundle">Невозможно получить ключи шифрования</string>
     <string name="error_trustkey_hint_mutual">Подсказка: в некоторых случаях это может исправлено добавлением друг друга в список контактов.</string>
-    <string name="disable_encryption_message">Выключить OMEMO-шифрование для этого чата?
+    <string name="disable_encryption_message">Выключить OMEMO-шифрование для этой беседы?
 \nЭто позволит администратору сервера читать ваши сообщения, но также это может быть единственным способом связи с людьми, использующими устаревшие клиенты.</string>
     <string name="disable_now">Отключить сейчас</string>
     <string name="draft">Черновик:</string>
     <string name="pref_omemo_setting">OMEMO-шифрование</string>
-    <string name="pref_omemo_setting_summary_always">OMEMO будет всегда использоваться для одиночных бесед и закрытых конференций.</string>
-    <string name="pref_omemo_setting_summary_default_on">OMEMO будет использоваться по умолчанию для новых чатов.</string>
-    <string name="pref_omemo_setting_summary_default_off">OMEMO нужно будет явно включать для новых чатов.</string>
+    <string name="pref_omemo_setting_summary_always">OMEMO будет всегда использоваться для одиночных бесед и приватных конференций.</string>
+    <string name="pref_omemo_setting_summary_default_on">OMEMO будет использоваться по умолчанию для новых бесед.</string>
+    <string name="pref_omemo_setting_summary_default_off">OMEMO нужно будет явно включать для новых бесед.</string>
     <string name="create_shortcut">Создать ярлык</string>
     <string name="default_on">Включено по умолчанию</string>
     <string name="default_off">Выключено по умолчанию</string>
@@ -748,7 +748,7 @@
     <string name="no_microphone_permission">Предоставить %1$s разрешение на использование микрофона</string>
     <string name="search_messages">Поиск сообщений</string>
     <string name="gif">GIF</string>
-    <string name="view_conversation">Посмотреть чат</string>
+    <string name="view_conversation">Посмотреть беседу</string>
     <string name="pref_use_share_location_plugin">Расширение для обмена информацией о местонахождении</string>
     <string name="pref_use_share_location_plugin_summary">Использовать расширение для обмена информацией о местонахождении вместо встроенной карты</string>
     <string name="copy_link">Копировать ссылку</string>
@@ -757,7 +757,7 @@
     <string name="pref_start_search">Быстрый поиск</string>
     <string name="pref_start_search_summary">На экране новой беседы открывать клавиатуру и ставить курсор в поле поиска</string>
     <string name="group_chat_avatar">Аватар конференции</string>
-    <string name="host_does_not_support_group_chat_avatars">Сервер не поддерживает наличие аватар у конференций</string>
+    <string name="host_does_not_support_group_chat_avatars">Сервер не поддерживает наличие аватаров у конференций</string>
     <string name="only_the_owner_can_change_group_chat_avatar">Только владелец может менять аватар конференции</string>
     <string name="contact_name">Имя контакта</string>
     <string name="nickname">Имя</string>
@@ -788,7 +788,7 @@
     <string name="media_browser">Просмотр медиафайлов</string>
     <string name="security_violation_not_attaching_file">Файл не прикреплён из соображений безопасности.</string>
     <string name="pref_video_compression">Качество видео</string>
-    <string name="pref_video_compression_summary">Чем ниже качество, тем меньше объем файлов</string>
+    <string name="pref_video_compression_summary">Чем ниже качество, тем меньше размер файлов</string>
     <string name="video_360p">Среднее (360p)</string>
     <string name="video_720p">Высокое (720р)</string>
     <string name="cancelled">отменено</string>
@@ -859,7 +859,7 @@
     <string name="enter_jabber_id">Введите XMPP-адрес</string>
     <string name="create_group_chat">Создать конференцию</string>
     <string name="join_public_channel">Присоединиться к каналу</string>
-    <string name="create_private_group_chat">Создать закрытую конференцию</string>
+    <string name="create_private_group_chat">Создать приватную конференцию</string>
     <string name="create_public_channel">Создать публичный канал</string>
     <string name="create_dialog_channel_name">Название канала</string>
     <string name="xmpp_address">XMPP-адрес</string>
@@ -883,7 +883,7 @@
     <string name="no_users_hint_group_chat">У этой приватной конференции нет участников.</string>
     <string name="manage_permission">Управление правами</string>
     <string name="search_participants">Поиск участников</string>
-    <string name="file_too_large">Объём файла слишком велик</string>
+    <string name="file_too_large">Размер файла слишком велик</string>
     <string name="attach">Прикрепить</string>
     <string name="discover_channels">Найти каналы</string>
     <string name="search_channels">Поиск каналов</string>
@@ -904,7 +904,7 @@
     <string name="unable_to_perform_this_action">Невозможно совершить это действие</string>
     <string name="open_join_dialog">Присоединиться к публичному каналу…</string>
     <string name="sharing_application_not_grant_permission">Приложение для обмена не предоставило право доступа к этому файлу.</string>
-    <string name="group_chats_and_channels"><![CDATA[Группы и каналы]]></string>
+    <string name="group_chats_and_channels">Конференции и каналы</string>
     <string name="jabber_network">jabber.network</string>
     <string name="local_server">Локальный сервер</string>
     <string name="pref_channel_discovery_summary">Большинству пользователей следует выбрать \"jabber.network\" для получения наиболее подходящих предложений от всей публичной экосистемы XMPP.</string>
@@ -947,8 +947,8 @@
     <string name="remove_from_favorites">Открепить</string>
     <string name="gpx_track">GPX-трек</string>
     <string name="could_not_correct_message">Невозможно исправить сообщение</string>
-    <string name="search_all_conversations">Все чаты</string>
-    <string name="search_this_conversation">Этот чат</string>
+    <string name="search_all_conversations">Все беседы</string>
+    <string name="search_this_conversation">Эта беседа</string>
     <string name="your_avatar">Ваш аватар</string>
     <string name="avatar_for_x">Аватар для %s</string>
     <string name="encrypted_with_omemo">Зашифровано с помощью OMEMO</string>
@@ -988,7 +988,7 @@
         <item quantity="other">%d пропущенных вызовов</item>
     </plurals>
     <string name="account_status_incompatible_client">Несовместимый клиент</string>
-    <string name="group_chats">Групповые беседы</string>
+    <string name="group_chats">Конференции</string>
     <string name="multimedia_file">файл мультимедиа</string>
     <string name="continue_btn">Продолжить</string>
     <string name="pref_up_push_server_title">Сервер уведомлений</string>
@@ -997,7 +997,7 @@
     <string name="rtp_state_reconnecting">Переподключение</string>
     <string name="no_xmpp_adddress_found">Адрес XMPP не найден</string>
     <string name="pref_up_push_account_title">Аккаунт XMPP</string>
-    <string name="conference_technical_problems">Вы покинули данный групповой чат по техническим причинам</string>
+    <string name="conference_technical_problems">Вы покинули эту конференцию по техническим причинам</string>
     <string name="rtp_state_content_add">Добавить дополнительные треки\?</string>
     <string name="reconnecting_call">Переподключение к звонку</string>
     <string name="reconnecting_video_call">Переподключение к видеовызову</string>
@@ -1012,8 +1012,8 @@
     <string name="delete_from_server">Удалить аккаунт на сервере</string>
     <string name="pref_autojoin">Синхронизировать закладки</string>
     <string name="pref_autojoin_summary">Устанавливать флаг \"автоприсоединение\" при входе и выходе из MUC, и реагировать на изменения от других клиентов.</string>
-    <string name="search_group_chats">Поиск по групповым беседам</string>
-    <string name="download_failed_invalid_file">Загрузка неудачна: Неизвестный файл</string>
+    <string name="search_group_chats">Поиск по конференциям</string>
+    <string name="download_failed_invalid_file">Загрузка не выполнена: файл испорчен</string>
     <string name="rtp_state_content_add_video">Перейти на видеовызов\?</string>
     <string name="outgoing_call_duration_timestamp">Исходящий вызов (%s) · %s</string>
     <string name="incoming_call_duration_timestamp">Входящий вызов (%s) · %s</string>
@@ -1055,8 +1055,8 @@
     <string name="call_integration_not_available">Интеграция вызовов недоступна!</string>
     <string name="no_permission_to_place_call">Нет разрешения на телефонный звонок</string>
     <string name="remove_bookmark">Удалить закладку для \"%s\"?</string>
-    <string name="delete_and_close">Архивировать и удалить чат</string>
-    <string name="remove_bookmark_and_close">Удалить закладку для %s и архивировать чат?</string>
+    <string name="delete_and_close">Архивировать и удалить беседу</string>
+    <string name="remove_bookmark_and_close">Удалить закладку для %s и архивировать беседу?</string>
     <string name="pref_send_crash_reports">Отправлять отчёты о сбоях</string>
     <string name="switch_to_chat">Перейти к беседе</string>
     <string name="pref_summary_appearance">Тема, цвета, снимки, ввод</string>
@@ -1103,7 +1103,7 @@
     <string name="pref_title_trust_system_ca_store_summary">Доверять сертификатам системных УЦ</string>
     <string name="pref_connection_summary_w_cd">Имя хоста и порт, Tor, обзор каналов</string>
     <string name="allow_private_messages">Разрешить личные сообщения</string>
-    <string name="pref_accept_invites_from_strangers_summary">Принимать приглашения в групповые беседы от неизвестных</string>
+    <string name="pref_accept_invites_from_strangers_summary">Принимать приглашения в конференции от неизвестных</string>
     <string name="unsupported_operation">Операция не поддерживается</string>
     <string name="pref_fullscreen_notification">Полноэкранные уведомления</string>
     <string name="pref_backup_recurring">Регулярные резервные копии</string>

From af068422f2f7e15bddfcd98b3ecc0698404a0600 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Fri, 11 Oct 2024 04:25:03 +0000
Subject: [PATCH 047/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index dad1c9b39a2fa48d4fb922dd65e7e8426f971f70..7d199d15d362cef67ab1b3367d36349c916d3c73 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -88,7 +88,7 @@
 \n 
 \n<b>Предупреждение:</b> данная операция не удалит копии файла, хранящиеся на других устройствах или серверах. </string>
     <string name="choose_presence">Выберите устройство</string>
-    <string name="send_unencrypted_message">Отправить сообщение без шифрования</string>
+    <string name="send_unencrypted_message">Отправить без шифрования</string>
     <string name="send_message">Сообщение</string>
     <string name="send_message_to_x">Сообщение для %s</string>
     <string name="send_omemo_x509_message">v\\Зашифрованное OMEMO сообщение</string>
@@ -1085,7 +1085,7 @@
     <string name="pref_automatic_download">Автоматическое скачивание</string>
     <string name="appearance">Внешний вид</string>
     <string name="pref_title_interface">Интерфейс</string>
-    <string name="pref_light_dark_mode">Светлый/тёмный режим</string>
+    <string name="pref_light_dark_mode">Светлая/тёмная тема</string>
     <string name="pref_allow_screenshots_summary">Отображать содержимое экрана приложения в переключателе и разрешить делать снимки экрана</string>
     <string name="pref_category_e2ee">Сквозное шифрование</string>
     <string name="pref_title_trust_system_ca_store">Удостоверяющие центры</string>

From e75ae65ba1a810e672352644c7af5a2cfaf61df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Thu, 10 Oct 2024 21:33:27 +0000
Subject: [PATCH 048/357] Translated using Weblate (Estonian)

Currently translated at 64.4% (672 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 118 ++++++++++++++++++++++++++++-
 1 file changed, 116 insertions(+), 2 deletions(-)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 4bdac3546c9feb85eb6dc67a16f45437e446b53d..c43ccf179262fa4064eebc0df35a0b8ad941f97a 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -329,7 +329,7 @@
     <string name="jid_does_not_match_certificate">XMPP-aadress ei vasta sertifikaadile</string>
     <string name="hostname_or_onion">Serveri või .onion-teenuse aadress</string>
     <string name="secure_password_generated">Tekitasime turvalise salasõna</string>
-    <string name="no_keys_just_confirm">Sa juba oled usaldanud selle kasutaja sõrmejälge. Valides „Done“ sa vaid kinnitad, et %s osaleb selles vestlusrühmas.</string>
+    <string name="no_keys_just_confirm">Sa juba oled usaldanud selle kasutaja sõrmejälge. Valides „Valmis“ sa vaid kinnitad, et %s osaleb selles vestlusrühmas.</string>
     <string name="registration_password_too_weak">Registreerimine ei õnnestunud: salasõna on liiga nõrk</string>
     <string name="creating_conference">Loome vestlusrühma…</string>
     <string name="group_chat_avatar">Vestlusrühma profiilipilt</string>
@@ -342,7 +342,7 @@
     <string name="only_the_owner_can_change_group_chat_avatar">Vaid omanik võib muuta vestlusrühma profiilipilte</string>
     <string name="contact_name">Kontakti nimi</string>
     <string name="set_profile_picture">Conversationsi profiilipilt</string>
-    <string name="enter_password_to_restore">Varukoopia taastamiseks sisesta %s kasutajakonto salasõna.</string>
+    <string name="enter_password_to_restore">Varukoopiast taastamiseks sisesta %s kasutajakonto salasõna.</string>
     <string name="enter_your_name_instructions">Selleks, et need, kellel pole sind oma aadressiraamatus, saaksid teada, kes sa oled, siis palun lisa oma nimi.</string>
     <string name="group_chat_will_make_your_jabber_id_public">See kanal teeb sinu XMPP-aadressi avalikuks</string>
     <string name="enter_jabber_id">Sisesta XMPP-aadress</string>
@@ -586,4 +586,118 @@
     <string name="download_failed_could_not_connect">Allalaadimine ei õnnestunud: ühendus serveriga ei õnnestunud</string>
     <string name="download_failed_could_not_write_file">Allalaadimine ei õnnestunud: faili salvestamine ei õnnestunud</string>
     <string name="download_failed_invalid_file">Allalaadimine ei õnnestunud: vigane fail</string>
+    <string name="clear_other_devices_desc">Kas sa oled kindel, et soovid eemaldada OMEMO-levitusest kõik muud seadmed? Kui sinu seadmed järgmisel korral loovad ühenduse, siis nad levitavad sama teavitust uuesti, aga nad ei pruugi saada vahepeal saadetud sõnumeid.</string>
+    <string name="clear_other_devices">Eemalda seadmed</string>
+    <string name="error_no_keys_to_trust_server_error">Selle kontakti jaoks ei leidu ühtegi kasutatavat võtit.
+\nServerist uute võtmete laadimine ei õnnestunud. Kas vestluse teise osapoole serveriga võib midagi valesti olla?</string>
+    <string name="error_no_keys_to_trust_presence">Selle kontakti jaoks ei leidu ühtegi kasutatavat võtit.
+\nPalun kontrolli, et teil mõlemal on olekuteavituste kontrollimine sisse lülitatud.</string>
+    <string name="member">Osaleja</string>
+    <string name="unable_to_parse_certificate">Sertifikaadi sisu töötlemine ei õnnestunud</string>
+    <plurals name="x_messages">
+        <item quantity="one">%d sõnum</item>
+        <item quantity="other">%d sõnumit</item>
+    </plurals>
+    <string name="not_a_valid_port">See pole korrektne pordi number</string>
+    <string name="not_valid_hostname">See pole korrektne hosti nimi</string>
+    <string name="shared_file_with_x">Fail jagatud kasutajaga %s</string>
+    <string name="shared_image_with_x">Pilt jagatud kasutajaga %s</string>
+    <string name="shared_images_with_x">Pildid jagatud kasutajaga %s</string>
+    <string name="shared_text_with_x">Tekst jagatud kasutajaga %s</string>
+    <string name="security_error_invalid_file_access">Turvaviga: vale ligipääs failile!</string>
+    <string name="create_account">Loo kasutajakonto</string>
+    <string name="reject_request">Lükka päring tagasi</string>
+    <string name="install_orbot">Paigalda Orbot</string>
+    <string name="no_name_set_instructions">Oma nime lisamiseks või muutmiseks klõpsi nuppu „Muuda“.</string>
+    <string name="ebook">e-raamat</string>
+    <string name="create_dialog_channel_name">Kanali nimi</string>
+    <string name="unable_to_perform_this_action">Seda toimingut ei õnnestunud teha</string>
+    <string name="open_join_dialog">Liitu avaliku kanaliga…</string>
+    <string name="error_trustkeys_title">Midagi läks valesti</string>
+    <string name="no_role">Pole võrgus</string>
+    <string name="outcast">Hüljatu</string>
+    <string name="advanced_mode">Üksikasjalik seadistus</string>
+    <string name="grant_membership">Liikmelisuse lubamine</string>
+    <string name="remove_membership">Liikmelisuse keelamine</string>
+    <string name="grant_admin_privileges">Peakasutaja õiguste lubamine</string>
+    <string name="remove_admin_privileges">Peakasutaja õiguste keelamine</string>
+    <string name="grant_owner_privileges">Omaniku õiguste lubamine</string>
+    <string name="never">Mitte kunagi</string>
+    <string name="until_further_notice">Järgmise teadaandmiseni</string>
+    <string name="snooze">Lükka edasi</string>
+    <string name="reply">Vasta</string>
+    <string name="mark_as_read">Märgi loetuks</string>
+    <string name="pref_input_options">Sisend</string>
+    <string name="pref_enter_is_send">Sisestusklahv saadab</string>
+    <string name="pref_enter_is_send_summary">Kasuta sisestusklahvi saatmiseks. Lisaks toimib saatmiseks ka Ctrl+Enter, ka siis kui see valik pole kasutusel.</string>
+    <string name="none">Määramata</string>
+    <string name="recently_used">Viimatikasutatu</string>
+    <string name="choose_quick_action">Vali kiirtoiming</string>
+    <string name="search_contacts">Otsi kontakte</string>
+    <string name="pref_presence_settings">Saadavus</string>
+    <string name="account_status_tor_unavailable">Tori võrk pole saadaval</string>
+    <string name="account_status_bind_failure">Serveriga sidumine ei õnnestunud</string>
+    <string name="account_status_host_unknown">See server ei vastuta antud domeeni eest</string>
+    <string name="server_info_broken">Katki</string>
+    <string name="pref_away_when_screen_off">Seadme lukustumisel, määra olekuks „Eemal“</string>
+    <string name="pref_away_when_screen_off_summary">Kui seade on lukus, siis määra oma olekuks „Eemal“</string>
+    <string name="pref_dnd_on_silent_mode">Vaikse seadme puhul näita olekut „Hõivatud“</string>
+    <string name="pref_dnd_on_silent_mode_summary">Kui nutiseade on vaikses režiimis, siis näita oma olekuks „Hõivatud“</string>
+    <string name="pref_treat_vibrate_as_silent">Tõlgenda värinaalarmi kasutamist vaikse režiimina</string>
+    <string name="pref_treat_vibrate_as_dnd_summary">Kui nutiseade on värinaalarmi režiimis, siis näita oma olekuks „Hõivatud“</string>
+    <string name="pref_show_connection_options">Serveri hosti nimi ja pordi number</string>
+    <string name="pref_show_connection_options_summary">Kasutajakonto lisamisel näita täiendavaid ühenduse seadistusi</string>
+    <string name="hostname_example">xmpp.toredomeen.ee</string>
+    <string name="mam_prefs">Arhiveerimise eelistused</string>
+    <string name="fetching_mam_prefs">Laadime arhiveerimise eelistusi. Palun oota…</string>
+    <string name="unable_to_fetch_mam_prefs">Arhiveerimise eelistuste laadimine ei õnnestunud</string>
+    <string name="captcha_required">Robotilõksu lahendamine on vajalik</string>
+    <string name="captcha_hint">Sisesta tekst, mida näed ülal asuval pildil</string>
+    <string name="certificate_chain_is_not_trusted">Ebausaldusväärne sertifikaadiahel</string>
+    <string name="action_renew_certificate">Uuenda sertifikaati</string>
+    <string name="error_fetching_omemo_key">Viga OMEMO-võtme laadimisel!</string>
+    <string name="load_more_messages">Laadi veel sõnumeid</string>
+    <string name="verified_omemo_key_with_certificate">Verifitseerisime OMEMO-võtme sertifikaadiga!</string>
+    <string name="device_does_not_support_certificates">Sinu nutiseade ei toeta kliendipoolsete sertifikaatide valimist!</string>
+    <string name="pref_connection_options">Ühendus</string>
+    <string name="pref_use_tor">Ühenda Tori võrgu kaudu</string>
+    <string name="pref_use_tor_summary">Kasuta kõikideks ühendusteks tunnelit läbi Tori võrgu. Eeldab Orbot-rakenduse kasutamist</string>
+    <string name="account_settings_hostname">Hosti nimi</string>
+    <string name="account_settings_port">Pordi number</string>
+    <string name="connected_accounts">Kasutajakontosid: %2$d, neist ühendus olemas %1$d</string>
+    <string name="status_message">Olekuteade</string>
+    <string name="presence_chat">Vestlemiseks vaba</string>
+    <string name="presence_away">Eemal</string>
+    <string name="presence_dnd">Hõivatud</string>
+    <string name="presence_online">Võrgus</string>
+    <string name="use_own_provider">Kasuta minu valitud teenusepakkujat</string>
+    <string name="pick_your_username">Vali oma kasutajanimi</string>
+    <string name="pref_manually_change_presence">Halda saadavust käsitsi</string>
+    <string name="pref_manually_change_presence_summary">Olekuteate muutmisega seadista oma kättesaadavust.</string>
+    <string name="presence_xa">Pole saadaval</string>
+    <string name="this_account_is_disabled">Sa oled selle kasutajakonto välja lülitanud</string>
+    <string name="this_account_is_logged_out">Sa oled sellest kasutajakontost välja loginud</string>
+    <string name="choose_participants">Vali osalejad</string>
+    <string name="invite_again">Kutsu uuesti</string>
+    <string name="registration_please_wait">Registreerimine ei õnnestunud: palun proovi hiljem uuesti</string>
+    <string name="the_app_is_out_of_date">Sa kasutad rakenduse aegunud versiooni.</string>
+    <string name="update">Uuenda</string>
+    <string name="logged_in_with_another_device">See telefoninumber on hetkel sisselogitud ühes teises seadmes.</string>
+    <string name="video_original">Algne (pakkimata)</string>
+    <string name="open_with">Ava rakendusega…</string>
+    <string name="choose_account">Vali kasutajakonto</string>
+    <string name="restore_backup">Taasta varukoopiast</string>
+    <string name="restore">Taasta</string>
+    <string name="backup_channel_name">Varundus ja taastamine</string>
+    <string name="no_market_app_installed">Ühtegi rakendustepoodi pole paigaldatud.</string>
+    <string name="join_public_channel">Liitu avaliku kanaliga</string>
+    <string name="create_public_channel">Loo avalik kanal</string>
+    <string name="rtp_state_declined_or_busy">Hõivatud</string>
+    <string name="remove_from_favorites">Eemalda esiletõstetute hulgast</string>
+    <string name="gpx_track">GPX-rada</string>
+    <string name="could_not_correct_message">Sõnumi muutmine ei õnnestunud</string>
+    <string name="search_all_conversations">Kõik vestlused</string>
+    <string name="search_this_conversation">See vestlus</string>
+    <string name="pref_up_push_account_title">XMPP konto</string>
+    <string name="hide_notification">Peida teavitus</string>
 </resources>
\ No newline at end of file

From caff6859e3e0615cd53734b25710b5cf84acb9b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Fri, 11 Oct 2024 07:35:00 +0000
Subject: [PATCH 049/357] Translated using Weblate (Estonian)

Currently translated at 66.7% (696 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index c43ccf179262fa4064eebc0df35a0b8ad941f97a..011b8783037abe54f6c0c98809b3b18c479e275e 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -700,4 +700,31 @@
     <string name="search_this_conversation">See vestlus</string>
     <string name="pref_up_push_account_title">XMPP konto</string>
     <string name="hide_notification">Peida teavitus</string>
+    <string name="no_storage_permission">Anna rakendusele %1$s õigus kasutada välist andmeruumi</string>
+    <string name="pref_picture_compression">Piltide pakkimine ja tihendamine</string>
+    <string name="pref_picture_compression_summary">Vihje: sõltumata selle eelistuse olekust, kui soovid saata pilte algsel kujul, siis kasuta valikut „Vali fail“, mitte „Vali pilt“.</string>
+    <string name="always">Alati</string>
+    <string name="notify_never">Teavitused pole kasutusel</string>
+    <string name="notify_paused">Teavitused on peatatud</string>
+    <string name="large_images_only">Vaid suurte piltide puhul</string>
+    <string name="battery_optimizations_enabled">Akukasutuse optimeerimine on sisselülitatud</string>
+    <string name="battery_optimizations_enabled_explained">Sinu nutiseade kasutab hetkel %1$s rakenduse jaoks tõhusat akukasutuse optimeerimist ning see võib põhjustada nii sõnumite hiljem saabumist, kui kadumist.
+\nMe soovitame, et lülitad akukasutuse optimeerimise välja.</string>
+    <string name="battery_optimizations_enabled_dialog">Sinu nutiseade kasutab hetkel %1$s rakenduse jaoks tõhusat akukasutuse optimeerimist ning see võib põhjustada nii sõnumite hiljem saabumist, kui kadumist.
+\n
+\nJärgnevas palume, et lülitad akukasutuse optimeerimise välja.</string>
+    <string name="welcome_header">Liitu Conversationi kasutajatega</string>
+    <string name="welcome_header_quicksy">Tere tulemast kasutama sõnumirakendust Quicksy!</string>
+    <string name="no_application_to_share_uri">Ei leidu ühtegi rakendust võrguaadressi ehk URI jagamiseks</string>
+    <string name="share_uri_with">Jaga võrguaadress rakendusega…</string>
+    <string name="no_camera_permission">Anna rakendusele %1$s õigus kasutada kaamerat</string>
+    <string name="notify_on_all_messages">Teavita kõikidest sõnumitest</string>
+    <string name="notify_only_when_highlighted">Teavita vaid mainimiste puhul</string>
+    <string name="disable">Lülita välja</string>
+    <string name="selection_too_large">Valitud ala on liiga suur</string>
+    <string name="no_accounts">(Aktiveeritud kasutajakontosid pole)</string>
+    <string name="this_field_is_required">Selle välja täitmine on kohustuslik</string>
+    <string name="correct_message">Muuda sõnumit</string>
+    <string name="send_corrected_message">Saada muudetud sõnum</string>
+    <string name="device_does_not_support_battery_op">Sinu nutiseade et toeta akukasutuse optimeerimise rakendusekohast väljalülitamist</string>
 </resources>
\ No newline at end of file

From 892b7d415d7deebfa8c401d0a65879037a889838 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Fri, 11 Oct 2024 18:47:59 +0000
Subject: [PATCH 050/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 7d199d15d362cef67ab1b3367d36349c916d3c73..edc027ae585e727aed2238a15428c23b4829faf4 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -88,7 +88,7 @@
 \n 
 \n<b>Предупреждение:</b> данная операция не удалит копии файла, хранящиеся на других устройствах или серверах. </string>
     <string name="choose_presence">Выберите устройство</string>
-    <string name="send_unencrypted_message">Отправить без шифрования</string>
+    <string name="send_unencrypted_message">Отправить сообщение без шифрования</string>
     <string name="send_message">Сообщение</string>
     <string name="send_message_to_x">Сообщение для %s</string>
     <string name="send_omemo_x509_message">v\\Зашифрованное OMEMO сообщение</string>
@@ -185,7 +185,7 @@
     <string name="openpgp_has_been_published">Публичный ключ OpenPGP опубликован.</string>
     <string name="mgmt_account_enable">Включить аккаунт</string>
     <string name="mgmt_account_delete_confirm_text">Удалить свой аккаунт? Удаление аккаунта также сотрёт все беседы.</string>
-    <string name="attach_record_voice">Запись голоса</string>
+    <string name="attach_record_voice">Записать голос</string>
     <string name="account_settings_jabber_id">XMPP-адрес</string>
     <string name="block_jabber_id">Заблокировать XMPP-адрес</string>
     <string name="account_settings_example_jabber_id">username@example.com</string>
@@ -943,7 +943,7 @@
     <string name="only_one_call_at_a_time">Нельзя одновременно совершать больше одного вызова.</string>
     <string name="return_to_ongoing_call">Вернуться к текущему вызову</string>
     <string name="could_not_switch_camera">Невозможно переключить камеру</string>
-    <string name="add_to_favorites">Прикрепить</string>
+    <string name="add_to_favorites">Закрепить</string>
     <string name="remove_from_favorites">Открепить</string>
     <string name="gpx_track">GPX-трек</string>
     <string name="could_not_correct_message">Невозможно исправить сообщение</string>

From 85dbe519731cd7515467f4fa84911bf48d254848 Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Fri, 11 Oct 2024 12:59:44 +0000
Subject: [PATCH 051/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (72 of 72 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/uk/
---
 fastlane/metadata/android/uk/changelogs/4212104.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/uk/changelogs/4212104.txt

diff --git a/fastlane/metadata/android/uk/changelogs/4212104.txt b/fastlane/metadata/android/uk/changelogs/4212104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b842175e7c34dd845a10affeec7a19f4d141b421
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/4212104.txt
@@ -0,0 +1 @@
+* Підтримка реакцій на повідомлення

From 172d87f0845b0556b1452139a2158c6c30a33bcd Mon Sep 17 00:00:00 2001
From: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Date: Sat, 12 Oct 2024 00:28:29 +0000
Subject: [PATCH 052/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (72 of 72 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/zh_Hans/
---
 fastlane/metadata/android/zh-CN/changelogs/4212104.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/zh-CN/changelogs/4212104.txt

diff --git a/fastlane/metadata/android/zh-CN/changelogs/4212104.txt b/fastlane/metadata/android/zh-CN/changelogs/4212104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8b298885a0360713de8b2be5a46e008c9b89e661
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/4212104.txt
@@ -0,0 +1 @@
+* 支持消息回应

From a3e48d56ecae5f05668d5bf572845f6f7cbe2f72 Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Sat, 12 Oct 2024 03:20:27 +0000
Subject: [PATCH 053/357] Translated using Weblate (Galician)

Currently translated at 61.1% (44 of 72 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/gl/
---
 fastlane/metadata/android/gl-ES/changelogs/4212104.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/gl-ES/changelogs/4212104.txt

diff --git a/fastlane/metadata/android/gl-ES/changelogs/4212104.txt b/fastlane/metadata/android/gl-ES/changelogs/4212104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2b93142c71d699af7f832784a12bc78d45b2f7da
--- /dev/null
+++ b/fastlane/metadata/android/gl-ES/changelogs/4212104.txt
@@ -0,0 +1 @@
+* Compatibilidade con Reaccións ás Mensaxes

From f1a078a43028ee8d2cfd3004d24b875ad8102127 Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Sat, 12 Oct 2024 08:18:04 +0000
Subject: [PATCH 054/357] Translated using Weblate (Polish)

Currently translated at 22.2% (16 of 72 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/pl/
---
 fastlane/metadata/android/pl-PL/changelogs/4212104.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4212104.txt

diff --git a/fastlane/metadata/android/pl-PL/changelogs/4212104.txt b/fastlane/metadata/android/pl-PL/changelogs/4212104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..438f01fef891e04a23f150ef12129094731bc817
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4212104.txt
@@ -0,0 +1 @@
+* Obsługa reakcji na wiadomości

From 638db99f19f86180d5ffe8104bec19ac42216d3f Mon Sep 17 00:00:00 2001
From: fossdd <fossdd@pwned.life>
Date: Sat, 12 Oct 2024 11:42:22 +0000
Subject: [PATCH 055/357] Translated using Weblate (German)

Currently translated at 100.0% (72 of 72 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/de/
---
 fastlane/metadata/android/de-DE/changelogs/4212104.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/de-DE/changelogs/4212104.txt

diff --git a/fastlane/metadata/android/de-DE/changelogs/4212104.txt b/fastlane/metadata/android/de-DE/changelogs/4212104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..68997eff0870bb1e7c78284b61b9b146792db7cf
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/4212104.txt
@@ -0,0 +1 @@
+* Unterstützung von Reaktionen auf Nachrichten

From 7e667d66f639d358d740bff3c9218fb4c24ee182 Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Sat, 12 Oct 2024 17:32:17 +0000
Subject: [PATCH 056/357] Translated using Weblate (German)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/de/
---
 src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 6d820a8ede50325585eb43f2cba488598da440b0..b17626daf2f3b51647f95c66a606caa995405325 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -830,7 +830,7 @@
     <string name="backup_channel_name">Sicherung &amp; Wiederherstellung</string>
     <string name="enter_jabber_id">XMPP-Adresse eingeben</string>
     <string name="create_group_chat">Gruppenchat erstellen</string>
-    <string name="join_public_channel">Öffentlichen Channel beitreten</string>
+    <string name="join_public_channel">Öffentlichem Channel beitreten</string>
     <string name="create_private_group_chat">Privaten Gruppenchat erstellen</string>
     <string name="create_public_channel">Öffentlichen Channel erstellen</string>
     <string name="create_dialog_channel_name">Channelname</string>

From 36d379f5209b78e522f5cd28b5f4b4bb2a7f9729 Mon Sep 17 00:00:00 2001
From: 0ko <0ko@users.noreply.translate.codeberg.org>
Date: Sun, 13 Oct 2024 17:24:47 +0000
Subject: [PATCH 057/357] Translated using Weblate (Russian)

Currently translated at 100.0% (13 of 13 strings)

Translation: Conversations/Android App (Conversations)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-conversations/ru/
---
 src/conversations/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conversations/res/values-ru/strings.xml b/src/conversations/res/values-ru/strings.xml
index 27f98bae9d8133fde9b9ca8268be0d5cef6bbe5b..9661e76f62ee39f1115cf2668d0aea48838289fc 100644
--- a/src/conversations/res/values-ru/strings.xml
+++ b/src/conversations/res/values-ru/strings.xml
@@ -4,7 +4,7 @@
     <string name="use_conversations.im">Использовать conversations.im</string>
     <string name="create_new_account">Создать новый аккаунт</string>
     <string name="do_you_have_an_account">У вас есть аккаунт XMPP? Если вы использовали Conversations или другой XMPP-клиент в прошлом, то скорее всего, он у вас есть. Если у вас нет аккаунта, вы можете создать его прямо сейчас.
-\nПодсказка: некоторые провайдеры электронной почты также регистрируют аккаунты XMPP.</string>
+\nПодсказка: некоторые провайдеры эл. почты также предоставляют аккаунты XMPP.</string>
     <string name="server_select_text">XMPP - это независимая сеть обмена сообщениями. Это приложение позволяет подключиться к любому XMPP-серверу на ваш выбор.
 \nЕсли у вас нет сервера, предлагаем вам зарегистрировать аккаунт на conversations.im, сервере, специально предназначенном для работы с Conversations.</string>
     <string name="magic_create_text_on_x">Вас пригласили на %1$s. Мы проведём вас через процесс создания аккаунта. 

From 315b9068d0cf563f37ef92ebd62a59c287cd1f58 Mon Sep 17 00:00:00 2001
From: 0ko <0ko@users.noreply.translate.codeberg.org>
Date: Sun, 13 Oct 2024 17:20:14 +0000
Subject: [PATCH 058/357] Translated using Weblate (Russian)

Currently translated at 13.8% (10 of 72 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/ru/
---
 fastlane/metadata/android/ru-RU/changelogs/4210904.txt | 2 ++
 fastlane/metadata/android/ru-RU/changelogs/4211004.txt | 2 ++
 fastlane/metadata/android/ru-RU/changelogs/4211404.txt | 2 ++
 fastlane/metadata/android/ru-RU/changelogs/4211604.txt | 1 +
 fastlane/metadata/android/ru-RU/changelogs/4211804.txt | 1 +
 fastlane/metadata/android/ru-RU/changelogs/4212104.txt | 1 +
 6 files changed, 9 insertions(+)
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4210904.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4211004.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4211404.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4211604.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4211804.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4212104.txt

diff --git a/fastlane/metadata/android/ru-RU/changelogs/4210904.txt b/fastlane/metadata/android/ru-RU/changelogs/4210904.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2f74049e2a39518999816f1e1985cc5760a10c28
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4210904.txt
@@ -0,0 +1,2 @@
+* исправлена регистрация Quicksy на Android 6-7
+* проигрывание рингтона вызова через канал уведомлений
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4211004.txt b/fastlane/metadata/android/ru-RU/changelogs/4211004.txt
new file mode 100644
index 0000000000000000000000000000000000000000..bb6411e72eedb048493846c19526c53366395ce9
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4211004.txt
@@ -0,0 +1,2 @@
+* исправлена интеграция звонков для устройств с Android 14
+* добавлена настройка «Приглашения от незнакомцев»
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4211404.txt b/fastlane/metadata/android/ru-RU/changelogs/4211404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..62bffa9de4a9feb3294fd43a1898db2fac225f45
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4211404.txt
@@ -0,0 +1,2 @@
+* старые устройства Oppo исключены из интеграции звонков
+* различные исправления
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4211604.txt b/fastlane/metadata/android/ru-RU/changelogs/4211604.txt
new file mode 100644
index 0000000000000000000000000000000000000000..13b38ab36cdec6a2d4161711d61877a4806108ff
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4211604.txt
@@ -0,0 +1 @@
+* Незначительные исправления
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4211804.txt b/fastlane/metadata/android/ru-RU/changelogs/4211804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..44ec8d8ad339823e90cffb01e77aee431a5e57ae
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4211804.txt
@@ -0,0 +1 @@
+* Добавлено время истечения для попытки начала вызова
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4212104.txt b/fastlane/metadata/android/ru-RU/changelogs/4212104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c46070924cd3530c657a8b756c23ece76dd80e44
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4212104.txt
@@ -0,0 +1 @@
+* Поддержка реакций сообщений

From 1509e8b96d3793e12f5d9d5f38cb2f4c43a42f3f Mon Sep 17 00:00:00 2001
From: Besnik_b <Besnik_b@users.noreply.translate.codeberg.org>
Date: Mon, 14 Oct 2024 09:13:50 +0000
Subject: [PATCH 059/357] Translated using Weblate (Albanian)

Currently translated at 100.0% (72 of 72 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/sq/
---
 fastlane/metadata/android/sq/changelogs/4212104.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/sq/changelogs/4212104.txt

diff --git a/fastlane/metadata/android/sq/changelogs/4212104.txt b/fastlane/metadata/android/sq/changelogs/4212104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2b421f81930129ad1ccf9ca5880dac53c46181b9
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/4212104.txt
@@ -0,0 +1 @@
+* Mbulim për Reagime Ndaj Mesazhesh

From ab1d6f3d6a95952afeb5e1feb6af71baace02c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Mon, 14 Oct 2024 19:49:40 +0000
Subject: [PATCH 060/357] Translated using Weblate (Estonian)

Currently translated at 68.4% (714 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 011b8783037abe54f6c0c98809b3b18c479e275e..d4d3cce23e6abc4687e561d640bfa7b1dc6e38d6 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -727,4 +727,22 @@
     <string name="correct_message">Muuda sõnumit</string>
     <string name="send_corrected_message">Saada muudetud sõnum</string>
     <string name="device_does_not_support_battery_op">Sinu nutiseade et toeta akukasutuse optimeerimise rakendusekohast väljalülitamist</string>
+    <string name="agree_and_continue">Nõustu ja jätka</string>
+    <string name="quicksy_wants_your_consent">Quicksy küsib nõusolekut sinu andmete kasutamiseks</string>
+    <string name="pref_theme_light">Hele kujundus</string>
+    <string name="pref_theme_dark">Tume kujundus</string>
+    <string name="pref_privacy">Privaatsus</string>
+    <string name="pref_theme_options">Kujundus</string>
+    <string name="pref_theme_options_summary">Vali värvipalett</string>
+    <string name="pref_theme_automatic">Automaatne</string>
+    <string name="pref_use_colorful_bubbles">Värvilised vestlusmullid</string>
+    <string name="pref_use_colorful_bubbles_summary">Saadetud ja saabunud sõnumite erksad taustavärvid</string>
+    <string name="unable_to_connect_to_keychain">Ühenduse loomine OpenKeychainiga ei õnnestunud</string>
+    <string name="this_device_is_no_longer_in_use">See seade pole enam kasutusel</string>
+    <string name="type_pc">Arvuti</string>
+    <string name="type_phone">Mobiiltelefon</string>
+    <string name="type_tablet">Tahvelarvuti</string>
+    <string name="type_web">Veebibrauser</string>
+    <string name="type_console">Konsool</string>
+    <string name="payment_required">Makse on vajalik</string>
 </resources>
\ No newline at end of file

From ab7f71cf67a502b6eb07ea43d7aeb0151a9ac0f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Mon, 14 Oct 2024 20:08:33 +0000
Subject: [PATCH 061/357] Translated using Weblate (Estonian)

Currently translated at 73.1% (763 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 51 ++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index d4d3cce23e6abc4687e561d640bfa7b1dc6e38d6..a3eca8433230aa30fcee8249fd48340373516da8 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -745,4 +745,55 @@
     <string name="type_web">Veebibrauser</string>
     <string name="type_console">Konsool</string>
     <string name="payment_required">Makse on vajalik</string>
+    <string name="mtm_trust_anchor">Serveri sertifikaat pole allkirjastatud ühegi tunnustaud sertifitseerimiskeskuse (CA) poolt.</string>
+    <string name="error_trustkey_general">%1$s ei suuda saata krüptitud sõnumit kasutajale %2$s. Võib-olla kasutab teine osapool aegunud serveritarkvara või tema vestlusrakendus ei oska OMEMO abil krüptimist kasutada.</string>
+    <string name="qr_code_scanner_needs_access_to_camera">QR-koodi skaneerimiseks on vajalik õigus kasutada kaamerat</string>
+    <string name="pref_validate_hostname_summary">Kui serveri sertifikaadis leidub kontrollitud hostinimi, siis loetakse ta verifitseerituks</string>
+    <string name="pref_delete_omemo_identities">Kustuta OMEMO identiteedid</string>
+    <string name="show_error_message">Näita veateadet</string>
+    <string name="error_message">Veateade</string>
+    <string name="data_saver_enabled">Andmemahu säästja on kasutusel</string>
+    <string name="server_info_partial">osaline</string>
+    <string name="video_is_enabled_tap_to_disable">Video on kasutusel. Väljalülitamiseks klõpsi.</string>
+    <string name="video_is_disabled_tap_to_enable">Video pole kasutusel. Sisselülitamiseks klõpsi.</string>
+    <string name="sync_with_contacts_long">%1$s töötleb sinu kontaktiloendit sinu nutiseadmes ning näitab sulle XMPP-aadressidele vastavaid nimesid ja profiilipilte.
+\n
+\nKontaktide andmed mitte kunagi ei lahku sinu nutiseadmest!</string>
+    <string name="sync_with_contacts">Kontaktiloendi lõimimine</string>
+    <string name="gp_disable">Eemalda kasutusest</string>
+    <string name="gp_short">Lühike</string>
+    <string name="gp_medium">Keskmine</string>
+    <string name="gp_long">Pikk</string>
+    <string name="pref_broadcast_last_activity">Viimati nähtud</string>
+    <string name="pref_broadcast_last_activity_summary">Luba oma kontaktidel näha, millal sa viimati vestlusrakendust kasutasid</string>
+    <string name="today">Täna</string>
+    <string name="yesterday">Eile</string>
+    <string name="pref_validate_hostname">Kontrolli hosti nime DNSSECi abil</string>
+    <string name="attach_record_video">Salvesta video</string>
+    <string name="copy_to_clipboard">Kopeeri lõikelauale</string>
+    <string name="message_copied_to_clipboard">Sõnum on kopeeritud lõikelauale</string>
+    <string name="message">Sõnum</string>
+    <string name="private_messages_are_disabled">Privaatsõnumid pole kasutusel</string>
+    <string name="mtm_accept_cert">Kas soovid nõustuda tundmatu sertifikaadiga?</string>
+    <string name="mtm_accept_servername">Kas nõustud, et serveri nimi ei klapi sertifikaadis leiduvaga?</string>
+    <string name="mtm_hostname_mismatch">Serveri tuvastamine kui „%s“ polnud võimalik. Sertifikaat kehtib vaid alljärgnevalt:</string>
+    <string name="mtm_connect_anyway">Kas sa ikkagi soovid ühenduse luua?</string>
+    <string name="mtm_cert_details">Sertifikaadi üksikasjad:</string>
+    <string name="once">Üks kord</string>
+    <string name="pref_scroll_to_bottom">Keri alla välja</string>
+    <string name="pref_scroll_to_bottom_summary">Peale sõnumi saatmist keri vaade alla</string>
+    <string name="edit_status_message_title">Muuda olekuteadet</string>
+    <string name="edit_status_message">Muuda olekuteadet</string>
+    <string name="disable_encryption">Lülita krüptimine välja</string>
+    <string name="error_trustkey_device_list">Seadmete loendi laadimine ei õnnestunud</string>
+    <string name="call_is_using_earpiece_tap_to_switch_to_speaker">Kõne kasutab kõrvaklappe. Valjuhääldile ümberlülitamiseks klõpsi.</string>
+    <string name="call_is_using_earpiece">Kõne kasutab kõrvaklappe.</string>
+    <string name="call_is_using_wired_headset">Kõne kasutab traadiga kõrvaklappe</string>
+    <string name="call_is_using_speaker_tap_to_switch_to_earpiece">Kõne kasutab valjuhääldit. Kõrvaklappidele ümberlülitamiseks klõpsi.</string>
+    <string name="call_is_using_speaker">Kõne kasutab valjuhääldit.</string>
+    <string name="call_is_using_bluetooth">Kõne kasutab bluetoothi ühendust.</string>
+    <string name="flip_camera">Pööra kaamera teistpidi</string>
+    <string name="server_info_login_mechanism">Sisselogimise meetod</string>
+    <string name="add_reaction_title">Lisa reaktsioon</string>
+    <string name="more_reactions">Veel reaktsioone</string>
 </resources>
\ No newline at end of file

From db66e532f98430520f2c16c328af90bae9ab6285 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 16 Oct 2024 11:36:21 +0200
Subject: [PATCH 062/357] improve reaction flow when they dont fit in one line

---
 src/main/res/layout/item_message_received.xml | 3 +++
 src/main/res/layout/item_message_sent.xml     | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/res/layout/item_message_received.xml b/src/main/res/layout/item_message_received.xml
index 3fa4a0247b067279981253d1df06bde0d1d5c53d..60c665ffe0fc570fb0bf8e7a2bcb3a00f2400440 100644
--- a/src/main/res/layout/item_message_received.xml
+++ b/src/main/res/layout/item_message_received.xml
@@ -114,6 +114,9 @@
             android:orientation="horizontal"
             android:visibility="visible"
             app:chipSpacingHorizontal="4dp"
+            app:chipSpacingVertical="4dp"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="@+id/message_box"
             app:layout_constraintTop_toBottomOf="@+id/reactions_anchor" />
diff --git a/src/main/res/layout/item_message_sent.xml b/src/main/res/layout/item_message_sent.xml
index 0fa77a0585b1d47d0e55e84c66d6ad97ab0d9a20..aac6eb78a5b397fcc9417e57e0ee236ad186d525 100644
--- a/src/main/res/layout/item_message_sent.xml
+++ b/src/main/res/layout/item_message_sent.xml
@@ -113,8 +113,11 @@
             android:orientation="horizontal"
             android:visibility="visible"
             app:chipSpacingHorizontal="4dp"
+            app:chipSpacingVertical="4dp"
+            app:layout_constrainedWidth="true"
             app:layout_constraintEnd_toEndOf="@+id/message_box"
-            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/reactions_anchor" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

From b690dd741915825e85ac7d839f542ce6ef54b43e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 18 Oct 2024 09:03:58 +0200
Subject: [PATCH 063/357] remove outdated sections of readme

---
 README.md | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index f82e1b18287ef04ec45ee86c9e6ef089acee2815..0f9f5c1bd28c84870c31f597985797752efcca72 100644
--- a/README.md
+++ b/README.md
@@ -86,10 +86,6 @@ build your apk file.
 
 Conversations is available on [Google Play](https://play.google.com/store/apps/details?id=eu.siacs.conversations) and on [F-Droid](https://f-droid.org/en/packages/eu.siacs.conversations/).
 
-#### I don't have a Google Account but I would still like to make a donation
-
-I’m listing several options to support me financially on [my website](https://gultsch.de/donate.html). Among other things [Liberapay](https://liberapay.com/iNPUTmice/donate), [GitHub Sponsors](https://github.com/sponsors/inputmice) and bank transfer.
-
 #### How do I create an account?
 XMPP, like email, is a federated protocol, which means that there is not one company you can create an *official XMPP account* with. Instead there are hundreds, or even thousands, of providers out there. One of those providers is our very own [conversations.im](https://account.conversations.im). If you don’t like to use *conversations.im* use a web search engine of your choice to find another provider. Or maybe your university has one. Or you can run your own. Or ask a friend to run one. Once you've found one, you can use Conversations to create an account. Just select *register new account* on server within the create account dialog.
 
@@ -174,20 +170,10 @@ You can find a detailed description of how your server, the app server and FCM a
 #### But why do I need a permanent notification if I use Google Push?
 FCM (Google Push) allows an app to wake up from *Doze* which is (as the name suggests) a hibernation feature of the Android operating system that cuts the network connection and also reduces the number of times the app is allowed to wake up (to ping the server for example). The app can ask to be excluded from doze. Non push variants of the app (from F-Droid or if the server doesn’t support it) will do this on first start up. So if you get exemption from *Doze*, or if you get regular push events sent to you, Doze should not pose a threat to Conversatons working properly. But even with *Doze* the app is still open in the background (kept in memory); it is just limited in the actions it can do. Conversations needs to stay in memory to hold certain session state (online status of contacts, join status of group chats, …). However with Android 8 Google changed all of this again and now an App that wants to stay in memory needs to have a foreground service which is visible to the user via the annoying notification. But why does Conversations need to hold that state? XMPP is a statefull protocol that has a lot of per-session information; packets need to be counted, presence information needs to be held, some features like Message Carbons get activated once per session, MAM catch-up happens once, service discovery happens only once; the list goes on. When Conversations was created in early 2014 none of this was a problem because apps were just allowed to stay in memory. Basically every XMPP client out there holds that information in memory because it would be a lot more complicated trying to persist it to disk. An entire rewrite of Conversations in the year 2019 would attempt to do that and would probably succeed however it would require exactly that; a complete rewrite which is not feasible right now. That’s by the way also the reason why it is difficult to write an XMPP client on iOS. Or more broadly put this is also the reason why other protocols are designed as or migrated to stateless protocols (often based on HTTP); take for example the migration of IMAP to [JMAP](https://jmap.io/).
 
-#### Conversations doesn’t work for me. Where can I get help?
-
-You can join our conference room on [`conversations@conference.siacs.eu`](https://conversations.im/j/conversations@conference.siacs.eu).
-A lot of people in there are able to answer basic questions about the usage of
-Conversations or can provide you with tips on running your own XMPP server. If
-you found a bug or your app crashes please read the Developer / Report Bugs
-section of this document.
-
-#### I need professional support with Conversations or setting up my server
-
-I'm available for hire. Contact information can be found on [my website](https://gultsch.de).
-
 #### How does the address book integration work?
 
+Address book integration is only available in the F-Droid version.
+
 The address book integration was designed to protect your privacy. Conversations
 neither uploads contacts from your address book to your server nor fills your
 address book with unnecessary contacts from your online roster. If you manually

From c5d54b759c0cf9b2b701911b265079bc7e1201a1 Mon Sep 17 00:00:00 2001
From: Mako <Mako@users.noreply.translate.codeberg.org>
Date: Wed, 16 Oct 2024 02:23:39 +0000
Subject: [PATCH 064/357] Translated using Weblate (Japanese)

Currently translated at 99.4% (1037 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ja/
---
 src/main/res/values-ja/strings.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index adc465911a9295b6198bfa975a67da1eca2eae9a..1dbdd5b3263f03aa4f8b939b89f4e4ae2567bd43 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -1050,4 +1050,26 @@
     <string name="pref_backup_recurring">繰り返し作成</string>
     <string name="pref_backup_summary">一回限りもしくは繰り返し計画を作成</string>
     <string name="pref_create_backup_one_off_summary">一回限りのバックアップを作成</string>
+    <string name="your_avatar_tap_to_select_new_avatar">アバター。新しいアバターをギャラリーから選択するにはタップしてください。</string>
+    <string name="could_not_disable_video">ビデオを無効にできませんでした。</string>
+    <string name="edit_nick">ニックネームを編集</string>
+    <string name="delete_pgp_key">OpenPGP 鍵を削除</string>
+    <string name="edit_configuration">設定を変更</string>
+    <string name="change_notification_settings">通知設定を変更</string>
+    <string name="call_is_using_earpiece">通話はイヤホンを使用します。</string>
+    <string name="call_is_using_earpiece_tap_to_switch_to_speaker">通話はイヤホンを使用します。スピーカーに切り替えるにはタップしてください。</string>
+    <string name="call_is_using_speaker">通話はスピーカーを使用します。</string>
+    <string name="call_is_using_bluetooth">通話は bluetooth を使用します。</string>
+    <string name="video_is_enabled_tap_to_disable">ビデオが有効になっています。無効にするにはタップしてください。</string>
+    <string name="server_info_login_mechanism">ログインメカニズム</string>
+    <string name="call_is_using_wired_headset">通話は有線ヘッドセットを使用します</string>
+    <string name="call_is_using_speaker_tap_to_switch_to_earpiece">通話はスピーカーを使用します。イヤホンに切り替えるにはタップしてください。</string>
+    <string name="video_is_disabled_tap_to_enable">ビデオが無効になっています。有効にするにはタップしてください。</string>
+    <string name="server_info_bind2">XEP-0386: Bind 2</string>
+    <string name="channel_discover_opt_in_message">談話室の探索には &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt; というサードパーティのサービスを利用します。&lt;br&gt;&lt;br&gt;この機能を使用すると、IP アドレスと検索語がこのサービスに送信されます。詳細は、&lt;a href=https://search.jabber.network/privacy&gt;プライバシーポリシー&lt;/a&gt;をご覧ください。</string>
+    <string name="server_info_sasl2">XEP-0388: 拡張可能な SASL プロファイル</string>
+    <string name="could_not_add_reaction">リアクションを追加できませんでした</string>
+    <string name="add_reaction">リアクションを追加…</string>
+    <string name="add_reaction_title">リアクションを追加</string>
+    <string name="more_reactions">さらに多くのリアクション</string>
 </resources>
\ No newline at end of file

From 2284fc342e5f0d800bbfa13a7e86df84321ca4b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Wed, 16 Oct 2024 06:02:19 +0000
Subject: [PATCH 065/357] Translated using Weblate (Estonian)

Currently translated at 73.2% (764 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index a3eca8433230aa30fcee8249fd48340373516da8..11e0a379ed2175915ccc0c05da4083eb76522209 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -796,4 +796,5 @@
     <string name="server_info_login_mechanism">Sisselogimise meetod</string>
     <string name="add_reaction_title">Lisa reaktsioon</string>
     <string name="more_reactions">Veel reaktsioone</string>
+    <string name="pref_omemo_setting_summary_default_on">OMEMO on vaikimisi kasutusel kõikide uute vestluste puhul.</string>
 </resources>
\ No newline at end of file

From a893a6e160e631065eae56f792ae1215ed3346a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Wed, 16 Oct 2024 06:13:21 +0000
Subject: [PATCH 066/357] Translated using Weblate (Estonian)

Currently translated at 74.9% (782 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 11e0a379ed2175915ccc0c05da4083eb76522209..de578a6c3cf7165281a9b3a54825847ae0ff6479 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -797,4 +797,22 @@
     <string name="add_reaction_title">Lisa reaktsioon</string>
     <string name="more_reactions">Veel reaktsioone</string>
     <string name="pref_omemo_setting_summary_default_on">OMEMO on vaikimisi kasutusel kõikide uute vestluste puhul.</string>
+    <string name="action_unfix_from_location">Eemalda fikseeritud asukoht</string>
+    <string name="action_copy_location">Kopeeri asukoht</string>
+    <string name="action_share_location">Jaga asukohta</string>
+    <string name="action_fix_to_location">Fikseeri asukoht</string>
+    <string name="action_directions">Tee juhtamine</string>
+    <string name="share">Jaga</string>
+    <string name="pref_omemo_setting_summary_default_off">OMEMO vajab eraldi siselülitamist kõikide uute vestluste puhul.</string>
+    <string name="create_shortcut">Loo kiirlink</string>
+    <string name="default_on">Vaikimisi kasutusel</string>
+    <string name="default_off">Vaikimisi pole kasutusel</string>
+    <string name="pref_dynamic_colors">Dünaamilised värvid</string>
+    <string name="pref_dynamic_colors_summary">Süsteemi värvid (Material You)</string>
+    <string name="not_encrypted_for_this_device">Sõnum polnud selle seadme jaoks krüptitud.</string>
+    <string name="undo">võta tagasi</string>
+    <string name="location_disabled">Asukoha jagamine pole kasutusel</string>
+    <string name="title_activity_share_location">Jaga asukohta</string>
+    <string name="title_activity_show_location">Näita oma asukohta</string>
+    <string name="omemo_decryption_failed">OMEMO-põhise sõnumi dekrüptimine ei õnnestunud.</string>
 </resources>
\ No newline at end of file

From a13b8ecfd330c570a3bd5da39bd4884f851838e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Wed, 16 Oct 2024 10:02:25 +0000
Subject: [PATCH 067/357] Translated using Weblate (Estonian)

Currently translated at 76.8% (802 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index de578a6c3cf7165281a9b3a54825847ae0ff6479..894160fa3324ef94d51d89c757d55e805cec1c91 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -815,4 +815,25 @@
     <string name="title_activity_share_location">Jaga asukohta</string>
     <string name="title_activity_show_location">Näita oma asukohta</string>
     <string name="omemo_decryption_failed">OMEMO-põhise sõnumi dekrüptimine ei õnnestunud.</string>
+    <string name="no_permission_to_access_x">Puudub õigus %s kasutamiseks</string>
+    <string name="remote_server_not_found">Serverit ei leidu</string>
+    <string name="remote_server_timeout">Ühendus serveriga aegus</string>
+    <string name="unable_to_update_account">Kasutajakonto uuendamine ei õnnestunud</string>
+    <string name="pref_delete_omemo_identities_summary">Loo uuesti kõik oma OMEMO-võtmed. Kõik sinu kontaktid peavad sel juhul sind uuesti verifitseerima. Kasuta seda võimalust ainult viimase abinõuna.</string>
+    <string name="no_permission_to_place_call">Pole õigusi helistamiseks</string>
+    <string name="delete_selected_keys">Kustuta valitud võtmed</string>
+    <string name="gif">GIF</string>
+    <string name="magic_create_text">Me aitama sul luua kasutajakontot veebiteenuses conversations.im.
+\nKui conversations.im on sinu teenusepakkuja, siis saad suhelda kõikide teiste teenusepakkujate serverites asuvate kasutajatega - lihtsalt edasta neile oma XMPP aadress.</string>
+    <string name="missing_internet_permission">Anna õigused internetiühenduse kasutamiseks</string>
+    <string name="me">Mina</string>
+    <string name="contact_asks_for_presence_subscription">Sinu kontakt soovib kasutada olekuteadete tellimist</string>
+    <string name="allow">Luba</string>
+    <string name="reconnect_on_other_host">Loo ühendus teises hostis</string>
+    <string name="no_microphone_permission">Anna rakendusele %1$s õigus kasutada mikrofoni</string>
+    <string name="please_wait">Palun oota korraks…</string>
+    <string name="search_messages">Otsi sõnumeid</string>
+    <string name="view_conversation">Vaata vestlust</string>
+    <string name="pref_use_share_location_plugin">Asukoha jagamise lisamoodul</string>
+    <string name="pref_use_share_location_plugin_summary">Rakenduses leiduva kaardi asemel kasuta asukoha jagamise lisamoodulit</string>
 </resources>
\ No newline at end of file

From 6d279a8ae5b33418ef0dcb1b7c37e324469cf5a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Wed, 16 Oct 2024 21:11:47 +0000
Subject: [PATCH 068/357] Translated using Weblate (Estonian)

Currently translated at 78.8% (822 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 894160fa3324ef94d51d89c757d55e805cec1c91..f183cd4d3fc3efb431334b08a453f54d449f76f0 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -836,4 +836,24 @@
     <string name="view_conversation">Vaata vestlust</string>
     <string name="pref_use_share_location_plugin">Asukoha jagamise lisamoodul</string>
     <string name="pref_use_share_location_plugin_summary">Rakenduses leiduva kaardi asemel kasuta asukoha jagamise lisamoodulit</string>
+    <string name="share_as_uri">Jaga XMPP võrguaadressina</string>
+    <string name="error_unable_to_create_temporary_file">Ajutise faili loomine ei õnnestunud</string>
+    <string name="this_device_has_been_verified">See seade on verifitseeritud</string>
+    <string name="copy_fingerprint">Kopeeri sõrmejälg</string>
+    <string name="all_omemo_keys_have_been_verified">Sa oled verifitseerinud kõik sinu valduses olevad OMEMO-võtmed</string>
+    <string name="barcode_does_not_contain_fingerprints_for_this_chat">See triipkood ei sisalda selle vestluse sõrmejägi.</string>
+    <string name="verified_fingerprints">Verifitseeritud sõrmejäljed</string>
+    <string name="use_camera_icon_to_scan_barcode">Kasuta kaamerat kontakti triipkoodi skaneerimiseks</string>
+    <string name="please_wait_for_keys_to_be_fetched">Palun oota, kuni võtmed saavad laaditud</string>
+    <string name="share_as_barcode">Jaga triipkoodina</string>
+    <string name="share_as_http">Jaga HTTP lingina</string>
+    <string name="pref_blind_trust_before_verification">Enne verifitseerimist usalda pimesi</string>
+    <string name="pref_blind_trust_before_verification_summary">Usalda verifitseerimata kontaktide uusi seadmeid, aga küsi kinnitust verifitseeritud kontaktide uute seadmete puhul.</string>
+    <string name="blindly_trusted_omemo_keys">Pimesi usaldatud OMEMO-võtmed. See võib tähendada, et tegemist on kellegi teisega või keegi kolmas suudab sõnumiliiklust jälgida.</string>
+    <string name="not_trusted">Pole usaldatud</string>
+    <string name="invalid_barcode">Vigane QR-kood</string>
+    <string name="pref_clean_cache_summary">Tühjenda puhverdatud failide kaust (mida kasutab kaamerarakendus)</string>
+    <string name="pref_clean_cache">Tühjenda puhver</string>
+    <string name="pref_clean_private_storage">Tühjenda privaatne vahemälu</string>
+    <string name="pref_clean_private_storage_summary">Tühjenda failide hoidmiseks mõeldud privaatne vahemälu (faile saad serverist uuesti alla laadida)</string>
 </resources>
\ No newline at end of file

From 78b3e9dfd06dd7a31e90b1bbfe08591d52f5c428 Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Thu, 17 Oct 2024 13:15:29 +0000
Subject: [PATCH 069/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/uk/
---
 src/main/res/values-uk/strings.xml | 124 ++++++++++++++---------------
 1 file changed, 62 insertions(+), 62 deletions(-)

diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 6655ef7887f52067de368f7edf80dc01d4e09e83..eef73c4c31dfae2b3c43e7602b966d934cf69989 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -27,7 +27,7 @@
     <string name="minutes_ago">%d хвилин тому</string>
     <string name="sending">надсилання…</string>
     <string name="message_decrypting">Повідомлення розшифровується. Зачекайте, будь ласка…</string>
-    <string name="pgp_message">Повідомлення зашифроване OpenPGP</string>
+    <string name="pgp_message">Повідомлення, зашифроване OpenPGP</string>
     <string name="nick_in_use">Таке прізвисько вже використовується</string>
     <string name="invalid_muc_nick">Неприйнятне прізвисько</string>
     <string name="admin">Адміністратор</string>
@@ -84,7 +84,7 @@
     <string name="send_message">Надіслати повідомлення</string>
     <string name="send_message_to_x">Повідомлення %s</string>
     <string name="send_omemo_x509_message">Повідомлення, зашифроване v\\OMEMO</string>
-    <string name="your_nick_has_been_changed">Ваше прізвисько змінено</string>
+    <string name="your_nick_has_been_changed">Використовується нове прізвисько</string>
     <string name="send_unencrypted">Надіслати без шифрування</string>
     <string name="decryption_failed">Не вдалося розшифрувати. Можливо, у Вас відсутній потрібний приватний ключ.</string>
     <string name="openkeychain_required">OpenKeychain</string>
@@ -129,10 +129,10 @@
     <string name="send_presence_updates">Повідомляти про присутність</string>
     <string name="receive_presence_updates">Отримувати оновлення присутності</string>
     <string name="ask_for_presence_updates">Надіслати запит на оновлення присутності</string>
-    <string name="attach_choose_picture">Обрати зображення</string>
+    <string name="attach_choose_picture">Вибрати зображення</string>
     <string name="attach_take_picture">Зняти світлину</string>
     <string name="preemptively_grant">Попередньо давати запит на підписку</string>
-    <string name="error_not_an_image_file">Обраний файл не є зображенням</string>
+    <string name="error_not_an_image_file">Вибраний файл не є зображенням</string>
     <string name="error_compressing_image">Не вдалося конвертувати зображення</string>
     <string name="error_file_not_found">Файл не знайдено</string>
     <string name="error_io_exception">Загальна помилка вводу-виводу. Можливо, на пристрої закінчилася вільна пам\'ять\?</string>
@@ -200,8 +200,8 @@
     <string name="last_seen_hours">у мережі %d годин тому</string>
     <string name="last_seen_day">у мережі 1 день тому</string>
     <string name="last_seen_days">у мережі %d днів тому</string>
-    <string name="install_openkeychain">Зашифроване повідомлення. Будь ласка, встановіть OpenKeychain, щоб розшифрувати.</string>
-    <string name="openpgp_messages_found">Знайдено повідомлення, зашифроване OpenPGP</string>
+    <string name="install_openkeychain">Повідомлення зашифровано. Щоб його розшифрувати, будь ласка, встановіть OpenKeychain.</string>
+    <string name="openpgp_messages_found">Знайдено нові повідомлення, зашифровані OpenPGP</string>
     <string name="openpgp_key_id">Ідентифікатор ключа OpenPGP</string>
     <string name="omemo_fingerprint">Цифровий підпис OMEMO</string>
     <string name="omemo_fingerprint_x509">Цифровий підпис v\\OMEMO</string>
@@ -242,7 +242,7 @@
     <string name="add_back">Також додати</string>
     <string name="contact_has_read_up_to_this_point">%s дочитав(ла) до цього місця</string>
     <string name="contacts_have_read_up_to_this_point">%s дочитали до цього місця</string>
-    <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s +%2$d дочитали до цього місця</string>
+    <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s і %2$d дочитали до цього місця</string>
     <string name="everyone_has_read_up_to_this_point">Усі прочитали до цього місця</string>
     <string name="publish">Опублікувати</string>
     <string name="touch_to_choose_picture">Торкніться аватара, щоб вибрати зображення з галереї</string>
@@ -258,23 +258,23 @@
     <string name="connect">Підключення</string>
     <string name="account_already_exists">Цей обліковий запис уже існує</string>
     <string name="next">Далі</string>
-    <string name="server_info_session_established">Поточну сесію встановлено</string>
+    <string name="server_info_session_established">Сесію встановлено</string>
     <string name="skip">Пропустити</string>
     <string name="disable_notifications">Вимкнути сповіщення</string>
     <string name="enable">Увімкнути</string>
-    <string name="conference_requires_password">Група вимагає пароль</string>
-    <string name="enter_password">Зазначте пароль</string>
-    <string name="request_presence_updates">Будь ласка, спершу надішліть запит на оновлення присутності від Вашого контакту.
-\n
-\n<small>Оновлення буде використано, щоб визначити, яку програму-клієнт (які програми-клієнти) він використовує</small>.</string>
+    <string name="conference_requires_password">Групу захищено паролем</string>
+    <string name="enter_password">Уведіть пароль</string>
+    <string name="request_presence_updates">Будь ласка, спершу надішліть запит на оновлення присутності від Вашого контакту. 
+\n 
+\n<small>Це потрібно, щоб визначити, яку програму-клієнт він використовує</small>.</string>
     <string name="request_now">Надіслати запит зараз</string>
     <string name="ignore">Ігнорувати</string>
     <string name="without_mutual_presence_updates"><b>Попередження:</b> Надсилання без взаємної згоди на оновлення присутності може спричинити неочікувані проблеми.
 \n
 \n<small>Перегляньте деталі контакту та перевірте отримання стану присутності.</small></string>
     <string name="pref_security_settings">Безпека</string>
-    <string name="pref_allow_message_correction">Редагування повідомлень</string>
-    <string name="pref_allow_message_correction_summary">Дозволити контактам редагувати свої повідомлення після надсилання</string>
+    <string name="pref_allow_message_correction">Виправлення повідомлень</string>
+    <string name="pref_allow_message_correction_summary">Дозволити контактам виправляти свої повідомлення після надсилання</string>
     <string name="pref_expert_options">Експертні налаштування</string>
     <string name="pref_expert_options_summary">Будь ласка, будьте обережними з цим</string>
     <string name="title_activity_about_x">Про %s</string>
@@ -288,12 +288,12 @@
     <string name="conference_banned">Вам заборонили доступ до цієї групи</string>
     <string name="conference_members_only">Ця група лише для учасників</string>
     <string name="conference_resource_constraint">Обмеження ресурсів</string>
-    <string name="conference_kicked">Вас виключили з цієї групи</string>
+    <string name="conference_kicked">Вас вигнали з цієї групи</string>
     <string name="conference_shutdown">Цю групу закрили</string>
-    <string name="conference_unknown_error">Ви більше не берете участі у цій групі</string>
+    <string name="conference_unknown_error">Ви більше не є учасником цієї групи</string>
     <string name="using_account">обліковий запис %s</string>
     <string name="hosted_on">розміщений на %s</string>
-    <string name="checking_x">Перевіряю %s на вузлі з HTTP</string>
+    <string name="checking_x">Перевірка %s на вузлі з HTTP</string>
     <string name="not_connected_try_again">Ви поза мережею. Спробуйте ще раз пізніше</string>
     <string name="check_x_filesize">Перевірити %s розмір</string>
     <string name="check_x_filesize_on_host">Перевірити %1$s розмір на %2$s</string>
@@ -319,9 +319,9 @@
     <string name="pref_create_backup_summary">Резервні копії зберігатимуться до %s</string>
     <string name="notification_create_backup_title">Створення резервних копій</string>
     <string name="notification_backup_created_title">Резервну копію створено</string>
-    <string name="notification_backup_created_subtitle">Резервні копії збережено до %s</string>
-    <string name="restoring_backup">Відтворення з резервної копії</string>
-    <string name="notification_restored_backup_title">Відтворено з резервної копії</string>
+    <string name="notification_backup_created_subtitle">Резервну копію збережено до %s</string>
+    <string name="restoring_backup">Відновлення з резервної копії</string>
+    <string name="notification_restored_backup_title">Відновлено з резервної копії</string>
     <string name="notification_restored_backup_subtitle">Не забудьте увімкнути обліковий запис.</string>
     <string name="choose_file">Файл</string>
     <string name="receiving_x_file">Отримання %1$s (%2$d%% завершено)</string>
@@ -334,8 +334,8 @@
     <string name="x_file_offered_for_download">%s запропоновано для завантаження</string>
     <string name="cancel_transmission">Припинити передачу</string>
     <string name="file_transmission_failed">передача файлу не вдалася</string>
-    <string name="file_transmission_cancelled">скасовано передачу файлу</string>
-    <string name="file_deleted">Файл вилучено</string>
+    <string name="file_transmission_cancelled">передачу файлу скасовано</string>
+    <string name="file_deleted">Файл видалено</string>
     <string name="no_application_found_to_open_file">Не знайдено застосунку, щоб відкрити файл</string>
     <string name="no_application_found_to_open_link">Не знайдено застосунку, щоб відкрити посилання</string>
     <string name="no_application_found_to_view_contact">Не знайдено застосунку, щоб переглянути контакт</string>
@@ -378,12 +378,12 @@
     <string name="grant_owner_privileges">Надати права власника</string>
     <string name="remove_owner_privileges">Відкликати права власника</string>
     <string name="remove_from_room">Вилучити з групи</string>
-    <string name="remove_from_channel">Прибрати з каналу</string>
-    <string name="could_not_change_affiliation">Неможливо змінити роль %s</string>
+    <string name="remove_from_channel">Вилучити з каналу</string>
+    <string name="could_not_change_affiliation">Неможливо змінити статус участі %s</string>
     <string name="ban_from_conference">Заборонити доступ до групи</string>
-    <string name="ban_from_channel">Вилучити з каналу</string>
+    <string name="ban_from_channel">Заборонити в каналі</string>
     <string name="removing_from_public_conference">Ви намагаєтеся вилучити %s з публічного каналу. Єдиним способом для цього є заблокувати користувача назавжди.</string>
-    <string name="ban_now">Вилучити зараз</string>
+    <string name="ban_now">Заборонити зараз</string>
     <string name="could_not_change_role">Неможливо змінити роль %s</string>
     <string name="conference_options">Налаштування приватного чату</string>
     <string name="channel_options">Налаштування публічного каналу</string>
@@ -400,19 +400,19 @@
     <string name="mark_as_read">Позначити як прочитане</string>
     <string name="pref_input_options">Введення</string>
     <string name="pref_enter_is_send">Enter для надсилання</string>
-    <string name="pref_enter_is_send_summary">Використовувати кнопку Enter для надсилання повідомлень. Якщо цей параметр вимкнено, повідомлення можна надсилати за допомогою комбінації Ctrl+Enter.</string>
+    <string name="pref_enter_is_send_summary">Використовувати кнопку Enter для надсилання повідомлень. Також для надсилання можна використовувати Ctrl+Enter, навіть якщо цей параметр вимкнено.</string>
     <string name="pref_display_enter_key">Показувати кнопку Enter</string>
     <string name="pref_display_enter_key_summary">Змінити клавішу емоційок на кнопку Enter</string>
     <string name="audio">аудіо</string>
     <string name="video">відео</string>
     <string name="image">зображення</string>
     <string name="pdf_document">документ PDF</string>
-    <string name="apk">Програма Android</string>
-    <string name="vcard">Контакт</string>
+    <string name="apk">програма Android</string>
+    <string name="vcard">контакт</string>
     <string name="avatar_has_been_published">Аватар опубліковано!</string>
     <string name="sending_x_file">Надсилання %s</string>
     <string name="offering_x_file">Пропозиція %s</string>
-    <string name="hide_offline">Сховати поза мережею</string>
+    <string name="hide_offline">Сховати «Поза мережею»</string>
     <string name="contact_is_typing">%s пише…</string>
     <string name="contact_has_stopped_typing">%s припинив писати</string>
     <string name="contacts_are_typing">%s пишуть…</string>
@@ -427,7 +427,7 @@
     <string name="title_undo_swipe_out_channel">Залишити публічний канал</string>
     <string name="pref_dont_trust_system_cas_title">Не довіряти системним центрам сертифікації</string>
     <string name="pref_dont_trust_system_cas_summary">Усі сертифікати мають бути підтверджені вручну</string>
-    <string name="pref_remove_trusted_certificates_title">Вилучати сертифікати</string>
+    <string name="pref_remove_trusted_certificates_title">Вилучити сертифікати</string>
     <string name="pref_remove_trusted_certificates_summary">Вилучити сертифікати, які було підтверджено вручну</string>
     <string name="toast_no_trusted_certs">Немає сертифікатів, підтверджених вручну</string>
     <string name="dialog_manage_certs_title">Вилучити сертифікати</string>
@@ -448,10 +448,10 @@
     <string name="user_has_left_conference">%1$s залишив групу</string>
     <string name="username">Ім\'я користувача</string>
     <string name="username_hint">Ім\'я користувача</string>
-    <string name="invalid_username">Таке ім\'я користувача не допустиме</string>
-    <string name="download_failed_server_not_found">Звантаження не вдалося: сервер не знайдено</string>
-    <string name="download_failed_file_not_found">Звантаження не вдалося: файл не знайдено</string>
-    <string name="download_failed_could_not_connect">Звантаження не вдалося: неможливо з\'єднатися з вузлом</string>
+    <string name="invalid_username">Таке ім\'я користувача недопустиме</string>
+    <string name="download_failed_server_not_found">Завантаження не вдалося: сервер не знайдено</string>
+    <string name="download_failed_file_not_found">Завантаження не вдалося: файл не знайдено</string>
+    <string name="download_failed_could_not_connect">Завантаження не вдалося: неможливо з\'єднатися з вузлом</string>
     <string name="download_failed_could_not_write_file">Завантаження не вдалося: неможливо записати файл</string>
     <string name="account_status_tor_unavailable">Мережа Tor недоступна</string>
     <string name="account_status_bind_failure">Прив\'язка не спрацювала</string>
@@ -509,9 +509,9 @@
     <string name="disable">Вимкнути</string>
     <string name="selection_too_large">Вибрана ділянка завелика</string>
     <string name="no_accounts">(Немає активних облікових записів)</string>
-    <string name="this_field_is_required">Це обов\'язкове поле</string>
-    <string name="correct_message">Відредагувати</string>
-    <string name="send_corrected_message">Відредаговане повідомлення</string>
+    <string name="this_field_is_required">Це поле обов\'язкове</string>
+    <string name="correct_message">Виправити</string>
+    <string name="send_corrected_message">Надіслати виправлене</string>
     <string name="no_keys_just_confirm">Ви вже довіряєте цифровому підпису цієї особи. Вибираючи «Зроблено», Ви лише підтверджуєте, що %s є учасником групи.</string>
     <string name="this_account_is_disabled">Ви вимкнули цей обліковий запис</string>
     <string name="security_error_invalid_file_access">Помилка безпеки: неправильний доступ до файлу!</string>
@@ -522,7 +522,7 @@
 \nОбравши conversations.im в якості свого постачальника, Ви зможете спілкуватися з користувачами інших постачальників, для цього повідомте їм свою повну адресу XMPP.</string>
     <string name="your_full_jid_will_be">Ваша повна адреса XMPP: %s</string>
     <string name="create_account">Створити обліковий запис</string>
-    <string name="use_own_provider">Застосувати дані мого власного постачальника</string>
+    <string name="use_own_provider">Застосувати дані мого постачальника</string>
     <string name="pick_your_username">Придумайте ім\'я користувача</string>
     <string name="pref_manually_change_presence">Керувати станом вручну</string>
     <string name="pref_manually_change_presence_summary">Показувати доступність під час редагування повідомлення стану.</string>
@@ -567,7 +567,7 @@
     <string name="remote_server_not_found">Віддалений сервер не знайдено</string>
     <string name="remote_server_timeout">Затримка відповіді сервера</string>
     <string name="unable_to_update_account">Не вдалося оновити обліковий запис</string>
-    <string name="report_jid_as_spammer">Надіслати скаргу про те, що контакт з цим ID розсилає спам.</string>
+    <string name="report_jid_as_spammer">Надіслати скаргу про те, що контакт із цим ID розсилає спам.</string>
     <string name="pref_delete_omemo_identities">Вилучити ідентифікаційні дані OMEMO</string>
     <string name="pref_delete_omemo_identities_summary">Створити наново Ваші ключі OMEMO. Всі Ваші контакти будуть змушені підтвердити Вас знову. Використовуйте це, лише якщо немає іншого вибору.</string>
     <string name="delete_selected_keys">Вилучити вибрані ключі</string>
@@ -592,11 +592,11 @@
     <string name="pref_clean_cache_summary">Очистити теку з кешем (використовується застосунком Камера)</string>
     <string name="pref_clean_cache">Очистити кеш</string>
     <string name="pref_clean_private_storage">Очистити приватне сховище</string>
-    <string name="pref_clean_private_storage_summary">Очистити приватне сховище, де зберігаються файли (Їх можна повторно звантажити з сервера)</string>
+    <string name="pref_clean_private_storage_summary">Очистити приватне сховище, де зберігаються файли (Їх можна повторно завантажити з сервера)</string>
     <string name="i_followed_this_link_from_a_trusted_source">Я перейшов за цим посиланням від довіреного джерела</string>
     <string name="verifying_omemo_keys_trusted_source">Ви збираєтеся підтвердити ключі OMEMO для %1$s після переходу за посиланням. Це безпечно, лише якщо Ви отримали посилання з довіреного джерела, де лише %2$s міг опублікувати це посилання.</string>
     <string name="verify_omemo_keys">Підтвердити ключі OMEMO</string>
-    <string name="show_inactive_devices">Показувати неактивні</string>
+    <string name="show_inactive_devices">Показати неактивні</string>
     <string name="hide_inactive_devices">Приховати неактивні</string>
     <string name="distrust_omemo_key">Не довіряти пристрою</string>
     <string name="distrust_omemo_key_text">Ви впевнені, що більше не довіряєте цьому пристрою\?
@@ -639,7 +639,7 @@
     </plurals>
     <string name="pref_automatically_delete_messages">Автоматичне вилучення повідомлень</string>
     <string name="pref_automatically_delete_messages_description">Автоматично вилучати повідомлення з цього пристрою, старіші за зазначений проміжок часу.</string>
-    <string name="encrypting_message">Зашифровую повідомлення</string>
+    <string name="encrypting_message">Шифрування повідомлення</string>
     <string name="not_fetching_history_retention_period">Повідомлення не завантажуються з огляду на локально встановлений строк зберігання.</string>
     <string name="transcoding_video">Стиснення відео</string>
     <string name="contact_blocked_past_tense">Контакт заблоковано.</string>
@@ -669,7 +669,7 @@
     <string name="message">Повідомлення</string>
     <string name="private_messages_are_disabled">Приватні повідомлення вимкнено</string>
     <string name="mtm_accept_cert">Прийняти незнайомий сертифікат?</string>
-    <string name="mtm_trust_anchor">Сертифікат сервера не підтверджено відомим центром сертифікації.</string>
+    <string name="mtm_trust_anchor">Сертифікат сервера не підписано відомим центром сертифікації.</string>
     <string name="mtm_accept_servername">Прийняти сервер з невідповідним ім\'ям?</string>
     <string name="mtm_hostname_mismatch">Серверу не вдалося авторизуватися як «%s». Сертифікат чинний лише для:</string>
     <string name="mtm_connect_anyway">Усе одно бажаєте підключитися?</string>
@@ -681,11 +681,11 @@
     <string name="edit_status_message_title">Редагувати повідомлення стану</string>
     <string name="edit_status_message">Редагувати повідомлення стану</string>
     <string name="disable_encryption">Вимкнути шифрування</string>
-    <string name="error_trustkey_device_list">Неможливо отримати перелік пристроїв</string>
-    <string name="error_trustkey_bundle">Неможливо отримати пакети пристроїв</string>
+    <string name="error_trustkey_device_list">Не вдалося отримати перелік пристроїв</string>
+    <string name="error_trustkey_bundle">Не вдалося отримати ключі шифрування</string>
     <string name="error_trustkey_hint_mutual">Підказка: В деяких випадках це можна виправити, якщо додати один одного у свої списки контактів.</string>
     <string name="disable_encryption_message">Дійсно вимкнути шифрування OMEMO для цієї розмови?
-\nПісля цього в адміністратора Вашого сервера буде можливість мати доступ до Ваших повідомлень. Проте, це може бути єдиним способом спілкуватися з людьми, які використовують застарілі застосунки.</string>
+\nПісля цього в адміністратора сервера буде можливість читати Ваші повідомлення. Проте, це може бути єдиним способом спілкуватися з людьми, які використовують застарілі застосунки.</string>
     <string name="disable_now">Вимкнути зараз</string>
     <string name="draft">Чернетка:</string>
     <string name="pref_omemo_setting">Шифрування OMEMO</string>
@@ -727,7 +727,7 @@
     <string name="group_chat_name">Ім\'я</string>
     <string name="providing_a_name_is_optional">Ім\'я вказувати необов\'язково</string>
     <string name="create_dialog_group_chat_name">Назва групи</string>
-    <string name="conference_destroyed">Цю групу закрито</string>
+    <string name="conference_destroyed">Цю групу видалено</string>
     <string name="unable_to_save_recording">Неможливо зберегти запис</string>
     <string name="foreground_service_channel_name">Процес на передньому плані</string>
     <string name="notification_group_status_information">Інформація про стан</string>
@@ -765,8 +765,8 @@
     <string name="please_enter_your_phone_number">Будь ласка, введіть свій номер телефону.</string>
     <string name="search_countries">Шукати країну</string>
     <string name="verify_x">Перевірити %s</string>
-    <string name="we_have_sent_you_an_sms_to_x">Ми направили Вам SMS на <b>%s</b>.</string>
-    <string name="we_have_sent_you_another_sms">Ми направили Вам SMS із кодом з 6 цифр.</string>
+    <string name="we_have_sent_you_an_sms_to_x">SMS надіслано на <b>%s</b>.</string>
+    <string name="we_have_sent_you_another_sms">Ми надіслали Вам SMS із 6-цифровим кодом.</string>
     <string name="please_enter_pin_below">Будь ласка, введіть нижче 6 цифр коду.</string>
     <string name="resend_sms">Надіслати нове SMS</string>
     <string name="resend_sms_in">Надіслати нове SMS (%s)</string>
@@ -812,10 +812,10 @@
     <string name="choose_account">Виберіть обліковий запис</string>
     <string name="restore_backup">Відновити з резервної копії</string>
     <string name="restore">Відновити</string>
-    <string name="enter_password_to_restore">Зазначте пароль до облікового запису %s, щоб відновити з резервної копії.</string>
+    <string name="enter_password_to_restore">Введіть пароль до облікового запису %s, щоб відновити з резервної копії.</string>
     <string name="restore_warning">Не використовуйте відновлення з резервної копії з метою клонування застосунку (запускати одночасно ще один примірник). Відновлення з резервної копії призначене виключно для перенесення даних або на випадок втрати оригінального пристрою.</string>
     <string name="unable_to_restore_backup">Неможливо відновити з резервної копії.</string>
-    <string name="unable_to_decrypt_backup">Неможливо розшифрувати резервну копію. Чи правильний пароль\?</string>
+    <string name="unable_to_decrypt_backup">Не вдалося розшифрувати резервну копію. Чи правильний пароль?</string>
     <string name="backup_channel_name">Створити або відновити резервну копію</string>
     <string name="enter_jabber_id">Введіть адресу XMPP</string>
     <string name="create_group_chat">Створити групу</string>
@@ -841,14 +841,14 @@
     <string name="jabber_ids_are_visible_to_admins">Адміністратори бачать адреси XMPP.</string>
     <string name="jabber_ids_are_visible_to_anyone">Будь-хто бачить адреси XMPP.</string>
     <string name="no_users_hint_channel">Цей публічний канал не має учасників. Запросіть Ваші контакти або скористайтеся кнопкою поширення, щоб поділитися адресою XMPP.</string>
-    <string name="no_users_hint_group_chat">У цій приватній групі відсутні учасники.</string>
+    <string name="no_users_hint_group_chat">У цій приватній групі немає учасників.</string>
     <string name="manage_permission">Керувати правами</string>
     <string name="search_participants">Шукати учасників</string>
     <string name="file_too_large">Файл надто великий</string>
     <string name="attach">Прикріпити</string>
-    <string name="discover_channels">Пошук каналу</string>
+    <string name="discover_channels">Пошук каналів</string>
     <string name="search_channels">Шукати канали</string>
-    <string name="channel_discovery_opt_in_title">Можливе порушення приватності!</string>
+    <string name="channel_discovery_opt_in_title">Можливе порушення конфіденційності!</string>
     <string name="i_already_have_an_account">Я вже маю обліковий запис</string>
     <string name="add_existing_account">Додати наявний обліковий запис</string>
     <string name="register_new_account">Зареєструвати новий обліковий запис</string>
@@ -873,7 +873,7 @@
     <string name="backup">Резервне копіювання</string>
     <string name="category_about">Про застосунок</string>
     <string name="please_enable_an_account">Будь ласка, активуйте обліковий запис</string>
-    <string name="make_call">Здійснити виклик</string>
+    <string name="make_call">Виклик</string>
     <string name="rtp_state_incoming_call">Вхідний виклик</string>
     <string name="rtp_state_incoming_video_call">Вхідний відеовиклик</string>
     <string name="rtp_state_connecting">З\'єднання</string>
@@ -930,7 +930,7 @@
         <item quantity="many">%1$d пропущених викликів від %2$s</item>
         <item quantity="other">%1$d пропущених викликів від %2$s</item>
     </plurals>
-    <string name="download_failed_invalid_file">Звантаження не вдалося: неправильний файл</string>
+    <string name="download_failed_invalid_file">Завантаження не вдалося: неправильний файл</string>
     <string name="pref_dnd_on_silent_mode_summary">Встановити статус «Зайнятий», коли пристрій у безшумному режимі</string>
     <string name="rtp_state_content_add_video">Перемкнути на відеовиклик\?</string>
     <string name="no_storage_permission">Надати %1$s доступ до зовнішньої пам\'яті</string>
@@ -969,12 +969,12 @@
 \n
 \nУсі дані списку контактів залишаються на Вашому пристрої!</string>
     <string name="missed_calls_channel_name">Пропущені виклики</string>
-    <string name="data_saver_enabled_explained">Ваша операційна система обмежує для %1$s доступ до Інтернету у фоновому режимі. Щоб отримувати сповіщення про нові повідомлення, Вам потрібно дозволити %1$s необмежений доступ, коли заощадження трафіку увімкнено.
+    <string name="data_saver_enabled_explained">Ваша операційна система обмежує для %1$s доступ до Інтернету у фоновому режимі. Щоб отримувати сповіщення про нові повідомлення, Вам потрібно дозволити необмежений доступ для %1$s, коли заощадження трафіку ввімкнено.
 \n%1$s намагатиметься по можливості економити трафік.</string>
     <string name="pref_autojoin_summary">Встановлювати прапорець «autojoin» під час приєднання або виходу з групового чату/каналу та реагувати на зміни, зроблені іншими клієнтами.</string>
     <string name="battery_optimizations_enabled_explained">Ваш пристрій застосовує до %1$s інтенсивний режим енергозбереження, що може спричинити затримку сповіщень чи навіть втрату повідомлень.
 \nРекомендуємо вимкнути режим енергозбереження.</string>
-    <string name="could_not_correct_message">Не вдалося відредагувати повідомлення</string>
+    <string name="could_not_correct_message">Не вдалося виправити повідомлення</string>
     <string name="omemo_fingerprint_selected_message">Цифровий підпис OMEMO (джерело повідомлення)</string>
     <string name="omemo_fingerprint_x509_selected_message">Цифровий підпис v\\OMEMO (джерело повідомлення)</string>
     <string name="continue_btn">Продовжити</string>
@@ -984,7 +984,7 @@
     <string name="vector_graphic">векторна графіка</string>
     <string name="multimedia_file">мультимедіа</string>
     <string name="search_group_chats">Шукати групу</string>
-    <string name="pref_away_when_screen_off">«Відійшов» якщо екран заблоковано</string>
+    <string name="pref_away_when_screen_off">«Відійшов», якщо екран заблоковано</string>
     <string name="pref_away_when_screen_off_summary">Встановити статус «Відійшов», коли пристрій заблоковано</string>
     <string name="pref_dnd_on_silent_mode">«Зайнятий» у безшумному режимі</string>
     <string name="pref_treat_vibrate_as_dnd_summary">Встановити статус «Зайнятий», коли пристрій у віброрежимі</string>
@@ -1037,7 +1037,7 @@
     <string name="rtp_state_content_add">Додати ще пісні\?</string>
     <string name="restore_warning_continued">Не намагайтеся відновити резервні копії, які створили не Ви!</string>
     <string name="outdated_backup_file_format">Ви намагаєтеся імпортувати файл резервної копії у застарілому форматі</string>
-    <string name="audiobook">Аудіокнига</string>
+    <string name="audiobook">аудіокнига</string>
     <string name="reconnect_on_other_host">Відновити з\'єднання на іншому вузлі</string>
     <string name="this_account_is_logged_out">Ви вийшли з цього облікового запису</string>
     <string name="log_in">Увійти</string>

From 180622747b46f88f0aeb140ec4b41cc8de703ae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Thu, 17 Oct 2024 21:24:37 +0000
Subject: [PATCH 070/357] Translated using Weblate (Estonian)

Currently translated at 85.6% (893 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 73 +++++++++++++++++++++++++++++-
 1 file changed, 72 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index f183cd4d3fc3efb431334b08a453f54d449f76f0..454c181f343bb597a962762924b40fa4f7918ea3 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -579,7 +579,7 @@
     <string name="feature_not_implemented">Funktsionaalsus pole implementeeritud</string>
     <string name="invalid_country_code">Vigane riigikood</string>
     <string name="choose_a_country">Vali riik</string>
-    <string name="phone_number">telefoninimber</string>
+    <string name="phone_number">telefoninumber</string>
     <string name="backup_started_message">Varundamine on alanud. Saad teavituse, kui ta on lõppenud.</string>
     <string name="start_chat">Alusta vestlust</string>
     <string name="pref_quick_action_summary">Asenda „Saada“ nupp kiirtoimingutega</string>
@@ -856,4 +856,75 @@
     <string name="pref_clean_cache">Tühjenda puhver</string>
     <string name="pref_clean_private_storage">Tühjenda privaatne vahemälu</string>
     <string name="pref_clean_private_storage_summary">Tühjenda failide hoidmiseks mõeldud privaatne vahemälu (faile saad serverist uuesti alla laadida)</string>
+    <string name="sharing_application_not_grant_permission">Jagav rakendus ei andnud õigusi selle faili lugemiseks.</string>
+    <string name="jabber_network">jabber.network</string>
+    <string name="reconnecting_call">Kõne on uuesti ühendamisel</string>
+    <string name="reconnecting_video_call">Videokõne on uuesti ühendamisel</string>
+    <string name="abort_registration_procedure">Kas sa oled kindel, et soovid katkestada registreerimise?</string>
+    <string name="yes">Jah</string>
+    <string name="no">Ei</string>
+    <string name="verify_your_phone_number">Verifitseeri oma telefoninumber</string>
+    <string name="enter_country_code_and_phone_number">Quicksy saadab sulle telefoninumbri verifitseerimiseks SMS-sõnumi (võivad lisanduda sidevõrkude tasud). Sisesta maakood ja oma telefoninumber:</string>
+    <string name="we_will_be_verifying">Järgnevaga me verifitseerime telefoninumbri <br/><br/><b>%s</b><br/><br/>Kas kõik on õige või sooviksid numbrit muuta?</string>
+    <string name="not_a_valid_phone_number">%s pole korrektne telefoninumber.</string>
+    <string name="please_enter_your_phone_number">Palun sisesta oma telefoninumber.</string>
+    <string name="search_countries">Otsi riike</string>
+    <string name="verify_x">Verifitseeri %s</string>
+    <string name="we_have_sent_you_an_sms_to_x">Me oleme sulle saatnud SMS-sõnumi siia: <b>%s</b>.</string>
+    <string name="please_enter_pin_below">Palun sisesta 6-numbriline PIN-kood alljärgnevalt.</string>
+    <string name="resend_sms">Saada SMS uuesti</string>
+    <string name="resend_sms_in">Saada SMS uuesti (%s)</string>
+    <string name="wait_x">Palun oota (%s)</string>
+    <string name="please_enter_pin">Palun sisesta oma 6-numbriline PIN-kood.</string>
+    <string name="verifying">Verifitseerime…</string>
+    <string name="requesting_sms">Teeme päringu SMS-sõnumi kohta…</string>
+    <string name="incorrect_pin">Sinu sisestatud PIN-kood pole õige.</string>
+    <string name="pin_expired">Sinu sisestatud PIN-kood on aegunud.</string>
+    <string name="unknown_api_error_network">Tundmatu võrguühenduse viga.</string>
+    <string name="unknown_api_error_response">Tundmatu vastus serverilt.</string>
+    <string name="unable_to_connect_to_server">Ühenduse loomine serveriga ei õnnestunud.</string>
+    <string name="invalid_user_input">Vigane sisend kasutajalt</string>
+    <string name="temporarily_unavailable">Teenus pole ajutiselt saadaval. Palun proovi hiljem uuesti.</string>
+    <string name="no_network_connection">Võrguühendus puudub.</string>
+    <string name="try_again_in_x">Palun oota %s ja proovi uuesti</string>
+    <string name="rate_limited">Sinu tehtavatele päringutele kehtib hetkel ajaühikuline piirang</string>
+    <string name="too_many_attempts">Liiga palju päringuid</string>
+    <string name="restore_warning">Ära kasuta varukoopiat olemasoleva paigalduse kloonimiseks (samaaegseks käivitamiseks). Varukoopiast taastamine on mõeldud vaid teise seadmesse kolimise jaoks ning juhuks, kui kaotad oma algse nutiseadme.</string>
+    <string name="restore_warning_continued">Palun ära kasuta varukoopiaid, mida sa pole ise teinud!</string>
+    <string name="unable_to_restore_backup">Varukoopiast taastamine ei õnnestunud.</string>
+    <string name="local_server">Kohalik server</string>
+    <string name="pref_channel_discovery_summary">Enamus kasutajaid peaksid eelistama valikut „jabber.network“. See tagab asjakohasemad soovitused kogu avalikust XMPP võrgustikust.</string>
+    <string name="pref_channel_discovery">Kanalite tuvastamise meetod</string>
+    <string name="backup">Varukoopia</string>
+    <string name="category_about">Rakenduse teave</string>
+    <string name="please_enable_an_account">Palun võta mõni kasutajakonto kasutusele</string>
+    <string name="make_call">Helista</string>
+    <string name="rtp_state_incoming_call">Saabuv kõne</string>
+    <string name="rtp_state_incoming_video_call">Saabuv videokõne</string>
+    <string name="rtp_state_content_add">Kas lisame veel meediavoogusid?</string>
+    <string name="rtp_state_connecting">Ühendame</string>
+    <string name="rtp_state_connected">Ühendatud</string>
+    <string name="rtp_state_reconnecting">Ühendame uuesti</string>
+    <string name="rtp_state_accepting_call">Võtame kõnet vastu</string>
+    <string name="rtp_state_ending_call">Lõpetame kõnet</string>
+    <string name="answer_call">Vasta</string>
+    <string name="dismiss_call">Keeldu</string>
+    <string name="rtp_state_finding_device">Tuvastame seadmeid</string>
+    <string name="rtp_state_ringing">Helistame</string>
+    <string name="rtp_state_contact_offline">Kontakt pole kättesaadav</string>
+    <string name="rtp_state_connectivity_error">Kõne ühendamine ei õnnestunud</string>
+    <string name="rtp_state_connectivity_lost_error">Ühendus katkes</string>
+    <string name="rtp_state_retracted">Kõne on katkestatud</string>
+    <string name="rtp_state_application_failure">Rakenduse viga</string>
+    <string name="rtp_state_security_error">Viga verifitseerimisel</string>
+    <string name="hang_up">Lõpeta kõne</string>
+    <string name="ongoing_call">Kõne on pooleli</string>
+    <string name="we_have_sent_you_another_sms">Me oleme saatnud sulle uue SMS-sõnumi 6-numbrilise koodiga.</string>
+    <string name="disable_tor_to_make_call">Helistamiseks lülita Tori võrguühendus välja</string>
+    <string name="back">Tagasi</string>
+    <string name="unable_to_establish_secure_connection">Turvalise ühenduse loomine ei õnnestunud.</string>
+    <string name="possible_pin">Automaatselt asetasime lõikelaualt võimaliku PIN-koodi.</string>
+    <string name="unable_to_find_server">Serveri leidmine ei õnnestunud.</string>
+    <string name="something_went_wrong_processing_your_request">Midagi läks valesti sinu päringu töötlemisel.</string>
+    <string name="ongoing_video_call">Videokõne on pooleli</string>
 </resources>
\ No newline at end of file

From dc3bc6fa2c5ff2d3a18f89822c36551a00b564f4 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 18 Oct 2024 09:27:31 +0200
Subject: [PATCH 071/357] version bump to 2.17.1 + changelog

---
 CHANGELOG.md                                           | 4 ++++
 build.gradle                                           | 4 ++--
 fastlane/metadata/android/en-US/changelogs/4212204.txt | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/4212204.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 726b2ca78137ea0da0e51ae2e0a74f71a7a6eda4..8b2bb7c5bf1159b7794ef43c378e245e2629c5bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 2.17.1
+
+* Fix UI glitch when showing multiple reactions
+
 ### Version 2.17.0
 
 * Support Message Reactions
diff --git a/build.gradle b/build.gradle
index 1acf698171fc90db1c8c7837ff1d93bc44870856..7be25ad8a4d320517951b7d74aac5289ff3c7dbb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,8 +100,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 42121
-        versionName "2.17.0"
+        versionCode 42122
+        versionName "2.17.1"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/4212204.txt b/fastlane/metadata/android/en-US/changelogs/4212204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..976971e5a56d1ef863e19cd4789def4af4634dcb
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/4212204.txt
@@ -0,0 +1 @@
+* Fix UI glitch when showing multiple reactions

From d0cf3d3ffc526d78a83351a0b48d45f4aa79d4c8 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 18 Oct 2024 10:01:51 +0200
Subject: [PATCH 072/357] codeberg. we are on codeberg

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 0f9f5c1bd28c84870c31f597985797752efcca72..dc6892c8530e131708acaa2ebbc3728a6b3b3c54 100644
--- a/README.md
+++ b/README.md
@@ -81,8 +81,8 @@ run your own XMPP server for you and your friends. These XEP's are:
 #### How do I install Conversations?
 
 Conversations is entirely open source and licensed under GPLv3. So if you are a
-software developer you can check out the sources from GitHub and use Gradle to
-build your apk file.
+software developer you can check out the sources from Codeberg and use Gradle to
+build your APK file.
 
 Conversations is available on [Google Play](https://play.google.com/store/apps/details?id=eu.siacs.conversations) and on [F-Droid](https://f-droid.org/en/packages/eu.siacs.conversations/).
 

From d06ff45783642edd233a060059431670783d45aa Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 18 Oct 2024 17:03:16 +0200
Subject: [PATCH 073/357] try (and prefer) direct TLS when no SRV records are
 set

---
 .../conversations/ui/EditAccountActivity.java |  2 +-
 .../siacs/conversations/utils/Resolver.java   | 58 ++++++++++++-------
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index e76bfb3e64ef72ec85258590463c393e1b55057b..8713263425cd019dd3b6f6b3f2df1e2f65f29e21 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -734,7 +734,7 @@ public class EditAccountActivity extends OmemoActivity
         this.binding.hostname.addTextChangedListener(mTextWatcher);
         this.binding.hostname.setOnFocusChangeListener(mEditTextFocusListener);
         this.binding.clearDevices.setOnClickListener(v -> showWipePepDialog());
-        this.binding.port.setText(String.valueOf(Resolver.DEFAULT_PORT_XMPP));
+        this.binding.port.setText(String.valueOf(Resolver.XMPP_PORT_STARTTLS));
         this.binding.port.addTextChangedListener(mTextWatcher);
         this.binding.saveButton.setOnClickListener(this.mSaveButtonClickListener);
         this.binding.cancelButton.setOnClickListener(this.mCancelButtonClickListener);
diff --git a/src/main/java/eu/siacs/conversations/utils/Resolver.java b/src/main/java/eu/siacs/conversations/utils/Resolver.java
index 9d089ad05de24f8a7ca22ab73722321380a53947..224a5758f9fd8f9ab6177e1de908e6b8bbe21b29 100644
--- a/src/main/java/eu/siacs/conversations/utils/Resolver.java
+++ b/src/main/java/eu/siacs/conversations/utils/Resolver.java
@@ -9,6 +9,7 @@ import androidx.annotation.NonNull;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.base.Strings;
+import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
@@ -40,6 +41,7 @@ import org.minidns.record.SRV;
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -76,7 +78,8 @@ public class Resolver {
 
     private static final ExecutorService DNS_QUERY_EXECUTOR = Executors.newFixedThreadPool(12);
 
-    public static final int DEFAULT_PORT_XMPP = 5222;
+    public static final int XMPP_PORT_STARTTLS = 5222;
+    private static final int XMPP_PORT_DIRECT_TLS = 5223;
 
     private static final String DIRECT_TLS_SERVICE = "_xmpps-client";
     private static final String STARTTLS_SERVICE = "_xmpp-client";
@@ -106,7 +109,7 @@ public class Resolver {
     public static void clearCache() {}
 
     public static boolean useDirectTls(final int port) {
-        return port == 443 || port == 5223;
+        return port == 443 || port == XMPP_PORT_DIRECT_TLS;
     }
 
     public static List<Result> resolve(final String domain) {
@@ -157,10 +160,7 @@ public class Resolver {
             } catch (final UnknownHostException e) {
                 return Collections.emptyList();
             }
-            final Result result = new Result();
-            result.ip = inetAddress;
-            result.port = DEFAULT_PORT_XMPP;
-            return Collections.singletonList(result);
+            return Result.createWithDefaultPorts(null, inetAddress);
         } else {
             return Collections.emptyList();
         }
@@ -263,20 +263,22 @@ public class Resolver {
                 Futures.transform(
                         resolveAsFuture(dnsName, A.class),
                         result ->
-                                Lists.transform(
-                                        ImmutableList.copyOf(result.getAnswersOrEmptySet()),
-                                        a -> Result.createDefault(dnsName, a.getInetAddress())),
+                                Result.createDefaults(
+                                        dnsName,
+                                        Collections2.transform(
+                                                result.getAnswersOrEmptySet(),
+                                                InternetAddressRR::getInetAddress)),
                         MoreExecutors.directExecutor());
         futuresBuilder.add(aRecordResults);
         ListenableFuture<List<Result>> aaaaRecordResults =
                 Futures.transform(
                         resolveAsFuture(dnsName, AAAA.class),
                         result ->
-                                Lists.transform(
-                                        ImmutableList.copyOf(result.getAnswersOrEmptySet()),
-                                        aaaa ->
-                                                Result.createDefault(
-                                                        dnsName, aaaa.getInetAddress())),
+                                Result.createDefaults(
+                                        dnsName,
+                                        Collections2.transform(
+                                                result.getAnswersOrEmptySet(),
+                                                InternetAddressRR::getInetAddress)),
                         MoreExecutors.directExecutor());
         futuresBuilder.add(aaaaRecordResults);
         if (cName) {
@@ -299,7 +301,7 @@ public class Resolver {
                 noSrvFallbacks,
                 results -> {
                     if (results.isEmpty()) {
-                        return Collections.singletonList(Result.createDefault(dnsName));
+                        return Result.createDefaults(dnsName);
                     } else {
                         return results;
                     }
@@ -330,7 +332,7 @@ public class Resolver {
         public static final String AUTHENTICATED = "authenticated";
         private InetAddress ip;
         private DnsName hostname;
-        private int port = DEFAULT_PORT_XMPP;
+        private int port = XMPP_PORT_STARTTLS;
         private boolean directTls = false;
         private boolean authenticated = false;
         private int priority;
@@ -344,16 +346,32 @@ public class Resolver {
             return result;
         }
 
-        static Result createDefault(final DnsName hostname, final InetAddress ip) {
+        static List<Result> createWithDefaultPorts(final DnsName hostname, final InetAddress ip) {
+            return Lists.transform(
+                    Arrays.asList(XMPP_PORT_STARTTLS, XMPP_PORT_DIRECT_TLS),
+                    p -> createDefault(hostname, ip, p));
+        }
+
+        static Result createDefault(final DnsName hostname, final InetAddress ip, final int port) {
             Result result = new Result();
-            result.port = DEFAULT_PORT_XMPP;
+            result.port = port;
             result.hostname = hostname;
             result.ip = ip;
+            result.directTls = useDirectTls(port);
             return result;
         }
 
-        static Result createDefault(final DnsName hostname) {
-            return createDefault(hostname, null);
+        static List<Result> createDefaults(
+                final DnsName hostname, final Collection<InetAddress> inetAddresses) {
+            final ImmutableList.Builder<Result> builder = new ImmutableList.Builder<>();
+            for (final InetAddress inetAddress : inetAddresses) {
+                builder.addAll(createWithDefaultPorts(hostname, inetAddress));
+            }
+            return builder.build();
+        }
+
+        static List<Result> createDefaults(final DnsName hostname) {
+            return createWithDefaultPorts(hostname, null);
         }
 
         public static Result fromCursor(final Cursor cursor) {

From 36b5f2b5e27b93f3814cb85b9fd3050a5e630db9 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 20 Oct 2024 16:25:02 +0200
Subject: [PATCH 074/357] mark call integration as initialized during propose

---
 .../siacs/conversations/xmpp/jingle/JingleConnectionManager.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
index 588856b24a2438869947e1b38097fdd9aca8c6c4..1f93ed924bd60522bfaf9920e9413f8eab2cd400 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
@@ -790,6 +790,7 @@ public class JingleConnectionManager extends AbstractConnectionManager {
             final var contact = account.getRoster().getContact(with);
             callIntegration.setCallerDisplayName(
                     contact.getDisplayName(), TelecomManager.PRESENTATION_ALLOWED);
+            callIntegration.setInitialized();
             callIntegration.setInitialAudioDevice(CallIntegration.initialAudioDevice(media));
             callIntegration.startAudioRouting();
             final RtpSessionProposal proposal =

From d4729a9ae7f239ea689fd0a8ea0257f1484981d9 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 20 Oct 2024 16:25:33 +0200
Subject: [PATCH 075/357] handle reactions with missing id attribute

---
 .../java/eu/siacs/conversations/parser/MessageParser.java     | 2 +-
 .../conversations/android/xmpp/model/reactions/Reactions.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 22c9cf64c824da4b958d2844edc578ada07bd310..6de4bf10ecd3ef6d10d23ebcc499707b2aeaf51f 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -1137,7 +1137,7 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
             final Conversation conversation =
                     mXmppConnectionService.find(account, counterpart.asBareJid());
 
-            if (conversation != null) {
+            if (conversation != null && reactingTo != null) {
                 if (isTypeGroupChat && conversation.getMode() == Conversational.MODE_MULTI) {
                     final var mucOptions = conversation.getMucOptions();
                     final var occupantId = occupant == null ? null : occupant.getId();
diff --git a/src/main/java/im/conversations/android/xmpp/model/reactions/Reactions.java b/src/main/java/im/conversations/android/xmpp/model/reactions/Reactions.java
index ec3ae989176bc25d1cef26cafa8137c8ef707d46..acd8dbb2471beb5f614cbb1c8381d99be4b2ed61 100644
--- a/src/main/java/im/conversations/android/xmpp/model/reactions/Reactions.java
+++ b/src/main/java/im/conversations/android/xmpp/model/reactions/Reactions.java
@@ -2,8 +2,10 @@ package im.conversations.android.xmpp.model.reactions;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Collections2;
+
 import im.conversations.android.annotation.XmlElement;
 import im.conversations.android.xmpp.model.Extension;
+
 import java.util.Collection;
 import java.util.Objects;
 
@@ -21,7 +23,7 @@ public class Reactions extends Extension {
     }
 
     public String getId() {
-        return this.getAttribute("id");
+        return Strings.emptyToNull(this.getAttribute("id"));
     }
 
     public void setId(String id) {

From b45a3eeaf2b9f657d3587a72b3af47a7265e2a8b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 20 Oct 2024 16:39:17 +0200
Subject: [PATCH 076/357] disable call integration on Android 15

The call integration depends on the operating system giving us a list of
possible output devices (speaker, earpiece, BT headset, ...) via a
callback called
`onAvailableCallEndpointsChanged()` that is called as soon as the app
registers the call with the operating system.
For outgoing calls on Android 15 this method is no longer invoked
leaving Conversations without knowledge about what devices are available
and thus without the ability to switch between speaker and earpiece.

Logcat output seems to indicate that there might be some sort of race
condition (there is a line that says something like: available endpoints
changed but service was not bound)
There is further evidence in that if one tries multiple calls in a row
(10+) one might actually see the output device switcher / indicator.

However after a full day of investigation it seems that the race
condition is in the platform code; not in Conversations.
---
 .../java/eu/siacs/conversations/services/CallIntegration.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/eu/siacs/conversations/services/CallIntegration.java b/src/main/java/eu/siacs/conversations/services/CallIntegration.java
index 99fda67df321874e7f9f48a8efa0e3b66bed19b7..be0446cd9f54f4b28d25fbb034dff021887257a7 100644
--- a/src/main/java/eu/siacs/conversations/services/CallIntegration.java
+++ b/src/main/java/eu/siacs/conversations/services/CallIntegration.java
@@ -527,6 +527,7 @@ public class CallIntegration extends Connection {
 
     public static boolean selfManaged(final Context context) {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
+                && Build.VERSION.SDK_INT < 35
                 && hasSystemFeature(context)
                 && isDeviceModelSupported();
     }

From 26d52906726c74cb4882fdbe5c607f384132fbf4 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 23 Oct 2024 14:27:46 +0200
Subject: [PATCH 077/357] version bump to 2.17.2 + changelog

---
 CHANGELOG.md                                           | 5 +++++
 build.gradle                                           | 4 ++--
 fastlane/metadata/android/en-US/changelogs/4212304.txt | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/4212304.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b2bb7c5bf1159b7794ef43c378e245e2629c5bf..401f577923421f8867c331feea0a2ce75b45efbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.17.2
+
+* Fix calls on Android 15
+* Fix rare crash / regression introduced with 2.17.0
+
 ### Version 2.17.1
 
 * Fix UI glitch when showing multiple reactions
diff --git a/build.gradle b/build.gradle
index 7be25ad8a4d320517951b7d74aac5289ff3c7dbb..ec4fe938d40a10eff046f2b17b868049efe3efa1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,8 +100,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 42122
-        versionName "2.17.1"
+        versionCode 42123
+        versionName "2.17.2"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/4212304.txt b/fastlane/metadata/android/en-US/changelogs/4212304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..800d1fb03c4fdb8f7256b2e534f1021f9d45b7cd
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/4212304.txt
@@ -0,0 +1,2 @@
+* Fix calls on Android 15
+* Fix rare crash / regression introduced with 2.17.0

From 4fd56aee82ae0973e4c0a45c0039f24918c8b926 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 29 Oct 2024 19:25:49 +0100
Subject: [PATCH 078/357] show no internet error in edit account

---
 .../conversations/ui/EditAccountActivity.java | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 8713263425cd019dd3b6f6b3f2df1e2f65f29e21..61c76eb6e9fbf5387ea0d0a92b87f25d80b96f84 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -1045,11 +1045,7 @@ public class EditAccountActivity extends OmemoActivity
     }
 
     private void deleteAccount() {
-        this.deleteAccount(
-                mAccount,
-                () -> {
-                    finish();
-                });
+        this.deleteAccount(mAccount, () -> finish());
     }
 
     private boolean inNeedOfSaslAccept() {
@@ -1393,7 +1389,7 @@ public class EditAccountActivity extends OmemoActivity
             if (hasKeys
                     && Config.supportOmemo()) { // TODO: either the button should be visible if we
                 // print an active device or the device list should
-                // be fed with reactived devices
+                // be fed with reactivated devices
                 this.binding.otherDeviceKeysCard.setVisibility(View.VISIBLE);
                 Set<Integer> otherDevices = mAccount.getAxolotlService().getOwnDeviceIds();
                 if (otherDevices == null || otherDevices.isEmpty()) {
@@ -1409,12 +1405,17 @@ public class EditAccountActivity extends OmemoActivity
             }
         } else {
             final TextInputLayout errorLayout;
-            if (this.mAccount.errorStatus()) {
-                if (this.mAccount.getStatus() == Account.State.UNAUTHORIZED
-                        || this.mAccount.getStatus() == Account.State.DOWNGRADE_ATTACK) {
+            final var status = this.mAccount.getStatus();
+            if (status.isError()
+                    || Arrays.asList(
+                                    Account.State.NO_INTERNET,
+                                    Account.State.MISSING_INTERNET_PERMISSION)
+                            .contains(status)) {
+                if (status == Account.State.UNAUTHORIZED
+                        || status == Account.State.DOWNGRADE_ATTACK) {
                     errorLayout = this.binding.accountPasswordLayout;
                 } else if (mShowOptions
-                        && this.mAccount.getStatus() == Account.State.SERVER_NOT_FOUND
+                        && status == Account.State.SERVER_NOT_FOUND
                         && this.binding.hostname.getText().length() > 0) {
                     errorLayout = this.binding.hostnameLayout;
                 } else {

From a19d84a26d15bffca2653111d16b79095bdb6df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Sat, 19 Oct 2024 13:30:30 +0000
Subject: [PATCH 079/357] Translated using Weblate (Estonian)

Currently translated at 86.2% (900 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 454c181f343bb597a962762924b40fa4f7918ea3..fcca2c2bbf2075ace54b32448ef88dad17d1935e 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -927,4 +927,12 @@
     <string name="unable_to_find_server">Serveri leidmine ei õnnestunud.</string>
     <string name="something_went_wrong_processing_your_request">Midagi läks valesti sinu päringu töötlemisel.</string>
     <string name="ongoing_video_call">Videokõne on pooleli</string>
+    <string name="device_does_not_support_data_saver">Sinu nutiseadme operatsioonisüsteem ei toeta andmesäästja väljalülitamist %1$s jaoks.</string>
+    <string name="data_saver_enabled_explained">Sinu nutiseadme operatsioonisüsteem piirab taustal töötamise ajal %1$s ligipääsu internetiühendusele. Et sa saaksid teavitusi uute sõnumite kohta ka siis, kui „Andmesäästja“ on kasutusel, siis palun luba, et %1$s saaks piiramatult kasutada võrguühendust.
+\nKui vähegi võimalik, siis ka %1$s üritab säästa andmeliikluse mahtu.</string>
+    <string name="verifying_omemo_keys_trusted_source_account">Oled verifitseerimas oma kasutajakonto OMEMO-võtmeid. See tegevus on turvaline vaid siis, kui leidsid lingi usaldusväärsest allikast, sellisest, kuhu vaid sina said selle lisada.</string>
+    <string name="continue_btn">Jätka</string>
+    <string name="verify_omemo_keys">Verifitseeri OMEMO-võtmed</string>
+    <string name="i_followed_this_link_from_a_trusted_source">Ma klõpsisin seda linki allikas, mida usaldan</string>
+    <string name="verifying_omemo_keys_trusted_source">Oled verifitseerimas %1$s OMEMO-võtmeid niipea, kui linki klõpsid. See tegevus on turvaline vaid siis, kui leidsid lingi usaldusväärsest allikast, sellisest, kuhu vaid %2$s oleks võinud selle lisada.</string>
 </resources>
\ No newline at end of file

From 06e389d580f158864a4a750aeefe3c0be9a66cb6 Mon Sep 17 00:00:00 2001
From: takto <takto@users.noreply.translate.codeberg.org>
Date: Sat, 19 Oct 2024 16:30:17 +0000
Subject: [PATCH 080/357] Translated using Weblate (Portuguese)

Currently translated at 37.6% (393 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pt/
---
 src/main/res/values-pt/strings.xml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index d20287ff09cf45223102a698407064ddae6360cb..4b325f428660f3ea457c6e526c55a0d92f4f2427 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -37,7 +37,7 @@
     <string name="blocked">Bloqueado</string>
     <string name="register_account">Registe uma nova conta no servidor</string>
     <string name="change_password_on_server">Altere a senha no servidor</string>
-    <string name="share_with">Compartilhar com...</string>
+    <string name="share_with">Mostrar a…</string>
     <string name="invite_contact">Convidar contacto</string>
     <string name="contacts">Contactos</string>
     <string name="contact">Contacto</string>
@@ -90,8 +90,8 @@
     <string name="error">Ocorreu um erro</string>
     <string name="recording_error">Erro</string>
     <string name="your_account">A sua conta</string>
-    <string name="send_presence_updates">Enviar atualizações de presença</string>
-    <string name="receive_presence_updates">Receber atualizações de presença</string>
+    <string name="send_presence_updates">Enviar presença</string>
+    <string name="receive_presence_updates">Receber presença</string>
     <string name="ask_for_presence_updates">Pedir atualizações de presença</string>
     <string name="attach_choose_picture">Escolher imagem</string>
     <string name="attach_take_picture">Tirar foto</string>
@@ -400,4 +400,13 @@
     <string name="message_copied_to_clipboard">Mensagem copiada para a área de transferência</string>
     <string name="title_activity_show_location">Exibir localização</string>
     <string name="rtp_state_declined_or_busy">Ocupado</string>
+    <string name="action_account">Gerir conta</string>
+    <string name="action_muc_details">Detalhes do grupo</string>
+    <string name="channel_details">Detalhes do canal</string>
+    <string name="title_activity_share_with">Mostrar a…</string>
+    <string name="action_unblock_participant">Perdoar membro</string>
+    <string name="title_activity_share_via_account">Mostrar via conta</string>
+    <string name="title_activity_new_chat">Nova conversa</string>
+    <string name="action_archive_chat">Arquivar conversa</string>
+    <string name="action_block_participant">Ignorar membro</string>
 </resources>
\ No newline at end of file

From 7743f12b977d17ee96b6d5c9c0a0d6befb78e4db Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Sun, 20 Oct 2024 07:52:19 +0000
Subject: [PATCH 081/357] Translated using Weblate (Polish)

Currently translated at 23.2% (17 of 73 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/pl/
---
 fastlane/metadata/android/pl-PL/changelogs/4212204.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4212204.txt

diff --git a/fastlane/metadata/android/pl-PL/changelogs/4212204.txt b/fastlane/metadata/android/pl-PL/changelogs/4212204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..54d774b3d6860e8fbc8833ed0706f0c195bccf1f
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4212204.txt
@@ -0,0 +1 @@
+* Naprawienie usterki interfejsu użytkownika podczas pokazywania wielu reakcji

From d6c4684c858ea8764bd8d26ccca2c9e53c0b2ec9 Mon Sep 17 00:00:00 2001
From: Besnik_b <Besnik_b@users.noreply.translate.codeberg.org>
Date: Sun, 20 Oct 2024 07:50:04 +0000
Subject: [PATCH 082/357] Translated using Weblate (Albanian)

Currently translated at 100.0% (73 of 73 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/sq/
---
 fastlane/metadata/android/sq/changelogs/4212204.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/sq/changelogs/4212204.txt

diff --git a/fastlane/metadata/android/sq/changelogs/4212204.txt b/fastlane/metadata/android/sq/changelogs/4212204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f1c36671ffd4f62bfbd2a489ce73a87ca292d686
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/4212204.txt
@@ -0,0 +1 @@
+* Ndreqje e një problemi të vockël në UI, kur shfaqen reagime të shumtë

From 3ce3e4f1567cb41074007d1e8573eb6c1d65bb49 Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Sat, 19 Oct 2024 16:29:01 +0000
Subject: [PATCH 083/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (73 of 73 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/uk/
---
 fastlane/metadata/android/uk/changelogs/4212204.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/uk/changelogs/4212204.txt

diff --git a/fastlane/metadata/android/uk/changelogs/4212204.txt b/fastlane/metadata/android/uk/changelogs/4212204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..edaa8adc22e7236865a91e00bb5e90824cbaeef3
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/4212204.txt
@@ -0,0 +1 @@
+* Виправлено помилку інтерфейсу під час показу декількох реакцій

From feb5a8159fc79cb89f301cefa31653891926f4df Mon Sep 17 00:00:00 2001
From: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Date: Sun, 20 Oct 2024 01:16:27 +0000
Subject: [PATCH 084/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (73 of 73 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/zh_Hans/
---
 fastlane/metadata/android/zh-CN/changelogs/4212204.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/zh-CN/changelogs/4212204.txt

diff --git a/fastlane/metadata/android/zh-CN/changelogs/4212204.txt b/fastlane/metadata/android/zh-CN/changelogs/4212204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..eb7805db93f5495f1a2e3ffc6afec8f55b32be9b
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/4212204.txt
@@ -0,0 +1 @@
+* 修复显示多个回应时的 UI 故障

From 07c690b5844fabef5af4c7bb38711d99912de832 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Sun, 20 Oct 2024 13:16:03 +0000
Subject: [PATCH 085/357] Translated using Weblate (Estonian)

Currently translated at 89.2% (931 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 50 ++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index fcca2c2bbf2075ace54b32448ef88dad17d1935e..9c64779383039bf1db739e61ab3d5e84b50c4283 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -935,4 +935,54 @@
     <string name="verify_omemo_keys">Verifitseeri OMEMO-võtmed</string>
     <string name="i_followed_this_link_from_a_trusted_source">Ma klõpsisin seda linki allikas, mida usaldan</string>
     <string name="verifying_omemo_keys_trusted_source">Oled verifitseerimas %1$s OMEMO-võtmeid niipea, kui linki klõpsid. See tegevus on turvaline vaid siis, kui leidsid lingi usaldusväärsest allikast, sellisest, kuhu vaid %2$s oleks võinud selle lisada.</string>
+    <plurals name="days">
+        <item quantity="one">%d päev</item>
+        <item quantity="other">%d päeva</item>
+    </plurals>
+    <string name="distrust_omemo_key">Lõpeta seadme usaldamine</string>
+    <string name="encrypting_message">Krüptime sõnumit</string>
+    <string name="not_fetching_history_retention_period">Ei laadi sõnumeid, kuna kohalik keeluperiood veel kehtib.</string>
+    <string name="pref_automatically_delete_messages">Kustuta sõnumid automaatselt</string>
+    <string name="pref_automatically_delete_messages_description">Kustuta sellest seadmest automaatselt sõnumid, mille vanus ületab seadistatud aja.</string>
+    <plurals name="seconds">
+        <item quantity="one">%d sekund</item>
+        <item quantity="other">%d sekundit</item>
+    </plurals>
+    <plurals name="months">
+        <item quantity="one">%d kuu</item>
+        <item quantity="other">%d kuud</item>
+    </plurals>
+    <string name="hide_inactive_devices">Peida mitteaktiivsed</string>
+    <plurals name="minutes">
+        <item quantity="one">%d minut</item>
+        <item quantity="other">%d minutit</item>
+    </plurals>
+    <plurals name="hours">
+        <item quantity="one">%d tund</item>
+        <item quantity="other">%d tundi</item>
+    </plurals>
+    <plurals name="weeks">
+        <item quantity="one">%d nädal</item>
+        <item quantity="other">%d nädalat</item>
+    </plurals>
+    <string name="show_inactive_devices">Näita mitteaktiivseid</string>
+    <string name="transcoding_video">Tihendame videot</string>
+    <string name="corresponding_chats_closed">Vastavad vestlused on arhiveeritud.</string>
+    <string name="contact_blocked_past_tense">Kontakt on blokeeritud.</string>
+    <string name="pref_notifications_from_strangers">Teavitused tundmatute isikute suhtlusest</string>
+    <string name="pref_notifications_from_strangers_summary">Teavita, kui tundmatud on saatnud sõnumeid või helistanud.</string>
+    <string name="received_message_from_stranger">Said sõnumi tundmatult isikult</string>
+    <string name="block_stranger">Blokeeri tundmatu saatja</string>
+    <string name="block_entire_domain">Blokeeri kogu domeen</string>
+    <string name="online_right_now">hetkel võrgus</string>
+    <string name="retry_decryption">Proovi dekrüptimist uuesti</string>
+    <string name="session_failure">Sessiooniviga</string>
+    <string name="sasl_downgrade">Nõrgendatud SASLi meetod</string>
+    <string name="account_status_regis_web">Server eeldab registreerimist veebisaidis</string>
+    <string name="open_website">Ava veebisait</string>
+    <string name="application_found_to_open_website">Veebisaidi avamiseks ei leidu rakendust</string>
+    <string name="pref_headsup_notifications">Teavitused väljaspool olekuriba</string>
+    <string name="pref_headsup_notifications_summary">Näita teavitusi väljaspool olekuriba (Heads-Up notifications)</string>
+    <string name="distrust_omemo_key_text">Kas sa oled kindel, et tahad sellelt seadmelt eemaldada verifitseerimise?
+\nSee seade ja temalt saabunud sõnumid on nüüd märgitud kui „Pole usaldatud“.</string>
 </resources>
\ No newline at end of file

From 264b6cf28c16509c5e4a2bb47909e0e15f88dd32 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Mon, 21 Oct 2024 06:55:28 +0000
Subject: [PATCH 086/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index edc027ae585e727aed2238a15428c23b4829faf4..ddbeb788f23429309640c18840568ae61acd5485 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -218,9 +218,9 @@
     <string name="openpgp_messages_found">Найдены новые зашифрованные OpenPGP сообщения</string>
     <string name="openpgp_key_id">ID ключа OpenPGP</string>
     <string name="omemo_fingerprint">Отпечаток OMEMO</string>
-    <string name="omemo_fingerprint_x509">v\\OMEMO-отпечаток</string>
-    <string name="omemo_fingerprint_selected_message">OMEMO-отпечаток (выбранного сообщения)</string>
-    <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO-отпечаток (выбранного сообщения)</string>
+    <string name="omemo_fingerprint_x509">v\\Отпечаток OMEMO</string>
+    <string name="omemo_fingerprint_selected_message">Отпечаток OMEMO (выбранного сообщения)</string>
+    <string name="omemo_fingerprint_x509_selected_message">v\\Отпечаток OMEMO (выбранного сообщения)</string>
     <string name="other_devices">Другие устройства</string>
     <string name="trust_omemo_fingerprints">Доверенные отпечатки OMEMO</string>
     <string name="fetching_keys">Получение ключей…</string>
@@ -300,7 +300,7 @@
     <string name="title_pref_enable_quiet_hours">Включить режим \"тихих часов\"</string>
     <string name="pref_quiet_hours_summary">Уведомления будут отключены во время \"тихих часов\"</string>
     <string name="pref_expert_options_other">Другие</string>
-    <string name="toast_message_omemo_fingerprint">OMEMO-отпечаток скопирован в буфер обмена</string>
+    <string name="toast_message_omemo_fingerprint">Отпечаток OMEMO скопирован в буфер обмена</string>
     <string name="conference_banned">Вы заблокированы в этой конференции</string>
     <string name="conference_members_only">Эта конференция — только для участников</string>
     <string name="conference_resource_constraint">Ресурсное ограничение</string>
@@ -361,7 +361,7 @@
     <string name="no_conference_server_found">Сервер конференции не найден</string>
     <string name="conference_creation_failed">Невозможно создать конференцию</string>
     <string name="account_image_description">Аватар аккаунта</string>
-    <string name="copy_omemo_clipboard_description">Скопировать OMEMO-отпечаток в буфер обмена</string>
+    <string name="copy_omemo_clipboard_description">Копировать отпечаток OMEMO в буфер обмена</string>
     <string name="regenerate_omemo_key">Создать ключ OMEMO заново</string>
     <string name="clear_other_devices">Очистить устройства</string>
     <string name="clear_other_devices_desc">Очистить все остальные устройства из анонса ключей OMEMO? При соединении устройств в следующий раз новые ключи анонсируются автоматически, но устройства могут не получить сообщения, посланные до этого.</string>
@@ -699,7 +699,7 @@
     <string name="certificate_does_not_contain_jid">Сертификат не содержит XMPP-адрес</string>
     <string name="server_info_partial">частичный</string>
     <string name="attach_record_video">Записать видео</string>
-    <string name="copy_to_clipboard">Скопировать в буфер обмена</string>
+    <string name="copy_to_clipboard">Копировать в буфер обмена</string>
     <string name="message_copied_to_clipboard">Сообщение скопировано в буфер обмена</string>
     <string name="message">Сообщение</string>
     <string name="private_messages_are_disabled">Личные сообщения выключены</string>

From 429d3f9d452d0807f99389e195779a89bc04a231 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Mon, 21 Oct 2024 05:43:58 +0000
Subject: [PATCH 087/357] Translated using Weblate (Russian)

Currently translated at 100.0% (9 of 9 strings)

Translation: Conversations/Android App (Quicksy)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-quicksy/ru/
---
 src/quicksy/res/values-ru/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/quicksy/res/values-ru/strings.xml b/src/quicksy/res/values-ru/strings.xml
index 698c3bd29c6851fa82b900d023d58605f83a58a9..b1c0301d343c6d842fc12ec8059dafc224175e1f 100644
--- a/src/quicksy/res/values-ru/strings.xml
+++ b/src/quicksy/res/values-ru/strings.xml
@@ -3,9 +3,9 @@
     <string name="pref_notification_grace_period_summary">Время, на которое уведомления от Quicksy будут отключены после активности с другого устройства</string>
     <string name="pref_never_send_crash_summary">Отправляя отчёты об ошибках, вы помогаете в разработке Quicksy</string>
     <string name="pref_broadcast_last_activity_summary">Извещать собеседников, когда вы пользуетесь Quicksy</string>
-    <string name="huawei_protected_apps_summary">Чтобы продолжать получать уведомления, даже если экран выключен, вам необходимо добавить Quicksy в список защищенных приложений.</string>
+    <string name="huawei_protected_apps_summary">Чтобы продолжать получать уведомления даже при отключённом экране необходимо добавить Quicksy в список защищённых приложений.</string>
     <string name="set_profile_picture">Аватар Quicksy</string>
-    <string name="not_available_in_your_country">Quicksy недоступен в Вашем регионе.</string>
+    <string name="not_available_in_your_country">Quicksy недоступен в вашем регионе.</string>
     <string name="unable_to_verify_server_identity">Не удалось подтвердить сервер.</string>
     <string name="unknown_security_error">Неизвестная ошибка безопасности.</string>
     <string name="timeout_while_connecting_to_server">Время ожидания подключения к серверу вышло.</string>

From 441e010c94bc26816cc0f103bd4213bc50fa7bb0 Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Mon, 21 Oct 2024 04:00:41 +0000
Subject: [PATCH 088/357] Translated using Weblate (Galician)

Currently translated at 61.6% (45 of 73 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/gl/
---
 fastlane/metadata/android/gl-ES/changelogs/4212204.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/gl-ES/changelogs/4212204.txt

diff --git a/fastlane/metadata/android/gl-ES/changelogs/4212204.txt b/fastlane/metadata/android/gl-ES/changelogs/4212204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..117a4a757c7db337719c9a24d664c1ba630d60af
--- /dev/null
+++ b/fastlane/metadata/android/gl-ES/changelogs/4212204.txt
@@ -0,0 +1 @@
+* Arranxo do problema na interface cando hai varias reaccións

From 10d278e2acf0bcf3d04da7a6a2157537a9e21395 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Mon, 21 Oct 2024 05:30:08 +0000
Subject: [PATCH 089/357] Translated using Weblate (Russian)

Currently translated at 26.0% (19 of 73 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/ru/
---
 fastlane/metadata/android/ru-RU/changelogs/4210104.txt | 2 +-
 fastlane/metadata/android/ru-RU/changelogs/4210404.txt | 3 +++
 fastlane/metadata/android/ru-RU/changelogs/4210504.txt | 2 ++
 fastlane/metadata/android/ru-RU/changelogs/4210704.txt | 3 +++
 fastlane/metadata/android/ru-RU/changelogs/4210804.txt | 2 ++
 fastlane/metadata/android/ru-RU/changelogs/4211104.txt | 3 +++
 fastlane/metadata/android/ru-RU/changelogs/4211204.txt | 2 ++
 fastlane/metadata/android/ru-RU/changelogs/4211304.txt | 1 +
 fastlane/metadata/android/ru-RU/changelogs/4211704.txt | 3 +++
 fastlane/metadata/android/ru-RU/changelogs/4212204.txt | 1 +
 10 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4210404.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4210504.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4210704.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4210804.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4211104.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4211204.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4211304.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4211704.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4212204.txt

diff --git a/fastlane/metadata/android/ru-RU/changelogs/4210104.txt b/fastlane/metadata/android/ru-RU/changelogs/4210104.txt
index 3b2e3069bb4a03d99dc86f1087e2b43c15c8db76..c42e447f9266484143334abc99cce612a5853995 100644
--- a/fastlane/metadata/android/ru-RU/changelogs/4210104.txt
+++ b/fastlane/metadata/android/ru-RU/changelogs/4210104.txt
@@ -1 +1 @@
-* Улучшена интеграция вызовов A/V с операционной системой
+* Улучшена интеграция аудио- и видеовызовов с операционной системой
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4210404.txt b/fastlane/metadata/android/ru-RU/changelogs/4210404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..280144fff51228da301e25b51905093c83eef5fa
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4210404.txt
@@ -0,0 +1,3 @@
+* Исправлены аудио- и видеовызовы на Android 8
+* Исправлены приоритеты в новой интеграции вызовов
+* Исправлена проблема со сжатием видео
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4210504.txt b/fastlane/metadata/android/ru-RU/changelogs/4210504.txt
new file mode 100644
index 0000000000000000000000000000000000000000..73a70549ff33f7977578c5141638cf4215021e0a
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4210504.txt
@@ -0,0 +1,2 @@
+* Восстановлен доступ к поиску каналов для Android 6+7
+* Улучшено ведение журнала для неудачной интеграции вызовов
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4210704.txt b/fastlane/metadata/android/ru-RU/changelogs/4210704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..497d807095325d11367c261d7e1fcc559c1aa334
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4210704.txt
@@ -0,0 +1,3 @@
+* Используется тема Material 3
+* Реорганизация настроек
+* Синхронизация состояния прочтения на разных устройствах
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4210804.txt b/fastlane/metadata/android/ru-RU/changelogs/4210804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6a6207a57354e8cd5950269d041fe9e6bb44eb7d
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4210804.txt
@@ -0,0 +1,2 @@
+* Отображение статуса сообщения значком
+* Добавлен параметр "Крупный шрифт" для пузырей сообщений
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4211104.txt b/fastlane/metadata/android/ru-RU/changelogs/4211104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5f65fadee00d6ca767f374ba8e5c6afa2cab8b75
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4211104.txt
@@ -0,0 +1,3 @@
+* Планировщик регулярного резервного копирования
+* Все устройства Realme до Android 11 исключены из интеграции вызовов
+* Незначительные улучшения интерфейса (пузыри сообщений)
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4211204.txt b/fastlane/metadata/android/ru-RU/changelogs/4211204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1054a8426c766af28e792f855d1c12ce1ab27e7c
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4211204.txt
@@ -0,0 +1,2 @@
+* Исправлена ошибка, из-за которой звук вызова включался при переключении устройств вывода
+* Все устройства Umidigi исключены из интеграции вызовов
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4211304.txt b/fastlane/metadata/android/ru-RU/changelogs/4211304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9a70a488583400e959531d5c5e7930451d058a84
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4211304.txt
@@ -0,0 +1 @@
+* Резервное копирование запускается как приоритетная служба, чтобы предотвратить остановку процесса через 10 минут
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4211704.txt b/fastlane/metadata/android/ru-RU/changelogs/4211704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d072da7efb7d9c4904761d44692585aab60ce331
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4211704.txt
@@ -0,0 +1,3 @@
+* Предлагаются более высокие значения автоматического приёма файлов
+* Отображается дополнительная информация в разделе "Информация о сервере"
+* Различные исправления ошибок
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4212204.txt b/fastlane/metadata/android/ru-RU/changelogs/4212204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..14c9d8b0106da63f183b512a1a131e275204d72d
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4212204.txt
@@ -0,0 +1 @@
+* Исправлен сбой интерфейса при отображении нескольких реакций

From 0a7ec70a29328cdcb5c808aadcbfa9cad4bd10db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Sun, 20 Oct 2024 16:08:03 +0000
Subject: [PATCH 090/357] Translated using Weblate (Estonian)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 134 ++++++++++++++++++++++++++++-
 1 file changed, 131 insertions(+), 3 deletions(-)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 9c64779383039bf1db739e61ab3d5e84b50c4283..5f09629738bfe6493fa0b6ad6068ff14cf29272f 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -634,7 +634,7 @@
     <string name="recently_used">Viimatikasutatu</string>
     <string name="choose_quick_action">Vali kiirtoiming</string>
     <string name="search_contacts">Otsi kontakte</string>
-    <string name="pref_presence_settings">Saadavus</string>
+    <string name="pref_presence_settings">Kättesaadavus</string>
     <string name="account_status_tor_unavailable">Tori võrk pole saadaval</string>
     <string name="account_status_bind_failure">Serveriga sidumine ei õnnestunud</string>
     <string name="account_status_host_unknown">See server ei vastuta antud domeeni eest</string>
@@ -672,7 +672,7 @@
     <string name="presence_online">Võrgus</string>
     <string name="use_own_provider">Kasuta minu valitud teenusepakkujat</string>
     <string name="pick_your_username">Vali oma kasutajanimi</string>
-    <string name="pref_manually_change_presence">Halda saadavust käsitsi</string>
+    <string name="pref_manually_change_presence">Halda kättesaadavust käsitsi</string>
     <string name="pref_manually_change_presence_summary">Olekuteate muutmisega seadista oma kättesaadavust.</string>
     <string name="presence_xa">Pole saadaval</string>
     <string name="this_account_is_disabled">Sa oled selle kasutajakonto välja lülitanud</string>
@@ -969,7 +969,7 @@
     <string name="transcoding_video">Tihendame videot</string>
     <string name="corresponding_chats_closed">Vastavad vestlused on arhiveeritud.</string>
     <string name="contact_blocked_past_tense">Kontakt on blokeeritud.</string>
-    <string name="pref_notifications_from_strangers">Teavitused tundmatute isikute suhtlusest</string>
+    <string name="pref_notifications_from_strangers">Teavitused tundmatutelt isikutelt</string>
     <string name="pref_notifications_from_strangers_summary">Teavita, kui tundmatud on saatnud sõnumeid või helistanud.</string>
     <string name="received_message_from_stranger">Said sõnumi tundmatult isikult</string>
     <string name="block_stranger">Blokeeri tundmatu saatja</string>
@@ -985,4 +985,132 @@
     <string name="pref_headsup_notifications_summary">Näita teavitusi väljaspool olekuriba (Heads-Up notifications)</string>
     <string name="distrust_omemo_key_text">Kas sa oled kindel, et tahad sellelt seadmelt eemaldada verifitseerimise?
 \nSee seade ja temalt saabunud sõnumid on nüüd märgitud kui „Pole usaldatud“.</string>
+    <string name="providing_a_name_is_optional">Nime lisamine pole kohustuslik</string>
+    <string name="silent_messages_channel_description">See teavituste kategooria on kasutusel selliste teavituste kuvamiseks, mille puhul ei peaks helilist teavitust kasutama. Näiteks kui sa tegutsed mõnes muus nutiseadmes (teavituste keelamise viiteaeg).</string>
+    <string name="ongoing_calls_channel_name">Pooleliolevad kõned</string>
+    <string name="missed_calls_channel_name">Vastamata kõned</string>
+    <string name="silent_messages_channel_name">Vaiksed sõnumid</string>
+    <string name="incoming_call">Saabuv kõne</string>
+    <string name="incoming_call_duration_timestamp">Saabuv kõne (%s) · %s</string>
+    <string name="unable_to_parse_invite">Kutse töötlemine ei õnnestunud</string>
+    <string name="plain_text_document">Vormindamata tekst</string>
+    <string name="account_registrations_are_not_supported">Kasutajakontode registreerimine pole toetatud</string>
+    <string name="pref_notifications_summary">Teavituste keelamise viiteaeg, helin, värinaalarm, tundmatud saatjad</string>
+    <string name="pref_attachments_summary">Failide suurus, piltide pakkimine, videote kvaliteet</string>
+    <string name="notifications">Teavitused</string>
+    <string name="pref_category_sending">Saatmine</string>
+    <string name="pref_category_receiving">Vastuvõtmine</string>
+    <string name="pref_large_font">Suur font</string>
+    <string name="pref_large_font_summary">Näita jutumullides tekste suuremana</string>
+    <string name="pref_up_long_summary">Toimides UnifiedPushi levitajana, kasutatakse meie püsivat, usaldusväärset ja akusõbralikku XMPP-ühendust teiste UnifiedPushiga ühilduvate rakenduste (Tusky, Ltt.rs, FluffyChat ja paljud teised) äratamiseks.</string>
+    <string name="pref_accept_invites_from_strangers">Kutsed tundmatutelt saatjatelt</string>
+    <string name="error_trustkey_hint_mutual">Vihje: mõnel juhul õnnestub seda viga parandada, kui mõlemad osapooled üksteist oma kontaktiloendisse lisavad.</string>
+    <string name="disable_encryption_message">Kas sa oled kindel, et soovid OMEMO-põhise krüptimise selle vestluse jaoks välja lülitada?
+\nSee võimaldab sinu serveri haldajal seinu sõnumeid lugeda, kuid see võib olla ainus võimalus suhelda osapooltega, kes kasutavad aegunud sõnumikliente.</string>
+    <string name="disable_now">Lülita välja nüüd</string>
+    <string name="draft">Visand:</string>
+    <string name="pref_omemo_setting">OMEMO-põhine krüptimine</string>
+    <string name="foreground_service_channel_name">Teenus esiplaanil</string>
+    <string name="foreground_service_channel_description">See teavituste kategooria on kasutusel selliste püsiteavituste kuvamiseks, mis märgivad, et %1$s töötab.</string>
+    <string name="notification_group_status_information">Olekuteave</string>
+    <string name="error_channel_name">Võrguühenduse probleemid</string>
+    <string name="unable_to_save_recording">Salvestise salvestamine ei õnnestunud</string>
+    <string name="error_channel_description">See teavituste kategooria on kasutusel teavituse kuvamiseks olukorras, kus serveris asuva kasutajakontoga ühenduse loomine ei õnenstu.</string>
+    <string name="notification_group_messages">Sõnumid</string>
+    <string name="notification_group_calls">Kõned</string>
+    <string name="messages_channel_name">Sõnumid</string>
+    <string name="incoming_calls_channel_name">Saabuvad kõned</string>
+    <string name="delivery_failed_channel_name">Vead kohaletoimetamisel</string>
+    <string name="pref_message_notification_settings">Sõnumite teavituste seadistused</string>
+    <string name="pref_incoming_call_notification_settings">Saabuvate kõnede teavituste seadistused</string>
+    <string name="pref_more_notification_settings_summary">Tähtsus, helid, värinaalarm</string>
+    <string name="video_compression_channel_name">Video pakkimine ja tihendamine</string>
+    <string name="view_media">Näita meediat</string>
+    <string name="outgoing_call_duration_timestamp">Väljuv kõne (%s) · %s</string>
+    <string name="outgoing_call">Väljuv kõne</string>
+    <string name="outgoing_call_timestamp">Väljuv kõne · %s</string>
+    <string name="missed_call_timestamp">Vastamata kõne · %s</string>
+    <string name="missed_call">Vastamata kõne</string>
+    <plurals name="n_missed_calls_from_x">
+        <item quantity="one">%1$d vastamata kõne kasutajalt %2$s</item>
+        <item quantity="other">%1$d vastamata kõnet kasutajalt %2$s</item>
+    </plurals>
+    <string name="audio_call">Häälkõne</string>
+    <string name="video_call">Videokõne</string>
+    <string name="help">Abiteave</string>
+    <string name="switch_to_chat">Lülita ümber vestlusele</string>
+    <string name="microphone_unavailable">Sinu nutiseadme mikrofon pole saadaval</string>
+    <string name="only_one_call_at_a_time">Korraga saad osaleda vaid ühes kõnes.</string>
+    <string name="return_to_ongoing_call">Tagasi poolelioleva kõne juurde</string>
+    <string name="could_not_switch_camera">Kaamera vahetamine ei õnnestunud</string>
+    <string name="server_does_not_support_easy_onboarding_invites">Server ei toeta kutsete loomist</string>
+    <string name="no_active_accounts_support_this">Ükski aktiivne konto ei toeta seda funktsionaalsust</string>
+    <plurals name="view_users">
+        <item quantity="one">Näita %1$d osalejat</item>
+        <item quantity="other">Näita %1$d osalejat</item>
+    </plurals>
+    <plurals name="some_messages_could_not_be_delivered">
+        <item quantity="one">Sõnumi kohaletoimetamine ei õnnestunud</item>
+        <item quantity="other">Mõnede sõnumite kohaletoimetamine ei õnnestunud</item>
+    </plurals>
+    <string name="failed_deliveries">Vead kohaletoimetamisel</string>
+    <string name="more_options">Täiendavad valikud</string>
+    <string name="no_application_found">Rakendust ei leidunud</string>
+    <string name="invite_to_app">Kutsu kasutama Conversationsit</string>
+    <string name="unable_to_enable_video">Video kasutuselevõtmine ei õnnestu.</string>
+    <string name="could_not_disable_video">Video kasutuselt eemaldamine ei õnnestu.</string>
+    <string name="unified_push_distributor">UnifiedPushi levitaja</string>
+    <string name="pref_up_push_account_summary">Kasutajakonto, mille kaudu tõukesõnumeid saadakse.</string>
+    <string name="pref_up_push_server_title">Tõukesõnumite server</string>
+    <string name="no_account_deactivated">Puudub (pole kasutusel)</string>
+    <string name="decline">Keeldu</string>
+    <string name="delete_from_server">Eemalda kasutajakonto serverist</string>
+    <string name="could_not_delete_account_from_server">Kasutajakonto eemaldamine serverist ei õnnestunud</string>
+    <string name="contact_uses_unverified_keys">Vestluse teine osapool kasutab verifitseerimata nutiseadmeid. Verifitseerimiseks skaneeri tema QR-koodi ja takista võimalikke vahendusründeid.</string>
+    <string name="privacy_policy">Privaatsuspoliitika</string>
+    <string name="contact_list_integration_not_available">Kontaktiloendi lõimimine pole hetkel saadaval</string>
+    <string name="unverified_devices">Sina kasutad verifitseerimata nutiseadmeid. Verifitseerimiseks skaneeri oma muus sedames kuvatavat QR-koodi ja takista võimalikke vahendusründeid.</string>
+    <string name="report_spam">Teata spämmist</string>
+    <string name="report_spam_and_block">Teata spämmist ja blokeeri selle saatja</string>
+    <string name="call_integration_not_available">Kõnede lõimimine pole hetkel saadaval!</string>
+    <string name="delete_and_close">Kustuta ja arhiveeri vestlus</string>
+    <string name="no_certificate_selected">Kliendisertifikaati pole valitud!</string>
+    <string name="pref_title_interface">Liides</string>
+    <string name="pref_summary_appearance">Välimus, värvid, ekraanitõmmised, sisendid</string>
+    <string name="pref_title_security">Turvalisus</string>
+    <string name="pref_summary_security">Läbiv krüptimine, pimesi usaldamine enne verifitseerimist, vahendusründe tuvastamine</string>
+    <string name="unified_push_summary">Teavituste edastamine UnifiedPushiga ühilduvatele kolmandate osapoolte rakendustele</string>
+    <string name="pref_automatic_download">Automaatne allalaadimine</string>
+    <string name="appearance">Välimus</string>
+    <string name="pref_light_dark_mode">Hele või tume kujundus</string>
+    <string name="detect_mim">Nõua kanaliga sidumist</string>
+    <string name="detect_mim_summary">Edastuskanaliga sidumine võib aidata vahendusrünnete tuvastamisel</string>
+    <string name="pref_category_server_connection">Ühendus serveriga</string>
+    <string name="pref_category_operating_system">Operatsioonisüsteem</string>
+    <string name="pref_privacy_summary">Kirjutamisteatised, viimati nähtud, kättesaadavus</string>
+    <string name="pref_connection_summary">Hosti nimi ja port, ühendus Tori võrguga</string>
+    <string name="pref_connection_summary_w_cd">Hosti nimi ja port, ühendus Tori võrguga, kanalite tuvastamine</string>
+    <string name="pref_keyboard_options">Klahvistik</string>
+    <string name="unsupported_operation">Tegevus pole toetatud</string>
+    <string name="pref_category_engagement_notifications">Osalusest teavitamine</string>
+    <string name="pref_fullscreen_notification_summary">Luba sellel rakendusel näidata saabuvate kõnede teavitusi täisekraanivaates ka siis, kui seade on lukustatud.</string>
+    <string name="pref_category_application">Rakendus</string>
+    <string name="pref_category_interaction">Koostoime</string>
+    <string name="pref_category_on_this_device">Seadmes</string>
+    <string name="pref_backup_summary">Üks kord tehtav või korduv varundus</string>
+    <string name="pref_create_backup_one_off_summary">Tee varukoopia vaid nüüd</string>
+    <string name="pref_backup_recurring">Tee varukoopiaid korduvalt</string>
+    <string name="pref_fullscreen_notification">Täisekraaniteavitused</string>
+    <string name="delete_pgp_key">Kustuta OpenPGP võti</string>
+    <string name="edit_configuration">Muuda seadistusi</string>
+    <string name="allow_private_messages">Luba privaatsed sõnumid</string>
+    <string name="edit_nick">Muuda hüüdnime</string>
+    <plurals name="n_missed_calls">
+        <item quantity="one">%d vastamata kõne</item>
+        <item quantity="other">%d vastamata kõnet</item>
+    </plurals>
+    <plurals name="n_missed_calls_from_m_contacts">
+        <item quantity="one">%1$d vastamata kõne %2$dlt helistajalt</item>
+        <item quantity="other">%1$d vastamata kõnet %2$dlt helistajalt</item>
+    </plurals>
 </resources>
\ No newline at end of file

From 8679347fd250ddfe414c471d735f2f2b585ab113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Sun, 20 Oct 2024 20:29:22 +0000
Subject: [PATCH 091/357] Translated using Weblate (Estonian)

Currently translated at 8.2% (6 of 73 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/et/
---
 fastlane/metadata/android/et/changelogs/4211404.txt | 2 ++
 fastlane/metadata/android/et/changelogs/4211604.txt | 1 +
 fastlane/metadata/android/et/changelogs/4211704.txt | 3 +++
 fastlane/metadata/android/et/changelogs/4211804.txt | 1 +
 fastlane/metadata/android/et/changelogs/4212104.txt | 1 +
 fastlane/metadata/android/et/changelogs/4212204.txt | 1 +
 6 files changed, 9 insertions(+)
 create mode 100644 fastlane/metadata/android/et/changelogs/4211404.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4211604.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4211704.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4211804.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4212104.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4212204.txt

diff --git a/fastlane/metadata/android/et/changelogs/4211404.txt b/fastlane/metadata/android/et/changelogs/4211404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c0fc59046a793cafc5dc9c5d4e70d8ba0dbfb6a5
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4211404.txt
@@ -0,0 +1,2 @@
+* välistasime vanemad Oppo telefonid kõnelõimingutest
+* mitmed veaparandused
diff --git a/fastlane/metadata/android/et/changelogs/4211604.txt b/fastlane/metadata/android/et/changelogs/4211604.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a0571dea82198717c9e2096ead3c152460df6c50
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4211604.txt
@@ -0,0 +1 @@
+* väikesed veaparandused
diff --git a/fastlane/metadata/android/et/changelogs/4211704.txt b/fastlane/metadata/android/et/changelogs/4211704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d9dadda4d8e53f570484e684ad7adddf5eac60c4
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4211704.txt
@@ -0,0 +1,3 @@
+* muutsime vaikimisi allalaaditavate failide mahu suuremaks
+* näitame rohkem teavet valikus „Serveri info“
+* parandasime mitmeid vigu
diff --git a/fastlane/metadata/android/et/changelogs/4211804.txt b/fastlane/metadata/android/et/changelogs/4211804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a4c9c989a4b147674f6ba5bd2982234407498be6
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4211804.txt
@@ -0,0 +1 @@
+* Lisasime kõne alustamisele aegumise
diff --git a/fastlane/metadata/android/et/changelogs/4212104.txt b/fastlane/metadata/android/et/changelogs/4212104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e9d3f444a7fd144d81bf4d5cb0d94edb4639924b
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4212104.txt
@@ -0,0 +1 @@
+* Sõnumitest reageerimise tugi
diff --git a/fastlane/metadata/android/et/changelogs/4212204.txt b/fastlane/metadata/android/et/changelogs/4212204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c48235eca4a75e88f4949e254675edcc139740c3
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4212204.txt
@@ -0,0 +1 @@
+* Parandasime kasutajaliidese vea, kui kuvamisel oli mitu reageerimist

From 16260d77c046db92606c7f0e5d36812c1c5aa8bb Mon Sep 17 00:00:00 2001
From: Dirk <Dirk@users.noreply.translate.codeberg.org>
Date: Mon, 21 Oct 2024 18:47:54 +0000
Subject: [PATCH 092/357] Translated using Weblate (German)

Currently translated at 100.0% (73 of 73 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/de/
---
 fastlane/metadata/android/de-DE/changelogs/4212204.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/de-DE/changelogs/4212204.txt

diff --git a/fastlane/metadata/android/de-DE/changelogs/4212204.txt b/fastlane/metadata/android/de-DE/changelogs/4212204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f7827c6d60921b98cd0fe8141ed3e05fc7c8b36d
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/4212204.txt
@@ -0,0 +1 @@
+* Darstellungsfehler beim Anzeigen mehrerer Reaktionen behoben

From 9321bc582ebaedcceaf26b5ed4242a31ad0e12f9 Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Thu, 24 Oct 2024 12:50:39 +0000
Subject: [PATCH 093/357] Translated using Weblate (Galician)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/gl/
---
 src/main/res/values-gl/strings.xml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index dd4db7504cf4f83be420f2a8dcc68a38c208b227..889002e14f245c09a4212629731334dd44217955 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -78,9 +78,7 @@
     <string name="sharing_files_please_wait">Compartindo ficheiros. Agarda…</string>
     <string name="action_clear_history">Baleirar historial</string>
     <string name="clear_conversation_history">Limpar historial da charla</string>
-    <string name="clear_histor_msg">¿Queres eliminar tódalas mensaxes desta conversa? 
-\n 
-\n<b>Aviso:</b> Esto non lle afecta ás mensaxes gardadas noutros dispositivos ou servidores.</string>
+    <string name="clear_histor_msg">Queres eliminar todas as mensaxes desta conversa?\n\n<b>Aviso:</b> Isto non lle afecta ás mensaxes gardadas noutros dispositivos ou servidores.</string>
     <string name="delete_file_dialog">Eliminar ficheiro</string>
     <string name="delete_file_dialog_msg">Tes a certeza de querer eliminar este ficheiro\?
 \n
@@ -236,9 +234,7 @@
     <string name="delete_bookmark">Eliminar marcador</string>
     <string name="destroy_room">Destruír a parola do grupo</string>
     <string name="destroy_channel">Eliminar canle</string>
-    <string name="destroy_room_dialog">Tes a certeza de querer destruír esta conversa en grupo? 
-\n 
-\n<b>Aviso:</b> O parola en grupo será totalmente eliminado do servidor.</string>
+    <string name="destroy_room_dialog">Tes a certeza de querer destruír esta conversa en grupo?\n\n<b>Aviso:</b> A parola en grupo será totalmente eliminada do servidor.</string>
     <string name="destroy_channel_dialog">Tes a certeza de querer eliminar a canle?\n\n<b>Aviso:</b> A canle será eliminada completamente do servidor.</string>
     <string name="could_not_destroy_room">Non se puido eliminar a parola</string>
     <string name="could_not_destroy_channel">Non se puido eliminar a canle</string>

From 30b2b3469961e5ab7f49ab4c394d810603ff73de Mon Sep 17 00:00:00 2001
From: takto <takto@users.noreply.translate.codeberg.org>
Date: Wed, 23 Oct 2024 23:45:58 +0000
Subject: [PATCH 094/357] Translated using Weblate (Portuguese)

Currently translated at 38.0% (397 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pt/
---
 src/main/res/values-pt/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 4b325f428660f3ea457c6e526c55a0d92f4f2427..f1278472859689c08f2dc797b1fdc3e960caf562 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -409,4 +409,12 @@
     <string name="title_activity_new_chat">Nova conversa</string>
     <string name="action_archive_chat">Arquivar conversa</string>
     <string name="action_block_participant">Ignorar membro</string>
+    <plurals name="x_unread_conversations">
+        <item quantity="one">%d conversa não lida</item>
+        <item quantity="many">%d muitas conversas não lidas</item>
+        <item quantity="other">%d conversas não lidas</item>
+    </plurals>
+    <string name="remove_bookmark">Gostaria de remover %s como favorito?</string>
+    <string name="remove_bookmark_and_close">Gostaria de remover o favorito de %s e arquivar a conversa?</string>
+    <string name="remove_contact_text">Gostaria de remover %s da sua lista de contatos? A conversa não será removida.</string>
 </resources>
\ No newline at end of file

From 70739b2f0200167ac53156699e009571f569c26a Mon Sep 17 00:00:00 2001
From: takto <takto@users.noreply.translate.codeberg.org>
Date: Thu, 24 Oct 2024 00:04:50 +0000
Subject: [PATCH 095/357] Translated using Weblate (Portuguese (Brazil))

Currently translated at 99.9% (1042 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pt_BR/
---
 src/main/res/values-pt-rBR/strings.xml | 44 ++++++++++++--------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 4a4b675a8e1918b5860993e5b3368812c8ebb4be..d896cdb40230f610feec58de918bbc25aefd9b0f 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -119,7 +119,7 @@
     <string name="pref_notification_sound_summary">Som de notificação para novas mensagens</string>
     <string name="pref_call_ringtone_summary">Toque para chamadas recebidas</string>
     <string name="pref_notification_grace_period">Período de espera</string>
-    <string name="pref_notification_grace_period_summary">Espaço de tempo em que as notificações serão silenciadas, após detectar atividade em algum dos seus outros dispositivos.</string>
+    <string name="pref_notification_grace_period_summary">Por quanto tempo os avisos serão silenciados, após detectar atividade em algum dos seus outros dispositivos.</string>
     <string name="pref_advanced_options">Avançado</string>
     <string name="pref_never_send_crash_summary">Ao enviar os stack traces você está colaborando com o desenvolvimento</string>
     <string name="pref_confirm_messages">Confirmação de mensagens</string>
@@ -269,7 +269,7 @@
     <string name="next">Próximo</string>
     <string name="server_info_session_established">Sessão estabelecida</string>
     <string name="skip">Pular</string>
-    <string name="disable_notifications">Desabilitar notificações</string>
+    <string name="disable_notifications">Desativar avisos</string>
     <string name="enable">Habilitar</string>
     <string name="conference_requires_password">Esta conversa em grupo exige uma senha</string>
     <string name="enter_password">Digite a senha</string>
@@ -289,7 +289,7 @@
     <string name="title_pref_quiet_hours_start_time">Início</string>
     <string name="title_pref_quiet_hours_end_time">Fim</string>
     <string name="title_pref_enable_quiet_hours">Habilitar horário de sossego</string>
-    <string name="pref_quiet_hours_summary">As notificações serão silenciadas no horário de sossego</string>
+    <string name="pref_quiet_hours_summary">Avisos serão silenciadas no horário de sossego</string>
     <string name="pref_expert_options_other">Outras</string>
     <string name="pref_autojoin">Sincronizar favoritos</string>
     <string name="pref_autojoin_summary">Define a flag \"autojoin\" ao entrar ou sair de uma sala e reage a modificações feitas por outros clientes.</string>
@@ -351,7 +351,7 @@
     <string name="no_application_found_to_view_contact">Não foi encontrado nenhum aplicativo para visualizar contatos</string>
     <string name="pref_show_dynamic_tags">Rótulos dinâmicos</string>
     <string name="pref_show_dynamic_tags_summary">Exibe rótulos de somente-leitura abaixo dos contatos</string>
-    <string name="enable_notifications">Habilitar notificações</string>
+    <string name="enable_notifications">Ativar avisos</string>
     <string name="no_conference_server_found">Nenhum servidor de conversas em grupo encontrado</string>
     <string name="conference_creation_failed">Não foi possível criar a conversa em grupo</string>
     <string name="account_image_description">Avatar da conta</string>
@@ -427,7 +427,7 @@
     <string name="contact_has_stopped_typing">%s parou de digitar</string>
     <string name="contacts_are_typing">%s estão digitando…</string>
     <string name="contacts_have_stopped_typing">%s pararam de digitar</string>
-    <string name="pref_chat_states">Notificações de digitação</string>
+    <string name="pref_chat_states">Aviso de digitação</string>
     <string name="pref_chat_states_summary">Permita que os seus contatos saibam quando você está escrevendo mensagens para eles</string>
     <string name="send_location">Enviar localização</string>
     <string name="show_location">Exibir localização</string>
@@ -518,17 +518,15 @@
 \nNenhum dado da sua lista de contato sai do seu dispositivo!</string>
     <string name="notify_on_all_messages">Notificar em todas as mensagens</string>
     <string name="notify_only_when_highlighted">Notificar somente quando for mencionado</string>
-    <string name="notify_never">Notificações desabilitadas</string>
-    <string name="notify_paused">Notificações pausadas</string>
+    <string name="notify_never">Avisos desativados</string>
+    <string name="notify_paused">Avisos pausados</string>
     <string name="pref_picture_compression">Compressão de imagem</string>
     <string name="pref_picture_compression_summary">Dica: Use \'Selecionar o arquivo\' ao invés de \'Selecionar a imagem\' para enviar uma cópia da imagem original, sem redução de qualidade.</string>
     <string name="always">Sempre</string>
     <string name="large_images_only">Apenas imagens grandes</string>
     <string name="battery_optimizations_enabled">Otimizações de bateria habilitadas</string>
-    <string name="battery_optimizations_enabled_explained">O seu dispositivo está empregando uma otimização intensa de bateria para o %1$s, o que pode levar a atrasos nas notificações ou mesmo perda de mensagens.\nÉ recomendável desabilitar essa otimização.</string>
-    <string name="battery_optimizations_enabled_dialog">O seu dispositivo está empregando uma otimização intensa de bateria para o %1$s, o que pode levar a atrasos nas notificações ou mesmo perda de mensagens.
-\n
-\nVocê será pedido agora para desabilitar essa otimização.</string>
+    <string name="battery_optimizations_enabled_explained">O seu dispositivo está usando uma otimização intensa de bateria para o %1$s, o que pode atrasar avisos ou mesmo perder de mensagens.\nÉ recomendável desativar essa otimização.</string>
+    <string name="battery_optimizations_enabled_dialog">O seu dispositivo está usando uma otimização intensa de bateria para o %1$s, o que pode levar a atrasos nos avisos ou mesmo perda de mensagens.\n\nVocê será pedido agora para desativar essa otimização.</string>
     <string name="disable">Desabilitar</string>
     <string name="selection_too_large">A área selecionada é muito grande</string>
     <string name="no_accounts">(Nenhuma conta ativa)</string>
@@ -598,7 +596,7 @@
     <string name="show_error_message">Exibir a mensagem de erro</string>
     <string name="error_message">Mensagem de erro</string>
     <string name="data_saver_enabled">Economia de dados habilitada</string>
-    <string name="data_saver_enabled_explained">O seu sistema operacional está restringindo o acesso à internet ao %1$s, quando ele está em segundo plano. Para receber notificações de novas mensagens você deve permitir que o %1$s tenha acesso irrestrito quando a economia de dados estiver ativada.\nO %1$s fará um esforço para economizar dados sempre que possível.</string>
+    <string name="data_saver_enabled_explained">O seu sistema operacional está limitando o acesso à internet ao %1$s, quando ele está em segundo plano. Para receber avisos de novas mensagens você deve permitir que o %1$s tenha acesso irrestrito quando a economia de dados estiver ativada.\nO %1$s se um esforçará para economizar dados sempre que possível.</string>
     <string name="device_does_not_support_data_saver">O seu dispositivo não permite que a economia de dados seja desativada para o %1$s.</string>
     <string name="error_unable_to_create_temporary_file">Não foi possível criar o arquivo temporário</string>
     <string name="this_device_has_been_verified">Este dispositivo foi verificado</string>
@@ -664,7 +662,7 @@
     <string name="not_fetching_history_retention_period">As mensagens não estão sendo obtidas devido ao período de retenção local.</string>
     <string name="transcoding_video">Comprimindo vídeo</string>
     <string name="contact_blocked_past_tense">O contato foi bloqueado.</string>
-    <string name="pref_notifications_from_strangers">Notificações de desconhecidos</string>
+    <string name="pref_notifications_from_strangers">Avisos de desconhecidos</string>
     <string name="pref_notifications_from_strangers_summary">Notificar ao receber mensagens e chamadas de desconhecidos.</string>
     <string name="received_message_from_stranger">Foi recebida uma mensagem de um desconhecido</string>
     <string name="block_stranger">Bloquear os desconhecidos</string>
@@ -676,8 +674,8 @@
     <string name="account_status_regis_web">O servidor exige um registro no site web</string>
     <string name="open_website">Abrir site web</string>
     <string name="application_found_to_open_website">Não foi encontrado nenhum aplicativo para abrir o site web</string>
-    <string name="pref_headsup_notifications">Notificações Heads-up</string>
-    <string name="pref_headsup_notifications_summary">Exibe as notificações Heads-up</string>
+    <string name="pref_headsup_notifications">Avisos emergentes</string>
+    <string name="pref_headsup_notifications_summary">Exibir avisos emergentes</string>
     <string name="today">Hoje</string>
     <string name="yesterday">Ontem</string>
     <string name="pref_validate_hostname">Validar o nome do host com o DNSSEC</string>
@@ -764,10 +762,10 @@
     <string name="ongoing_calls_channel_name">Chamadas em andamento</string>
     <string name="missed_calls_channel_name">Chamadas perdidas</string>
     <string name="silent_messages_channel_name">Silenciar mensagens</string>
-    <string name="silent_messages_channel_description">Essa categoria de notificação é utilizada para exibir notificações que não deveriam gerar nenhum som. Por exemplo, quando estiver ativo em outro dispositivo (Período de Espera).</string>
+    <string name="silent_messages_channel_description">Essa categoria de aviso é utilizada para exibir avisos que não deveriam gerar nenhum som. Por exemplo, quando estiver ativo em outro dispositivo (Período de Espera).</string>
     <string name="delivery_failed_channel_name">Entregas não efetuadas</string>
-    <string name="pref_message_notification_settings">Configurações das notificações de mensagens</string>
-    <string name="pref_incoming_call_notification_settings">configurações das notificações de chamadas recebidas</string>
+    <string name="pref_message_notification_settings">Configurações dos avisos de mensagens</string>
+    <string name="pref_incoming_call_notification_settings">configurações dos avisos de chamadas recebidas</string>
     <string name="pref_more_notification_settings_summary">Importância, Som, Vibrar</string>
     <string name="video_compression_channel_name">Compressão de vídeo</string>
     <string name="view_media">Ver mídia</string>
@@ -1013,7 +1011,7 @@
     <string name="pref_summary_appearance">Tema, Cores, Capturas de tela, Entrada</string>
     <string name="pref_title_security">Segurança</string>
     <string name="pref_summary_security">Criptografia de ponta-a-ponta, confiança cega antes da verificação, detecção de MITM</string>
-    <string name="notifications">Notificações</string>
+    <string name="notifications">Avisos</string>
     <string name="pref_attachments_summary">Tamanho do arquivo, Compressão de imagem, Qualidade de vídeo</string>
     <string name="pref_title_trust_system_ca_store_summary">Confiar nos certificados CA do sistema</string>
     <string name="privacy_policy">Política de privacidade</string>
@@ -1038,7 +1036,7 @@
     <string name="decline">Rejeitar</string>
     <string name="delete_from_server">Remover conta do servidor</string>
     <string name="could_not_delete_account_from_server">Não pôde excluir conta do servidor</string>
-    <string name="unified_push_summary">Transmissor de notificações para apps de terceiros compatíveis com o UnifiedPush</string>
+    <string name="unified_push_summary">Transmissor de aviso para apps de terceiros compatíveis com o UnifiedPush</string>
     <string name="pref_category_e2ee">Criptografia de ponta-a-ponta</string>
     <string name="pref_title_trust_system_ca_store">Autoridades de certificação</string>
     <string name="hide_notification">Esconder notificação</string>
@@ -1088,7 +1086,7 @@
     <string name="pref_category_on_this_device">No dispositivo</string>
     <string name="pref_backup_recurring">Backup recorrente</string>
     <string name="pref_fullscreen_notification">Notificações em tela cheia</string>
-    <string name="pref_fullscreen_notification_summary">Permitir que este app mostre notificações para chamadas recebidas que utilizam a tela inteira quando o dispositivo está bloqueado.</string>
+    <string name="pref_fullscreen_notification_summary">Permitir que este app mostre avisos para chamadas recebidas que utilizam a tela cheia quando o dispositivo está bloqueado.</string>
     <string name="edit_nick">Editar nome de usuário</string>
     <string name="delete_pgp_key">Excluir chave OpenPGP</string>
     <string name="edit_name_and_topic">Editar nome e tópico</string>
@@ -1103,11 +1101,11 @@
     <string name="pref_allow_screenshots_summary">Mostrar o conteúdo do app no alternador de apps e permitir que a tela seja capturada</string>
     <string name="detect_mim">Exigir vínculo do canal</string>
     <string name="detect_mim_summary">A vinculação de canal pode detectar alguns ataques de máquina-no-meio</string>
-    <string name="pref_privacy_summary">Notificações de digitação, Visto por Último, Disponibilidade</string>
+    <string name="pref_privacy_summary">Avisos de digitação, Visto por Último, Disponibilidade</string>
     <string name="pref_connection_summary">Nome do host e porta, Tor</string>
     <string name="pref_connection_summary_w_cd">Nome do host e porta, Tor, Descoberta de Canais</string>
     <string name="pref_keyboard_options">Teclado</string>
-    <string name="pref_category_engagement_notifications">Notificações de engajamento</string>
+    <string name="pref_category_engagement_notifications">Avisos de engajamento</string>
     <string name="pref_category_application">Aplicação</string>
     <string name="could_not_add_reaction">Não pôde adicionar reação</string>
     <string name="add_reaction">Adicionar reação…</string>

From 0f8c1d600bd4866fb8deaea784dfa94a00354fe8 Mon Sep 17 00:00:00 2001
From: Dirk <Dirk@users.noreply.translate.codeberg.org>
Date: Fri, 25 Oct 2024 20:49:18 +0000
Subject: [PATCH 096/357] Translated using Weblate (German)

Currently translated at 100.0% (74 of 74 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/de/
---
 fastlane/metadata/android/de-DE/changelogs/4212304.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/de-DE/changelogs/4212304.txt

diff --git a/fastlane/metadata/android/de-DE/changelogs/4212304.txt b/fastlane/metadata/android/de-DE/changelogs/4212304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..aae698adee83ade3691b8d55afffeac23a40d5b5
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/4212304.txt
@@ -0,0 +1,2 @@
+* Behoben: Anrufe auf Android 15
+* Behoben: Seltener Absturz / Regression die mit 2.17.0 aufgetreten ist

From 5cb9a05cf00c7918ec941aeaccfe1150ed0dade2 Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Fri, 25 Oct 2024 15:29:25 +0000
Subject: [PATCH 097/357] Translated using Weblate (Polish)

Currently translated at 24.3% (18 of 74 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/pl/
---
 fastlane/metadata/android/pl-PL/changelogs/4212304.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4212304.txt

diff --git a/fastlane/metadata/android/pl-PL/changelogs/4212304.txt b/fastlane/metadata/android/pl-PL/changelogs/4212304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..27a1f7d03aa9e6dd28a3a51eb1619d420847fdea
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4212304.txt
@@ -0,0 +1,2 @@
+* Naprawienie rozmów w Androidzie 15
+* Naprawienie rzadkiej awarii (regresji) wprowadzonej w 2.17.0

From 8b98d79fa3dd5f2aa728a027b285fc62c4af946f Mon Sep 17 00:00:00 2001
From: Besnik_b <Besnik_b@users.noreply.translate.codeberg.org>
Date: Fri, 25 Oct 2024 15:28:39 +0000
Subject: [PATCH 098/357] Translated using Weblate (Albanian)

Currently translated at 100.0% (74 of 74 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/sq/
---
 fastlane/metadata/android/sq/changelogs/4212304.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/sq/changelogs/4212304.txt

diff --git a/fastlane/metadata/android/sq/changelogs/4212304.txt b/fastlane/metadata/android/sq/changelogs/4212304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1281f9ed9dda4b7a01ba3ac681321c486e5b4819
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/4212304.txt
@@ -0,0 +1,2 @@
+* Ndreqje thirrjesh në Android 15
+* Ndreqje vithisjeje / prapakthimi të rrallë, sjellë me 2.17.0

From 450177e6a815b6d0c168122d2a05e06ca30775eb Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Fri, 25 Oct 2024 13:12:22 +0000
Subject: [PATCH 099/357] Translated using Weblate (Galician)

Currently translated at 62.1% (46 of 74 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/gl/
---
 fastlane/metadata/android/gl-ES/changelogs/4212304.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/gl-ES/changelogs/4212304.txt

diff --git a/fastlane/metadata/android/gl-ES/changelogs/4212304.txt b/fastlane/metadata/android/gl-ES/changelogs/4212304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9b1064d6981adb5beaf32a9959520857f3e2008c
--- /dev/null
+++ b/fastlane/metadata/android/gl-ES/changelogs/4212304.txt
@@ -0,0 +1,2 @@
+* Arranxo das chamadas en Android 15
+* Arranxo do problema raro / regresión introducido en 2.17.0

From c145643136b7a78176651780e1767caed8a702f2 Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Fri, 25 Oct 2024 07:35:41 +0000
Subject: [PATCH 100/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (74 of 74 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/uk/
---
 fastlane/metadata/android/uk/changelogs/4212304.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/uk/changelogs/4212304.txt

diff --git a/fastlane/metadata/android/uk/changelogs/4212304.txt b/fastlane/metadata/android/uk/changelogs/4212304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..28b128d2aeebf8fb8781f719b4c96975b13b7a04
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/4212304.txt
@@ -0,0 +1,2 @@
+* Виправлено виклики на Android 15
+* Виправлено рідкісний збій / регресію, що з'явилися у 2.17.0

From b89cb9edf3f87d928f05a026f00069b5c0b02bb5 Mon Sep 17 00:00:00 2001
From: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Date: Fri, 25 Oct 2024 01:16:56 +0000
Subject: [PATCH 101/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (74 of 74 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/zh_Hans/
---
 fastlane/metadata/android/zh-CN/changelogs/4212304.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/zh-CN/changelogs/4212304.txt

diff --git a/fastlane/metadata/android/zh-CN/changelogs/4212304.txt b/fastlane/metadata/android/zh-CN/changelogs/4212304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..65f60dfebf581beaec1d868428e13688adc82118
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/4212304.txt
@@ -0,0 +1,2 @@
+* 修复 Android 15 上的通话
+* 修复 2.17.0 引入的罕见崩溃问题

From 40315acd522fc23ed9d5633c045787f6213586f4 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Sun, 27 Oct 2024 08:50:04 +0000
Subject: [PATCH 102/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index ddbeb788f23429309640c18840568ae61acd5485..c46641fc09eecb2bb3747ec38de6a8e85e381b4a 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -256,10 +256,10 @@
     <string name="leave">Покинуть</string>
     <string name="contact_added_you">Собеседник добавил вас в список контактов</string>
     <string name="add_back">Добавить в ответ</string>
-    <string name="contact_has_read_up_to_this_point">%s прочитал(а) до этого момента</string>
-    <string name="contacts_have_read_up_to_this_point">%s прочитали до этого момента</string>
-    <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s + ещё %2$d прочитали до этого момента</string>
-    <string name="everyone_has_read_up_to_this_point">Все прочитали сообщения до этого момента</string>
+    <string name="contact_has_read_up_to_this_point">%s прочитал(а) досюда</string>
+    <string name="contacts_have_read_up_to_this_point">%s прочитали досюда</string>
+    <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s + ещё %2$d прочитали досюда</string>
+    <string name="everyone_has_read_up_to_this_point">Все прочитали сообщения досюда</string>
     <string name="publish">Опубликовать</string>
     <string name="touch_to_choose_picture">Нажмите на аватар, чтобы выбрать новую фотографию из галереи</string>
     <string name="publishing">Установка…</string>
@@ -631,7 +631,7 @@
     <string name="i_followed_this_link_from_a_trusted_source">Открывать ссылки из надёжного источника</string>
     <string name="verifying_omemo_keys_trusted_source">Вы подтверждаете OMEMO-ключи %1$s после нажатия на ссылку. Это безопасно только если вы перешли по ссылке из доверенного источника, где только %2$s мог разместить эту ссылку.</string>
     <string name="verify_omemo_keys">Проверить OMEMO-ключи</string>
-    <string name="show_inactive_devices">Показывать неактивные</string>
+    <string name="show_inactive_devices">Показать неактивные</string>
     <string name="hide_inactive_devices">Скрыть неактивные</string>
     <string name="distrust_omemo_key">Прекратить доверять устройству</string>
     <string name="distrust_omemo_key_text">Удалить устройство из доверенных?

From 5f5307fa19e164f5a4f8d9616b4705c8349c7d1b Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Sat, 26 Oct 2024 10:09:30 +0000
Subject: [PATCH 103/357] Translated using Weblate (German)

Currently translated at 100.0% (74 of 74 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/de/
---
 fastlane/metadata/android/de-DE/changelogs/4212304.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fastlane/metadata/android/de-DE/changelogs/4212304.txt b/fastlane/metadata/android/de-DE/changelogs/4212304.txt
index aae698adee83ade3691b8d55afffeac23a40d5b5..fc865be6b499d414854b49f8e8dfaf8c8704bc7c 100644
--- a/fastlane/metadata/android/de-DE/changelogs/4212304.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/4212304.txt
@@ -1,2 +1,2 @@
-* Behoben: Anrufe auf Android 15
-* Behoben: Seltener Absturz / Regression die mit 2.17.0 aufgetreten ist
+* Anrufe auf Android 15 behoben
+* Seltener Absturz behoben / Regression die mit 2.17.0 aufgetreten ist

From 23c928bb42fe729f3765d666052bbb538818f0ae Mon Sep 17 00:00:00 2001
From: gallegonovato <gallegonovato@users.noreply.translate.codeberg.org>
Date: Sun, 27 Oct 2024 15:38:48 +0000
Subject: [PATCH 104/357] Translated using Weblate (Spanish)

Currently translated at 100.0% (74 of 74 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/es/
---
 fastlane/metadata/android/es-ES/changelogs/4211704.txt | 3 +++
 fastlane/metadata/android/es-ES/changelogs/4211804.txt | 1 +
 fastlane/metadata/android/es-ES/changelogs/4212104.txt | 1 +
 fastlane/metadata/android/es-ES/changelogs/4212204.txt | 1 +
 fastlane/metadata/android/es-ES/changelogs/4212304.txt | 2 ++
 5 files changed, 8 insertions(+)
 create mode 100644 fastlane/metadata/android/es-ES/changelogs/4211704.txt
 create mode 100644 fastlane/metadata/android/es-ES/changelogs/4211804.txt
 create mode 100644 fastlane/metadata/android/es-ES/changelogs/4212104.txt
 create mode 100644 fastlane/metadata/android/es-ES/changelogs/4212204.txt
 create mode 100644 fastlane/metadata/android/es-ES/changelogs/4212304.txt

diff --git a/fastlane/metadata/android/es-ES/changelogs/4211704.txt b/fastlane/metadata/android/es-ES/changelogs/4211704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0d18da37311897c3d56251d1f8d2654cfa70af10
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/4211704.txt
@@ -0,0 +1,3 @@
+* Ofrecer valores más grandes para la recepción automática de archivo 
+* Proporcionar más información en 'Información del servidor'
+* Varias correcciones de errores
diff --git a/fastlane/metadata/android/es-ES/changelogs/4211804.txt b/fastlane/metadata/android/es-ES/changelogs/4211804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..821f50e6b2e9a18b2253e31a95c1dd0fa1dd9625
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/4211804.txt
@@ -0,0 +1 @@
+* Agregar tiempo de espera al inicio de la llamada
diff --git a/fastlane/metadata/android/es-ES/changelogs/4212104.txt b/fastlane/metadata/android/es-ES/changelogs/4212104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fc349204d5a1b7ae61250dcac86fa961eb26c2ec
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/4212104.txt
@@ -0,0 +1 @@
+* Reacciones a los mensajes de soporte
diff --git a/fastlane/metadata/android/es-ES/changelogs/4212204.txt b/fastlane/metadata/android/es-ES/changelogs/4212204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1565c4ca903e87c22e217f3977b96f8b4e5f0fd7
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/4212204.txt
@@ -0,0 +1 @@
+* Se solucionó un error de la interfaz de usuario al mostrar múltiples reacciones
diff --git a/fastlane/metadata/android/es-ES/changelogs/4212304.txt b/fastlane/metadata/android/es-ES/changelogs/4212304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d7ab6b5f8c2b49494f451700991576bfd72d27a0
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/4212304.txt
@@ -0,0 +1,2 @@
+* Arreglar llamadas en Android 15
+* Corrección de un error raro/ regresión introducida con 2.17.0

From e9a3716e0f2713f18d1638cc74eddd286cc07195 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Mon, 28 Oct 2024 04:46:13 +0000
Subject: [PATCH 105/357] Translated using Weblate (Russian)

Currently translated at 27.0% (20 of 74 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/ru/
---
 fastlane/metadata/android/ru-RU/changelogs/4212304.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4212304.txt

diff --git a/fastlane/metadata/android/ru-RU/changelogs/4212304.txt b/fastlane/metadata/android/ru-RU/changelogs/4212304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a2394f670fb70f3b60a31c149a5d2f69dd489678
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4212304.txt
@@ -0,0 +1,2 @@
+* Исправлены звонки на Android 15
+* Исправлен редкий сбой, появившийся в версии 2.17.0

From 62f8a81297161d5d81c8448b78ba4fc9261bc620 Mon Sep 17 00:00:00 2001
From: akaron <matlaurt@proton.me>
Date: Sat, 26 Oct 2024 17:09:40 +0800
Subject: [PATCH 106/357] fix crash when nickname only consists of blank chars

---
 .../conversations/ui/adapter/ConversationAdapter.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index a64ffd5f249329a0943f4316c38fa890e0a4f8ab..80c0c7eea449ca7ce7d11176543ad7e0e67258b4 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -183,8 +183,11 @@ public class ConversationAdapter
             if (status == Message.STATUS_RECEIVED) {
                 if (conversation.getMode() == Conversation.MODE_MULTI) {
                     viewHolder.binding.senderName.setVisibility(View.VISIBLE);
-                    viewHolder.binding.senderName.setText(
-                            UIHelper.getMessageDisplayName(message).split("\\s+")[0] + ':');
+                    String display = UIHelper.getMessageDisplayName(message);
+                    // Skip when nickname only consists of blank chars
+                    if (display.split("\\s+").length != 0)
+                        display = display.split("\\s+")[0];
+                    viewHolder.binding.senderName.setText(display + ':');
                 } else {
                     viewHolder.binding.senderName.setVisibility(View.GONE);
                 }

From 3bf10861d295eb6802d0e85ecf6ac6931ed9e0a8 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 30 Oct 2024 10:48:43 +0100
Subject: [PATCH 107/357] fixup: no need to split string twice

---
 .../ui/adapter/ConversationAdapter.java           | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index 80c0c7eea449ca7ce7d11176543ad7e0e67258b4..3bcb8286f38f6d55663609d3cd086beb52885cb1 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -183,17 +183,22 @@ public class ConversationAdapter
             if (status == Message.STATUS_RECEIVED) {
                 if (conversation.getMode() == Conversation.MODE_MULTI) {
                     viewHolder.binding.senderName.setVisibility(View.VISIBLE);
-                    String display = UIHelper.getMessageDisplayName(message);
+                    final var displayName = UIHelper.getMessageDisplayName(message);
+                    final var displayNameParts = displayName.split("\\s+");
                     // Skip when nickname only consists of blank chars
-                    if (display.split("\\s+").length != 0)
-                        display = display.split("\\s+")[0];
-                    viewHolder.binding.senderName.setText(display + ':');
+                    if (displayNameParts.length == 0) {
+                        viewHolder.binding.senderName.setText(String.format("%s:", displayName));
+                    } else {
+                        viewHolder.binding.senderName.setText(
+                                String.format("%s:", displayNameParts[0]));
+                    }
                 } else {
                     viewHolder.binding.senderName.setVisibility(View.GONE);
                 }
             } else if (message.getType() != Message.TYPE_STATUS) {
                 viewHolder.binding.senderName.setVisibility(View.VISIBLE);
-                viewHolder.binding.senderName.setText(activity.getString(R.string.me) + ':');
+                viewHolder.binding.senderName.setText(
+                        String.format("%s:", activity.getString(R.string.me)));
             } else {
                 viewHolder.binding.senderName.setVisibility(View.GONE);
             }

From 974461fb23453108417a9f2c005ba46c0991440c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 7 Nov 2024 17:18:13 +0100
Subject: [PATCH 108/357] track resumption id

---
 .../conversations/xmpp/XmppConnection.java    | 33 +++++++++++++++----
 .../android/xmpp/model/sm/Resumed.java        |  4 +++
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index f6650abbfc6a84f866431ac3940e9ba68b526c24..5ba2dbe72a1ed078cf96588c3c4fb2dce30a5375 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -45,6 +45,7 @@ import eu.siacs.conversations.services.MemorizingTrustManager;
 import eu.siacs.conversations.services.MessageArchiveService;
 import eu.siacs.conversations.services.NotificationService;
 import eu.siacs.conversations.services.XmppConnectionService;
+import eu.siacs.conversations.ui.util.PendingItem;
 import eu.siacs.conversations.utils.AccountUtils;
 import eu.siacs.conversations.utils.CryptoHelper;
 import eu.siacs.conversations.utils.Patterns;
@@ -189,6 +190,7 @@ public class XmppConnection implements Runnable {
     private OnStatusChanged statusListener = null;
     private final Runnable bindListener;
     private OnMessageAcknowledged acknowledgedListener = null;
+    private final PendingItem<String> pendingResumeId = new PendingItem<>();
     private LoginInfo loginInfo;
     private HashedToken.Mechanism hashTokenRequest;
     private HttpUrl redirectionUrl = null;
@@ -288,6 +290,7 @@ public class XmppConnection implements Runnable {
             mXmppConnectionService.resetSendingToWaiting(account);
         }
         Log.d(Config.LOGTAG, account.getJid().asBareJid().toString() + ": connecting");
+        this.pendingResumeId.clear();
         this.loginInfo = null;
         this.features.encryptionEnabled = false;
         this.inSmacksSession = false;
@@ -1068,6 +1071,17 @@ public class XmppConnection implements Runnable {
     }
 
     private void processResumed(final Resumed resumed) throws StateChangingException {
+        final var pendingResumeId = this.pendingResumeId.pop();
+        final var prevId = resumed.getPrevId();
+        if (prevId == null || !prevId.equals(pendingResumeId)) {
+            Log.d(
+                    Config.LOGTAG,
+                    account.getJid().asBareJid()
+                            + ": server tried resume with unknown id "
+                            + prevId);
+            resetStreamId();
+            throw new StateChangingException(Account.State.INCOMPATIBLE_SERVER);
+        }
         this.inSmacksSession = true;
         this.isBound = true;
         this.tagWriter.writeStanzaAsync(new Request());
@@ -1475,9 +1489,9 @@ public class XmppConnection implements Runnable {
                                 + ": resuming after stanza #"
                                 + stanzasReceived);
             }
-            final var resume = new Resume(this.streamId.id, stanzasReceived);
-            this.mSmCatchupMessageCounter.set(0);
-            this.mWaitingForSmCatchup.set(true);
+            final var streamId = this.streamId.id;
+            final var resume = new Resume(streamId, stanzasReceived);
+            prepareForResume(streamId);
             this.tagWriter.writeStanzaAsync(resume);
         } else if (needsBinding) {
             if (this.streamFeatures.hasChild("bind", Namespace.BIND)
@@ -1705,9 +1719,9 @@ public class XmppConnection implements Runnable {
             authenticate.addChild(generateBindRequest(bind));
         }
         if (inlineStreamManagement && streamId != null) {
-            final var resume = new Resume(this.streamId.id, stanzasReceived);
-            this.mSmCatchupMessageCounter.set(0);
-            this.mWaitingForSmCatchup.set(true);
+            final var streamId = this.streamId.id;
+            final var resume = new Resume(streamId, stanzasReceived);
+            prepareForResume(streamId);
             authenticate.addExtension(resume);
         }
         if (hashedTokenRequest != null) {
@@ -1719,6 +1733,12 @@ public class XmppConnection implements Runnable {
         return authenticate;
     }
 
+    private void prepareForResume(final String streamId) {
+        this.mSmCatchupMessageCounter.set(0);
+        this.mWaitingForSmCatchup.set(true);
+        this.pendingResumeId.push(streamId);
+    }
+
     private Bind generateBindRequest(final Collection<String> bindFeatures) {
         Log.d(Config.LOGTAG, "inline bind features: " + bindFeatures);
         final var bind = new Bind();
@@ -2617,6 +2637,7 @@ public class XmppConnection implements Runnable {
     }
 
     private void resetStreamId() {
+        this.pendingResumeId.clear();
         this.streamId = null;
         this.boundStreamFeatures = null;
     }
diff --git a/src/main/java/im/conversations/android/xmpp/model/sm/Resumed.java b/src/main/java/im/conversations/android/xmpp/model/sm/Resumed.java
index eb240745fd4b1402e96c838ef71a868f1d7dcf68..bcb36d4093f2cbe4f04423b6a1393a62c6aca28e 100644
--- a/src/main/java/im/conversations/android/xmpp/model/sm/Resumed.java
+++ b/src/main/java/im/conversations/android/xmpp/model/sm/Resumed.java
@@ -15,4 +15,8 @@ public class Resumed extends StreamElement {
     public Optional<Integer> getHandled() {
         return this.getOptionalIntAttribute("h");
     }
+
+    public String getPrevId() {
+        return this.getAttribute("previd");
+    }
 }

From 177ff29f412ee75929dfdaaffa758d6c0457400b Mon Sep 17 00:00:00 2001
From: Matthieu Volat <mazhe@alkumuna.eu>
Date: Sat, 2 Nov 2024 10:23:46 +0100
Subject: [PATCH 109/357] If user is running on SailfishOS, disable Call
 Integration.

---
 .../java/eu/siacs/conversations/services/CallIntegration.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/eu/siacs/conversations/services/CallIntegration.java b/src/main/java/eu/siacs/conversations/services/CallIntegration.java
index be0446cd9f54f4b28d25fbb034dff021887257a7..ae9e14c0cb78e105603676c84024d323da463146 100644
--- a/src/main/java/eu/siacs/conversations/services/CallIntegration.java
+++ b/src/main/java/eu/siacs/conversations/services/CallIntegration.java
@@ -557,6 +557,10 @@ public class CallIntegration extends Connection {
         if ("umidigi".equals(manufacturer) && Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
             return false;
         }
+        // SailfishOS's AppSupport do not support Call Integration
+        if (Build.MODEL.endsWith("(AppSupport)")) {
+			return false;
+        }
         return true;
     }
 

From e70575354bdcba8ff9130d354c7b9cea6f150936 Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Sat, 2 Nov 2024 08:05:02 +0000
Subject: [PATCH 110/357] Translated using Weblate (Galician)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/gl/
---
 src/main/res/values-gl/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 889002e14f245c09a4212629731334dd44217955..e0137d9f4469ceb1e4e23b9864f86d8296f59d16 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -279,7 +279,7 @@
     <string name="pref_allow_message_correction_summary">Permitir aos teus contactos editar as súas mensaxes de xeito retroactivo</string>
     <string name="pref_expert_options">Axustes de experta</string>
     <string name="pref_expert_options_summary">Por favor ten tino con estos axustes</string>
-    <string name="title_activity_about_x">Acerca de %s</string>
+    <string name="title_activity_about_x">Sobre %s</string>
     <string name="title_pref_quiet_hours">Non molestar</string>
     <string name="title_pref_quiet_hours_start_time">Hora de inicio</string>
     <string name="title_pref_quiet_hours_end_time">Hora de finalización</string>
@@ -882,7 +882,7 @@
     <string name="pref_channel_discovery_summary">A maioría das usuarias debería escoller \'jabber.network\' para obter mellores suxestións desde o ecosistema público XMPP.</string>
     <string name="pref_channel_discovery">Método de descubrimento de canles</string>
     <string name="backup">Copia de apoio</string>
-    <string name="category_about">Acerca de</string>
+    <string name="category_about">Sobre</string>
     <string name="please_enable_an_account">Activa unha conta por favor</string>
     <string name="make_call">Facer unha chamada</string>
     <string name="rtp_state_incoming_call">Chamada entrante</string>

From 6658c747ee6d8c61883391873553c96b0a8466d9 Mon Sep 17 00:00:00 2001
From: NorbiPeti <NorbiPeti@users.noreply.translate.codeberg.org>
Date: Sun, 3 Nov 2024 01:36:16 +0000
Subject: [PATCH 111/357] Translated using Weblate (Hungarian)

Currently translated at 82.9% (865 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/hu/
---
 src/main/res/values-hu/strings.xml | 65 +++++++++++++++++++++++++-----
 1 file changed, 55 insertions(+), 10 deletions(-)

diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 85633b909148d3a44ad74a7e1be156a897fe715a..f21ede58a7b95edc0571a38c81bd8dfd528ff1c5 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -26,8 +26,8 @@
     <string name="minute_ago">1 perce</string>
     <string name="minutes_ago">%d perce</string>
     <plurals name="x_unread_conversations">
-        <item quantity="one">%d olvasatlan beszélgetés</item>
-        <item quantity="other">%d olvasatlan beszélgetés</item>
+        <item quantity="one">%d olvasatlan csevegés</item>
+        <item quantity="other">%d olvasatlan csevegés</item>
     </plurals>
     <string name="sending">küldés…</string>
     <string name="message_decrypting">Üzenet visszafejtése. Kérem várjon…</string>
@@ -39,7 +39,7 @@
     <string name="moderator">Moderátor</string>
     <string name="participant">Résztvevő</string>
     <string name="visitor">Látogató</string>
-    <string name="remove_contact_text">Szeretné eltávolítani %s partnerét a partnerlistájából? Beszélgetései ezzel a partnerrel nem lesznek eltávolítva.</string>
+    <string name="remove_contact_text">Szeretné eltávolítani %s partnerét a partnerlistájából? A csevegése ezzel a partnerrel nem lesz eltávolítva.</string>
     <string name="block_contact_text">Szeretné tiltani %s partnert, hogy ne tudjon üzeneteket küldeni?</string>
     <string name="unblock_contact_text">Szeretné feloldani %s partner tiltását és lehetővé tenni számára az üzenetek küldését?</string>
     <string name="block_domain_text">%s összes partnerét tiltja?</string>
@@ -77,7 +77,7 @@
     <string name="preparing_images">Képek előkészítése az átvitelhez</string>
     <string name="sharing_files_please_wait">Fájlok megosztása. Kérem várjon…</string>
     <string name="action_clear_history">Előzmények törlése</string>
-    <string name="clear_conversation_history">Beszélgetés előzményeinek törlése</string>
+    <string name="clear_conversation_history">Csevegés előzményeinek törlése</string>
     <string name="clear_histor_msg">Biztosan törölni szeretné az összes üzenetet a beszélgetésen belül?
 \n
 \n<b>Figyelmeztetés:</b> Ez nem fogja érinteni a más eszközökön vagy kiszolgálókon tárolt üzeneteket.</string>
@@ -173,7 +173,7 @@
     <string name="unpublish_pgp_message">Biztosan el szeretné távolítani az OpenPGP nyilvános kulcsát a jelenléti közleményéből?\nA partnerei többé nem lesznek képesek OpenPGP titkosítású üzeneteket küldeni Önnek.</string>
     <string name="openpgp_has_been_published">Az OpenPGP nyilvános kulcs közzé lett téve.</string>
     <string name="mgmt_account_enable">Fiók engedélyezése</string>
-    <string name="mgmt_account_delete_confirm_text">A fiók törlésével az összes beszélgetési előzményei is eltávolításra kerülnek</string>
+    <string name="mgmt_account_delete_confirm_text">A fiók törlésével az összes csevegési előzménye is eltávolításra kerül</string>
     <string name="attach_record_voice">Hang rögzítése</string>
     <string name="account_settings_jabber_id">XMPP-cím</string>
     <string name="block_jabber_id">XMPP-cím tiltása</string>
@@ -240,7 +240,7 @@
     <string name="contact_added_you">A partner hozzáadta Önt a partnerlistához</string>
     <string name="add_back">Én is hozzáadom</string>
     <string name="contact_has_read_up_to_this_point">%s elolvasta eddig a pontig</string>
-    <string name="contacts_have_read_up_to_this_point">%selolvasta eddig a pontig</string>
+    <string name="contacts_have_read_up_to_this_point">%s elolvasta eddig a pontig</string>
     <string name="everyone_has_read_up_to_this_point">Mindenki elolvasta eddig a pontig</string>
     <string name="publish">Közzététel</string>
     <string name="touch_to_choose_picture">Érintse meg a profilképet egy fénykép kiválasztásához a galériából</string>
@@ -265,7 +265,7 @@
     <string name="request_now">Kérés most</string>
     <string name="ignore">Mellőzés</string>
     <string name="pref_security_settings">Biztonság</string>
-    <string name="pref_allow_message_correction">Üzenetjavítás engedélyezése</string>
+    <string name="pref_allow_message_correction">Üzenetek javítása</string>
     <string name="pref_allow_message_correction_summary">Engedélyezés a partnereknek, hogy visszamenőlegesen szerkesszék az üzeneteiket</string>
     <string name="pref_expert_options">Szakértő beállítások</string>
     <string name="pref_expert_options_summary">Legyen óvatos ezekkel</string>
@@ -299,8 +299,8 @@
     <string name="jabber_id_copied_to_clipboard">Az XMPP-cím a vágólapra másolva</string>
     <string name="error_message_copied_to_clipboard">A hibaüzenet a vágólapra másolva</string>
     <string name="web_address">webcím</string>
-    <string name="scan_qr_code">2D vonalkód beolvasása</string>
-    <string name="show_qr_code">2D vonalkód megjelenítése</string>
+    <string name="scan_qr_code">QR kód beolvasása</string>
+    <string name="show_qr_code">QR kód megjelenítése</string>
     <string name="show_block_list">Tiltólista megjelenítése</string>
     <string name="account_details">Fiók részletei</string>
     <string name="confirm">Megerősítés</string>
@@ -446,7 +446,7 @@
     <string name="pref_away_when_screen_off">Távol, ha az eszköz le van zárva</string>
     <string name="pref_away_when_screen_off_summary">Mutasson „Távoli”-ként, ha az eszköz le van zárva</string>
     <string name="pref_treat_vibrate_as_silent">Rezgés kezelése csendes módként</string>
-    <string name="pref_show_connection_options">Kiterjesztett kapcsolati beállítások</string>
+    <string name="pref_show_connection_options">Gépnév és port</string>
     <string name="pref_show_connection_options_summary">Gépnév és port beállításainak megjelenítése egy fiók beállításakor</string>
     <string name="hostname_example">xmpp.example.com</string>
     <string name="action_add_account_with_certificate">Bejelentkezés tanúsítvánnyal</string>
@@ -868,4 +868,49 @@
         <item quantity="one">%1$d résztvevő megtekintése</item>
         <item quantity="other">%1$d résztvevő megtekintése</item>
     </plurals>
+    <string name="welcome_header">Csatlakozzon a Beszélgetéshez</string>
+    <string name="pref_enter_is_send_summary">Az Enter gomb használata az üzenetküldéshez. A Ctrl+Entert mindig használhatja üzenetküldésre, akkor is, ha ez ki van kapcsolva.</string>
+    <string name="conference_technical_problems">Technikai okokból elhagyta ezt a csoportos csevegést</string>
+    <string name="pref_dnd_on_silent_mode">Elfoglalt csendes módban</string>
+    <string name="remove_bookmark_and_close">Szeretné eltávolítani a könyvjelzőt erről: %s és archiválni a csevegést?</string>
+    <string name="audiobook">Hangoskönyv</string>
+    <string name="pref_send_crash_reports">Hibajelentések küldése</string>
+    <string name="pref_treat_vibrate_as_dnd_summary">Mutasson Elfoglaltként, ha az eszköz rezgő módban van</string>
+    <string name="pref_dnd_on_silent_mode_summary">Mutasson Elfoglaltként, ha az eszköz csendes módban van</string>
+    <string name="hostname_or_onion">Szerver- vagy .onion-cím</string>
+    <string name="no_storage_permission">%1$s hozzáférést igényel a külső tárhelyhez</string>
+    <string name="no_camera_permission">%1$s hozzáférést igényel a kamerához</string>
+    <string name="quicksy_wants_your_consent">Quicksy a hozzájárulását kéri az adatai felhasználásához</string>
+    <string name="battery_optimizations_enabled_explained">Az eszköze jelentős akkumulátor-optimalizálást alkalmaz a %1$s esetében, ami késleltetett értesítésekhez vagy akár üzenetvesztéshez vezethet.\nJavasolt kikapcsolni az optimalizálást.</string>
+    <string name="battery_optimizations_enabled_dialog">Az eszköze jelentős akkumulátor-optimalizálást alkalmaz a %1$s esetében, ami késleltetett értesítésekhez vagy akár üzenetvesztéshez vezethet.\n\nMost az eszköz meg fogja kérni, hogy kapcsolja ki.</string>
+    <string name="welcome_header_quicksy">Üdvözöljük a Quicksyben!</string>
+    <string name="unable_to_connect_to_keychain">Nem sikerült csatlakozni az OpenKeychainhez</string>
+    <string name="reconnect_on_other_host">Újracsatlakozás másik kiszolgálón</string>
+    <string name="no_permission_to_place_call">Nincs jogosultság hívást indítani</string>
+    <string name="pref_delete_omemo_identities_summary">Az OMEMO kulcsok újragenerálása. Az összes partnerének újra ellenőriznie kell majd. Csak végső esetben használja.</string>
+    <string name="data_saver_enabled_explained">%1$s nem tud hozzáférni az internethez a háttérben az operációs rendszer korlátozásai miatt. Engedélyezze a teljes hozzáférést %1$s számára, amikor az</string>
+    <string name="no_keys_just_confirm">Már megbízott ezen személy ujjlenyomatában. A \"kész\" kiválasztásával csak megerősíti, hogy %s része a csoportos csevegésnek.</string>
+    <string name="sync_with_contacts_long">%1$s feldolgozza a névjegyzékét helyben, az eszközén, hogy megmutassa az egyező partnerek neveit és profilképeit az XMPP-n.\n\nSoha nem hagyja el névjegyzék-adat az eszközét!</string>
+    <string name="barcode_does_not_contain_fingerprints_for_this_chat">A vonalkód nem tartalmaz ujjlenyomatot ehhez a csevegéshez.</string>
+    <string name="title_activity_share_with">Megosztás ezzel…</string>
+    <string name="pref_use_colorful_bubbles">Színes csevegőbuborékok</string>
+    <string name="pref_use_colorful_bubbles_summary">Különböző háttérszínek a küldött és a fogadott üzeneteknél</string>
+    <string name="action_archive_chat">Csevegés archiválása</string>
+    <string name="title_activity_new_chat">Új csevegés</string>
+    <string name="remove_bookmark">Szeretné eltávolítani a könyvjezőlt erről: %s?</string>
+    <string name="archive_this_chat">Csevegés törlése ezután</string>
+    <string name="download_failed_invalid_file">Letöltés sikertelen: Érvénytelen fájl</string>
+    <string name="send_encrypted_message">Titkosított üzenet küldése</string>
+    <string name="account_state_logged_out">Kijelentkezve</string>
+    <string name="account_status_incompatible_client">Nem kompatibilis kliens</string>
+    <string name="title_undo_swipe_out_chat">Csevegés archiválva</string>
+    <string name="group_chats">Csoportos csevegések</string>
+    <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s+%2$d másik elolvasta eddig a pontig</string>
+    <string name="pref_autojoin">Könyvjelzők szinkronizálása</string>
+    <string name="error_no_keys_to_trust_server_error">Nincs használható kulcs ehhez partnerhez.\nNem sikerült lekérdezni újabb kulcsokat a kiszolgálóról. Lehetséges, hogy probléma adódott a partnere kiszolgálójával?</string>
+    <string name="error_no_keys_to_trust_presence">Nincs használható kulcs ehhez a partnerhez.\nGyőződjön meg, hogy mindkettejüknek van</string>
+    <string name="multimedia_file">multimédia fájl</string>
+    <string name="search_group_chats">Csoportos csevegés keresése</string>
+    <string name="this_account_is_logged_out">Kijelentkezett ebből a fiókból</string>
+    <string name="continue_btn">Folytatás</string>
 </resources>
\ No newline at end of file

From d498c06be36d37649620dcc5542931e65dbee9d6 Mon Sep 17 00:00:00 2001
From: NorbiPeti <NorbiPeti@users.noreply.translate.codeberg.org>
Date: Sun, 3 Nov 2024 01:11:56 +0000
Subject: [PATCH 112/357] Translated using Weblate (Hungarian)

Currently translated at 100.0% (13 of 13 strings)

Translation: Conversations/Android App (Conversations)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-conversations/hu/
---
 src/conversations/res/values-hu/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/conversations/res/values-hu/strings.xml b/src/conversations/res/values-hu/strings.xml
index 27280900778c3a8930b030f46b7c7bcb0cdd298d..069f6511e9231941921c4b24429b7332cf6f53c8 100644
--- a/src/conversations/res/values-hu/strings.xml
+++ b/src/conversations/res/values-hu/strings.xml
@@ -4,8 +4,7 @@
     <string name="use_conversations.im">A conversations.im használata</string>
     <string name="create_new_account">Új fiók létrehozása</string>
     <string name="do_you_have_an_account">Már rendelkezik XMPP-fiókkal? Ez az eset állhat fenn, ha már egy másik XMPP-klienst használ, vagy ha már korábban használta a Conversations alkalmazást. Ha nem, akkor most létrehozhat egy új XMPP-fiókot.\nTipp: egyes e-mail szolgáltatók is biztosítanak XMPP-fiókokat.</string>
-    <string name="server_select_text">Az XMPP egy szolgáltatófüggetlen, azonnali üzenetküldő hálózat. Ezt a kliensprogramot bármely XMPP-kiszolgálóhoz használhatja.
-\nAzonban a kényelem érdekében megkönnyítettük a conversations.im szolgáltatón való fióklétrehozást, ami kifejezetten a Conversations alkalmazással történő használatra lett tervezve.</string>
+    <string name="server_select_text">Az XMPP egy szolgáltatófüggetlen, azonnali üzenetküldő hálózat. Ezt az alkalmazást bármely XMPP-kiszolgálóhoz használhatja.\nAzonban a kényelem érdekében megkönnyítettük a conversations.im szolgáltatón való fióklétrehozást, ami kifejezetten a Conversations alkalmazással történő használatra lett tervezve.</string>
     <string name="magic_create_text_on_x">Meghívást kapott a(z) %1$s kiszolgálóra. Végig fogjuk vezetni egy fiók létrehozásának folyamatán.\nHa a(z) %1$s kiszolgálót választja szolgáltatóként, akkor képes lesz más szolgáltatók felhasználóival is kommunikálni, ha megadja nekik a teljes XMPP-címét.</string>
     <string name="magic_create_text_fixed">Meghívást kapott a(z) %1$s kiszolgálóra. Már kiválasztottak Önnek egy felhasználónevet. Végig fogjuk vezetni egy fiók létrehozásának folyamatán.\nKépes lesz más szolgáltatók felhasználóival is kommunikálni, ha megadja nekik a teljes XMPP-címét.</string>
     <string name="your_server_invitation">Az Ön kiszolgálómeghívása</string>

From 7c9ab3a41fb960366d8ec0183de195d32c1067ce Mon Sep 17 00:00:00 2001
From: NorbiPeti <NorbiPeti@users.noreply.translate.codeberg.org>
Date: Sun, 3 Nov 2024 20:32:59 +0000
Subject: [PATCH 113/357] Translated using Weblate (Hungarian)

Currently translated at 84.1% (878 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/hu/
---
 src/main/res/values-hu/strings.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index f21ede58a7b95edc0571a38c81bd8dfd528ff1c5..9ce1ca47b87421778e2e472e50288576429070ee 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -524,7 +524,7 @@
     <string name="gp_short">Rövid</string>
     <string name="gp_medium">Közepes</string>
     <string name="gp_long">Hosszú</string>
-    <string name="pref_broadcast_last_activity">Üzenetszórás használata</string>
+    <string name="pref_broadcast_last_activity">Utoljára elérhető</string>
     <string name="pref_broadcast_last_activity_summary">Tudassa partnereivel, hogy mikor használja a Conversations-t</string>
     <string name="pref_privacy">Adatvédelem</string>
     <string name="pref_theme_options">Téma</string>
@@ -565,7 +565,7 @@
     <string name="share_as_http">Megosztás HTTP hivatkozásként</string>
     <string name="pref_blind_trust_before_verification">Vak bizalom ellenőrzés előtt</string>
     <string name="not_trusted">Nem megbízható</string>
-    <string name="invalid_barcode">Érvénytelen 2D vonalkód</string>
+    <string name="invalid_barcode">Érvénytelen QR kód</string>
     <string name="pref_clean_cache_summary">Gyorsítótármappa törlése (Kamera alkalmazás által használt)</string>
     <string name="pref_clean_cache">Gyorsítótár törlése</string>
     <string name="pref_clean_private_storage">Személyes tárhely törlése</string>
@@ -647,14 +647,13 @@
     <string name="error_trustkey_device_list">Nem sikerült lekérni az eszközlistát</string>
     <string name="error_trustkey_bundle">Nem sikerült lekérni a titkosítási kulcsokat</string>
     <string name="error_trustkey_hint_mutual">Tipp: bizonyos esetekben ez megoldható azzal, hogy hozzáadják egymást a partnerlistákhoz.</string>
-    <string name="disable_encryption_message">Biztosan le szeretné tiltani az OMEMO titkosítást ennél a beszélgetésnél?
-\nEz lehetővé fogja tenni a kiszolgáló rendszergazdájának, hogy elolvassa az üzeneteket, de ez lehet az egyetlen módja annak, hogy kommunikáljon az elavult programokat használó emberekkel.</string>
+    <string name="disable_encryption_message">Biztosan le szeretné tiltani az OMEMO titkosítást ennél a csevegésnél?\nEz lehetővé fogja tenni a kiszolgáló rendszergazdájának, hogy elolvassa az üzeneteket, de ez lehet az egyetlen módja annak, hogy kommunikáljon az elavult programokat használó emberekkel.</string>
     <string name="disable_now">Letiltás most</string>
     <string name="draft">Vázlat:</string>
     <string name="pref_omemo_setting">OMEMO titkosítás</string>
     <string name="pref_omemo_setting_summary_always">Mindig az OMEMO lesz használva az egymással történő üzenetváltásokhoz és a személyes csoportos csevegésekhez.</string>
-    <string name="pref_omemo_setting_summary_default_on">Az OMEMO lesz alapértelmezetten használva az új beszélgetésekhez.</string>
-    <string name="pref_omemo_setting_summary_default_off">Az OMEMO-t kifejezetten be kell majd kapcsolni az új beszélgetésekhez.</string>
+    <string name="pref_omemo_setting_summary_default_on">Az OMEMO lesz alapértelmezetten használva az új csevegésekhez.</string>
+    <string name="pref_omemo_setting_summary_default_off">Az OMEMO-t kifejezetten be kell majd kapcsolni az új csevegésekhez.</string>
     <string name="create_shortcut">Gyorsbillentyű létrehozása</string>
     <string name="default_on">Alapértelmezetten be</string>
     <string name="default_off">Alapértelmezetten ki</string>
@@ -674,14 +673,14 @@
     <string name="please_wait">Kérem várjon…</string>
     <string name="search_messages">Üzenetek keresése</string>
     <string name="gif">GIF</string>
-    <string name="view_conversation">Beszélgetés megtekintése</string>
+    <string name="view_conversation">Csevegés megtekintése</string>
     <string name="pref_use_share_location_plugin">Helymegosztás bővítmény</string>
     <string name="pref_use_share_location_plugin_summary">A helymegosztás bővítmény használata a beépített térkép helyett</string>
     <string name="copy_link">Webcím másolása</string>
     <string name="copy_jabber_id">XMPP-cím másolása</string>
     <string name="p1_s3_filetransfer">HTTP fájlmegosztás S3-hoz</string>
     <string name="pref_start_search">Közvetlen keresés</string>
-    <string name="pref_start_search_summary">A „Beszélgetés indítása” képernyőn nyissa meg a billentyűzetet, és helyezze a kurzort a keresőmezőbe</string>
+    <string name="pref_start_search_summary">A „Csevegés indítása” képernyőn nyissa meg a billentyűzetet, és helyezze a kurzort a keresőmezőbe</string>
     <string name="group_chat_avatar">Csoportos csevegés profilképe</string>
     <string name="host_does_not_support_group_chat_avatars">A gép nem támogatja a csoportos csevegés profilképeket</string>
     <string name="only_the_owner_can_change_group_chat_avatar">Csak a tulajdonos tudja megváltoztatni a csoportos csevegés profilképét</string>
@@ -734,7 +733,7 @@
     <string name="resend_sms">SMS újraküldése</string>
     <string name="resend_sms_in">SMS újraküldése (%s)</string>
     <string name="wait_x">Kérem várjon (%s)</string>
-    <string name="back">vissza</string>
+    <string name="back">Vissza</string>
     <string name="possible_pin">Automatikusan beillesztett lehetséges PIN-kód a vágólapról.</string>
     <string name="please_enter_pin">Adja meg a 6 számjegyű PIN-kódot.</string>
     <string name="abort_registration_procedure">Biztosan meg szeretné szakítani a regisztrációs folyamatot?</string>

From 9797ee6990af820bd1565e8f9715005be916ac49 Mon Sep 17 00:00:00 2001
From: random_r <random_r@users.noreply.translate.codeberg.org>
Date: Tue, 5 Nov 2024 15:27:15 +0000
Subject: [PATCH 114/357] Translated using Weblate (Italian)

Currently translated at 100.0% (1043 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/it/
---
 src/main/res/values-it/strings.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 4091a868a9762ac781f0016c3a58263eb3ac41f2..be2a7f0660d624667f9cf161f22a04ff63154d00 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -1103,4 +1103,8 @@
     <string name="server_info_login_mechanism">Meccanismo di accesso</string>
     <string name="server_info_bind2">XEP-0386: Bind 2</string>
     <string name="server_info_sasl2">XEP-0388: Profilo SASL estensibile</string>
+    <string name="could_not_add_reaction">Impossibile aggiungere una reazione</string>
+    <string name="add_reaction">Aggiungi reazione…</string>
+    <string name="add_reaction_title">Aggiungi reazione</string>
+    <string name="more_reactions">Altre reazioni</string>
 </resources>
\ No newline at end of file

From 1588d2ef927dc1bd6e4920ab08098c0e3247d1ac Mon Sep 17 00:00:00 2001
From: dqjxelg2srtivm <dqjxelg2srtivm@users.noreply.translate.codeberg.org>
Date: Tue, 5 Nov 2024 04:09:24 +0000
Subject: [PATCH 115/357] Translated using Weblate (Japanese)

Currently translated at 99.6% (1039 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ja/
---
 src/main/res/values-ja/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 1dbdd5b3263f03aa4f8b939b89f4e4ae2567bd43..6cd97e3a5e26fddbef897609d374c413d317b2b6 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -1072,4 +1072,6 @@
     <string name="add_reaction">リアクションを追加…</string>
     <string name="add_reaction_title">リアクションを追加</string>
     <string name="more_reactions">さらに多くのリアクション</string>
+    <string name="welcome_header">会話に参加しよう</string>
+    <string name="flip_camera">表裏反転カメラ</string>
 </resources>
\ No newline at end of file

From 65a57be9baa2533edb91519b3bbbed6dc225aed2 Mon Sep 17 00:00:00 2001
From: random_r <random_r@users.noreply.translate.codeberg.org>
Date: Tue, 5 Nov 2024 15:25:01 +0000
Subject: [PATCH 116/357] Translated using Weblate (Italian)

Currently translated at 100.0% (74 of 74 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/it/
---
 fastlane/metadata/android/it-IT/changelogs/4211804.txt | 1 +
 fastlane/metadata/android/it-IT/changelogs/4212104.txt | 1 +
 fastlane/metadata/android/it-IT/changelogs/4212204.txt | 1 +
 fastlane/metadata/android/it-IT/changelogs/4212304.txt | 2 ++
 4 files changed, 5 insertions(+)
 create mode 100644 fastlane/metadata/android/it-IT/changelogs/4211804.txt
 create mode 100644 fastlane/metadata/android/it-IT/changelogs/4212104.txt
 create mode 100644 fastlane/metadata/android/it-IT/changelogs/4212204.txt
 create mode 100644 fastlane/metadata/android/it-IT/changelogs/4212304.txt

diff --git a/fastlane/metadata/android/it-IT/changelogs/4211804.txt b/fastlane/metadata/android/it-IT/changelogs/4211804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..468fa7c69db54cf0356a200d15a0f25ef3a8cb62
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/4211804.txt
@@ -0,0 +1 @@
+* Aggiunta scadenza per iniziazione della chiamata
diff --git a/fastlane/metadata/android/it-IT/changelogs/4212104.txt b/fastlane/metadata/android/it-IT/changelogs/4212104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..67535dc1a2d09e774cea78be94a9ebd8016804b2
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/4212104.txt
@@ -0,0 +1 @@
+* Supporto per le reazioni ai messaggi
diff --git a/fastlane/metadata/android/it-IT/changelogs/4212204.txt b/fastlane/metadata/android/it-IT/changelogs/4212204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..925213342b5be43b630c7634151b444ed9823590
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/4212204.txt
@@ -0,0 +1 @@
+* Corretto errore di interfaccia che mostrava reazioni multiple
diff --git a/fastlane/metadata/android/it-IT/changelogs/4212304.txt b/fastlane/metadata/android/it-IT/changelogs/4212304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6dba0777353985516a5b04f7f8397b769fd359ef
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/4212304.txt
@@ -0,0 +1,2 @@
+* Correzione delle chiamate su Android 15
+* Corretto un raro crash / regressione introdotto nella 2.17.0

From 7406c9f0dcbc180f3e0df8dca73666431cd8c241 Mon Sep 17 00:00:00 2001
From: random_r <random_r@users.noreply.translate.codeberg.org>
Date: Tue, 5 Nov 2024 15:24:20 +0000
Subject: [PATCH 117/357] Translated using Weblate (Italian)

Currently translated at 100.0% (2 of 2 strings)

Translation: Conversations/App Store Metadata (Conversations)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata-conversations/it/
---
 .../fastlane/metadata/android/it-IT/full_description.txt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conversations/fastlane/metadata/android/it-IT/full_description.txt b/src/conversations/fastlane/metadata/android/it-IT/full_description.txt
index d390af661340371a1eec874fdce2f4c5e56127b3..d9347e3bf310a3b9caaab5ecc75fd9d8ffbe8ce1 100644
--- a/src/conversations/fastlane/metadata/android/it-IT/full_description.txt
+++ b/src/conversations/fastlane/metadata/android/it-IT/full_description.txt
@@ -28,7 +28,7 @@ Conversations funziona con tutti i server XMPP. Tuttavia XMPP è un protocollo e
 
 Queste XEP sono, ad oggi:
 
-* XEP-0065: SOCKS5 Bytestreams (o mod_proxy65). Usata per trasferire file se entrambe le parti sono dietro un firewall (NAT).
+* XEP-0065: SOCKS5 Bytestreams (o mod_proxy65). Usata per trasferire file se entrambe le parti sono dietro un firewall o NAT.
 * XEP-0163: Personal Eventing Protocol. Per gli avatar.
 * XEP-0191: Blocking command. Ti consente di bloccare lo spam o i contatti senza rimuoverli dal tuo elenco.
 * XEP-0198: Stream Management. Consente a XMPP di resistere a brevi disconnessioni e cambi della connessione TCP sottostante.

From 3c7d7cc48b095be3b7ba94887bfeac8615901651 Mon Sep 17 00:00:00 2001
From: antigng <antigng@users.noreply.translate.codeberg.org>
Date: Wed, 6 Nov 2024 05:35:51 +0000
Subject: [PATCH 118/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (2 of 2 strings)

Translation: Conversations/App Store Metadata (Quicksy)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata-quicksy/zh_Hans/
---
 .../fastlane/metadata/android/zh-CN/full_description.txt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/quicksy/fastlane/metadata/android/zh-CN/full_description.txt b/src/quicksy/fastlane/metadata/android/zh-CN/full_description.txt
index 476e37c777977ec08544b83c4b73c58e84816f91..93c24f5bc396e68716b7a50a4506597eb828ac81 100644
--- a/src/quicksy/fastlane/metadata/android/zh-CN/full_description.txt
+++ b/src/quicksy/fastlane/metadata/android/zh-CN/full_description.txt
@@ -6,8 +6,8 @@ Quicksy 是流行的 Jabber/XMPP 客户端 Conversations 的衍生品，具有
 
 除了联系人同步之外，用户界面尽可能地接近 Conversations。让用户最终可以从 Quicksy 迁移到 Conversations，而无需重新了解应用程序的工作方式。
 
-建议的联系人包括其他 Quicksy 用户和在 Quicksy 目录（https://quicksy.im/#get-listed）中输入 Jabber ID 的普通 Jabber/XMPP 用户。
+建议的联系人包括其他 Quicksy 用户和在 Quicksy 目录 (https://quicksy.im/#get-listed) 中输入 Jabber ID 的普通 Jabber/XMPP 用户。
 
-注意：要在 Quicksy 目录中输入（https://quicksy.im/enter/）您的 Jabber ID 需要缴纳一次性注册费。
+注意：要加入 (https://quicksy.im/enter/) Quicksy 目录，您的 Jabber ID 需要缴纳一次性注册费。
 
-请阅读隐私政策（https://quicksy.im/#privacy）了解更多信息。
+请阅读隐私政策 (https://quicksy.im/#privacy) 了解更多信息。

From 69984d5c2b76f94dafecb927aa7fbdd33c9714fe Mon Sep 17 00:00:00 2001
From: mmbd <mmbd@users.noreply.translate.codeberg.org>
Date: Thu, 7 Nov 2024 11:25:27 +0000
Subject: [PATCH 119/357] Translated using Weblate (Japanese)

Currently translated at 99.7% (1040 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ja/
---
 src/main/res/values-ja/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 6cd97e3a5e26fddbef897609d374c413d317b2b6..c8d4a88179a5cdafb897d6f972f5b7e803147fcd 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -1074,4 +1074,5 @@
     <string name="more_reactions">さらに多くのリアクション</string>
     <string name="welcome_header">会話に参加しよう</string>
     <string name="flip_camera">表裏反転カメラ</string>
+    <string name="edit_name_and_topic">名前と題を編集</string>
 </resources>
\ No newline at end of file

From 75a4ecec56f6c9d20f5c2931c66f38a0484fb8df Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 8 Nov 2024 12:44:22 +0100
Subject: [PATCH 120/357] do not offer 'add reaction' when not participating

---
 .../conversations/services/XmppConnectionService.java      | 7 ++++++-
 .../eu/siacs/conversations/ui/ConversationFragment.java    | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index af1bc9f72e1868a4d4f890a5780d4ff4655e8bae..ad156ad6e4f1504ed058b8754689294ec83a1e6d 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -4638,7 +4638,12 @@ public class XmppConnectionService extends Service {
             final String reactToId;
             final Collection<Reaction> combinedReactions;
             if (conversation.getMode() == Conversational.MODE_MULTI) {
-                final var self = conversation.getMucOptions().getSelf();
+                final var mucOptions = conversation.getMucOptions();
+                if (!mucOptions.participating()) {
+                    Log.d(Config.LOGTAG,"not participating in MUC");
+                    return false;
+                }
+                final var self = mucOptions.getSelf();
                 final String occupantId = self.getOccupantId();
                 if (Strings.isNullOrEmpty(occupantId)) {
                     Log.d(Config.LOGTAG, "occupant id not found for reaction in MUC");
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index aad680b0f02f9c0016a44cd0c5b8d49d1f8e1e1c..81389b748349e14ace259998d7593a1622b6740f 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1346,7 +1346,8 @@ public class ConversationFragment extends XmppFragment
                         !showError
                                 && !m.isDeleted()
                                 && (c.getMode() == Conversational.MODE_SINGLE
-                                        || c.getMucOptions().occupantId()));
+                                        || (c.getMucOptions().occupantId()
+                                                && c.getMucOptions().participating())));
             } else {
                 addReaction.setVisible(false);
             }

From 098e5297c7859dde224c4b2ade1c1f80cea63532 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 11 Nov 2024 15:03:43 +0100
Subject: [PATCH 121/357] always ack JMI when presence sub

---
 src/main/java/eu/siacs/conversations/parser/MessageParser.java | 3 +--
 .../java/eu/siacs/conversations/ui/ConversationFragment.java   | 2 +-
 .../siacs/conversations/xmpp/jingle/JingleRtpConnection.java   | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 6de4bf10ecd3ef6d10d23ebcc499707b2aeaf51f..4bf8e5a705d183b32435256334b1c79f35266876 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -945,8 +945,7 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
                             // the 'ringing' response. Responding with delivery receipts predates
                             // the 'ringing' spec'd
                             final boolean sendReceipts =
-                                    (mXmppConnectionService.confirmMessages()
-                                                    && contact.showInContactList())
+                                    contact.showInContactList()
                                             || Config.JINGLE_MESSAGE_INIT_STRICT_OFFLINE_CHECK;
                             if (remoteMsgId != null && !contact.isSelf() && sendReceipts) {
                                 processMessageReceipts(account, packet, remoteMsgId, null);
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 81389b748349e14ace259998d7593a1622b6740f..d8b8b4151cc9f19171c81f155b31f1ec24940ba5 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1358,7 +1358,7 @@ public class ConversationFragment extends XmppFragment
                     && !unInitiatedButKnownSize
                     && t == null) {
                 copyMessage.setVisible(true);
-                quoteMessage.setVisible(!showError && MessageUtils.prepareQuote(m).length() > 0);
+                quoteMessage.setVisible(!showError && !MessageUtils.prepareQuote(m).isEmpty());
                 final String scheme = ShareUtil.getLinkScheme(m.getMergedBody());
                 if ("xmpp".equals(scheme)) {
                     copyLink.setTitle(R.string.copy_jabber_id);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
index 5f353ea2c488998f935d7a6757aa32945b76c033..3740b926f61eb6c0cc5a6c165295e7ed88e11ee5 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
@@ -1668,8 +1668,7 @@ public class JingleRtpConnection extends AbstractJingleConnection
             // in environments where we always use discovery timeouts we always want to respond with
             // 'ringing'
             if (Config.JINGLE_MESSAGE_INIT_STRICT_DEVICE_TIMEOUT
-                    || (xmppConnectionService.confirmMessages()
-                            && id.getContact().showInContactList())) {
+                    || id.getContact().showInContactList()) {
                 sendJingleMessage("ringing");
             }
         } else {

From 02352e9a2bcc49b1d2d03423d8859a14b6755010 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 12 Nov 2024 16:46:48 +0100
Subject: [PATCH 122/357] rename in MUC if bookmark nick or default (PEP nick)
 changes

---
 .../conversations/entities/Bookmark.java      |   3 +-
 .../conversations/entities/MucOptions.java    |  46 +++----
 .../conversations/parser/MessageParser.java   |   3 +-
 .../conversations/parser/PresenceParser.java  |   5 +-
 .../services/XmppConnectionService.java       | 125 +++++++++++++-----
 5 files changed, 120 insertions(+), 62 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
index 72abd718d5dcf637f16be479ecf2e56ee32a08f6..de76947173e3bb1de56a8f4f0105457f8bd853f6 100644
--- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java
+++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
@@ -186,7 +186,7 @@ public class Bookmark extends Element implements ListItem {
 	}
 
 	public String getNick() {
-		return this.findChildContent("nick");
+		return Strings.emptyToNull(this.findChildContent("nick"));
 	}
 
 	public void setNick(String nick) {
@@ -250,7 +250,6 @@ public class Bookmark extends Element implements ListItem {
 			this.conversation = null;
 		} else {
 			this.conversation = new WeakReference<>(conversation);
-			conversation.getMucOptions().notifyOfBookmarkNick(getNick());
 		}
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 7464af3adb6aa65c63cb472ca1b318b05248887c..5129d0bfdd774d1204da41fff4379320193b6bba 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -53,9 +53,7 @@ public class MucOptions {
     private User self;
     private String password = null;
 
-    private boolean tookProposedNickFromBookmark = false;
-
-    public MucOptions(Conversation conversation) {
+    public MucOptions(final Conversation conversation) {
         this.account = conversation.getAccount();
         this.conversation = conversation;
         this.self = new User(this, createJoinJid(getProposedNick()));
@@ -111,17 +109,6 @@ public class MucOptions {
         }
     }
 
-    public boolean isTookProposedNickFromBookmark() {
-        return tookProposedNickFromBookmark;
-    }
-
-    void notifyOfBookmarkNick(final String nick) {
-        final String normalized = normalize(account.getJid(),nick);
-        if (normalized != null && normalized.equals(getSelf().getFullJid().getResource())) {
-            this.tookProposedNickFromBookmark = true;
-        }
-    }
-
     public boolean mamSupport() {
         return MessageArchiveService.Version.has(getFeatures());
     }
@@ -133,8 +120,8 @@ public class MucOptions {
         if (roomConfigName != null) {
             name = roomConfigName.getValue();
         } else {
-            List<ServiceDiscoveryResult.Identity> identities = serviceDiscoveryResult.getIdentities();
-            String identityName = identities.size() > 0 ? identities.get(0).getName() : null;
+            final var identities = serviceDiscoveryResult.getIdentities();
+            final String identityName = !identities.isEmpty() ? identities.get(0).getName() : null;
             final Jid jid = conversation.getJid();
             if (identityName != null && !identityName.equals(jid == null ? null : jid.getEscapedLocal())) {
                 name = identityName;
@@ -151,7 +138,7 @@ public class MucOptions {
 
     private Data getRoomInfoForm() {
         final List<Data> forms = serviceDiscoveryResult == null ? Collections.emptyList() : serviceDiscoveryResult.forms;
-        return forms.size() == 0 ? new Data() : forms.get(0);
+        return forms.isEmpty() ? new Data() : forms.get(0);
     }
 
     public String getAvatar() {
@@ -474,14 +461,25 @@ public class MucOptions {
         }
     }
 
-    public String getProposedNick() {
+    private String getProposedNick() {
+        final Bookmark bookmark = this.conversation.getBookmark();
+        if (bookmark != null) {
+            // if we already have a bookmark we consider this the source of truth
+            return getProposedNickPure();
+        }
+        final var storedJid = conversation.getJid();
+        if (storedJid.isBareJid()) {
+            return defaultNick(account);
+        } else {
+            return storedJid.getResource();
+        }
+    }
+
+    public String getProposedNickPure() {
         final Bookmark bookmark = this.conversation.getBookmark();
         final String bookmarkedNick = normalize(account.getJid(), bookmark == null ? null : bookmark.getNick());
         if (bookmarkedNick != null) {
-            this.tookProposedNickFromBookmark = true;
             return bookmarkedNick;
-        } else if (!conversation.getJid().isBareJid()) {
-            return conversation.getJid().getResource();
         } else {
             return defaultNick(account);
         }
@@ -496,13 +494,13 @@ public class MucOptions {
         }
     }
 
-    private static String normalize(Jid account, String nick) {
-        if (account == null || TextUtils.isEmpty(nick)) {
+    private static String normalize(final Jid account, final String nick) {
+        if (account == null || Strings.isNullOrEmpty(nick)) {
             return null;
         }
         try {
             return account.withResource(nick).getResource();
-        } catch (IllegalArgumentException e) {
+        } catch (final IllegalArgumentException e) {
             return null;
         }
 
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 4bf8e5a705d183b32435256334b1c79f35266876..681c2b4bd230c11e2a2c0ce9682f6f524db041fe 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -337,12 +337,13 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
         mXmppConnectionService.processDeletedBookmarks(account, previous);
     }
 
-    private void setNick(Account account, Jid user, String nick) {
+    private void setNick(final Account account, final Jid user, final String nick) {
         if (user.asBareJid().equals(account.getJid().asBareJid())) {
             account.setDisplayName(nick);
             if (QuickConversationsService.isQuicksy()) {
                 mXmppConnectionService.getAvatarService().clear(account);
             }
+            mXmppConnectionService.checkMucRequiresRename();
         } else {
             Contact contact = account.getRoster().getContact(user);
             if (contact.setPresenceName(nick)) {
diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
index f2ddef405d543a3d2d7b2c25327c40a9e1f4bc70..e50d1096c26c66d6671e59d27fbd25cfc54b0aee 100644
--- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
@@ -85,13 +85,14 @@ public class PresenceParser extends AbstractParser implements Consumer<im.conver
                             if (mucOptions.setOnline()) {
                                 mXmppConnectionService.getAvatarService().clear(mucOptions);
                             }
+                            final var current = mucOptions.getSelf().getFullJid();
                             if (mucOptions.setSelf(user)) {
                                 Log.d(Config.LOGTAG, "role or affiliation changed");
                                 mXmppConnectionService.databaseBackend.updateConversation(
                                         conversation);
                             }
-
-                            mXmppConnectionService.persistSelfNick(user);
+                            final var modified = current == null || !current.equals(user.getFullJid());
+                            mXmppConnectionService.persistSelfNick(user, modified);
                             invokeRenameListener(mucOptions, true);
                         }
                         boolean isNew = mucOptions.updateUser(user);
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index ad156ad6e4f1504ed058b8754689294ec83a1e6d..2c8d834f4ffd5fb7787793b7186555a2dcfacf4b 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1969,11 +1969,13 @@ public class XmppConnectionService extends Service {
                 final MucOptions mucOptions = conversation.getMucOptions();
                 if (mucOptions.getError() == MucOptions.Error.NICK_IN_USE) {
                     final String current = mucOptions.getActualNick();
-                    final String proposed = mucOptions.getProposedNick();
+                    final String proposed = mucOptions.getProposedNickPure();
                     if (current != null && !current.equals(proposed)) {
                         Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": proposed nick changed after bookmark push " + current + "->" + proposed);
                         joinMuc(conversation);
                     }
+                } else {
+                    checkMucRequiresRename(conversation);
                 }
             }
         } else if (bookmark.autojoin()) {
@@ -3319,62 +3321,85 @@ public class XmppConnectionService extends Service {
         new Thread(() -> onMediaLoaded.onMediaLoaded(fileBackend.convertToAttachments(databaseBackend.getRelativeFilePaths(account, jid, limit)))).start();
     }
 
-    public void persistSelfNick(final MucOptions.User self) {
+    public void persistSelfNick(final MucOptions.User self, final boolean modified) {
         final Conversation conversation = self.getConversation();
-        final boolean tookProposedNickFromBookmark = conversation.getMucOptions().isTookProposedNickFromBookmark();
-        Jid full = self.getFullJid();
+        final Account account = conversation.getAccount();
+        final Jid full = self.getFullJid();
         if (!full.equals(conversation.getJid())) {
-            Log.d(Config.LOGTAG, "nick changed. updating");
+            Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": persisting full jid " + full);
             conversation.setContactJid(full);
             databaseBackend.updateConversation(conversation);
         }
 
         final Bookmark bookmark = conversation.getBookmark();
-        final String bookmarkedNick = bookmark == null ? null : bookmark.getNick();
-        if (bookmark != null && (tookProposedNickFromBookmark || Strings.isNullOrEmpty(bookmarkedNick)) && !full.getResource().equals(bookmarkedNick)) {
-            final Account account = conversation.getAccount();
-            final String defaultNick = MucOptions.defaultNick(account);
-            if (Strings.isNullOrEmpty(bookmarkedNick) && full.getResource().equals(defaultNick)) {
-                return;
-            }
-            Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": persist nick '" + full.getResource() + "' into bookmark for " + conversation.getJid().asBareJid());
-            bookmark.setNick(full.getResource());
-            createBookmark(bookmark.getAccount(), bookmark);
+        if (bookmark == null || !modified) {
+            return;
         }
-    }
-
-    public boolean renameInMuc(final Conversation conversation, final String nick, final UiCallback<Conversation> callback) {
+        final var nick = full.getResource();
+        final String defaultNick = MucOptions.defaultNick(account);
+        if (nick.equals(defaultNick) || nick.equals(bookmark.getNick())) {
+            return;
+        }
+        Log.d(
+                Config.LOGTAG,
+                account.getJid().asBareJid()
+                        + ": persist nick '"
+                        + full.getResource()
+                        + "' into bookmark for "
+                        + conversation.getJid().asBareJid());
+        bookmark.setNick(nick);
+        createBookmark(bookmark.getAccount(), bookmark);
+    }
+
+    public boolean renameInMuc(
+            final Conversation conversation,
+            final String nick,
+            final UiCallback<Conversation> callback) {
+        final Account account = conversation.getAccount();
+        final Bookmark bookmark = conversation.getBookmark();
         final MucOptions options = conversation.getMucOptions();
         final Jid joinJid = options.createJoinJid(nick);
         if (joinJid == null) {
             return false;
         }
         if (options.online()) {
-            Account account = conversation.getAccount();
-            options.setOnRenameListener(new OnRenameListener() {
+            options.setOnRenameListener(
+                    new OnRenameListener() {
 
-                @Override
-                public void onSuccess() {
-                    callback.success(conversation);
-                }
+                        @Override
+                        public void onSuccess() {
+                            callback.success(conversation);
+                        }
 
-                @Override
-                public void onFailure() {
-                    callback.error(R.string.nick_in_use, conversation);
-                }
-            });
+                        @Override
+                        public void onFailure() {
+                            callback.error(R.string.nick_in_use, conversation);
+                        }
+                    });
 
-            final var packet = mPresenceGenerator.selfPresence(account, Presence.Status.ONLINE, options.nonanonymous());
+            final var packet =
+                    mPresenceGenerator.selfPresence(
+                            account, Presence.Status.ONLINE, options.nonanonymous());
             packet.setTo(joinJid);
             sendPresencePacket(account, packet);
+            if (nick.equals(MucOptions.defaultNick(account))
+                    && bookmark != null
+                    && bookmark.getNick() != null) {
+                Log.d(
+                        Config.LOGTAG,
+                        account.getJid().asBareJid()
+                                + ": removing nick from bookmark for "
+                                + bookmark.getJid());
+                bookmark.setNick(null);
+                createBookmark(account, bookmark);
+            }
         } else {
             conversation.setContactJid(joinJid);
             databaseBackend.updateConversation(conversation);
-            if (conversation.getAccount().getStatus() == Account.State.ONLINE) {
-                Bookmark bookmark = conversation.getBookmark();
+            if (account.getStatus() == Account.State.ONLINE) {
                 if (bookmark != null) {
                     bookmark.setNick(nick);
-                    createBookmark(bookmark.getAccount(), bookmark);
+                    createBookmark(account, bookmark);
                 }
                 joinMuc(conversation);
             }
@@ -3382,6 +3407,40 @@ public class XmppConnectionService extends Service {
         return true;
     }
 
+    public void checkMucRequiresRename() {
+        synchronized (this.conversations) {
+            for (final Conversation conversation : this.conversations) {
+                if (conversation.getMode() == Conversational.MODE_MULTI) {
+                    checkMucRequiresRename(conversation);
+                }
+            }
+        }
+    }
+
+    private void checkMucRequiresRename(final Conversation conversation) {
+        final var options = conversation.getMucOptions();
+        if (!options.online()) {
+            return;
+        }
+        final var account = conversation.getAccount();
+        final String current = options.getActualNick();
+        final String proposed = options.getProposedNickPure();
+        if (current == null || current.equals(proposed)) {
+            return;
+        }
+        final Jid joinJid = options.createJoinJid(proposed);
+        Log.d(
+                Config.LOGTAG,
+                String.format(
+                        "%s: muc rename required %s (was: %s)",
+                        account.getJid().asBareJid(), joinJid, current));
+        final var packet =
+                mPresenceGenerator.selfPresence(
+                        account, Presence.Status.ONLINE, options.nonanonymous());
+        packet.setTo(joinJid);
+        sendPresencePacket(account, packet);
+    }
+
     public void leaveMuc(Conversation conversation) {
         leaveMuc(conversation, false);
     }

From f50506a265f4580f35c96e513627f25311b0ddf0 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 13 Nov 2024 17:27:16 +0100
Subject: [PATCH 123/357] refactor correction (message edit) code

---
 .../java/eu/siacs/conversations/Config.java   |  2 -
 .../conversations/entities/Conversation.java  |  3 +-
 .../siacs/conversations/entities/Message.java | 25 +++--------
 .../generator/MessageGenerator.java           |  3 +-
 .../conversations/parser/MessageParser.java   | 43 ++++++++++++++-----
 .../ui/ConversationFragment.java              |  3 +-
 .../xmpp/model/correction/Replace.java        |  5 +++
 7 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index 985f03ebb8a280cf45c1a9ce10e17f70eb375496..cfe1cc60fafda27271c073c70fb88ac437bc2a1f 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -144,8 +144,6 @@ public final class Config {
     public static final boolean IGNORE_ID_REWRITE_IN_MUC = true;
     public static final boolean MUC_LEAVE_BEFORE_JOIN = false;
 
-    public static final boolean USE_LMC_VERSION_1_1 = true;
-
     public static final long MAM_MAX_CATCHUP = MILLISECONDS_IN_DAY * 5;
     public static final int MAM_MAX_MESSAGES = 750;
 
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index f2b17015f85c84e4afa5c2fbec20b1e679b65a85..bf8bdd7fb1d729cb73070b02f85f5a788cebdb58 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -415,8 +415,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                 }
                 if (mcp.equals(counterpart) && ((message.getStatus() == Message.STATUS_RECEIVED) == received)
                         && (carbon == message.isCarbon() || received)) {
-                    final boolean idMatch = id.equals(message.getRemoteMsgId()) || message.remoteMsgIdMatchInEdit(id);
-                    if (idMatch && !message.isFileOrImage() && !message.treatAsDownloadable()) {
+                    if (id.equals(message.getRemoteMsgId()) && !message.isFileOrImage() && !message.treatAsDownloadable()) {
                         return message;
                     } else {
                         return null;
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 237525a0859ba010d807f8e9d7f2db746451e378..6fb1ec2bd1e5c470635a8e3989d3e91ace474967 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -489,15 +489,6 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         }
     }
 
-    boolean remoteMsgIdMatchInEdit(String id) {
-        for (Edit edit : this.edits) {
-            if (id.equals(edit.getEditedId())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     public String getBodyLanguage() {
         return this.bodyLanguage;
     }
@@ -507,7 +498,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public boolean edited() {
-        return this.edits.size() > 0;
+        return !this.edits.isEmpty();
     }
 
     public void setTrueCounterpart(Jid trueCounterpart) {
@@ -828,19 +819,17 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public String getEditedId() {
-        if (edits.size() > 0) {
-            return edits.get(edits.size() - 1).getEditedId();
-        } else {
-            throw new IllegalStateException("Attempting to store unedited message");
+        if (this.edits.isEmpty()) {
+            throw new IllegalStateException("Attempting to access unedited message");
         }
+        return edits.get(edits.size() - 1).getEditedId();
     }
 
     public String getEditedIdWireFormat() {
-        if (edits.size() > 0) {
-            return edits.get(Config.USE_LMC_VERSION_1_1 ? 0 : edits.size() - 1).getEditedId();
-        } else {
-            throw new IllegalStateException("Attempting to store unedited message");
+        if (this.edits.isEmpty()) {
+            throw new IllegalStateException("Attempting to access unedited message");
         }
+        return edits.get(0).getEditedId();
     }
 
     public void setOob(boolean isOob) {
diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index ff5dddb0f7e4f6fd0f4e31362957a139dd491f38..af4349350a7ca0b437f33c42f1e24feb8effa126 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -23,6 +23,7 @@ import eu.siacs.conversations.xmpp.jingle.JingleConnectionManager;
 import eu.siacs.conversations.xmpp.jingle.JingleRtpConnection;
 import eu.siacs.conversations.xmpp.jingle.Media;
 import eu.siacs.conversations.xmpp.jingle.stanzas.Reason;
+import im.conversations.android.xmpp.model.correction.Replace;
 import im.conversations.android.xmpp.model.reactions.Reaction;
 import im.conversations.android.xmpp.model.reactions.Reactions;
 
@@ -63,7 +64,7 @@ public class MessageGenerator extends AbstractGenerator {
             packet.addChild("origin-id", Namespace.STANZA_IDS).setAttribute("id", message.getUuid());
         }
         if (message.edited()) {
-            packet.addChild("replace", "urn:xmpp:message-correct:0").setAttribute("id", message.getEditedIdWireFormat());
+            packet.addExtension(new Replace(message.getEditedIdWireFormat()));
         }
         return packet;
     }
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 681c2b4bd230c11e2a2c0ce9682f6f524db041fe..3ddb981240cf68030eb37bfbd656b71459b1282e 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -3,6 +3,7 @@ package eu.siacs.conversations.parser;
 import android.util.Log;
 import android.util.Pair;
 
+import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
 
 import java.text.SimpleDateFormat;
@@ -54,6 +55,7 @@ import eu.siacs.conversations.xmpp.pep.Avatar;
 import im.conversations.android.xmpp.model.Extension;
 import im.conversations.android.xmpp.model.carbons.Received;
 import im.conversations.android.xmpp.model.carbons.Sent;
+import im.conversations.android.xmpp.model.correction.Replace;
 import im.conversations.android.xmpp.model.forward.Forwarded;
 import im.conversations.android.xmpp.model.occupant.OccupantId;
 import im.conversations.android.xmpp.model.reactions.Reactions;
@@ -456,10 +458,11 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
         final Element mucUserElement = packet.findChild("x", Namespace.MUC_USER);
         final boolean isTypeGroupChat = packet.getType() == im.conversations.android.xmpp.model.stanza.Message.Type.GROUPCHAT;
         final String pgpEncrypted = packet.findChildContent("x", "jabber:x:encrypted");
-        final Element replaceElement = packet.findChild("replace", "urn:xmpp:message-correct:0");
+
         final Element oob = packet.findChild("x", Namespace.OOB);
         final String oobUrl = oob != null ? oob.findChildContent("url") : null;
-        final String replacementId = replaceElement == null ? null : replaceElement.getAttribute("id");
+        final var replace = packet.getExtension(Replace.class);
+        final var replacementId = replace == null ? null : replace.getId();
         final Element axolotlEncrypted = packet.findChildEnsureSingle(XmppAxolotlMessage.CONTAINERTAG, AxolotlService.PEP_PREFIX);
         int status;
         final Jid counterpart;
@@ -549,7 +552,14 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
 
 
             if (selfAddressed) {
-                if (mXmppConnectionService.markMessage(conversation, remoteMsgId, Message.STATUS_SEND_RECEIVED, serverMsgId)) {
+                // don’t store serverMsgId on reflections for edits
+                final var reflectedServerMsgId =
+                        Strings.isNullOrEmpty(replacementId) ? serverMsgId : null;
+                if (mXmppConnectionService.markMessage(
+                        conversation,
+                        remoteMsgId,
+                        Message.STATUS_SEND_RECEIVED,
+                        reflectedServerMsgId)) {
                     return;
                 }
                 status = Message.STATUS_RECEIVED;
@@ -562,7 +572,10 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
                 if (conversation.getMucOptions().isSelf(counterpart)) {
                     status = Message.STATUS_SEND_RECEIVED;
                     isCarbon = true; //not really carbon but received from another resource
-                    if (mXmppConnectionService.markMessage(conversation, remoteMsgId, status, serverMsgId, body)) {
+                    // don’t store serverMsgId on reflections for edits
+                    final var reflectedServerMsgId =
+                            Strings.isNullOrEmpty(replacementId) ? serverMsgId : null;
+                    if (mXmppConnectionService.markMessage(conversation, remoteMsgId, status, reflectedServerMsgId, body)) {
                         return;
                     } else if (remoteMsgId == null || Config.IGNORE_ID_REWRITE_IN_MUC) {
                         if (body != null) {
@@ -716,16 +729,26 @@ public class MessageParser extends AbstractParser implements Consumer<im.convers
                             final String uuid = replacedMessage.getUuid();
                             replacedMessage.setUuid(UUID.randomUUID().toString());
                             replacedMessage.setBody(message.getBody());
-                            replacedMessage.putEdited(replacedMessage.getRemoteMsgId(), replacedMessage.getServerMsgId());
-                            replacedMessage.setRemoteMsgId(remoteMsgId);
-                            if (replacedMessage.getServerMsgId() == null || message.getServerMsgId() != null) {
-                                replacedMessage.setServerMsgId(message.getServerMsgId());
-                            }
+                            // we store the IDs of the replacing message. This is essentially unused
+                            // today (only the fact that there are _some_ edits causes the edit icon
+                            // to appear)
+                            replacedMessage.putEdited(
+                                    message.getRemoteMsgId(), message.getServerMsgId());
+
+                            // we used to call
+                            // `replacedMessage.setServerMsgId(message.getServerMsgId());` so during
+                            // catchup we could start from the edit; not the original message
+                            // however this caused problems for things like reactions that refer to
+                            // the serverMsgId
+
                             replacedMessage.setEncryption(message.getEncryption());
                             if (replacedMessage.getStatus() == Message.STATUS_RECEIVED) {
                                 replacedMessage.markUnread();
                             }
-                            extractChatState(mXmppConnectionService.find(account, counterpart.asBareJid()), isTypeGroupChat, packet);
+                            extractChatState(
+                                    mXmppConnectionService.find(account, counterpart.asBareJid()),
+                                    isTypeGroupChat,
+                                    packet);
                             mXmppConnectionService.updateMessage(replacedMessage, uuid);
                             if (mXmppConnectionService.confirmMessages()
                                     && replacedMessage.getStatus() == Message.STATUS_RECEIVED
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index d8b8b4151cc9f19171c81f155b31f1ec24940ba5..e118c0a4302b007f31d9fca8958abf461b1e99b6 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -853,7 +853,7 @@ public class ConversationFragment extends XmppFragment
         final Editable text = this.binding.textinput.getText();
         final String body = text == null ? "" : text.toString();
         final Conversation conversation = this.conversation;
-        if (body.length() == 0 || conversation == null) {
+        if (body.isEmpty() || conversation == null) {
             return;
         }
         if (trustKeysIfNeeded(conversation, REQUEST_TRUST_KEYS_TEXT)) {
@@ -867,7 +867,6 @@ public class ConversationFragment extends XmppFragment
             message = conversation.getCorrectingMessage();
             message.setBody(body);
             message.putEdited(message.getUuid(), message.getServerMsgId());
-            message.setServerMsgId(null);
             message.setUuid(UUID.randomUUID().toString());
         }
         switch (conversation.getNextEncryption()) {
diff --git a/src/main/java/im/conversations/android/xmpp/model/correction/Replace.java b/src/main/java/im/conversations/android/xmpp/model/correction/Replace.java
index dbd7395572c7b614f9c7caf83996fbe94e8aca55..7c96118be656520c1bbb04d167edd366d337916b 100644
--- a/src/main/java/im/conversations/android/xmpp/model/correction/Replace.java
+++ b/src/main/java/im/conversations/android/xmpp/model/correction/Replace.java
@@ -14,6 +14,11 @@ public class Replace extends Extension {
         super(Replace.class);
     }
 
+    public Replace(final String id) {
+        this();
+        this.setId(id);
+    }
+
     public String getId() {
         return Strings.emptyToNull(this.getAttribute("id"));
     }

From 25b023c39135b858f93f702a1c623c0010c728c2 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 13 Nov 2024 19:08:21 +0100
Subject: [PATCH 124/357] show toast when reaction can not be added

---
 .../eu/siacs/conversations/ui/AddReactionActivity.java |  9 +++++++--
 .../siacs/conversations/ui/ConversationFragment.java   |  7 ++++++-
 .../siacs/conversations/ui/adapter/MessageAdapter.java | 10 +++++++++-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java b/src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java
index 9b50817547daa4f4d7d0a17a6aa0aeda8cb857e4..709202f659dbb772ba872dc888399dac543bf88e 100644
--- a/src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/AddReactionActivity.java
@@ -45,12 +45,17 @@ public class AddReactionActivity extends XmppActivity {
         }
         final var aggregated = m.getAggregatedReactions();
         if (aggregated.ourReactions.contains(emoji)) {
-            xmppConnectionService.sendReactions(m, aggregated.ourReactions);
+            if (!xmppConnectionService.sendReactions(m, aggregated.ourReactions)) {
+                Toast.makeText(this, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show();
+                return;
+            }
         } else {
             final ImmutableSet.Builder<String> reactionBuilder = new ImmutableSet.Builder<>();
             reactionBuilder.addAll(aggregated.ourReactions);
             reactionBuilder.add(emoji);
-            xmppConnectionService.sendReactions(m, reactionBuilder.build());
+            if (!xmppConnectionService.sendReactions(m, reactionBuilder.build())) {
+                Toast.makeText(this, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show();
+            }
         }
         finish();
     }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index e118c0a4302b007f31d9fca8958abf461b1e99b6..73b8dfc7c3aa3ba6be4e69ab37cec8fd986635d4 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -2141,7 +2141,12 @@ public class ConversationFragment extends XmppFragment
     }
 
     private void addReaction(final Message message) {
-        activity.addReaction(message, reactions -> activity.xmppConnectionService.sendReactions(message, reactions));
+        activity.addReaction(message, reactions -> {
+            if (activity.xmppConnectionService.sendReactions(message, reactions)) {
+                return;
+            }
+            Toast.makeText(activity, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show();
+        });
     }
 
     private void reportMessage(final Message message) {
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 5ed24dfb12b6c7196a0c1f3366fdc01b0ac07767..8d3fa2b8aa85da03b27c5c98b55caad3a0656bfd 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -1122,7 +1122,15 @@ public class MessageAdapter extends ArrayAdapter<Message> {
     }
 
     private void addReaction(final Message message) {
-        activity.addReaction(message, reactions -> activity.xmppConnectionService.sendReactions(message,reactions));
+        activity.addReaction(
+                message,
+                reactions -> {
+                    if (activity.xmppConnectionService.sendReactions(message, reactions)) {
+                        return;
+                    }
+                    Toast.makeText(activity, R.string.could_not_add_reaction, Toast.LENGTH_LONG)
+                            .show();
+                });
     }
 
     private void promptOpenKeychainInstall(View view) {

From dc59f781991f98566b77600a14911141e99c30eb Mon Sep 17 00:00:00 2001
From: licaon-kter <licaon-kter@noreply.codeberg.org>
Date: Tue, 12 Nov 2024 09:39:02 +0000
Subject: [PATCH 125/357] Transcoder - bump version

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ec4fe938d40a10eff046f2b17b868049efe3efa1..108765b7f1ef8ee5726c68012be06133461f94d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -69,7 +69,7 @@ dependencies {
     implementation 'com.makeramen:roundedimageview:2.3.0'
 
     //noinspection GradleDependency
-    implementation 'io.deepmedia.community:transcoder-android:0.11.1'
+    implementation 'io.deepmedia.community:transcoder-android:0.11.2'
 
     implementation 'org.jxmpp:jxmpp-jid:1.0.3'
     implementation 'org.jxmpp:jxmpp-stringprep-libidn:1.0.3'

From 71ab08a2fd12febd82ac88b55f30d95d85a7f157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Sat, 9 Nov 2024 22:31:52 +0000
Subject: [PATCH 126/357] Translated using Weblate (Estonian)

Currently translated at 9.4% (7 of 74 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/et/
---
 fastlane/metadata/android/et/changelogs/4212304.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/et/changelogs/4212304.txt

diff --git a/fastlane/metadata/android/et/changelogs/4212304.txt b/fastlane/metadata/android/et/changelogs/4212304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..31a3d46c219cf620c562fd0412cfef9d8e1a33ea
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4212304.txt
@@ -0,0 +1,2 @@
+* Parandasime kõnete vead Android 15's
+* Parandasime harvaesineva kokkujooksmise/regressiooni, mis tekkis alates versioonist 2.17.0

From 623df48955adda6eac7c59e5c9ddbc67355da25f Mon Sep 17 00:00:00 2001
From: slickdaddy <slickdaddy@users.noreply.translate.codeberg.org>
Date: Mon, 11 Nov 2024 23:43:44 +0000
Subject: [PATCH 127/357] Translated using Weblate (Turkish)

Currently translated at 96.7% (1009 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/tr/
---
 src/main/res/values-tr-rTR/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/res/values-tr-rTR/strings.xml b/src/main/res/values-tr-rTR/strings.xml
index e9b585765f3cf6c64eb6319878525ac7639d84bb..a00a9f776f1c5de7e89f0273f827ba7b13e1089d 100644
--- a/src/main/res/values-tr-rTR/strings.xml
+++ b/src/main/res/values-tr-rTR/strings.xml
@@ -1063,4 +1063,9 @@
     <string name="pref_summary_security">Uçtan Uca Şifreleme, Doğrulamadan Körü Körüne Güven, MITM Algılama</string>
     <string name="pref_category_engagement_notifications">Etkileşim bildirimleri</string>
     <string name="pref_up_long_summary">UnifiedPush Dağıtıcısı olarak davranılırken devamlı, güvenli ve pil ömrü dostu olan XMPP bağlantısı diğer UnifiedPush ile uyumlu olan Tusky, Ltt.rs, FluffyChat ve benzeri uygulamaları uyandırmak için kullanılacaktır.</string>
+    <string name="reconnect_on_other_host">Diğer sunucuda yeniden bağlan</string>
+    <string name="allow_private_messages">Özel mesajlara izin ver</string>
+    <string name="pref_accept_invites_from_strangers">Yabancılardan gelen davetler</string>
+    <string name="pref_accept_invites_from_strangers_summary">Yabancılardan gelen grup davetlerini kabul et</string>
+    <string name="edit_configuration">Yapılandırmayı değiştir</string>
 </resources>
\ No newline at end of file

From fd8dc1a11c484a9712a8cb1d243fcedc3e274850 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 15 Nov 2024 19:04:01 +0100
Subject: [PATCH 128/357] hide button in video call after timeout

---
 .../conversations/ui/RtpSessionActivity.java  | 131 +++++++++++++++---
 src/main/res/layout/activity_rtp_session.xml  |   7 +-
 src/main/res/values/strings.xml               |   1 +
 3 files changed, 116 insertions(+), 23 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
index f7818e2921f4c619159c6e2880fde82e6571340e..3bd79b37fc06a4b65b014c08b364a5219d0e3b9b 100644
--- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
@@ -32,6 +32,7 @@ import androidx.annotation.RequiresApi;
 import androidx.annotation.StringRes;
 import androidx.databinding.DataBindingUtil;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
@@ -88,7 +89,8 @@ public class RtpSessionActivity extends XmppActivity
     public static final String ACTION_MAKE_VOICE_CALL = "action_make_voice_call";
     public static final String ACTION_MAKE_VIDEO_CALL = "action_make_video_call";
 
-    private static final int CALL_DURATION_UPDATE_INTERVAL = 333;
+    private static final int CALL_DURATION_UPDATE_INTERVAL = 250;
+    private static final int BUTTON_VISIBILITY_TIMEOUT = 10_000;
 
     private static final List<RtpEndUserState> END_CARD =
             Arrays.asList(
@@ -143,6 +145,8 @@ public class RtpSessionActivity extends XmppActivity
                     mHandler.postDelayed(mTickExecutor, CALL_DURATION_UPDATE_INTERVAL);
                 }
             };
+    private boolean buttonsHiddenAfterTimeout = false;
+    private final Runnable mVisibilityToggleExecutor = this::updateButtonInVideoCallVisibility;
 
     public static Set<Media> actionToMedia(final String action) {
         if (ACTION_MAKE_VIDEO_CALL.equals(action)) {
@@ -179,10 +183,16 @@ public class RtpSessionActivity extends XmppActivity
                                 | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
                                 | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
         this.binding = DataBindingUtil.setContentView(this, R.layout.activity_rtp_session);
+        this.binding.remoteVideo.setOnClickListener(this::onVideoScreenClick);
+        this.binding.localVideo.setOnClickListener(this::onVideoScreenClick);
         setSupportActionBar(binding.toolbar);
         Activities.setStatusAndNavigationBarColors(this, binding.getRoot());
     }
 
+    private void onVideoScreenClick(final View view) {
+        resetVisibilityExecutorShowButtons();
+    }
+
     @Override
     public boolean onCreateOptionsMenu(final Menu menu) {
         getMenuInflater().inflate(R.menu.activity_rtp_session, menu);
@@ -605,12 +615,20 @@ public class RtpSessionActivity extends XmppActivity
     public void onStart() {
         super.onStart();
         mHandler.postDelayed(mTickExecutor, CALL_DURATION_UPDATE_INTERVAL);
+        mHandler.postDelayed(mVisibilityToggleExecutor, BUTTON_VISIBILITY_TIMEOUT);
         this.binding.remoteVideo.setOnAspectRatioChanged(this);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        resetVisibilityExecutorShowButtons();
+    }
+
     @Override
     public void onStop() {
         mHandler.removeCallbacks(mTickExecutor);
+        mHandler.removeCallbacks(mVisibilityToggleExecutor);
         binding.remoteVideo.release();
         binding.remoteVideo.setOnAspectRatioChanged(null);
         binding.localVideo.release();
@@ -732,6 +750,17 @@ public class RtpSessionActivity extends XmppActivity
         }
     }
 
+    private boolean isInConnectedVideoCall() {
+        final JingleRtpConnection rtpConnection;
+        try {
+            rtpConnection = requireRtpConnection();
+        } catch (final IllegalStateException e) {
+            return false;
+        }
+        return rtpConnection.getMedia().contains(Media.VIDEO)
+                && rtpConnection.getEndUserState() == RtpEndUserState.CONNECTED;
+    }
+
     private boolean initializeActivityWithRunningRtpSession(
             final Account account, Jid with, String sessionId) {
         final WeakReference<JingleRtpConnection> reference =
@@ -834,7 +863,7 @@ public class RtpSessionActivity extends XmppActivity
             final ContentAddition contentAddition) {
         switch (state) {
             case INCOMING_CALL -> {
-                Preconditions.checkArgument(media.size() > 0, "Media must not be empty");
+                Preconditions.checkArgument(!media.isEmpty(), "Media must not be empty");
                 if (media.contains(Media.VIDEO)) {
                     setTitle(R.string.rtp_state_incoming_video_call);
                 } else {
@@ -925,7 +954,9 @@ public class RtpSessionActivity extends XmppActivity
             final RtpEndUserState state,
             final Set<Media> media,
             final ContentAddition contentAddition) {
-        if (state == RtpEndUserState.ENDING_CALL || isPictureInPicture()) {
+        if (state == RtpEndUserState.ENDING_CALL
+                || isPictureInPicture()
+                || this.buttonsHiddenAfterTimeout) {
             this.binding.rejectCall.setVisibility(View.INVISIBLE);
             this.binding.endCall.setVisibility(View.INVISIBLE);
             this.binding.acceptCall.setVisibility(View.INVISIBLE);
@@ -982,12 +1013,17 @@ public class RtpSessionActivity extends XmppActivity
             this.binding.endCall.setContentDescription(getString(R.string.hang_up));
             this.binding.endCall.setOnClickListener(this::endCall);
             this.binding.endCall.setImageResource(R.drawable.ic_call_end_24dp);
-            this.binding.endCall.setVisibility(View.VISIBLE);
+            setVisibleAndShow(this.binding.endCall);
             this.binding.acceptCall.setVisibility(View.INVISIBLE);
         }
         updateInCallButtonConfiguration(state, media);
     }
 
+    private static void setVisibleAndShow(final FloatingActionButton button) {
+        button.show();
+        button.setVisibility(View.VISIBLE);
+    }
+
     private boolean isPictureInPicture() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             return isInPictureInPictureMode();
@@ -1004,7 +1040,8 @@ public class RtpSessionActivity extends XmppActivity
     @SuppressLint("RestrictedApi")
     private void updateInCallButtonConfiguration(
             final RtpEndUserState state, final Set<Media> media) {
-        if (STATES_CONSIDERED_CONNECTED.contains(state) && !isPictureInPicture()) {
+        final var showButtons = !isPictureInPicture() && !buttonsHiddenAfterTimeout;
+        if (STATES_CONSIDERED_CONNECTED.contains(state) && showButtons) {
             Preconditions.checkArgument(!media.isEmpty(), "Media must not be empty");
             if (media.contains(Media.VIDEO)) {
                 final JingleRtpConnection rtpConnection = requireRtpConnection();
@@ -1024,7 +1061,7 @@ public class RtpSessionActivity extends XmppActivity
                 this.binding.inCallActionLeft.setVisibility(View.GONE);
             }
         } else if (STATES_SHOWING_SPEAKER_CONFIGURATION.contains(state)
-                && !isPictureInPicture()
+                && showButtons
                 && Media.audioOnly(media)) {
             final CallIntegration callIntegration;
             try {
@@ -1089,17 +1126,17 @@ public class RtpSessionActivity extends XmppActivity
                 this.binding.inCallActionRight.setClickable(false);
             }
         }
-        this.binding.inCallActionRight.setVisibility(View.VISIBLE);
+        setVisibleAndShow(this.binding.inCallActionRight);
     }
 
     @SuppressLint("RestrictedApi")
     private void updateInCallButtonConfigurationVideo(
             final boolean videoEnabled, final boolean isCameraSwitchable) {
-        this.binding.inCallActionRight.setVisibility(View.VISIBLE);
+        setVisibleAndShow(this.binding.inCallActionRight);
         if (isCameraSwitchable) {
             this.binding.inCallActionFarRight.setImageResource(
                     R.drawable.ic_flip_camera_android_24dp);
-            this.binding.inCallActionFarRight.setVisibility(View.VISIBLE);
+            setVisibleAndShow(this.binding.inCallActionFarRight);
             this.binding.inCallActionFarRight.setOnClickListener(this::switchCamera);
             this.binding.inCallActionFarRight.setContentDescription(
                     getString(R.string.flip_camera));
@@ -1120,6 +1157,7 @@ public class RtpSessionActivity extends XmppActivity
     }
 
     private void switchCamera(final View view) {
+        resetVisibilityToggleExecutor();
         Futures.addCallback(
                 requireRtpConnection().switchCamera(),
                 new FutureCallback<>() {
@@ -1145,6 +1183,7 @@ public class RtpSessionActivity extends XmppActivity
     }
 
     private void enableVideo(final View view) {
+        resetVisibilityToggleExecutor();
         try {
             requireRtpConnection().setVideoEnabled(true);
         } catch (final IllegalStateException e) {
@@ -1155,6 +1194,7 @@ public class RtpSessionActivity extends XmppActivity
     }
 
     private void disableVideo(final View view) {
+        resetVisibilityToggleExecutor();
         final JingleRtpConnection rtpConnection = requireRtpConnection();
         final ContentAddition pending = rtpConnection.getPendingContentAddition();
         if (pending != null && pending.direction == ContentAddition.Direction.OUTGOING) {
@@ -1179,7 +1219,7 @@ public class RtpSessionActivity extends XmppActivity
             this.binding.inCallActionLeft.setImageResource(R.drawable.ic_mic_off_24dp);
             this.binding.inCallActionLeft.setOnClickListener(this::enableMicrophone);
         }
-        this.binding.inCallActionLeft.setVisibility(View.VISIBLE);
+        setVisibleAndShow(this.binding.inCallActionLeft);
     }
 
     private void updateCallDuration() {
@@ -1198,6 +1238,47 @@ public class RtpSessionActivity extends XmppActivity
         }
     }
 
+    private void resetVisibilityToggleExecutor() {
+        mHandler.removeCallbacks(this.mVisibilityToggleExecutor);
+        mHandler.postDelayed(this.mVisibilityToggleExecutor, BUTTON_VISIBILITY_TIMEOUT);
+    }
+
+    private void updateButtonInVideoCallVisibility() {
+        if (isInConnectedVideoCall()) {
+            if (isPictureInPicture()) {
+                return;
+            }
+            Log.d(Config.LOGTAG, "hiding in-call buttons after timeout was reached");
+            hideInCallButtons();
+        }
+    }
+
+    private void hideInCallButtons() {
+        binding.inCallActionLeft.hide();
+        binding.endCall.hide();
+        binding.inCallActionRight.hide();
+        binding.inCallActionFarRight.hide();
+    }
+
+    private void showInCallButtons() {
+        this.buttonsHiddenAfterTimeout = false;
+        final JingleRtpConnection rtpConnection;
+        try {
+            rtpConnection = requireRtpConnection();
+        } catch (final IllegalStateException e) {
+            return;
+        }
+        updateButtonConfiguration(
+                rtpConnection.getEndUserState(),
+                rtpConnection.getMedia(),
+                rtpConnection.getPendingContentAddition());
+    }
+
+    private void resetVisibilityExecutorShowButtons() {
+        resetVisibilityToggleExecutor();
+        showInCallButtons();
+    }
+
     private void updateVideoViews(final RtpEndUserState state) {
         if (END_CARD.contains(state) || state == RtpEndUserState.ENDING_CALL) {
             binding.localVideo.setVisibility(View.GONE);
@@ -1292,17 +1373,23 @@ public class RtpSessionActivity extends XmppActivity
         return connection.getRemoteVideoTrack();
     }
 
-    private void disableMicrophone(View view) {
-        final JingleRtpConnection rtpConnection = requireRtpConnection();
-        if (rtpConnection.setMicrophoneEnabled(false)) {
-            updateInCallButtonConfiguration();
-        }
+    private void disableMicrophone(final View view) {
+        setMicrophoneEnabled(false);
     }
 
-    private void enableMicrophone(View view) {
-        final JingleRtpConnection rtpConnection = requireRtpConnection();
-        if (rtpConnection.setMicrophoneEnabled(true)) {
-            updateInCallButtonConfiguration();
+    private void enableMicrophone(final View view) {
+        setMicrophoneEnabled(true);
+    }
+
+    private void setMicrophoneEnabled(final boolean enabled) {
+        resetVisibilityExecutorShowButtons();
+        try {
+            final JingleRtpConnection rtpConnection = requireRtpConnection();
+            if (rtpConnection.setMicrophoneEnabled(enabled)) {
+                updateInCallButtonConfiguration();
+            }
+        } catch (final IllegalStateException e) {
+            Toast.makeText(this, R.string.could_not_modify_call, Toast.LENGTH_SHORT).show();
         }
     }
 
@@ -1311,7 +1398,7 @@ public class RtpSessionActivity extends XmppActivity
             requireCallIntegration().setAudioDevice(CallIntegration.AudioDevice.EARPIECE);
             acquireProximityWakeLock();
         } catch (final IllegalStateException e) {
-            Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, R.string.could_not_modify_call, Toast.LENGTH_SHORT).show();
         }
     }
 
@@ -1320,7 +1407,7 @@ public class RtpSessionActivity extends XmppActivity
             requireCallIntegration().setAudioDevice(CallIntegration.AudioDevice.SPEAKER_PHONE);
             releaseProximityWakeLock();
         } catch (final IllegalStateException e) {
-            Toast.makeText(this, e.getMessage(), Toast.LENGTH_SHORT).show();
+            Toast.makeText(this, R.string.could_not_modify_call, Toast.LENGTH_SHORT).show();
         }
     }
 
@@ -1410,6 +1497,7 @@ public class RtpSessionActivity extends XmppActivity
                     () -> getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON));
         }
         if (with.isBareJid()) {
+            // TODO check for ENDED
             updateRtpSessionProposalState(account, with, state);
             return;
         }
@@ -1433,6 +1521,7 @@ public class RtpSessionActivity extends XmppActivity
                 finish();
                 return;
             }
+            resetVisibilityToggleExecutor();
             runOnUiThread(
                     () -> {
                         updateStateDisplay(state, media, contentAddition);
diff --git a/src/main/res/layout/activity_rtp_session.xml b/src/main/res/layout/activity_rtp_session.xml
index 7cb17111f0204348d12271bad9ea3dd21d67f5fa..3b779969d5af79e732658d2f72a6af9b96c339ee 100644
--- a/src/main/res/layout/activity_rtp_session.xml
+++ b/src/main/res/layout/activity_rtp_session.xml
@@ -112,7 +112,8 @@
             <eu.siacs.conversations.ui.widget.SurfaceViewRenderer
                 android:id="@+id/remote_video"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:soundEffectsEnabled="false" />
         </LinearLayout>
 
         <eu.siacs.conversations.ui.widget.SurfaceViewRenderer
@@ -123,6 +124,7 @@
             android:layout_alignParentEnd="true"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="24dp"
+            android:soundEffectsEnabled="false"
             android:visibility="gone"
             app:elevation="4dp" />
 
@@ -161,7 +163,8 @@
             <RelativeLayout
                 android:layout_width="288dp"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true">
+                android:layout_centerInParent="true"
+                android:background="@android:color/transparent">
 
                 <com.google.android.material.floatingactionbutton.FloatingActionButton
                     android:id="@+id/reject_call"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 627106a3569d8985f59653f67d334403dddbfdf4..d6d324321d6e9bbf9c294cca24e445cc482e2a5f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1086,4 +1086,5 @@
     <string name="add_reaction">Add reaction…</string>
     <string name="add_reaction_title">Add reaction</string>
     <string name="more_reactions">More reactions</string>
+    <string name="could_not_modify_call">Could not modify call</string>
 </resources>

From bffd362c50e3dc6ef0054058bebc89bea27c4823 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 16 Nov 2024 13:17:05 +0100
Subject: [PATCH 129/357] always show call icon

---
 .../java/eu/siacs/conversations/entities/Contact.java    | 7 +++----
 .../eu/siacs/conversations/ui/ConversationFragment.java  | 9 ++++-----
 .../siacs/conversations/xmpp/jingle/RtpCapability.java   | 2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index c66220ab55af42850aa88edc7216d7c0008c3765..6437cffa338882a4740c4b3f3b488239532429fc 100644
--- a/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
@@ -22,7 +22,6 @@ import java.util.Locale;
 import java.util.Objects;
 
 import eu.siacs.conversations.Config;
-import eu.siacs.conversations.R;
 import eu.siacs.conversations.android.AbstractPhoneContact;
 import eu.siacs.conversations.android.JabberIdContact;
 import eu.siacs.conversations.services.QuickConversationsService;
@@ -544,7 +543,7 @@ public class Contact implements ListItem, Blockable {
     public synchronized boolean unsetPhoneContact(Class<? extends AbstractPhoneContact> clazz) {
         resetOption(getOption(clazz));
         boolean changed = false;
-        if (!getOption(Options.SYNCED_VIA_ADDRESSBOOK) && !getOption(Options.SYNCED_VIA_OTHER)) {
+        if (!getOption(Options.SYNCED_VIA_ADDRESS_BOOK) && !getOption(Options.SYNCED_VIA_OTHER)) {
             setSystemAccount(null);
             changed |= setPhotoUri(null);
             changed |= setSystemName(null);
@@ -554,7 +553,7 @@ public class Contact implements ListItem, Blockable {
 
     public static int getOption(Class<? extends AbstractPhoneContact> clazz) {
         if (clazz == JabberIdContact.class) {
-            return Options.SYNCED_VIA_ADDRESSBOOK;
+            return Options.SYNCED_VIA_ADDRESS_BOOK;
         } else {
             return Options.SYNCED_VIA_OTHER;
         }
@@ -593,7 +592,7 @@ public class Contact implements ListItem, Blockable {
         public static final int PENDING_SUBSCRIPTION_REQUEST = 5;
         public static final int DIRTY_PUSH = 6;
         public static final int DIRTY_DELETE = 7;
-        private static final int SYNCED_VIA_ADDRESSBOOK = 8;
+        private static final int SYNCED_VIA_ADDRESS_BOOK = 8;
         public static final int SYNCED_VIA_OTHER = 9;
     }
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 73b8dfc7c3aa3ba6be4e69ab37cec8fd986635d4..9149862e6f057f9142ef93b3335db07d8f846732 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -1175,13 +1175,12 @@ public class ConversationFragment extends XmppFragment
                     menuCall.setVisible(false);
                 } else {
                     menuOngoingCall.setVisible(false);
-                    final RtpCapability.Capability rtpCapability =
-                            RtpCapability.check(conversation.getContact());
+                    // use RtpCapability.check(conversation.getContact()); to check if contact
+                    // actually has support
                     final boolean cameraAvailable =
                             activity != null && activity.isCameraFeatureAvailable();
-                    menuCall.setVisible(rtpCapability != RtpCapability.Capability.NONE);
-                    menuVideoCall.setVisible(
-                            rtpCapability == RtpCapability.Capability.VIDEO && cameraAvailable);
+                    menuCall.setVisible(true);
+                    menuVideoCall.setVisible(cameraAvailable);
                 }
                 menuContactDetails.setVisible(!this.conversation.withSelf());
                 menuMucDetails.setVisible(false);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpCapability.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpCapability.java
index b53f0b9e8d519d55024c00da4a8f680f2c38c486..1b41285999ae2b0dcca084f253fa77ecf4f9d237 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpCapability.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpCapability.java
@@ -64,7 +64,7 @@ public class RtpCapability {
 
     public static Capability check(final Contact contact, final boolean allowFallback) {
         final Presences presences = contact.getPresences();
-        if (presences.size() == 0 && allowFallback && contact.getAccount().isEnabled()) {
+        if (presences.isEmpty() && allowFallback && contact.getAccount().isEnabled()) {
             return contact.getRtpCapability();
         }
         Capability result = Capability.NONE;

From 411a14ce87fa5df274de13af9d6dd5cbb365f51b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 18 Nov 2024 20:48:58 +0100
Subject: [PATCH 130/357] wait for disco response on resume

---
 .../siacs/conversations/xmpp/XmppConnection.java | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 5ba2dbe72a1ed078cf96588c3c4fb2dce30a5375..8cf9a59bcdf0dd4d6704f22dd85386db293fdf3d 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -223,10 +223,10 @@ public class XmppConnection implements Runnable {
         }
     }
 
-    private static boolean validBase64(String input) {
+    private static boolean validBase64(final String input) {
         try {
             return Base64.decode(input, Base64.URL_SAFE).length == 3;
-        } catch (Throwable throwable) {
+        } catch (final Throwable throwable) {
             return false;
         }
     }
@@ -1127,7 +1127,15 @@ public class XmppConnection implements Runnable {
             }
             sendPacket(packet);
         }
-        changeStatusToOnline();
+        if (mWaitForDisco.get()) {
+            this.lastDiscoStarted = SystemClock.elapsedRealtime();
+            Log.d(
+                    Config.LOGTAG,
+                    account.getJid().asBareJid() + ": awaiting disco results after resume");
+            changeStatus(Account.State.CONNECTING);
+        } else {
+            changeStatusToOnline();
+        }
     }
 
     private void changeStatusToOnline() {
@@ -2101,7 +2109,7 @@ public class XmppConnection implements Runnable {
         Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": starting service discovery");
         mPendingServiceDiscoveries.set(0);
         mWaitForDisco.set(waitForDisco);
-        lastDiscoStarted = SystemClock.elapsedRealtime();
+        this.lastDiscoStarted = SystemClock.elapsedRealtime();
         mXmppConnectionService.scheduleWakeUpCall(
                 Config.CONNECT_DISCO_TIMEOUT, account.getUuid().hashCode());
         final Element caps = streamFeatures.findChild("c");

From 0b4e8d947f50a927d8135e3350ae80b27b9ee86d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 19 Nov 2024 11:45:42 +0100
Subject: [PATCH 131/357] show warning if contact doesnt support calls

---
 .../conversations/ui/RtpSessionActivity.java  | 27 +++++++++++---
 src/main/res/drawable/ic_warning_48dp.xml     |  5 +++
 src/main/res/layout/activity_rtp_session.xml  | 35 +++++++++++++++++++
 src/main/res/values-land/bools.xml            |  2 +-
 src/main/res/values/bools.xml                 |  2 +-
 src/main/res/values/strings.xml               |  1 +
 6 files changed, 65 insertions(+), 7 deletions(-)
 create mode 100644 src/main/res/drawable/ic_warning_48dp.xml

diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
index 3bd79b37fc06a4b65b014c08b364a5219d0e3b9b..5945dd253600608912bde95ca687fdfe527daef7 100644
--- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
@@ -533,15 +533,17 @@ public class RtpSessionActivity extends XmppActivity
             final String extraLastState = intent.getStringExtra(EXTRA_LAST_REPORTED_STATE);
             final RtpEndUserState state =
                     extraLastState == null ? null : RtpEndUserState.valueOf(extraLastState);
+            final var contact = account.getRoster().getContact(with);
             if (state != null) {
                 Log.d(Config.LOGTAG, "restored last state from intent extra");
                 updateButtonConfiguration(state);
                 updateVerifiedShield(false);
                 updateStateDisplay(state);
                 updateIncomingCallScreen(state);
+                updateSupportWarning(state, contact);
                 invalidateOptionsMenu();
             }
-            setWith(account.getRoster().getContact(with), state);
+            setWith(state, contact);
             if (xmppConnectionService
                     .getJingleConnectionManager()
                     .fireJingleRtpConnectionStateUpdates()) {
@@ -564,10 +566,10 @@ public class RtpSessionActivity extends XmppActivity
     }
 
     private void setWidth(final RtpEndUserState state) {
-        setWith(getWith(), state);
+        setWith(state, getWith());
     }
 
-    private void setWith(final Contact contact, final RtpEndUserState state) {
+    private void setWith(final RtpEndUserState state, final Contact contact) {
         binding.with.setText(contact.getDisplayName());
         if (Arrays.asList(RtpEndUserState.INCOMING_CALL, RtpEndUserState.ACCEPTING_CALL)
                 .contains(state)) {
@@ -822,7 +824,9 @@ public class RtpSessionActivity extends XmppActivity
         updateCallDuration();
         updateVerifiedShield(false);
         invalidateOptionsMenu();
-        setWith(account.getRoster().getContact(with), state);
+        final var contact = account.getRoster().getContact(with);
+        setWith(state, contact);
+        updateSupportWarning(state, contact);
     }
 
     private void reInitializeActivityWithRunningRtpSession(
@@ -912,7 +916,7 @@ public class RtpSessionActivity extends XmppActivity
 
     private void updateIncomingCallScreen(final RtpEndUserState state, final Contact contact) {
         if (state == RtpEndUserState.INCOMING_CALL || state == RtpEndUserState.ACCEPTING_CALL) {
-            final boolean show = getResources().getBoolean(R.bool.show_avatar_incoming_call);
+            final boolean show = getResources().getBoolean(R.bool.is_portrait_mode);
             if (show) {
                 binding.contactPhoto.setVisibility(View.VISIBLE);
                 if (contact == null) {
@@ -937,6 +941,18 @@ public class RtpSessionActivity extends XmppActivity
         }
     }
 
+    private void updateSupportWarning(final RtpEndUserState state, final Contact contact) {
+        if (state == RtpEndUserState.CONNECTIVITY_ERROR
+                && getResources().getBoolean(R.bool.is_portrait_mode)) {
+            binding.supportWarning.setVisibility(
+                    RtpCapability.check(contact) == RtpCapability.Capability.NONE
+                            ? View.VISIBLE
+                            : View.GONE);
+        } else {
+            binding.supportWarning.setVisibility(View.GONE);
+        }
+    }
+
     private Set<Media> getMedia() {
         return requireRtpConnection().getMedia();
     }
@@ -1530,6 +1546,7 @@ public class RtpSessionActivity extends XmppActivity
                         updateButtonConfiguration(state, media, contentAddition);
                         updateVideoViews(state);
                         updateIncomingCallScreen(state, contact);
+                        updateSupportWarning(state, contact);
                         invalidateOptionsMenu();
                     });
             if (END_CARD.contains(state)) {
diff --git a/src/main/res/drawable/ic_warning_48dp.xml b/src/main/res/drawable/ic_warning_48dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..200b6a9fc98980de5a9dfe59cd19670a3f35a787
--- /dev/null
+++ b/src/main/res/drawable/ic_warning_48dp.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="48dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="48dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+    
+</vector>
diff --git a/src/main/res/layout/activity_rtp_session.xml b/src/main/res/layout/activity_rtp_session.xml
index 3b779969d5af79e732658d2f72a6af9b96c339ee..cd3ec1ceffa87bda73f4b2dba7757a21d46304bb 100644
--- a/src/main/res/layout/activity_rtp_session.xml
+++ b/src/main/res/layout/activity_rtp_session.xml
@@ -78,6 +78,41 @@
             android:layout_above="@+id/button_row"
             android:layout_below="@id/app_bar_layout">
 
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/support_warning"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginHorizontal="24dp"
+                android:layout_marginTop="@dimen/rtp_session_duration_top_margin"
+                android:visibility="gone"
+                app:cardBackgroundColor="?colorErrorContainer">
+
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="12dp">
+
+                    <ImageView
+                        android:id="@+id/no_support_av_icon"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/ic_warning_48dp"
+                        app:tint="?colorOnErrorContainer" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginStart="16dp"
+                        android:layout_toEndOf="@+id/no_support_av_icon"
+                        android:text="@string/clients_may_not_support_av"
+                        android:textAppearance="?textAppearanceBodyLarge"
+                        android:textColor="?colorOnErrorContainer" />
+                </RelativeLayout>
+            </com.google.android.material.card.MaterialCardView>
+
             <TextView
                 android:id="@+id/duration"
                 android:layout_width="wrap_content"
diff --git a/src/main/res/values-land/bools.xml b/src/main/res/values-land/bools.xml
index 1aa953fcccccb7d047cb34b81c6d303d7596eea3..ab2977960420077bc65c6603f119ba033b17ef46 100644
--- a/src/main/res/values-land/bools.xml
+++ b/src/main/res/values-land/bools.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <bool name="show_avatar_incoming_call">false</bool>
+    <bool name="is_portrait_mode">false</bool>
 </resources>
diff --git a/src/main/res/values/bools.xml b/src/main/res/values/bools.xml
index 0799afb3f53b5938ae611c3cb1110a04e87a6c52..dad6c5eebf5dbc571012524f35abd9db85e35433 100644
--- a/src/main/res/values/bools.xml
+++ b/src/main/res/values/bools.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <bool name="show_avatar_incoming_call">true</bool>
+    <bool name="is_portrait_mode">true</bool>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index d6d324321d6e9bbf9c294cca24e445cc482e2a5f..6e4ce77ea3fa3076a86a2deb28db0a2184758708 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1087,4 +1087,5 @@
     <string name="add_reaction_title">Add reaction</string>
     <string name="more_reactions">More reactions</string>
     <string name="could_not_modify_call">Could not modify call</string>
+    <string name="clients_may_not_support_av">Your contact’s XMPP client might not support audio/video calls.</string>
 </resources>

From 8de23f7bfc0e4eca9660a5579ee10c92a14b56a1 Mon Sep 17 00:00:00 2001
From: Besnik_b <Besnik_b@users.noreply.translate.codeberg.org>
Date: Fri, 15 Nov 2024 17:45:28 +0000
Subject: [PATCH 132/357] Translated using Weblate (Albanian)

Currently translated at 99.1% (1034 of 1043 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sq/
---
 src/main/res/values-sq-rAL/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index 676a43305953da3feb75935e96c909411bb381b9..4a2c217bdf402c46442c41c4a7401f073fc89283 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -208,7 +208,7 @@
     <string name="skip">Anashkaloje</string>
     <string name="disable_notifications">Çaktivizo njoftimet</string>
     <string name="enable">Aktivizoje</string>
-    <string name="conference_requires_password">Fjalosja në grupi lyp fjalëkalim</string>
+    <string name="conference_requires_password">Fjalosja në grup lyp fjalëkalim</string>
     <string name="enter_password">Jepni fjalëkalim</string>
     <string name="request_now">Kërkoje tani</string>
     <string name="ignore">Shpërfille</string>

From 3969c08e581d937ce996d05e91659ae0fb1f3e39 Mon Sep 17 00:00:00 2001
From: Anonymous <anonymous@users.noreply.translate.codeberg.org>
Date: Sat, 16 Nov 2024 18:08:20 +0000
Subject: [PATCH 133/357] Translated using Weblate (Swedish)

Currently translated at 91.6% (957 of 1044 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sv/
---
 src/main/res/values-sv/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index d9fd331896b3ffb3314f742511b57aa6321576f7..216bacd00de4309d7f1b5eb57576c7d1e21ffb30 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -941,7 +941,7 @@
     <string name="resend_sms">Skicka SMS igen</string>
     <string name="resend_sms_in">Skicka SMS igen (%s)</string>
     <string name="wait_x">Var god vänta (%s)</string>
-    <string name="we_will_be_verifying">Vi kommer att verifiera telefonnumret<br/><br/><b>%s</b><br/><br/>Är det här okej, eller vill du ändra telefonnumret\?</string>
+    <string name="we_will_be_verifying">Vi kommer att verifiera telefonnumret<br/><br/><b>%s</b><br/><br/>Är det här okej, eller vill du ändra telefonnumret?</string>
     <string name="not_a_valid_phone_number">%s är inte ett giltigt telefonnummer.</string>
     <string name="security_violation_not_attaching_file">Filen har utelämnats på grund av säkerhetsöverträdelse.</string>
     <string name="pref_video_compression_summary">Lägre kvalitet resulterar i mindre filer</string>

From c31bc1842e0655c677881b508927529ab96ebc72 Mon Sep 17 00:00:00 2001
From: Anonymous <anonymous@users.noreply.translate.codeberg.org>
Date: Sat, 16 Nov 2024 18:08:25 +0000
Subject: [PATCH 134/357] Translated using Weblate (Ukrainian)

Currently translated at 99.6% (1040 of 1044 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/uk/
---
 src/main/res/values-uk/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index eef73c4c31dfae2b3c43e7602b966d934cf69989..4365c8179305a44d43fcc6c52120e7cc2520a5f0 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -760,7 +760,7 @@
     <string name="phone_number">номер телефону</string>
     <string name="verify_your_phone_number">Перевірте номер телефону</string>
     <string name="enter_country_code_and_phone_number">Quicksy надішле SMS, щоб перевірити Ваш номер телефону. Тарифами Вашого оператора може бути передбачено плату за отримання SMS. Зазначте код Вашої країни та номер телефону:</string>
-    <string name="we_will_be_verifying">Ми перевіримо номер телефону<br/><br/><b>%s</b><br/><br/>Гаразд чи бажаєте вказати інший номер\?</string>
+    <string name="we_will_be_verifying">Ми перевіримо номер телефону<br/><br/><b>%s</b><br/><br/>Гаразд чи бажаєте вказати інший номер?</string>
     <string name="not_a_valid_phone_number">%s не є дійсним номером телефону.</string>
     <string name="please_enter_your_phone_number">Будь ласка, введіть свій номер телефону.</string>
     <string name="search_countries">Шукати країну</string>

From 6856afd8f7367e979c2133839b47ee333cc2ad9e Mon Sep 17 00:00:00 2001
From: Anonymous <anonymous@users.noreply.translate.codeberg.org>
Date: Sat, 16 Nov 2024 18:08:19 +0000
Subject: [PATCH 135/357] Translated using Weblate (Albanian)

Currently translated at 98.6% (1030 of 1044 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sq/
---
 src/main/res/values-sq-rAL/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index 4a2c217bdf402c46442c41c4a7401f073fc89283..dda33e96ed4ef75174f3671737ec220fe42ce56e 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -950,7 +950,7 @@
     <string name="please_enter_pin_below">Ju lutemi, jepni më poshtë PIN-in tuaj prej 6 shifrash.</string>
     <string name="please_enter_pin">Ju lutemi, jepni PIN-in tuaj prej 6 shifrash.</string>
     <string name="security_violation_not_attaching_file">Kartelë e shpërfillur, për shkak cenimi sigurie.</string>
-    <string name="we_will_be_verifying">Do të verifikojmë numrin e telefonit<br/><br/><b>%s</b><br/><br/>Dakord, apo do të donit të përpunonit numrin\?</string>
+    <string name="we_will_be_verifying">Do të verifikojmë numrin e telefonit<br/><br/><b>%s</b><br/><br/>Dakord, apo do të donit të përpunonit numrin?</string>
     <string name="we_have_sent_you_an_sms_to_x">Ju kemi dërguar një SMS te <b>%s</b>.</string>
     <string name="enter_password_to_restore">Që të rikthehet kopjeruajtja, jepni fjalëkalimin tuaj për llogarinë %s.</string>
     <string name="restore_warning">Mos përdorni veçorinë e rikthimit të një kopjeruajtje në një përpjekje për të klonuar (xhiruar në të njëjtën kohë) një instalim. Rikthimi i një kopjeruajtje është menduar vetëm për migrime, ose në rast se humbët pajisjen origjinale.</string>

From 36b1d4bb838c2cb32f8d324a6d48978f58e2f09a Mon Sep 17 00:00:00 2001
From: Anonymous <anonymous@users.noreply.translate.codeberg.org>
Date: Sat, 16 Nov 2024 18:08:21 +0000
Subject: [PATCH 136/357] Translated using Weblate (Silesian)

Currently translated at 83.9% (876 of 1044 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/szl/
---
 src/main/res/values-szl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-szl/strings.xml b/src/main/res/values-szl/strings.xml
index 32ef80fffca0b476ed33006e1b59d8c3863b30c4..8bb5d851c860773aae06d2400f363de648e7fa42 100644
--- a/src/main/res/values-szl/strings.xml
+++ b/src/main/res/values-szl/strings.xml
@@ -795,7 +795,7 @@
     <string name="phone_number">numer telefōnu</string>
     <string name="verify_your_phone_number">Zweryfikuj swōj numer telefōnu</string>
     <string name="enter_country_code_and_phone_number">Quicksy wyśle SMS (mogōm być naliczane płaty) coby zweryfikować numer telefōnu. Wpisz kod ôd kraju i numer telefōnu:</string>
-    <string name="we_will_be_verifying">Zweryfikujymy numer telefōnu <br/><br/><b>%s</b><br/><br/>Zgodzo sie wszysko, abo chcesz zmiynić numer\?</string>
+    <string name="we_will_be_verifying">Zweryfikujymy numer telefōnu <br/><br/><b>%s</b><br/><br/>Zgodzo sie wszysko, abo chcesz zmiynić numer?</string>
     <string name="not_a_valid_phone_number">%s to niy ma noleżny numer telefōnu.</string>
     <string name="please_enter_your_phone_number">Wkludź swōj numer telefōnu.</string>
     <string name="search_countries">Przeszukej kraje</string>

From dcae3e69af69b63754edbc9192f3986b9bbc7533 Mon Sep 17 00:00:00 2001
From: Stephan-P <Stephan-P@users.noreply.translate.codeberg.org>
Date: Sun, 17 Nov 2024 05:34:48 +0000
Subject: [PATCH 137/357] Translated using Weblate (Dutch)

Currently translated at 100.0% (1044 of 1044 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/nl/
---
 src/main/res/values-nl/strings.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 30e2b04024166f30b2b3cf19f5201d4fabf38bf5..835d32f30276aacaab9f5ccf92329028bf250c9c 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -822,7 +822,7 @@
     <string name="title_activity_share_with">Delen met…</string>
     <string name="archive_this_chat">Chat daarna verwijderen</string>
     <string name="remove_bookmark">Wil je de bladwijzer voor %s verwijderen?</string>
-    <string name="openkeychain_required_long">%1$s gebruikt &lt;b&gt;OpenKeychain&lt;/b&gt; om berichten te versleutelen en te decoderen en het beheer van je openbare sleutels. &lt;br&gt;&lt; br&gt;Het is gelicentieerd onder GPLv3+ en beschikbaar op F-Droid en Google Play&lt;br&gt;&lt;br&gt;&lt;small&gt;(Start %1$s hierna opnieuw.)&lt;/small&gt;</string>
+    <string name="openkeychain_required_long"><![CDATA[%1$s gebruikt <b>OpenKeychain</b> om berichten te versleutelen en te decoderen en het beheer van je openbare sleutels. <br>< br>Het is gelicentieerd onder GPLv3+ en beschikbaar op F-Droid en Google Play<br><br><small>(Start %1$s hierna opnieuw.)</small>]]></string>
     <string name="contact_has_no_pgp_key">Kan het bericht niet versleutelen omdat de contactpersoon hun openbare sleutel niet aankondigt.
 \n
 \n<small>Vraag de contactpersoon om OpenPGP in te stellen. </small></string>
@@ -1022,7 +1022,7 @@
     <string name="server_does_not_support_easy_onboarding_invites">Server biedt geen ondersteuning voor het aanmaken van uitnodigingen</string>
     <string name="outdated_backup_file_format">Je probeert een verouderd back-upbestandsformaat te importeren</string>
     <string name="sharing_application_not_grant_permission">De app voor delen heeft geen toestemming gegeven voor toegang tot dit bestand.</string>
-    <string name="group_chats_and_channels">Groepschats en kanalen</string>
+    <string name="group_chats_and_channels"><![CDATA[Groepschats en kanalen]]></string>
     <string name="jabber_network">jabber.network</string>
     <string name="pref_channel_discovery">Channel discovery-methode</string>
     <string name="rtp_state_incoming_call">Inkomende oproep</string>
@@ -1109,4 +1109,5 @@
     <string name="could_not_add_reaction">Kan reactie niet toevoegen</string>
     <string name="add_reaction_title">Reactie toevoegen</string>
     <string name="more_reactions">Meer reacties</string>
+    <string name="could_not_modify_call">Kan de aanroep niet wijzigen</string>
 </resources>
\ No newline at end of file

From ba96b9433dc0c3d5d1c9921caf4757ed33e978a1 Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Sat, 16 Nov 2024 19:32:28 +0000
Subject: [PATCH 138/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1044 of 1044 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/uk/
---
 src/main/res/values-uk/strings.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 4365c8179305a44d43fcc6c52120e7cc2520a5f0..415f6953ea18173ac8db8a59b5830951c418b9aa 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -760,12 +760,12 @@
     <string name="phone_number">номер телефону</string>
     <string name="verify_your_phone_number">Перевірте номер телефону</string>
     <string name="enter_country_code_and_phone_number">Quicksy надішле SMS, щоб перевірити Ваш номер телефону. Тарифами Вашого оператора може бути передбачено плату за отримання SMS. Зазначте код Вашої країни та номер телефону:</string>
-    <string name="we_will_be_verifying">Ми перевіримо номер телефону<br/><br/><b>%s</b><br/><br/>Гаразд чи бажаєте вказати інший номер?</string>
+    <string name="we_will_be_verifying"><![CDATA[Ми перевіримо номер телефону<br/><br/><b>%s</b><br/><br/>Гаразд чи бажаєте вказати інший номер?]]></string>
     <string name="not_a_valid_phone_number">%s не є дійсним номером телефону.</string>
     <string name="please_enter_your_phone_number">Будь ласка, введіть свій номер телефону.</string>
     <string name="search_countries">Шукати країну</string>
     <string name="verify_x">Перевірити %s</string>
-    <string name="we_have_sent_you_an_sms_to_x">SMS надіслано на <b>%s</b>.</string>
+    <string name="we_have_sent_you_an_sms_to_x"><![CDATA[SMS надіслано на <b>%s</b>.]]></string>
     <string name="we_have_sent_you_another_sms">Ми надіслали Вам SMS із 6-цифровим кодом.</string>
     <string name="please_enter_pin_below">Будь ласка, введіть нижче 6 цифр коду.</string>
     <string name="resend_sms">Надіслати нове SMS</string>
@@ -952,7 +952,7 @@
     <string name="add_contact_or_create_or_join_group_chat">Додати контакт, створити чи приєднатися до групи або знайти канали</string>
     <string name="pref_up_push_account_title">Обліковий запис XMPP</string>
     <string name="outgoing_call_timestamp">Вихідний виклик · %s</string>
-    <string name="openkeychain_required_long">%1$s використовує &lt;b&gt;OpenKeychain&lt;/b&gt; для шифрування/дешифрування повідомлень і керування публічними ключами.&lt;br&gt;&lt;br&gt;OpenKeychain поширюється на умовах ліцензії GPLv3+ і доступний для завантаження на F-Droid та Google Play.&lt;br&gt;&lt;br&gt;&lt;small&gt;(Після встановлення необхідно перезапустити %1$s.)&lt;/small&gt;</string>
+    <string name="openkeychain_required_long"><![CDATA[%1$s використовує <b>OpenKeychain</b> для шифрування/дешифрування повідомлень і керування публічними ключами.<br><br>OpenKeychain поширюється на умовах ліцензії GPLv3+ і доступний для завантаження на F-Droid та Google Play.<br><br><small>(Після встановлення необхідно перезапустити %1$s.)</small>]]></string>
     <string name="more_options">Додатково</string>
     <string name="unable_to_enable_video">Не вдалося увімкнути відео.</string>
     <string name="no_active_accounts_support_this">Жоден з активних облікових записів не підтримує цієї функції</string>
@@ -1141,4 +1141,5 @@
     <string name="add_reaction">Додати реакцію…</string>
     <string name="more_reactions">Більше реакцій</string>
     <string name="add_reaction_title">Додати реакцію</string>
+    <string name="could_not_modify_call">Не вдалося змінити виклик</string>
 </resources>
\ No newline at end of file

From 7b0913da5d21bbd5a07142c7041311680923f0f7 Mon Sep 17 00:00:00 2001
From: "lucasmz.dev" <git@lucasmz.dev>
Date: Sun, 17 Nov 2024 01:09:25 +0000
Subject: [PATCH 139/357] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1044 of 1044 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pt_BR/
---
 src/main/res/values-pt-rBR/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index d896cdb40230f610feec58de918bbc25aefd9b0f..d0cb3b8cb45cdba65283c0cbcf50239b1b4894dd 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -1111,4 +1111,5 @@
     <string name="add_reaction">Adicionar reação…</string>
     <string name="add_reaction_title">Adicionar reação</string>
     <string name="more_reactions">Mais reações</string>
+    <string name="could_not_modify_call">Não foi possível modificar a chamada</string>
 </resources>
\ No newline at end of file

From b97ba93634625e96e9a230c27029c65aafe29f2f Mon Sep 17 00:00:00 2001
From: Besnik_b <Besnik_b@users.noreply.translate.codeberg.org>
Date: Sat, 16 Nov 2024 18:29:46 +0000
Subject: [PATCH 140/357] Translated using Weblate (Albanian)

Currently translated at 99.1% (1035 of 1044 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sq/
---
 src/main/res/values-sq-rAL/strings.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index dda33e96ed4ef75174f3671737ec220fe42ce56e..43249abe8ce6b41b663f4e2a519aaadee419a397 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -674,7 +674,7 @@
     <string name="account_already_setup">Kjo llogari është ujdisur tashmë</string>
     <string name="please_enter_password">Ju lutemi, jepni fjalëkalimin për këtë llogari</string>
     <string name="unable_to_perform_this_action">S’u krye dot ky veprim</string>
-    <string name="group_chats_and_channels">Fjalosje në Grup &amp; Kanale</string>
+    <string name="group_chats_and_channels"><![CDATA[Fjalosje në Grup & Kanale]]></string>
     <string name="local_server">Shërbyes vendor</string>
     <string name="pref_channel_discovery">Metodë zbulimi kanalesh</string>
     <string name="backup">Kopjeruajtje</string>
@@ -829,7 +829,7 @@
 \n<b>Kujdes:</b> Kjo s’do të fshijë kopje të kësaj kartele që janë depozituar në pajisje apo shërbyes të tjerë. </string>
     <string name="decryption_failed">Shfshehtëzimi dështoi. Ndoshta s’keni kyçin e duhur privat.</string>
     <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">%1$s përdor &lt;b&gt;OpenKeychain&lt;/b&gt; që të fshehtëzojë dhe shfshehtëzojë mesazhe dhe të administrojë kyçet tuaj publikë.&lt;br&gt;&lt;br&gt;Licensohet sipas kushteve të GPLv3+ dhe mund të merret në F-Droid dhe Google Play.&lt;br&gt;&lt;br&gt;&lt;small&gt;(Ju lutemi, riniseni %1$s më pas.)&lt;/small&gt;</string>
+    <string name="openkeychain_required_long"><![CDATA[%1$s përdor <b>OpenKeychain</b> që të fshehtëzojë dhe shfshehtëzojë mesazhe dhe të administrojë kyçet tuaj publikë.<br><br>Licensohet sipas kushteve të GPLv3+ dhe mund të merret në F-Droid dhe Google Play.<br><br><small>(Ju lutemi, riniseni %1$s më pas.)</small>]]></string>
     <string name="contact_has_no_pgp_key">Mesazhi juaj s’u fshehtëzua dot, ngaqë kontakti juaj s’po deklaron kyçin e vet publik.
 \n
 \n<small>Ju lutemi, kërkojini kontaktit tuaj të ujdisë OpenPGP-në.</small></string>
@@ -950,8 +950,8 @@
     <string name="please_enter_pin_below">Ju lutemi, jepni më poshtë PIN-in tuaj prej 6 shifrash.</string>
     <string name="please_enter_pin">Ju lutemi, jepni PIN-in tuaj prej 6 shifrash.</string>
     <string name="security_violation_not_attaching_file">Kartelë e shpërfillur, për shkak cenimi sigurie.</string>
-    <string name="we_will_be_verifying">Do të verifikojmë numrin e telefonit<br/><br/><b>%s</b><br/><br/>Dakord, apo do të donit të përpunonit numrin?</string>
-    <string name="we_have_sent_you_an_sms_to_x">Ju kemi dërguar një SMS te <b>%s</b>.</string>
+    <string name="we_will_be_verifying"><![CDATA[Do të verifikojmë numrin e telefonit<br/><br/><b>%s</b><br/><br/>Dakord, apo do të donit të përpunonit numrin??]]></string>
+    <string name="we_have_sent_you_an_sms_to_x"><![CDATA[Ju kemi dërguar një SMS te <b>%s</b>.]]></string>
     <string name="enter_password_to_restore">Që të rikthehet kopjeruajtja, jepni fjalëkalimin tuaj për llogarinë %s.</string>
     <string name="restore_warning">Mos përdorni veçorinë e rikthimit të një kopjeruajtje në një përpjekje për të klonuar (xhiruar në të njëjtën kohë) një instalim. Rikthimi i një kopjeruajtje është menduar vetëm për migrime, ose në rast se humbët pajisjen origjinale.</string>
     <string name="no_users_hint_channel">Ky kanal publik s’ka pjesëmarrës. Ftoni kontaktet tuaj, ose përdorni butonin e ndarjes me të tjerët për të dhënë adresën XMPP të tij.</string>
@@ -1104,4 +1104,5 @@
     <string name="add_reaction">Shtoni reagim…</string>
     <string name="add_reaction_title">Shtoni reagim</string>
     <string name="more_reactions">Më tepër reagime</string>
+    <string name="could_not_modify_call">S’u ndryshua dot thirrja</string>
 </resources>
\ No newline at end of file

From 9ffd28893bad37ecd360547cb464da77f97132d4 Mon Sep 17 00:00:00 2001
From: melanotosjaunty <melanotosjaunty@users.noreply.translate.codeberg.org>
Date: Sun, 17 Nov 2024 02:06:44 +0000
Subject: [PATCH 141/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1044 of 1044 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/zh_Hans/
---
 src/main/res/values-zh-rCN/strings.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 2e931f88a825f0e4cef9bc89943e093c24e401ef..7b710dd18d6f39b0151c478f62a77fb6d67f56fa 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -93,7 +93,7 @@
     <string name="send_unencrypted">发送未加密</string>
     <string name="decryption_failed">解密失败。也许您没有正确的私钥。</string>
     <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">%1$s 使用 &lt;b&gt;OpenKeychain&lt;/b&gt; 来加密和解密消息并管理公钥。&lt;br&gt;&lt;br&gt;它在 GPLv3+ 许可证下授权并可在 F-Droid 和 Google Play 上获得。&lt;br&gt;&lt;br&gt;&lt;small&gt;（请之后重启 %1$s。）&lt;/small&gt;</string>
+    <string name="openkeychain_required_long"><![CDATA[%1$s 使用 <b>OpenKeychain</b> 来加密和解密消息并管理公钥。<br><br>它在 GPLv3+ 许可证下授权并可在 F-Droid 和 Google Play 上获得。<br><br><small>（请之后重启 %1$s。）</small>]]></string>
     <string name="restart">重启</string>
     <string name="install">安装</string>
     <string name="openkeychain_not_installed">请安装 OpenKeychain</string>
@@ -782,12 +782,12 @@
     <string name="phone_number">电话号码</string>
     <string name="verify_your_phone_number">验证您的电话号码</string>
     <string name="enter_country_code_and_phone_number">Quicksy 将发送短信（运营商可能收费）来验证电话号码。请输入您的国家/地区代码和电话号码：</string>
-    <string name="we_will_be_verifying">我们将验证这个电话号码 <br/><br/><b>%s</b><br/><br/> 可以吗？是否编辑号码？</string>
+    <string name="we_will_be_verifying"><![CDATA[我们将验证这个电话号码 <br/><br/><b>%s</b><br/><br/> 可以吗？是否编辑号码？]]></string>
     <string name="not_a_valid_phone_number">%s 不是有效的电话号码。</string>
     <string name="please_enter_your_phone_number">请输入您的电话号码。</string>
     <string name="search_countries">搜索国家/地区</string>
     <string name="verify_x">验证 %s</string>
-    <string name="we_have_sent_you_an_sms_to_x">我们已向您发送短信至 <b>%s</b>。</string>
+    <string name="we_have_sent_you_an_sms_to_x"><![CDATA[我们已向您发送短信至 <b>%s</b>。]]></string>
     <string name="we_have_sent_you_another_sms">我们已经向您发送了另一条带有 6 位数验证码的短信。</string>
     <string name="please_enter_pin_below">请在下方输入 6 位 PIN 码。</string>
     <string name="resend_sms">重新发送短信</string>
@@ -887,7 +887,7 @@
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="open_join_dialog">加入公开频道…</string>
     <string name="sharing_application_not_grant_permission">共享应用未授予访问此文件的权限。</string>
-    <string name="group_chats_and_channels">群聊和频道</string>
+    <string name="group_chats_and_channels"><![CDATA[群聊和频道]]></string>
     <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
     <string name="pref_channel_discovery_summary">大多数用户应该选择“jabber.network”以便从整个公共 XMPP 生态系统中获得更好的建议。</string>
@@ -1099,4 +1099,5 @@
     <string name="add_reaction">添加回应…</string>
     <string name="more_reactions">更多回应</string>
     <string name="add_reaction_title">添加回应</string>
+    <string name="could_not_modify_call">无法修改通话</string>
 </resources>
\ No newline at end of file

From 53d1cbd4b2f44b9b289bcc1f73b7aafec0a50dc6 Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Sun, 17 Nov 2024 09:47:25 +0000
Subject: [PATCH 142/357] Translated using Weblate (German)

Currently translated at 100.0% (1044 of 1044 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/de/
---
 src/main/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index b17626daf2f3b51647f95c66a606caa995405325..aea29f28a93e15399e4d962a1c2a64827fef7e74 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -1093,4 +1093,5 @@
     <string name="add_reaction">Reaktion hinzufügen…</string>
     <string name="add_reaction_title">Reaktion hinzufügen</string>
     <string name="more_reactions">Weitere Reaktionen</string>
+    <string name="could_not_modify_call">Anruf konnte nicht geändert werden</string>
 </resources>
\ No newline at end of file

From 3221341d886db9b740e28f7c781af0420060b615 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Mon, 18 Nov 2024 05:53:31 +0000
Subject: [PATCH 143/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1044 of 1044 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index c46641fc09eecb2bb3747ec38de6a8e85e381b4a..097680a2564efe576e4a98d5006139cf7754aaef 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -904,7 +904,7 @@
     <string name="unable_to_perform_this_action">Невозможно совершить это действие</string>
     <string name="open_join_dialog">Присоединиться к публичному каналу…</string>
     <string name="sharing_application_not_grant_permission">Приложение для обмена не предоставило право доступа к этому файлу.</string>
-    <string name="group_chats_and_channels">Конференции и каналы</string>
+    <string name="group_chats_and_channels"><![CDATA[Конференции и каналы]]></string>
     <string name="jabber_network">jabber.network</string>
     <string name="local_server">Локальный сервер</string>
     <string name="pref_channel_discovery_summary">Большинству пользователей следует выбрать \"jabber.network\" для получения наиболее подходящих предложений от всей публичной экосистемы XMPP.</string>
@@ -1140,4 +1140,5 @@
     <string name="add_reaction">Добавить реакцию…</string>
     <string name="add_reaction_title">Добавить реакцию</string>
     <string name="more_reactions">Другие реакции</string>
+    <string name="could_not_modify_call">Невозможно изменить звонок</string>
 </resources>
\ No newline at end of file

From 8d55e241149d80ad208497122cf7ca5d2e13322d Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Mon, 18 Nov 2024 05:56:36 +0000
Subject: [PATCH 144/357] Translated using Weblate (Russian)

Currently translated at 50.0% (1 of 2 strings)

Translation: Conversations/App Store Metadata (Conversations)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata-conversations/ru/
---
 .../fastlane/metadata/android/ru-RU/short_description.txt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conversations/fastlane/metadata/android/ru-RU/short_description.txt b/src/conversations/fastlane/metadata/android/ru-RU/short_description.txt
index 5c6dacbe88fc8c8fdcc30253e4ee170809141fe5..da8b6c54bd9b8282ed9218040371d299886b1daf 100644
--- a/src/conversations/fastlane/metadata/android/ru-RU/short_description.txt
+++ b/src/conversations/fastlane/metadata/android/ru-RU/short_description.txt
@@ -1 +1 @@
-Зашифрованный и простой в использовании XMPP-мессенджер для мобильного
+Шифрующий и простой в использовании XMPP-мессенджер для мобильного устройства

From e706c6c2b57df6bcef1940ea4b23955a945c0a9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Mon, 18 Nov 2024 10:41:44 +0000
Subject: [PATCH 145/357] Translated using Weblate (Estonian)

Currently translated at 100.0% (1044 of 1044 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 5f09629738bfe6493fa0b6ad6068ff14cf29272f..e7e3cada2215a02fa69769e6e53698d13a591779 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -114,7 +114,7 @@
     <string name="attach_file">Lisa fail</string>
     <string name="block_contact_text">Kas sa soovid, et kasutaja %s oleks blokeeritud ega saaks sulle sõnumeid saata?</string>
     <string name="send_failed">kohaletoimetamine ei õnnestunud</string>
-    <string name="openkeychain_required_long">%1$s kasutab sõnumite krüptimiseks ja dekrüptimiseks ning sinu avalike võtmete haldamiseks rakendust &lt;b&gt;OpenKeychain&lt;/b&gt;.&lt;br&gt;&lt;br&gt;Ta on litsentseeritud GPLv3+ alusel ning leidub nii F-Droidi kui Google Play rakendustepoodides.&lt;br&gt;&lt;br&gt;&lt;small&gt;(Palun käivita %1$s hiljem uuesti.)&lt;/small&gt;</string>
+    <string name="openkeychain_required_long"><![CDATA[%1$s kasutab sõnumite krüptimiseks ja dekrüptimiseks ning sinu avalike võtmete haldamiseks rakendust <b>OpenKeychain</b>.<br><br>Ta on litsentseeritud GPLv3+ alusel ning leidub nii F-Droidi kui Google Play rakendustepoodides.<br><br><small>(Palun käivita %1$s hiljem uuesti.)</small>]]></string>
     <string name="restart">Käivita uuesti</string>
     <string name="install">Paigalda</string>
     <string name="openkeychain_not_installed">Palun paigalda rakendus OpenKeychain</string>
@@ -376,7 +376,7 @@
     <string name="add_anway">Lisa ikkagi</string>
     <string name="this_looks_like_channel">See tundub olema kanali aadressi moodi</string>
     <string name="rtp_state_content_add_video">Kas lülitad ümber videokõnele?</string>
-    <string name="group_chats_and_channels">Vestlusrühmad ja kanalid</string>
+    <string name="group_chats_and_channels"><![CDATA[Vestlusrühmad ja kanalid]]></string>
     <string name="search_channels">Otsi kanaleid</string>
     <string name="register_new_account">Registreeri uus kasutajakonto</string>
     <string name="conversations_backup">Conversationsi varukoopia</string>
@@ -865,12 +865,12 @@
     <string name="no">Ei</string>
     <string name="verify_your_phone_number">Verifitseeri oma telefoninumber</string>
     <string name="enter_country_code_and_phone_number">Quicksy saadab sulle telefoninumbri verifitseerimiseks SMS-sõnumi (võivad lisanduda sidevõrkude tasud). Sisesta maakood ja oma telefoninumber:</string>
-    <string name="we_will_be_verifying">Järgnevaga me verifitseerime telefoninumbri <br/><br/><b>%s</b><br/><br/>Kas kõik on õige või sooviksid numbrit muuta?</string>
+    <string name="we_will_be_verifying"><![CDATA[Järgnevaga me verifitseerime telefoninumbri <br/><br/><b>%s</b><br/><br/>Kas kõik on õige või sooviksid numbrit muuta?]]></string>
     <string name="not_a_valid_phone_number">%s pole korrektne telefoninumber.</string>
     <string name="please_enter_your_phone_number">Palun sisesta oma telefoninumber.</string>
     <string name="search_countries">Otsi riike</string>
     <string name="verify_x">Verifitseeri %s</string>
-    <string name="we_have_sent_you_an_sms_to_x">Me oleme sulle saatnud SMS-sõnumi siia: <b>%s</b>.</string>
+    <string name="we_have_sent_you_an_sms_to_x"><![CDATA[Me oleme sulle siia saatnud SMS-sõnumi: <b>%s</b>.]]></string>
     <string name="please_enter_pin_below">Palun sisesta 6-numbriline PIN-kood alljärgnevalt.</string>
     <string name="resend_sms">Saada SMS uuesti</string>
     <string name="resend_sms_in">Saada SMS uuesti (%s)</string>
@@ -1113,4 +1113,5 @@
         <item quantity="one">%1$d vastamata kõne %2$dlt helistajalt</item>
         <item quantity="other">%1$d vastamata kõnet %2$dlt helistajalt</item>
     </plurals>
+    <string name="could_not_modify_call">Kõne muutmine ei õnnestunud</string>
 </resources>
\ No newline at end of file

From 16862ab3a40ccc0d0dca0de92d7681bb273d60c3 Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Mon, 18 Nov 2024 11:55:40 +0000
Subject: [PATCH 146/357] Translated using Weblate (Polish)

Currently translated at 100.0% (1044 of 1044 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pl/
---
 src/main/res/values-pl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 759d250d0920373f1a71874ab29c32dc8d0c8c3d..342cd970a38965632c27ab6b929f7fb681e7733a 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -1125,4 +1125,5 @@
     <string name="add_reaction">Dodaj reakcję…</string>
     <string name="add_reaction_title">Dodaj reakcję</string>
     <string name="more_reactions">Więcej reakcji</string>
+    <string name="could_not_modify_call">Nie można zmodyfikować rozmowy</string>
 </resources>
\ No newline at end of file

From bf6f7eaa2456b12dfa46efd79128f8bf69003ce4 Mon Sep 17 00:00:00 2001
From: user11 <user11@users.noreply.translate.codeberg.org>
Date: Mon, 18 Nov 2024 21:43:37 +0000
Subject: [PATCH 147/357] Translated using Weblate (Serbian)

Currently translated at 100.0% (1044 of 1044 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sr/
---
 src/main/res/values-sr/strings.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index bdc9da7ee4b6340c21a9a66af5dcd2d9570ad7f5..a633fb59a702665df5a4d92cdc4ebe972e600a2b 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -726,7 +726,7 @@
     <string name="create_public_channel">Направи јавни канал</string>
     <string name="allow_participants_to_edit_subject">Дозволи било коме да измени тему</string>
     <string name="share_backup_files">Подели резервне копије</string>
-    <string name="group_chats_and_channels">Групне Преписке и Канали</string>
+    <string name="group_chats_and_channels"><![CDATA[Групне Преписке и Канали]]></string>
     <string name="rtp_state_retracted">Опозван позив</string>
     <string name="reconnecting_call">Поновно успостављање позива</string>
     <string name="reconnecting_video_call">Поновно успостављање видео позива</string>
@@ -879,7 +879,7 @@
     <string name="sharing_application_not_grant_permission">Апликација за дељење није дозволила пермисију за приступ овом фајлу.</string>
     <string name="incoming_call_duration_timestamp">Долазни позив (%s) · %s</string>
     <string name="send_encrypted_message">Пошаљи шифровану поруку</string>
-    <string name="openkeychain_required_long">%1$s користи &lt;b&gt;OpenKeychain&lt;/b&gt; за шифровање и дешифровање порука и управљање твојим јавним кључевима.&lt;br&gt;&lt;br&gt;Лиценциран је под GPLv3+ и доступан је на F-Droid и Google Play продавницама.&lt;br&gt;&lt;br&gt;&lt;small&gt;(После поново покрени %1$s.)&lt;/small&gt;</string>
+    <string name="openkeychain_required_long"><![CDATA[%1$s користи <b>OpenKeychain</b> за шифровање и дешифровање порука и управљање твојим јавним кључевима.<br><br>Лиценциран је под GPLv3+ и доступан је на F-Droid и Google Play продавницама.<br><br><small>(После поново покрени %1$s.)</small>]]></string>
     <string name="pref_notification_grace_period_summary">Временски период током којег су обавештења утишана након примећене активности на једном од твојих других уређаја.</string>
     <string name="pref_prevent_screenshots">Забрани скриншотове</string>
     <string name="pref_prevent_screenshots_summary">Сакриј садржај апликације у прегледу недавних апликација и блокирај скриншотове</string>
@@ -988,10 +988,10 @@
     <string name="feature_not_implemented">Функција није имплементирана</string>
     <string name="choose_a_country">Одабери земљу</string>
     <string name="verify_your_phone_number">Овери свој број телефона</string>
-    <string name="we_will_be_verifying">Оверићемо број телефона<br/><br/><b>%s</b><br/><br/>Да ли је ово у реду, или би хтео/ла да измениш број?</string>
+    <string name="we_will_be_verifying"><![CDATA[Оверићемо број телефона<br/><br/><b>%s</b><br/><br/>Да ли је ово у реду, или би хтео/ла да измениш број?]]></string>
     <string name="not_a_valid_phone_number">%s није важећи број телефона.</string>
     <string name="please_enter_your_phone_number">Унеси свој број телефона.</string>
-    <string name="we_have_sent_you_an_sms_to_x">Послали смо ти SMS на <b>%s</b>.</string>
+    <string name="we_have_sent_you_an_sms_to_x"><![CDATA[Послали смо ти SMS на <b>%s</b>.]]></string>
     <string name="please_enter_pin_below">Унеси 6-оцифрени PIN испод.</string>
     <string name="resend_sms">Поново пошаљи SMS</string>
     <string name="resend_sms_in">Поново пошаљи SMS (%s)</string>
@@ -1127,4 +1127,5 @@
     <string name="add_reaction">Стави реакцију…</string>
     <string name="add_reaction_title">Стави реакцију</string>
     <string name="more_reactions">Још реакција</string>
+    <string name="could_not_modify_call">Није могуће изменити позив</string>
 </resources>
\ No newline at end of file

From f1ecae95d87232933c4b2ff07fba0939ed85f924 Mon Sep 17 00:00:00 2001
From: hsfg6 <hsfg6@users.noreply.translate.codeberg.org>
Date: Mon, 18 Nov 2024 11:31:36 +0000
Subject: [PATCH 148/357] Translated using Weblate (Chinese (Traditional Han
 script))

Currently translated at 100.0% (1044 of 1044 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/zh_Hant/
---
 src/main/res/values-zh-rTW/strings.xml | 41 ++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 73e533b3257046bf5086f84422001a24fcc1165e..c97a5f96b4a80d7b6b1801f14f63c5de47b096dc 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -381,7 +381,7 @@
     <string name="pref_display_enter_key">顯示 Enter 鍵</string>
     <string name="pref_display_enter_key_summary">將表情符號鍵變更為 Enter 鍵</string>
     <string name="audio">音訊</string>
-    <string name="video">影片</string>
+    <string name="video">視頻</string>
     <string name="image">圖片</string>
     <string name="vector_graphic">向量圖形</string>
     <string name="multimedia_file">多媒體檔案</string>
@@ -716,7 +716,7 @@
     <string name="please_enter_your_phone_number">請輸入您的電話號碼。</string>
     <string name="search_countries">搜尋國家</string>
     <string name="verify_x">驗證 %s</string>
-    <string name="we_have_sent_you_an_sms_to_x">我們傳送簡訊至 <b>%s</b>。</string>
+    <string name="we_have_sent_you_an_sms_to_x"><![CDATA[我們已向您發送一條簡訊至 <b>%s</b>。]]></string>
     <string name="we_have_sent_you_another_sms">我們已傳送另外一則帶有 6 位數代碼的簡訊給您。</string>
     <string name="please_enter_pin_below">請在下面輸入 6 位數字的 PIN 碼。</string>
     <string name="resend_sms">重新傳送簡訊</string>
@@ -912,9 +912,9 @@
     <string name="error_security_exception_during_image_copy">您用來選取此圖像的應用程式沒有足夠的權限以讀取此檔案。
 \n
 \n<small>請使用不同的檔案管理員以選擇圖像</small>。</string>
-    <string name="openkeychain_required_long">%1$s 使用 &lt;b&gt;OpenKeychain&lt;/b&gt; 以加密和解密訊息並管理您的公開金鑰。&lt;br&gt;&lt;br&gt;已獲 GPLv3+ 授權並可在 F-Droid 和 Google Play 中取得。&lt;br&gt;&lt;br&gt;&lt;small&gt;(之後請重新啟動 %1$s。)&lt;/small&gt;</string>
+    <string name="openkeychain_required_long"><![CDATA[%1$s 使用<b>OpenKeychain</b> 來加密和解密消息並管理您的公鑰。<br><br>它根據 GPLv3+ 獲得許可，可在 F-Droid 和 Google Play 上使用。<br><br><small>（請稍後重新啟動 %1$s。）</small>]]></string>
     <string name="pref_clean_cache_summary">清除快取資料夾 (由相機應用程式使用)</string>
-    <string name="we_will_be_verifying">我們將驗證 <br/><br/><b>%s</b><br/><br/> 電話號碼是否正確，或者您想編輯這個號碼嗎？</string>
+    <string name="we_will_be_verifying"><![CDATA[我們將驗證電話號碼<br/><br/><b>%s</b><br/><br/>這是否正確，或者您想編輯該號碼嗎？]]></string>
     <string name="distrust_omemo_key_text">您確定要移除此裝置的驗證嗎？
 \n此裝置和來自此裝置的訊息將被標示為「未受信任」。</string>
     <string name="mtm_hostname_mismatch">由於「%s」，伺服器無法驗證，憑證僅對此有效：</string>
@@ -1033,7 +1033,7 @@
     <string name="title_activity_share_with">分享至…</string>
     <string name="title_activity_new_chat">新會話</string>
     <string name="action_archive_chat">存檔會話</string>
-    <string name="archive_this_chat">存檔此會話</string>
+    <string name="archive_this_chat">之後刪除聊天</string>
     <string name="switch_to_chat">切換到會話</string>
     <string name="send_encrypted_message">傳送加密消息</string>
     <string name="quicksy_wants_your_consent">Quicksy 請求您同意使用您的數據</string>
@@ -1068,4 +1068,35 @@
     <string name="channel_discover_opt_in_message">頻道探索使用一個名為 &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt; 的第三方服務，&lt;br&gt;&lt;br&gt;使用此功能會將您的 IP 位址和搜尋詞彙傳送至此服務。更多資訊請參見他們的 &lt;a href=https://search.jabber.network/privacy&gt;隱私權政策&lt;/a&gt;。</string>
     <string name="pref_accept_invites_from_strangers">來自陌生人的邀請</string>
     <string name="pref_accept_invites_from_strangers_summary">接受來自陌生人的群聊邀請</string>
+    <string name="add_reaction_title">添加回應</string>
+    <string name="more_reactions">更多回應</string>
+    <string name="pref_create_backup_one_off_summary">創建一次性備份</string>
+    <string name="pref_backup_summary">創建一次性、計劃重複</string>
+    <string name="pref_backup_recurring">定期備份</string>
+    <string name="pref_fullscreen_notification">全屏通知</string>
+    <string name="unsupported_operation">不支援的操作</string>
+    <string name="pref_fullscreen_notification_summary">允許此應用程式在裝置鎖定時顯示全屏的來電通知。</string>
+    <string name="could_not_modify_call">無法修改通話</string>
+    <string name="allow_private_messages">允許私人消息</string>
+    <string name="your_avatar_tap_to_select_new_avatar">您的大頭貼。點擊可從圖庫中選擇新大頭貼。</string>
+    <string name="could_not_disable_video">無法禁用影片。</string>
+    <string name="edit_nick">編輯暱稱</string>
+    <string name="delete_pgp_key">刪除 OpenPGP 金鑰</string>
+    <string name="edit_name_and_topic">編輯名稱和主題</string>
+    <string name="edit_configuration">更改配置</string>
+    <string name="change_notification_settings">更改通知設置</string>
+    <string name="flip_camera">翻轉相機</string>
+    <string name="video_is_disabled_tap_to_enable">視頻已禁用。點擊以啟用。</string>
+    <string name="server_info_bind2">XEP-0386：綁定 2</string>
+    <string name="server_info_sasl2">XEP-0388：可擴展 SASL 配置檔</string>
+    <string name="call_is_using_bluetooth">呼叫正在使用藍牙。</string>
+    <string name="video_is_enabled_tap_to_disable">已啟用視頻。點擊以禁用。</string>
+    <string name="server_info_login_mechanism">登錄機制</string>
+    <string name="call_is_using_earpiece_tap_to_switch_to_speaker">呼叫正在使用聽筒。點擊可切換到揚聲器。</string>
+    <string name="call_is_using_earpiece">呼叫正在使用聽筒。</string>
+    <string name="call_is_using_wired_headset">呼叫正在使用有線耳機</string>
+    <string name="call_is_using_speaker_tap_to_switch_to_earpiece">呼叫正在使用揚聲器。點擊可切換到聽筒。</string>
+    <string name="call_is_using_speaker">呼叫正在使用揚聲器。</string>
+    <string name="could_not_add_reaction">無法添加回應</string>
+    <string name="add_reaction">添加回應…</string>
 </resources>
\ No newline at end of file

From 4c7abc76d118e2ad19c032869a5781a63e5182a6 Mon Sep 17 00:00:00 2001
From: Ricky-Tigg <Ricky-Tigg@users.noreply.translate.codeberg.org>
Date: Mon, 18 Nov 2024 12:42:01 +0000
Subject: [PATCH 149/357] Translated using Weblate (Finnish)

Currently translated at 100.0% (13 of 13 strings)

Translation: Conversations/Android App (Conversations)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-conversations/fi/
---
 src/conversations/res/values-fi/strings.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/conversations/res/values-fi/strings.xml b/src/conversations/res/values-fi/strings.xml
index c416b255544f83e01f5bc9d99e693b3dcab29283..fdf1fc58d05b77962b3b81f0ec909b4b540fe3ad 100644
--- a/src/conversations/res/values-fi/strings.xml
+++ b/src/conversations/res/values-fi/strings.xml
@@ -4,12 +4,13 @@
     <string name="use_conversations.im">Käytä conversations.im:ää</string>
     <string name="create_new_account">Luo uusi tili</string>
     <string name="do_you_have_an_account">Onko sinulla jo XMPP-tunnus? Jos käytät jo toista XMPP-sovellusta tai olet käyttänyt Conversationsia aiemmin, niin voi olla. Jos ei, voit tehdä uuden XMPP-tilin saman tien.\nVinkki: Jotkin sähköpostipalvelut tarjoavat myös XMPP-tilin.</string>
-    <string name="server_select_text">XMPP on tietystä palveluntarjoasta riippumaton pikaviestiverkosto. Voit käyttää tätä asiakasohjelmaa minkä tahansa haluamasi XMPP-palvelimen kanssa.
-\nHelppouden nimissä olemme kuitenkin helpottaneet tilin luomista conversations.im:iin.</string>
+    <string name="server_select_text">XMPP on tietystä palveluntarjoasta riippumaton pikaviestiverkosto. Voit käyttää tätä sovellusta minkä tahansa haluamasi XMPP-palvelimen kanssa.\nHelppouden nimissä olemme kuitenkin helpottaneet tilin luomista conversations.im:iin.</string>
     <string name="magic_create_text_on_x">Sinut on kutsuttu %1$s:iin. Opastamme sinua tilin luomisen kanssa.\nValitessasi palvelimen %1$s palveluntarjoajaksesi voit jutella muiden palveluntajoajien käyttäjien kanssa kertomalla heille koko XMPP-osoitteesi.</string>
     <string name="magic_create_text_fixed">Sinut on kutsuttu palvelimelle %1$s. Käyttäjänimesi on valittu valmiiksi puolestasi. Opastamme sinua tilin luomisen kanssa.\nVoit jutella muiden palveluntarjoajien käyttäjien kanssa kertomalle heille koko XMPP-osoitteesi.</string>
     <string name="your_server_invitation">Kutsusi palvelimelle</string>
     <string name="improperly_formatted_provisioning">Virheellisesti muotoiltu koodi</string>
     <string name="if_contact_is_nearby_use_qr">Jos henkilö on lähellä, hän voi myös hyväksyä kutsun lukemalla allaolevan koodin.</string>
-    <string name="share_invite_with">Jaa kutsu sovelluksella...</string>
+    <string name="share_invite_with">Jaa kutsu sovelluksella…</string>
+    <string name="tap_share_button_send_invite">Napauta jakamispainiketta lähettääksesi kontaktillesi kutsun %1$s:een.</string>
+    <string name="easy_invite_share_text">Liity %1$s:hen ja pikakeskustele kanssani: %2$s</string>
 </resources>
\ No newline at end of file

From 3152f4a1315d5b645461cdc0c6650e9699779fca Mon Sep 17 00:00:00 2001
From: hsfg6 <hsfg6@users.noreply.translate.codeberg.org>
Date: Mon, 18 Nov 2024 11:36:01 +0000
Subject: [PATCH 150/357] Translated using Weblate (Chinese (Traditional Han
 script))

Currently translated at 100.0% (74 of 74 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/zh_Hant/
---
 fastlane/metadata/android/zh-TW/changelogs/4211104.txt | 3 +++
 fastlane/metadata/android/zh-TW/changelogs/4211204.txt | 2 ++
 fastlane/metadata/android/zh-TW/changelogs/4211304.txt | 1 +
 fastlane/metadata/android/zh-TW/changelogs/4211404.txt | 2 ++
 fastlane/metadata/android/zh-TW/changelogs/4211604.txt | 1 +
 fastlane/metadata/android/zh-TW/changelogs/4211704.txt | 3 +++
 fastlane/metadata/android/zh-TW/changelogs/4211804.txt | 1 +
 fastlane/metadata/android/zh-TW/changelogs/4212104.txt | 1 +
 fastlane/metadata/android/zh-TW/changelogs/4212204.txt | 1 +
 fastlane/metadata/android/zh-TW/changelogs/4212304.txt | 2 ++
 10 files changed, 17 insertions(+)
 create mode 100644 fastlane/metadata/android/zh-TW/changelogs/4211104.txt
 create mode 100644 fastlane/metadata/android/zh-TW/changelogs/4211204.txt
 create mode 100644 fastlane/metadata/android/zh-TW/changelogs/4211304.txt
 create mode 100644 fastlane/metadata/android/zh-TW/changelogs/4211404.txt
 create mode 100644 fastlane/metadata/android/zh-TW/changelogs/4211604.txt
 create mode 100644 fastlane/metadata/android/zh-TW/changelogs/4211704.txt
 create mode 100644 fastlane/metadata/android/zh-TW/changelogs/4211804.txt
 create mode 100644 fastlane/metadata/android/zh-TW/changelogs/4212104.txt
 create mode 100644 fastlane/metadata/android/zh-TW/changelogs/4212204.txt
 create mode 100644 fastlane/metadata/android/zh-TW/changelogs/4212304.txt

diff --git a/fastlane/metadata/android/zh-TW/changelogs/4211104.txt b/fastlane/metadata/android/zh-TW/changelogs/4211104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d8754953eae3e18773850ecf4615954dafed3a88
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/4211104.txt
@@ -0,0 +1,3 @@
+* 安排定期備份
+* 從通話集成中排除所有 Android 11 及以下的 realme 裝置
+* Minor UI（消息氣泡）改進
diff --git a/fastlane/metadata/android/zh-TW/changelogs/4211204.txt b/fastlane/metadata/android/zh-TW/changelogs/4211204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..73019691b48d84adbd1b937add3b8130c8d6dcb7
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/4211204.txt
@@ -0,0 +1,2 @@
+* 修復了切換輸出設備時通話被取消靜音的問題
+* 從呼叫集成中排除所有 Umidigi 裝置
diff --git a/fastlane/metadata/android/zh-TW/changelogs/4211304.txt b/fastlane/metadata/android/zh-TW/changelogs/4211304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..44240545bcf8d0975fd6c8d6cbe18ce69731e4c3
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/4211304.txt
@@ -0,0 +1 @@
+* 將備份作為前台服務運行，以防止進程在 10 分鐘後停止
diff --git a/fastlane/metadata/android/zh-TW/changelogs/4211404.txt b/fastlane/metadata/android/zh-TW/changelogs/4211404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..87429860066bfb2dd12b83b51698e04da24f3423
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/4211404.txt
@@ -0,0 +1,2 @@
+* 從通話集成中排除較舊的 Oppo裝置
+* 各種錯誤修復
diff --git a/fastlane/metadata/android/zh-TW/changelogs/4211604.txt b/fastlane/metadata/android/zh-TW/changelogs/4211604.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c70766964558a001bb760845c1b878908ea0a349
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/4211604.txt
@@ -0,0 +1 @@
+* 小錯誤修復
diff --git a/fastlane/metadata/android/zh-TW/changelogs/4211704.txt b/fastlane/metadata/android/zh-TW/changelogs/4211704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e3b54eb1d3838740dd8d3b6d72083478891205af
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/4211704.txt
@@ -0,0 +1,3 @@
+* 提供更高的自動檔案接受值
+* 在「伺服器資訊」中提供更多資訊
+* 各種錯誤修復
diff --git a/fastlane/metadata/android/zh-TW/changelogs/4211804.txt b/fastlane/metadata/android/zh-TW/changelogs/4211804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..632aefa7d3e3f2a652ccaa58deb3610b75e6bde8
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/4211804.txt
@@ -0,0 +1 @@
+* 增加調用發起超時
diff --git a/fastlane/metadata/android/zh-TW/changelogs/4212104.txt b/fastlane/metadata/android/zh-TW/changelogs/4212104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..af35e09facef37f1c25b6e433f93b8a126a49b9e
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/4212104.txt
@@ -0,0 +1 @@
+* 支援消息回應
diff --git a/fastlane/metadata/android/zh-TW/changelogs/4212204.txt b/fastlane/metadata/android/zh-TW/changelogs/4212204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a446703858e474c13ded14924f12d3b9d2e1e01f
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/4212204.txt
@@ -0,0 +1 @@
+* 修復顯示多個反應時的 UI 故障
diff --git a/fastlane/metadata/android/zh-TW/changelogs/4212304.txt b/fastlane/metadata/android/zh-TW/changelogs/4212304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..3d1993fd14f6a43ffd106eded9ae308d2d1d3df5
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/4212304.txt
@@ -0,0 +1,2 @@
+* 修復 Android 15 上的通話
+* 修復 2.17.0 中引入的罕見崩潰/回歸問題

From ef6a6248cc6279754b78d159c579a560bc7f86cb Mon Sep 17 00:00:00 2001
From: hsfg6 <hsfg6@users.noreply.translate.codeberg.org>
Date: Mon, 18 Nov 2024 11:33:27 +0000
Subject: [PATCH 151/357] Translated using Weblate (Chinese (Traditional Han
 script))

Currently translated at 100.0% (2 of 2 strings)

Translation: Conversations/App Store Metadata (Conversations)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata-conversations/zh_Hant/
---
 .../fastlane/metadata/android/zh-TW/full_description.txt        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conversations/fastlane/metadata/android/zh-TW/full_description.txt b/src/conversations/fastlane/metadata/android/zh-TW/full_description.txt
index 0e9114c98bda9640c41f1dd6b04636afcd70f52c..59318b4cd9ed3a0e36d248e552114ceebd09f358 100644
--- a/src/conversations/fastlane/metadata/android/zh-TW/full_description.txt
+++ b/src/conversations/fastlane/metadata/android/zh-TW/full_description.txt
@@ -28,7 +28,7 @@ Conversations 可以在所有 XMPP 伺服器上運作。然而，XMPP 是一個
 
 如下 XEP - 截止目前：
 
-* XEP-0065：SOCKS5 位元資料流 (或 mod_proxy65)，將被用於傳輸檔案，如果雙方都在防火牆之後 (NAT)。
+* XEP-0065：SOCKS5 位元資料流 (或 mod_proxy65)，將被用於傳輸檔案，如果雙方都在防火牆或NAT之後。
 * XEP-0163：用於虛擬化身的私人活動通訊協定
 * XEP-0191：封鎖命令可讓您將濫發垃圾郵件者列入黑名單，或封鎖聯絡人而不把他們從名冊中移除。
 * XEP-0198：串流管理允許 XMPP 在小型網路中斷和基礎 TCP 連線的變更中生存。

From db040b263f30073d2226236d76806c47b8ab30d1 Mon Sep 17 00:00:00 2001
From: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Date: Tue, 19 Nov 2024 10:47:51 +0000
Subject: [PATCH 152/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1045 of 1045 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/zh_Hans/
---
 src/main/res/values-zh-rCN/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 7b710dd18d6f39b0151c478f62a77fb6d67f56fa..c488877df02b684f7015b87de9bc2e83fda5e9e4 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -1100,4 +1100,5 @@
     <string name="more_reactions">更多回应</string>
     <string name="add_reaction_title">添加回应</string>
     <string name="could_not_modify_call">无法修改通话</string>
+    <string name="clients_may_not_support_av">您的联系人的 XMPP 客户端可能不支持音频/视频通话。</string>
 </resources>
\ No newline at end of file

From 49f63aaf36ba9f6f4c581687c3bd201c4626d9ab Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 19 Nov 2024 14:05:34 +0100
Subject: [PATCH 153/357] show warning in JMI mode

---
 .../java/eu/siacs/conversations/ui/RtpSessionActivity.java  | 1 +
 .../eu/siacs/conversations/xmpp/jingle/RtpCapability.java   | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
index 5945dd253600608912bde95ca687fdfe527daef7..89068306de6d976b59aab276854c9d0a40d34b20 100644
--- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java
@@ -1618,6 +1618,7 @@ public class RtpSessionActivity extends XmppActivity
                         updateStateDisplay(state);
                         updateButtonConfiguration(state, media, null);
                         updateIncomingCallScreen(state);
+                        updateSupportWarning(state, account.getRoster().getContact(with));
                         invalidateOptionsMenu();
                     });
             resetIntent(account, with, state, media);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpCapability.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpCapability.java
index 1b41285999ae2b0dcca084f253fa77ecf4f9d237..484b6b5c892c7314047e42241c91d391c6648235 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpCapability.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/RtpCapability.java
@@ -2,6 +2,7 @@ package eu.siacs.conversations.xmpp.jingle;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Collections2;
+import com.google.common.collect.ImmutableSet;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -9,6 +10,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.Presence;
@@ -24,14 +26,14 @@ public class RtpCapability {
             Namespace.JINGLE_APPS_RTP,
             Namespace.JINGLE_APPS_DTLS
     );
-    private static final List<String> VIDEO_REQUIREMENTS = Arrays.asList(
+    private static final Collection<String> VIDEO_REQUIREMENTS = Arrays.asList(
             Namespace.JINGLE_FEATURE_AUDIO,
             Namespace.JINGLE_FEATURE_VIDEO
     );
 
     public static Capability check(final Presence presence) {
         final ServiceDiscoveryResult disco = presence.getServiceDiscoveryResult();
-        final List<String> features = disco == null ? Collections.emptyList() : disco.getFeatures();
+        final Set<String> features = disco == null ? Collections.emptySet() : ImmutableSet.copyOf(disco.getFeatures());
         if (features.containsAll(BASIC_RTP_REQUIREMENTS)) {
             if (features.containsAll(VIDEO_REQUIREMENTS)) {
                 return Capability.VIDEO;

From bd04a66786454551e0dc141383385946abca8dd6 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 19 Nov 2024 15:04:16 +0100
Subject: [PATCH 154/357] version bump to 2.17.3 + changelog

---
 CHANGELOG.md                                           | 5 +++++
 build.gradle                                           | 4 ++--
 fastlane/metadata/android/en-US/changelogs/4212504.txt | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/4212504.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 401f577923421f8867c331feea0a2ce75b45efbb..2538d5640cf371fca67dd8b89a077e1edb35326f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.17.3
+
+* Always show call button
+* Various bug fixes
+
 ### Version 2.17.2
 
 * Fix calls on Android 15
diff --git a/build.gradle b/build.gradle
index 108765b7f1ef8ee5726c68012be06133461f94d6..11efb566d3faa45732921e0424110758a76fa413 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,8 +100,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 42123
-        versionName "2.17.2"
+        versionCode 42124
+        versionName "2.17.3"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/4212504.txt b/fastlane/metadata/android/en-US/changelogs/4212504.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2addf4df6e5be0a40ec5d8f21eae2d3c25f610e7
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/4212504.txt
@@ -0,0 +1,2 @@
+* Always show call button
+* Various bug fixes

From 102bf11fe6adefa96c1b3a6b76edb2864553f8cb Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 19 Nov 2024 16:20:55 +0100
Subject: [PATCH 155/357] rename fastlane changelog file

---
 .../android/en-US/changelogs/{4212504.txt => 4212404.txt}         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename fastlane/metadata/android/en-US/changelogs/{4212504.txt => 4212404.txt} (100%)

diff --git a/fastlane/metadata/android/en-US/changelogs/4212504.txt b/fastlane/metadata/android/en-US/changelogs/4212404.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/4212504.txt
rename to fastlane/metadata/android/en-US/changelogs/4212404.txt

From 33f349ef015b8c681aa448e4a497f3c9e316d4cb Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 20 Nov 2024 10:39:49 +0100
Subject: [PATCH 156/357] fix some race conditions in jingle ft

---
 .../jingle/JingleFileTransferConnection.java  | 35 ++++++++++++-------
 .../WebRTCDataChannelTransport.java           |  4 ++-
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
index 712b7ccb2fa1bec643de6554d64155d65ef91f92..e2f8be3393a806a2eb4fc0dc58569db8c61cccd9 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
@@ -205,8 +205,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
         if (transition(
                 State.SESSION_INITIALIZED,
                 () -> this.initiatorFileTransferContentMap = contentMap)) {
-            final var iq =
-                    contentMap.toJinglePacket(Jingle.Action.SESSION_INITIATE, id.sessionId);
+            final var iq = contentMap.toJinglePacket(Jingle.Action.SESSION_INITIATE, id.sessionId);
             final var jingle = iq.getExtension(Jingle.class);
             if (xmppAxolotlMessage != null) {
                 this.transportSecurity =
@@ -456,8 +455,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
 
     private void sendSessionAccept(final FileTransferContentMap contentMap) {
         setLocalContentMap(contentMap);
-        final var iq =
-                contentMap.toJinglePacket(Jingle.Action.SESSION_ACCEPT, id.sessionId);
+        final var iq = contentMap.toJinglePacket(Jingle.Action.SESSION_ACCEPT, id.sessionId);
         send(iq);
         // this needs to come after session-accept or else our candidate-error might arrive first
         this.transport.connect();
@@ -562,7 +560,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
         Log.d(Config.LOGTAG, "peer confirmed received " + received);
     }
 
-    private void receiveSessionTerminate(final Iq jinglePacket, final Jingle jingle) {
+    private synchronized void receiveSessionTerminate(final Iq jinglePacket, final Jingle jingle) {
         respondOk(jinglePacket);
         final Jingle.ReasonWrapper wrapper = jingle.getReason();
         final State previous = this.state;
@@ -589,7 +587,6 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
         }
         terminateTransport();
         final State target = reasonToState(wrapper.reason);
-        // TODO check if we were already terminated
         transitionOrThrow(target);
         finish();
     }
@@ -865,13 +862,20 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
 
     @Override
     public void onTransportEstablished() {
-        Log.d(Config.LOGTAG, "on transport established");
+        Log.d(Config.LOGTAG, "transport established");
         final AbstractFileTransceiver fileTransceiver;
         try {
             fileTransceiver = setupTransceiver(isResponder());
         } catch (final Exception e) {
-            Log.d(Config.LOGTAG, "failed to set up file transceiver", e);
-            sendSessionTerminate(Reason.ofThrowable(e), e.getMessage());
+            terminateTransport();
+            if (isTerminated()) {
+                Log.d(
+                        Config.LOGTAG,
+                        "failed to set up file transceiver but session has already been terminated");
+            } else {
+                Log.d(Config.LOGTAG, "failed to set up file transceiver", e);
+                sendSessionTerminate(Reason.ofThrowable(e), e.getMessage());
+            }
             return;
         }
         this.fileTransceiver = fileTransceiver;
@@ -951,6 +955,10 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
     }
 
     private AbstractFileTransceiver setupTransceiver(final boolean receiving) throws IOException {
+        final var transport = this.transport;
+        if (transport == null) {
+            throw new IOException("No transport configured");
+        }
         final var fileDescription = getLocalContentMap().requireOnlyFile();
         final File file = xmppConnectionService.getFileBackend().getFile(message);
         final Runnable updateRunnable = () -> jingleConnectionManager.updateConversationUi(false);
@@ -987,7 +995,8 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
 
     private void sendSessionInfo(final FileTransferDescription.SessionInfo sessionInfo) {
         final var iq = new Iq(Iq.Type.SET);
-        final var jinglePacket = iq.addExtension(new Jingle(Jingle.Action.SESSION_INFO, this.id.sessionId));
+        final var jinglePacket =
+                iq.addExtension(new Jingle(Jingle.Action.SESSION_INFO, this.id.sessionId));
         jinglePacket.addChild(sessionInfo.asElement());
         send(iq);
     }
@@ -1071,8 +1080,7 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
                             + contentName);
             return;
         }
-        final Iq iq =
-                transportInfo.toJinglePacket(Jingle.Action.TRANSPORT_INFO, id.sessionId);
+        final Iq iq = transportInfo.toJinglePacket(Jingle.Action.TRANSPORT_INFO, id.sessionId);
         send(iq);
     }
 
@@ -1255,7 +1263,8 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
             }
             terminateTransport();
             final Iq iq = new Iq(Iq.Type.SET);
-            final var jingle = iq.addExtension(new Jingle(Jingle.Action.SESSION_TERMINATE, id.sessionId));
+            final var jingle =
+                    iq.addExtension(new Jingle(Jingle.Action.SESSION_TERMINATE, id.sessionId));
             jingle.setReason(reason, "User requested to stop file transfer");
             send(iq);
             finish();
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/transports/WebRTCDataChannelTransport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/transports/WebRTCDataChannelTransport.java
index 904c4aba89568f863bef293db89959cf58e187c7..95b15438460b50ac229ed522162e714f820a48d6 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/transports/WebRTCDataChannelTransport.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/transports/WebRTCDataChannelTransport.java
@@ -22,6 +22,7 @@ import eu.siacs.conversations.xmpp.jingle.IceServers;
 import eu.siacs.conversations.xmpp.jingle.WebRTCWrapper;
 import eu.siacs.conversations.xmpp.jingle.stanzas.IceUdpTransportInfo;
 import eu.siacs.conversations.xmpp.jingle.stanzas.WebRTCDataChannelTransportInfo;
+
 import im.conversations.android.xmpp.model.stanza.Iq;
 
 import org.webrtc.CandidatePairChangeEvent;
@@ -45,6 +46,7 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
+import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
@@ -455,7 +457,7 @@ public class WebRTCDataChannelTransport implements Transport {
         if (future != null && future.isDone()) {
             try {
                 return future.get();
-            } catch (final InterruptedException | ExecutionException e) {
+            } catch (final InterruptedException | ExecutionException | CancellationException e) {
                 throw new WebRTCWrapper.PeerConnectionNotInitialized();
             }
         } else {

From 87c3b334837f77df411d2463466f2faebc051df3 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 20 Nov 2024 14:35:59 +0100
Subject: [PATCH 157/357] use newer api for some jingle actions

---
 .../xmpp/jingle/AbstractJingleConnection.java |  1 +
 .../xmpp/jingle/JingleRtpConnection.java      | 27 +++++--------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/AbstractJingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/AbstractJingleConnection.java
index 7716792885eb154a8cb0d8a75b23ccad04f51f98..1b1a2d0e3ecf5f287467f789f771b7320df82ce2 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/AbstractJingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/AbstractJingleConnection.java
@@ -20,6 +20,7 @@ import eu.siacs.conversations.entities.ServiceDiscoveryResult;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.jingle.stanzas.Reason;
+
 import im.conversations.android.xmpp.model.jingle.Jingle;
 import im.conversations.android.xmpp.model.stanza.Iq;
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
index 3740b926f61eb6c0cc5a6c165295e7ed88e11ee5..b4f1882f5bfc906770b33e00d859ef0233cbf85f 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
@@ -239,20 +239,7 @@ public class JingleRtpConnection extends AbstractJingleConnection
             }
             receiveTransportInfo(jinglePacket, contentMap);
         } else {
-            if (isTerminated()) {
-                respondOk(jinglePacket);
-                Log.d(
-                        Config.LOGTAG,
-                        id.account.getJid().asBareJid()
-                                + ": ignoring out-of-order transport info; we where already terminated");
-            } else {
-                Log.d(
-                        Config.LOGTAG,
-                        id.account.getJid().asBareJid()
-                                + ": received transport info while in state="
-                                + this.state);
-                terminateWithOutOfOrder(jinglePacket);
-            }
+            receiveOutOfOrderAction(jinglePacket, Jingle.Action.TRANSPORT_INFO);
         }
     }
 
@@ -340,7 +327,7 @@ public class JingleRtpConnection extends AbstractJingleConnection
                     },
                     MoreExecutors.directExecutor());
         } else {
-            terminateWithOutOfOrder(iq);
+            receiveOutOfOrderAction(iq, Jingle.Action.CONTENT_ADD);
         }
     }
 
@@ -416,7 +403,7 @@ public class JingleRtpConnection extends AbstractJingleConnection
         final RtpContentMap outgoingContentAdd = this.outgoingContentAdd;
         if (outgoingContentAdd == null) {
             Log.d(Config.LOGTAG, "received content-accept when we had no outgoing content add");
-            terminateWithOutOfOrder(jinglePacket);
+            receiveOutOfOrderAction(jinglePacket, Jingle.Action.CONTENT_ACCEPT);
             return;
         }
         final Set<ContentAddition.Summary> ourSummary = ContentAddition.summary(outgoingContentAdd);
@@ -446,7 +433,7 @@ public class JingleRtpConnection extends AbstractJingleConnection
                     MoreExecutors.directExecutor());
         } else {
             Log.d(Config.LOGTAG, "received content-accept did not match our outgoing content-add");
-            terminateWithOutOfOrder(jinglePacket);
+            receiveOutOfOrderAction(jinglePacket, Jingle.Action.CONTENT_ACCEPT);
         }
     }
 
@@ -487,7 +474,7 @@ public class JingleRtpConnection extends AbstractJingleConnection
 
     private void receiveContentModify(final Iq jinglePacket, final Jingle jingle) {
         if (this.state != State.SESSION_ACCEPTED) {
-            terminateWithOutOfOrder(jinglePacket);
+            receiveOutOfOrderAction(jinglePacket, Jingle.Action.CONTENT_MODIFY);
             return;
         }
         final Map<String, Content.Senders> modification =
@@ -613,7 +600,7 @@ public class JingleRtpConnection extends AbstractJingleConnection
         final RtpContentMap outgoingContentAdd = this.outgoingContentAdd;
         if (outgoingContentAdd == null) {
             Log.d(Config.LOGTAG, "received content-reject when we had no outgoing content add");
-            terminateWithOutOfOrder(jinglePacket);
+            receiveOutOfOrderAction(jinglePacket, Jingle.Action.CONTENT_REJECT);
             return;
         }
         final Set<ContentAddition.Summary> ourSummary = ContentAddition.summary(outgoingContentAdd);
@@ -624,7 +611,7 @@ public class JingleRtpConnection extends AbstractJingleConnection
             receiveContentReject(ourSummary);
         } else {
             Log.d(Config.LOGTAG, "received content-reject did not match our outgoing content-add");
-            terminateWithOutOfOrder(jinglePacket);
+            receiveOutOfOrderAction(jinglePacket, Jingle.Action.CONTENT_REJECT);
         }
     }
 

From 360867dfd79aab32c2e61510d04dc26f1c374917 Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Tue, 19 Nov 2024 15:05:59 +0000
Subject: [PATCH 158/357] Translated using Weblate (Galician)

Currently translated at 99.9% (1044 of 1045 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/gl/
---
 src/main/res/values-gl/strings.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index e0137d9f4469ceb1e4e23b9864f86d8296f59d16..5723dac6bd7aaa814a45b11d17da1c1955826e66 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -70,7 +70,7 @@
     <string name="problem_connecting_to_accounts">Non puido conectarse a múltiples contas</string>
     <string name="touch_to_fix">Toca para xestionar as túas contas</string>
     <string name="attach_file">Adxuntar</string>
-    <string name="not_in_roster">¿Engadir este contacto faltante a lista de contactos?</string>
+    <string name="not_in_roster">Engadir este novo contacto á lista de contactos?</string>
     <string name="add_contact">Engadir contacto</string>
     <string name="send_failed">Erro ao enviar</string>
     <string name="preparing_image">Preparándose para enviar a imaxe</string>
@@ -771,7 +771,7 @@
     <string name="phone_number">número de teléfono</string>
     <string name="verify_your_phone_number">Valida o teu número de teléfono</string>
     <string name="enter_country_code_and_phone_number">Quicksy vaiche enviar unha mensaxe SMS (podería ter custos) para validar o teu número de teléfono. Escribe o código de país e número de teléfono:</string>
-    <string name="we_will_be_verifying">Validaremos o número de teléfono<br/><br/><b>%s</b><br/><br/>É correcto, ou queres modificar o número?</string>
+    <string name="we_will_be_verifying"><![CDATA[Comprobaremos o número de teléfono<br/><br/><b>%s</b><br/><br/>É correcto, ou queres modificar o número?]]></string>
     <string name="not_a_valid_phone_number">%s non é un número de teléfono válido.</string>
     <string name="please_enter_your_phone_number">Por favor escribe o teu número de teléfono.</string>
     <string name="search_countries">Buscar países</string>
@@ -876,7 +876,7 @@
     <string name="unable_to_perform_this_action">Non se puido completar a acción</string>
     <string name="open_join_dialog">Unirse a canle pública…</string>
     <string name="sharing_application_not_grant_permission">A aplicación que comparte non proporciona permiso para acceder ao ficheiro.</string>
-    <string name="group_chats_and_channels">Parolas en grupo e Canles</string>
+    <string name="group_chats_and_channels"><![CDATA[Parolas en Grupo e Canles]]></string>
     <string name="jabber_network">jabber.network</string>
     <string name="local_server">Servidor local</string>
     <string name="pref_channel_discovery_summary">A maioría das usuarias debería escoller \'jabber.network\' para obter mellores suxestións desde o ecosistema público XMPP.</string>
@@ -1093,4 +1093,6 @@
     <string name="add_reaction">Engadir reacción…</string>
     <string name="more_reactions">Outras reaccións</string>
     <string name="add_reaction_title">Engadir reacción</string>
+    <string name="could_not_modify_call">Non se puido modificar a chamada</string>
+    <string name="clients_may_not_support_av">O cliente do teu contacto XMPP pode que non sexa compatible con chamadas de audio/video.</string>
 </resources>
\ No newline at end of file

From 01fe9357f6d85d435b0d60798e567c7414aae52d Mon Sep 17 00:00:00 2001
From: Stephan-P <Stephan-P@users.noreply.translate.codeberg.org>
Date: Tue, 19 Nov 2024 18:03:33 +0000
Subject: [PATCH 159/357] Translated using Weblate (Dutch)

Currently translated at 100.0% (1045 of 1045 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/nl/
---
 src/main/res/values-nl/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 835d32f30276aacaab9f5ccf92329028bf250c9c..14225f14be4b7fc0fcee9a04be5543490c9d54ca 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -63,7 +63,7 @@
     <string name="save">Opslaan</string>
     <string name="ok">Oké</string>
     <string name="crash_report_title">%1$s is gecrasht</string>
-    <string name="crash_report_message">Door crashrapportages via uw XMPP account te sturen help je de ontwikkeling van %1$s.</string>
+    <string name="crash_report_message">Door crashrapportages via jouw XMPP-account te sturen help je de ontwikkeling van %1$s.</string>
     <string name="send_now">Nu versturen</string>
     <string name="send_never">Niet opnieuw vragen</string>
     <string name="problem_connecting_to_account">Verbinding met account mislukt</string>
@@ -1110,4 +1110,5 @@
     <string name="add_reaction_title">Reactie toevoegen</string>
     <string name="more_reactions">Meer reacties</string>
     <string name="could_not_modify_call">Kan de aanroep niet wijzigen</string>
+    <string name="clients_may_not_support_av">De XMPP-client van je contactpersoon ondersteunt mogelijk geen audio-/videogesprekken.</string>
 </resources>
\ No newline at end of file

From ce3945013bfda5e5f64aa472ce0c575da10661aa Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Wed, 20 Nov 2024 07:03:56 +0000
Subject: [PATCH 160/357] Translated using Weblate (Polish)

Currently translated at 100.0% (1045 of 1045 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pl/
---
 src/main/res/values-pl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 342cd970a38965632c27ab6b929f7fb681e7733a..691f9da1f8901477b827d93629fc46a7c3eae213 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -1126,4 +1126,5 @@
     <string name="add_reaction_title">Dodaj reakcję</string>
     <string name="more_reactions">Więcej reakcji</string>
     <string name="could_not_modify_call">Nie można zmodyfikować rozmowy</string>
+    <string name="clients_may_not_support_av">Klient XMPP Twojego kontaktu może nie obsługiwać rozmów/wideorozmów.</string>
 </resources>
\ No newline at end of file

From c93ecf155d9b588b606e40c9aa6d9c0c3e774c4e Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Tue, 19 Nov 2024 11:14:56 +0000
Subject: [PATCH 161/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1045 of 1045 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/uk/
---
 src/main/res/values-uk/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 415f6953ea18173ac8db8a59b5830951c418b9aa..bea873420729d20488f0d70515bc6e1b83276775 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -1142,4 +1142,5 @@
     <string name="more_reactions">Більше реакцій</string>
     <string name="add_reaction_title">Додати реакцію</string>
     <string name="could_not_modify_call">Не вдалося змінити виклик</string>
+    <string name="clients_may_not_support_av">Можливо, клієнт XMPP Вашого контакту не підтримує аудіо- та відеовиклики.</string>
 </resources>
\ No newline at end of file

From c087d5d265cba6eb0861d58242aadc23dde3a8ca Mon Sep 17 00:00:00 2001
From: "lucasmz.dev" <git@lucasmz.dev>
Date: Wed, 20 Nov 2024 04:34:29 +0000
Subject: [PATCH 162/357] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1045 of 1045 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pt_BR/
---
 src/main/res/values-pt-rBR/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index d0cb3b8cb45cdba65283c0cbcf50239b1b4894dd..791dbda9fd26a808ddbff53a3ec72c85ed961499 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -1112,4 +1112,5 @@
     <string name="add_reaction_title">Adicionar reação</string>
     <string name="more_reactions">Mais reações</string>
     <string name="could_not_modify_call">Não foi possível modificar a chamada</string>
+    <string name="clients_may_not_support_av">O cliente XMPP do seu contato não suporta chamadas de áudio ou vídeo.</string>
 </resources>
\ No newline at end of file

From ca71e1ffb0c259ad67299e82c1e63fc7c6378df5 Mon Sep 17 00:00:00 2001
From: licaon-kter <licaon-kter@users.noreply.translate.codeberg.org>
Date: Tue, 19 Nov 2024 10:52:19 +0000
Subject: [PATCH 163/357] Translated using Weblate (Romanian)

Currently translated at 100.0% (1045 of 1045 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ro/
---
 src/main/res/values-ro-rRO/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index cf6061dcee7a5c7f2a214762bfd259701671f930..235ce04ac7989932e31c7fddbe7c60c11bbdcb36 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -95,7 +95,7 @@
     <string name="send_unencrypted">Trimite necriptat</string>
     <string name="decryption_failed">Decriptarea a eșuat. Poate nu aveți cheia privată corectă.</string>
     <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">%1$s utilizează &lt;b&gt;OpenKeychain&lt;/b&gt; pentru a cripta și decripta mesaje și a administra cheile publice.&lt;br&gt;&lt;br&gt;OpenKeychain este licențiat sub GPLv3+ și este disponibil în F-Droid și Google Play.&lt;br&gt;&lt;br&gt;&lt;small&gt;(Vă rugăm să reporniți %1$s după instalare.)&lt;/small&gt;</string>
+    <string name="openkeychain_required_long"><![CDATA[%1$s utilizează <b>OpenKeychain</b> pentru a cripta și decripta mesaje și a administra cheile publice.<br><br>OpenKeychain este licențiat sub GPLv3+ și este disponibil în F-Droid și Google Play.<br><br><small>(Vă rugăm să reporniți %1$s după instalare.)</small>]]></string>
     <string name="restart">Repornește</string>
     <string name="install">Instalare</string>
     <string name="openkeychain_not_installed">Va rugăm să instalați OpenKeychain</string>
@@ -1112,4 +1112,6 @@
     <string name="could_not_add_reaction">Nu s-a putut adăuga o reacție</string>
     <string name="add_reaction_title">Adaugă reacție</string>
     <string name="more_reactions">Mai multe reacții</string>
+    <string name="could_not_modify_call">Nu s-a putut modifica apelul</string>
+    <string name="clients_may_not_support_av">Clientul XMPP al contactului dvs. este posibil să nu accepte apeluri audio/video.</string>
 </resources>
\ No newline at end of file

From 8615e250e5a71473a2ced6d9780b19b663d45002 Mon Sep 17 00:00:00 2001
From: Besnik_b <Besnik_b@users.noreply.translate.codeberg.org>
Date: Tue, 19 Nov 2024 14:49:09 +0000
Subject: [PATCH 164/357] Translated using Weblate (Albanian)

Currently translated at 99.1% (1036 of 1045 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sq/
---
 src/main/res/values-sq-rAL/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index 43249abe8ce6b41b663f4e2a519aaadee419a397..0b136e3eefb80d60e7b10f375776b13868e63349 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -1105,4 +1105,5 @@
     <string name="add_reaction_title">Shtoni reagim</string>
     <string name="more_reactions">Më tepër reagime</string>
     <string name="could_not_modify_call">S’u ndryshua dot thirrja</string>
+    <string name="clients_may_not_support_av">Klienti XMPP i kontaktit tuaj mund të mos mbulojë thirrje me audio/video.</string>
 </resources>
\ No newline at end of file

From 191c43ee98fab4ded0e72b86a1e3f968a4990399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Tue, 19 Nov 2024 15:19:49 +0000
Subject: [PATCH 165/357] Translated using Weblate (Estonian)

Currently translated at 100.0% (1045 of 1045 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index e7e3cada2215a02fa69769e6e53698d13a591779..64074a3d5772f0b8920484c7a089b26d6f019d79 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -1114,4 +1114,5 @@
         <item quantity="other">%1$d vastamata kõnet %2$dlt helistajalt</item>
     </plurals>
     <string name="could_not_modify_call">Kõne muutmine ei õnnestunud</string>
+    <string name="clients_may_not_support_av">Vestluse teise osapoole XMPP-klient ilmselt ei toeta hääl- ja videokõnesid.</string>
 </resources>
\ No newline at end of file

From 529569c5b646a374fba644f07c813eb0ba31a498 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Thu, 21 Nov 2024 08:14:34 +0000
Subject: [PATCH 166/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1045 of 1045 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 097680a2564efe576e4a98d5006139cf7754aaef..298b7030202f50e3d4ad07681dd960334805b8ee 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -1141,4 +1141,5 @@
     <string name="add_reaction_title">Добавить реакцию</string>
     <string name="more_reactions">Другие реакции</string>
     <string name="could_not_modify_call">Невозможно изменить звонок</string>
+    <string name="clients_may_not_support_av">XMPP-клиент вашего контакта может не поддерживать аудио- и видеозвонки.</string>
 </resources>
\ No newline at end of file

From 5acf6f172ee304eef0fe781decde4bccbf2df1c8 Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Wed, 20 Nov 2024 23:42:00 +0000
Subject: [PATCH 167/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1045 of 1045 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/uk/
---
 src/main/res/values-uk/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index bea873420729d20488f0d70515bc6e1b83276775..42dbc1fa0f2dbf81f2cdda6fd18a439b0684b31f 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -883,7 +883,7 @@
     <string name="answer_call">Відповісти</string>
     <string name="dismiss_call">Відхилити</string>
     <string name="rtp_state_finding_device">Пошук пристроїв</string>
-    <string name="rtp_state_ringing">Викликаю</string>
+    <string name="rtp_state_ringing">Виклик</string>
     <string name="rtp_state_declined_or_busy">Зайнято</string>
     <string name="rtp_state_connectivity_error">Неможливо здійснити виклик</string>
     <string name="rtp_state_connectivity_lost_error">З\'єднання втрачено</string>

From 1eb3a2fef751bbc53da0c86461d582e068bea544 Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Thu, 21 Nov 2024 10:06:08 +0000
Subject: [PATCH 168/357] Translated using Weblate (Polish)

Currently translated at 25.3% (19 of 75 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/pl/
---
 fastlane/metadata/android/pl-PL/changelogs/4212404.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4212404.txt

diff --git a/fastlane/metadata/android/pl-PL/changelogs/4212404.txt b/fastlane/metadata/android/pl-PL/changelogs/4212404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..403a9c18c8e62a2b5880227ccd6c3d759fcad277
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4212404.txt
@@ -0,0 +1,2 @@
+* Pokazywanie przycisku rozmowy zawsze
+* Różne poprawki błędów

From f3eafc5898525838dd1cdaf55f0558f2c180d537 Mon Sep 17 00:00:00 2001
From: Besnik_b <Besnik_b@users.noreply.translate.codeberg.org>
Date: Wed, 20 Nov 2024 15:00:07 +0000
Subject: [PATCH 169/357] Translated using Weblate (Albanian)

Currently translated at 100.0% (75 of 75 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/sq/
---
 fastlane/metadata/android/sq/changelogs/4212404.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/sq/changelogs/4212404.txt

diff --git a/fastlane/metadata/android/sq/changelogs/4212404.txt b/fastlane/metadata/android/sq/changelogs/4212404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..34203d3db3f83b82fcb201cc4bf4531b41199010
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/4212404.txt
@@ -0,0 +1,2 @@
+* Shfaq përherë buton thirrjesh
+* Ndreqje të ndryshme të metash

From 5416349c33523e28e07084cfb18d48d64820ea48 Mon Sep 17 00:00:00 2001
From: hsfg6 <hsfg6@users.noreply.translate.codeberg.org>
Date: Wed, 20 Nov 2024 22:57:48 +0000
Subject: [PATCH 170/357] Translated using Weblate (Chinese (Traditional Han
 script))

Currently translated at 98.6% (74 of 75 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/zh_Hant/
---
 fastlane/metadata/android/zh-TW/changelogs/387.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/metadata/android/zh-TW/changelogs/387.txt b/fastlane/metadata/android/zh-TW/changelogs/387.txt
index 38f22df14f2caeff87781e02d682189d777e66d5..473d718435dcf9c87476e7fe3e916bdd59e7ff16 100644
--- a/fastlane/metadata/android/zh-TW/changelogs/387.txt
+++ b/fastlane/metadata/android/zh-TW/changelogs/387.txt
@@ -1,2 +1,2 @@
 * 重做憑證登錄的使用者介面
-* 新增置頂聊天的功能（加入最愛）
+* 新增釘選聊天的功能（加入最愛）

From 25c6ab49bbcfb4bc2ff78deda074914e77291df6 Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Thu, 21 Nov 2024 09:53:39 +0000
Subject: [PATCH 171/357] Translated using Weblate (Galician)

Currently translated at 62.6% (47 of 75 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/gl/
---
 fastlane/metadata/android/gl-ES/changelogs/4212404.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/gl-ES/changelogs/4212404.txt

diff --git a/fastlane/metadata/android/gl-ES/changelogs/4212404.txt b/fastlane/metadata/android/gl-ES/changelogs/4212404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..59454bb1ce0ecb57cae038b40c130a0d81bd6daa
--- /dev/null
+++ b/fastlane/metadata/android/gl-ES/changelogs/4212404.txt
@@ -0,0 +1,2 @@
+* Mostra sempre o botón de chamada
+* Arranxo de varios problemas

From e176137f787655f4b08aa79cd7a4f6f5872231f4 Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Wed, 20 Nov 2024 11:34:55 +0000
Subject: [PATCH 172/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (75 of 75 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/uk/
---
 fastlane/metadata/android/uk/changelogs/4212404.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/uk/changelogs/4212404.txt

diff --git a/fastlane/metadata/android/uk/changelogs/4212404.txt b/fastlane/metadata/android/uk/changelogs/4212404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4639a5a8836b543fbadea130eb2a363ba70c6fc0
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/4212404.txt
@@ -0,0 +1,2 @@
+* Завжди показувати кнопку виклику
+* Виправлення різноманітних помилок

From d11868b3d9731c6570e6a6a1d0240ab34db7f8db Mon Sep 17 00:00:00 2001
From: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Date: Wed, 20 Nov 2024 11:17:05 +0000
Subject: [PATCH 173/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (75 of 75 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/zh_Hans/
---
 fastlane/metadata/android/zh-CN/changelogs/4212404.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/zh-CN/changelogs/4212404.txt

diff --git a/fastlane/metadata/android/zh-CN/changelogs/4212404.txt b/fastlane/metadata/android/zh-CN/changelogs/4212404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7e7fa1b3b79cdc53b9ca037f6970eb13cac73181
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/4212404.txt
@@ -0,0 +1,2 @@
+* 始终显示呼叫按钮
+* 各种错误修复

From 73f19c875c48e5819e902a2e3b992111e73fe423 Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Thu, 21 Nov 2024 14:39:19 +0000
Subject: [PATCH 174/357] Translated using Weblate (German)

Currently translated at 100.0% (1045 of 1045 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/de/
---
 src/main/res/values-de/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index aea29f28a93e15399e4d962a1c2a64827fef7e74..58c9c554d0b752adb7c5634526d588daf320c82e 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -1094,4 +1094,5 @@
     <string name="add_reaction_title">Reaktion hinzufügen</string>
     <string name="more_reactions">Weitere Reaktionen</string>
     <string name="could_not_modify_call">Anruf konnte nicht geändert werden</string>
+    <string name="clients_may_not_support_av">Der XMPP-Client deines Kontakts unterstützt möglicherweise keine Audio-/Videoanrufe.</string>
 </resources>
\ No newline at end of file

From c6fd7f49966cf34b5d4759698f463102a9c7e7f7 Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Thu, 21 Nov 2024 14:37:30 +0000
Subject: [PATCH 175/357] Translated using Weblate (German)

Currently translated at 100.0% (75 of 75 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/de/
---
 fastlane/metadata/android/de-DE/changelogs/4212404.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/de-DE/changelogs/4212404.txt

diff --git a/fastlane/metadata/android/de-DE/changelogs/4212404.txt b/fastlane/metadata/android/de-DE/changelogs/4212404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0bae96c951f3fc9c2e87b715da23e24ef1deef43
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/4212404.txt
@@ -0,0 +1,2 @@
+* Anruf-Taste immer anzeigen
+* Verschiedene Fehlerbehebungen

From 727f64355d3e36e0f9a4dbdc100470c732b360c6 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 23 Nov 2024 17:26:10 +0100
Subject: [PATCH 176/357] normalize some well known text emoji

---
 .../conversations/entities/Reaction.java      |  12 +-
 .../services/XmppConnectionService.java       |  16 +-
 .../ui/adapter/MessageAdapter.java            |   3 +-
 .../siacs/conversations/utils/Emoticons.java  | 151 +++++++++++++-----
 4 files changed, 136 insertions(+), 46 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Reaction.java b/src/main/java/eu/siacs/conversations/entities/Reaction.java
index 54166a318a3cb4f6146027191c532c605a45725e..3a945675f7aa225ee88fcbf3b60ea44d82238292 100644
--- a/src/main/java/eu/siacs/conversations/entities/Reaction.java
+++ b/src/main/java/eu/siacs/conversations/entities/Reaction.java
@@ -22,6 +22,7 @@ import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 
 import eu.siacs.conversations.Config;
+import eu.siacs.conversations.utils.Emoticons;
 import eu.siacs.conversations.xmpp.Jid;
 
 import java.io.IOException;
@@ -69,6 +70,10 @@ public class Reaction {
         this.occupantId = occupantId;
     }
 
+    public String normalizedReaction() {
+        return Emoticons.normalizeToVS16(this.reaction);
+    }
+
     public static String toString(final Collection<Reaction> reactions) {
         return (reactions == null || reactions.isEmpty()) ? null : GSON.toJson(reactions);
     }
@@ -80,7 +85,7 @@ public class Reaction {
         try {
             return GSON.fromJson(asString, new TypeToken<List<Reaction>>() {}.getType());
         } catch (final IllegalArgumentException | JsonSyntaxException e) {
-            Log.e(Config.LOGTAG,"could not restore reactions", e);
+            Log.e(Config.LOGTAG, "could not restore reactions", e);
             return Collections.emptyList();
         }
     }
@@ -152,7 +157,8 @@ public class Reaction {
     public static Aggregated aggregated(final Collection<Reaction> reactions) {
         final Map<String, Integer> aggregatedReactions =
                 Maps.transformValues(
-                        Multimaps.index(reactions, r -> r.reaction).asMap(), Collection::size);
+                        Multimaps.index(reactions, Reaction::normalizedReaction).asMap(),
+                        Collection::size);
         final List<Map.Entry<String, Integer>> sortedList =
                 Ordering.from(
                                 Comparator.comparingInt(
@@ -164,7 +170,7 @@ public class Reaction {
                 ImmutableSet.copyOf(
                         Collections2.transform(
                                 Collections2.filter(reactions, r -> !r.received),
-                                r -> r.reaction)));
+                                Reaction::normalizedReaction)));
     }
 
     public static final class Aggregated {
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 2c8d834f4ffd5fb7787793b7186555a2dcfacf4b..c145bebf7d47727be8b6c0dedcc5712353776818 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -57,6 +57,7 @@ import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 import com.google.common.base.Strings;
 import com.google.common.collect.Collections2;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 
 import org.conscrypt.Conscrypt;
@@ -140,6 +141,7 @@ import eu.siacs.conversations.utils.Compatibility;
 import eu.siacs.conversations.utils.ConversationsFileObserver;
 import eu.siacs.conversations.utils.CryptoHelper;
 import eu.siacs.conversations.utils.EasyOnboardingInvite;
+import eu.siacs.conversations.utils.Emoticons;
 import eu.siacs.conversations.utils.MimeUtils;
 import eu.siacs.conversations.utils.PhoneHelper;
 import eu.siacs.conversations.utils.QuickLoader;
@@ -4699,7 +4701,7 @@ public class XmppConnectionService extends Service {
             if (conversation.getMode() == Conversational.MODE_MULTI) {
                 final var mucOptions = conversation.getMucOptions();
                 if (!mucOptions.participating()) {
-                    Log.d(Config.LOGTAG,"not participating in MUC");
+                    Log.d(Config.LOGTAG, "not participating in MUC");
                     return false;
                 }
                 final var self = mucOptions.getSelf();
@@ -4708,11 +4710,21 @@ public class XmppConnectionService extends Service {
                     Log.d(Config.LOGTAG, "occupant id not found for reaction in MUC");
                     return false;
                 }
+                final var existingRaw =
+                        ImmutableSet.copyOf(
+                                Collections2.transform(message.getReactions(), r -> r.reaction));
+                final var reactionsAsExistingVariants =
+                        ImmutableSet.copyOf(
+                                Collections2.transform(
+                                        reactions, r -> Emoticons.existingVariant(r, existingRaw)));
+                if (!reactions.equals(reactionsAsExistingVariants)) {
+                    Log.d(Config.LOGTAG, "modified reactions to existing variants");
+                }
                 reactToId = message.getServerMsgId();
                 combinedReactions =
                         Reaction.withOccupantId(
                                 message.getReactions(),
-                                reactions,
+                                reactionsAsExistingVariants,
                                 false,
                                 self.getFullJid(),
                                 conversation.getAccount().getJid(),
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 8d3fa2b8aa85da03b27c5c98b55caad3a0656bfd..759960dcbbf3eda1902bc76912f6fbff15be66df 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -1097,7 +1097,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         final var c = message.getConversation();
         if (c instanceof Conversation conversation && c.getMode() == Conversational.MODE_MULTI) {
             final var reactions =
-                    Collections2.filter(message.getReactions(), r -> r.reaction.equals(emoji));
+                    Collections2.filter(
+                            message.getReactions(), r -> r.normalizedReaction().equals(emoji));
             final var mucOptions = conversation.getMucOptions();
             final var users = mucOptions.findUsers(reactions);
             if (users.isEmpty()) {
diff --git a/src/main/java/eu/siacs/conversations/utils/Emoticons.java b/src/main/java/eu/siacs/conversations/utils/Emoticons.java
index 8f2001ce3eed00c14afb647dba63ad158b057b1c..cee7b988b03e126b703a838c158f73940a6c9879 100644
--- a/src/main/java/eu/siacs/conversations/utils/Emoticons.java
+++ b/src/main/java/eu/siacs/conversations/utils/Emoticons.java
@@ -33,59 +33,126 @@ import android.util.LruCache;
 
 import androidx.annotation.NonNull;
 
+import com.google.common.collect.ImmutableSet;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 public class Emoticons {
 
-    private static final UnicodeRange MISC_SYMBOLS_AND_PICTOGRAPHS = new UnicodeRange(0x1F300, 0x1F5FF);
+    private static final UnicodeRange MISC_SYMBOLS_AND_PICTOGRAPHS =
+            new UnicodeRange(0x1F300, 0x1F5FF);
     private static final UnicodeRange SUPPLEMENTAL_SYMBOLS = new UnicodeRange(0x1F900, 0x1F9FF);
     private static final UnicodeRange EMOTICONS = new UnicodeRange(0x1F600, 0x1FAF6);
-    //private static final UnicodeRange TRANSPORT_SYMBOLS = new UnicodeRange(0x1F680, 0x1F6FF);
+    // private static final UnicodeRange TRANSPORT_SYMBOLS = new UnicodeRange(0x1F680, 0x1F6FF);
     private static final UnicodeRange MISC_SYMBOLS = new UnicodeRange(0x2600, 0x26FF);
     private static final UnicodeRange DINGBATS = new UnicodeRange(0x2700, 0x27BF);
-    private static final UnicodeRange ENCLOSED_ALPHANUMERIC_SUPPLEMENT = new UnicodeRange(0x1F100, 0x1F1FF);
-    private static final UnicodeRange ENCLOSED_IDEOGRAPHIC_SUPPLEMENT = new UnicodeRange(0x1F200, 0x1F2FF);
+    private static final UnicodeRange ENCLOSED_ALPHANUMERIC_SUPPLEMENT =
+            new UnicodeRange(0x1F100, 0x1F1FF);
+    private static final UnicodeRange ENCLOSED_IDEOGRAPHIC_SUPPLEMENT =
+            new UnicodeRange(0x1F200, 0x1F2FF);
     private static final UnicodeRange REGIONAL_INDICATORS = new UnicodeRange(0x1F1E6, 0x1F1FF);
     private static final UnicodeRange GEOMETRIC_SHAPES = new UnicodeRange(0x25A0, 0x25FF);
     private static final UnicodeRange LATIN_SUPPLEMENT = new UnicodeRange(0x80, 0xFF);
     private static final UnicodeRange MISC_TECHNICAL = new UnicodeRange(0x2300, 0x23FF);
     private static final UnicodeRange TAGS = new UnicodeRange(0xE0020, 0xE007F);
     private static final UnicodeList CYK_SYMBOLS_AND_PUNCTUATION = new UnicodeList(0x3030, 0x303D);
-    private static final UnicodeList LETTERLIKE_SYMBOLS = new UnicodeList(0x2122, 0x2139);
-
-    private static final UnicodeBlocks KEYCAP_COMBINEABLE = new UnicodeBlocks(new UnicodeList(0x23), new UnicodeList(0x2A), new UnicodeRange(0x30, 0x39));
-
-    private static final UnicodeBlocks SYMBOLIZE = new UnicodeBlocks(
-            GEOMETRIC_SHAPES,
-            LATIN_SUPPLEMENT,
-            CYK_SYMBOLS_AND_PUNCTUATION,
-            LETTERLIKE_SYMBOLS,
-            KEYCAP_COMBINEABLE);
-    private static final UnicodeBlocks EMOJIS = new UnicodeBlocks(
-            MISC_SYMBOLS_AND_PICTOGRAPHS,
-            SUPPLEMENTAL_SYMBOLS,
-            EMOTICONS,
-            //TRANSPORT_SYMBOLS,
-            MISC_SYMBOLS,
-            DINGBATS,
-            ENCLOSED_ALPHANUMERIC_SUPPLEMENT,
-            ENCLOSED_IDEOGRAPHIC_SUPPLEMENT,
-            MISC_TECHNICAL);
-
-    private static final int MAX_EMOIJS = 42;
+    private static final UnicodeList LETTER_LIKE_SYMBOLS = new UnicodeList(0x2122, 0x2139);
+
+    private static final UnicodeBlocks KEY_CAP_COMBINABLE =
+            new UnicodeBlocks(
+                    new UnicodeList(0x23), new UnicodeList(0x2A), new UnicodeRange(0x30, 0x39));
+
+    private static final UnicodeBlocks SYMBOLIZE =
+            new UnicodeBlocks(
+                    GEOMETRIC_SHAPES,
+                    LATIN_SUPPLEMENT,
+                    CYK_SYMBOLS_AND_PUNCTUATION,
+                    LETTER_LIKE_SYMBOLS,
+                    KEY_CAP_COMBINABLE);
+    private static final UnicodeBlocks EMOJIS =
+            new UnicodeBlocks(
+                    MISC_SYMBOLS_AND_PICTOGRAPHS,
+                    SUPPLEMENTAL_SYMBOLS,
+                    EMOTICONS,
+                    // TRANSPORT_SYMBOLS,
+                    MISC_SYMBOLS,
+                    DINGBATS,
+                    ENCLOSED_ALPHANUMERIC_SUPPLEMENT,
+                    ENCLOSED_IDEOGRAPHIC_SUPPLEMENT,
+                    MISC_TECHNICAL);
+
+    private static final int MAX_EMOJIS = 42;
 
     private static final int ZWJ = 0x200D;
     private static final int VARIATION_16 = 0xFE0F;
-    private static final int COMBINING_ENCLOSING_KEYCAP = 0x20E3;
+    private static final int VARIATION_15 = 0xFE0E;
+    private static final String VARIATION_16_STRING = new String(new char[] {VARIATION_16});
+    private static final String VARIATION_15_STRING = new String(new char[] {VARIATION_15});
+    private static final int COMBINING_ENCLOSING_KEY_CAP = 0x20E3;
     private static final int BLACK_FLAG = 0x1F3F4;
     private static final UnicodeRange FITZPATRICK = new UnicodeRange(0x1F3FB, 0x1F3FF);
 
+    private static final Set<String> TEXT_DEFAULT_TO_VS16 =
+            ImmutableSet.of(
+                    "❤",
+                    "✔",
+                    "✖",
+                    "➕",
+                    "➖",
+                    "➗",
+                    "⭐",
+                    "⚡",
+                    "\uD83C\uDF96",
+                    "\uD83C\uDFC6",
+                    "\uD83E\uDD47",
+                    "\uD83E\uDD48",
+                    "\uD83E\uDD49",
+                    "\uD83D\uDC51",
+                    "⚓",
+                    "⛵",
+                    "✈",
+                    "⚖",
+                    "⛑",
+                    "⚒",
+                    "⛏",
+                    "☎",
+                    "⛄",
+                    "⛅",
+                    "⚠",
+                    "⚛",
+                    "✡",
+                    "☮",
+                    "☯",
+                    "☀",
+                    "⬅",
+                    "➡",
+                    "⬆",
+                    "⬇");
+
     private static final LruCache<CharSequence, Pattern> CACHE = new LruCache<>(256);
 
+    public static String normalizeToVS16(final String input) {
+        return TEXT_DEFAULT_TO_VS16.contains(input) && !input.endsWith(VARIATION_15_STRING)
+                ? input + VARIATION_16_STRING
+                : input;
+    }
+
+    public static String existingVariant(final String original, final Set<String> existing) {
+        if (existing.contains(original) || original.endsWith(VARIATION_15_STRING)) {
+            return original;
+        }
+        final var variant =
+                original.endsWith(VARIATION_16_STRING)
+                        ? original.substring(0, original.length() - 1)
+                        : original + VARIATION_16_STRING;
+        return existing.contains(variant) ? variant : original;
+    }
+
     private static List<Symbol> parse(String input) {
         List<Symbol> symbols = new ArrayList<>();
         Builder builder = new Builder();
@@ -123,7 +190,7 @@ public class Emoticons {
         for (final Symbol symbol : parse(input.toString())) {
             if (symbol instanceof Emoji) {
                 emojis.add(symbol.toString());
-                if (++i >= MAX_EMOIJS) {
+                if (++i >= MAX_EMOJIS) {
                     return Pattern.compile("");
                 }
             }
@@ -150,10 +217,10 @@ public class Emoticons {
                 return false;
             }
         }
-        return symbols.size() > 0;
+        return !symbols.isEmpty();
     }
 
-    private static abstract class Symbol {
+    private abstract static class Symbol {
 
         private final String value;
 
@@ -201,26 +268,28 @@ public class Emoticons {
     private static class Builder {
         private final List<Integer> codepoints = new ArrayList<>();
 
-
         public boolean offer(int codepoint) {
             boolean add = false;
-            if (this.codepoints.size() == 0) {
+            if (this.codepoints.isEmpty()) {
                 if (SYMBOLIZE.contains(codepoint)) {
                     add = true;
                 } else if (REGIONAL_INDICATORS.contains(codepoint)) {
                     add = true;
-                } else if (EMOJIS.contains(codepoint) && !FITZPATRICK.contains(codepoint) && codepoint != ZWJ) {
+                } else if (EMOJIS.contains(codepoint)
+                        && !FITZPATRICK.contains(codepoint)
+                        && codepoint != ZWJ) {
                     add = true;
                 }
             } else {
                 int previous = codepoints.get(codepoints.size() - 1);
                 if (codepoints.get(0) == BLACK_FLAG) {
                     add = TAGS.contains(codepoint);
-                } else if (COMBINING_ENCLOSING_KEYCAP == codepoint) {
-                    add = KEYCAP_COMBINEABLE.contains(previous) || previous == VARIATION_16;
+                } else if (COMBINING_ENCLOSING_KEY_CAP == codepoint) {
+                    add = KEY_CAP_COMBINABLE.contains(previous) || previous == VARIATION_16;
                 } else if (SYMBOLIZE.contains(previous)) {
                     add = codepoint == VARIATION_16;
-                } else if (REGIONAL_INDICATORS.contains(previous) && REGIONAL_INDICATORS.contains(codepoint)) {
+                } else if (REGIONAL_INDICATORS.contains(previous)
+                        && REGIONAL_INDICATORS.contains(codepoint)) {
                     add = codepoints.size() == 1;
                 } else if (previous == VARIATION_16) {
                     add = isMerger(codepoint) || codepoint == VARIATION_16;
@@ -247,12 +316,15 @@ public class Emoticons {
         }
 
         public Symbol build() {
-            if (codepoints.size() > 0 && SYMBOLIZE.contains(codepoints.get(codepoints.size() - 1))) {
+            if (!codepoints.isEmpty()
+                    && SYMBOLIZE.contains(codepoints.get(codepoints.size() - 1))) {
                 return new Other(codepoints);
-            } else if (codepoints.size() > 1 && KEYCAP_COMBINEABLE.contains(codepoints.get(0)) && codepoints.get(codepoints.size() - 1) != COMBINING_ENCLOSING_KEYCAP) {
+            } else if (codepoints.size() > 1
+                    && KEY_CAP_COMBINABLE.contains(codepoints.get(0))
+                    && codepoints.get(codepoints.size() - 1) != COMBINING_ENCLOSING_KEY_CAP) {
                 return new Other(codepoints);
             }
-            return codepoints.size() == 0 ? new Other(codepoints) : new Emoji(codepoints);
+            return codepoints.isEmpty() ? new Other(codepoints) : new Emoji(codepoints);
         }
     }
 
@@ -292,7 +364,6 @@ public class Emoticons {
         }
     }
 
-
     public static class UnicodeRange implements UnicodeSet {
 
         private final int lower;

From 9f6e6c2f680692ca17b3dc6bcb49f87be1215201 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Fri, 22 Nov 2024 07:45:44 +0000
Subject: [PATCH 177/357] Translated using Weblate (Russian)

Currently translated at 28.0% (21 of 75 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/ru/
---
 fastlane/metadata/android/ru-RU/changelogs/4212404.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4212404.txt

diff --git a/fastlane/metadata/android/ru-RU/changelogs/4212404.txt b/fastlane/metadata/android/ru-RU/changelogs/4212404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..56b5f9f6bb6b4015e59e71d384f10653d253b333
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4212404.txt
@@ -0,0 +1,2 @@
+* Постоянное отображение кнопки звонка
+* Различные исправления ошибок

From 3918f78253bb05d1757f40da8d733f5445e558e0 Mon Sep 17 00:00:00 2001
From: user11 <user11@users.noreply.translate.codeberg.org>
Date: Sun, 24 Nov 2024 19:12:12 +0000
Subject: [PATCH 178/357] Translated using Weblate (Serbian)

Currently translated at 100.0% (1045 of 1045 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sr/
---
 src/main/res/values-sr/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index a633fb59a702665df5a4d92cdc4ebe972e600a2b..661db4043beb2d512689f048a9e0c52171e5fde3 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -1128,4 +1128,5 @@
     <string name="add_reaction_title">Стави реакцију</string>
     <string name="more_reactions">Још реакција</string>
     <string name="could_not_modify_call">Није могуће изменити позив</string>
+    <string name="clients_may_not_support_av">XMPP клијент вашег контакта можда не подржава аудио/видео позиве.</string>
 </resources>
\ No newline at end of file

From 52a9b83869d5b6bf03d9ac37eb4b50b1bb354b0d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 25 Nov 2024 14:46:16 +0100
Subject: [PATCH 179/357] version bump to 2.17.4 + changelog

---
 CHANGELOG.md                                           | 4 ++++
 build.gradle                                           | 4 ++--
 fastlane/metadata/android/en-US/changelogs/4212504.txt | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/4212504.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2538d5640cf371fca67dd8b89a077e1edb35326f..c6333a572de78ca274f48335677383f8fdaff1e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 2.17.4
+
+* improve handling of some emoji reactions
+
 ### Version 2.17.3
 
 * Always show call button
diff --git a/build.gradle b/build.gradle
index 11efb566d3faa45732921e0424110758a76fa413..d47aae0c4606ad0dea1763daf07d70228cf26d9a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -100,8 +100,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 42124
-        versionName "2.17.3"
+        versionCode 42125
+        versionName "2.17.4"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/4212504.txt b/fastlane/metadata/android/en-US/changelogs/4212504.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4655c359363d685602711e92848eb8d87fbe0770
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/4212504.txt
@@ -0,0 +1 @@
+* improve handling of some emoji reactions

From 0274fdf9ac410e8af1c21b6ca8a0008f7288be0a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 25 Nov 2024 17:04:51 +0100
Subject: [PATCH 180/357] execute file fallback on file thread

---
 .../persistance/FileBackend.java              | 18 ++--
 .../AttachFileToConversationRunnable.java     | 99 +++++++++++++------
 .../services/XmppConnectionService.java       |  2 +-
 3 files changed, 78 insertions(+), 41 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index 4fe2494f66b55544ea55f8211f1387cc12e48e39..af53574c5005c121b4c4380a5fe94ff8af3be8b3 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -268,7 +268,8 @@ public class FileBackend {
         return inSampleSize;
     }
 
-    private static Dimensions getVideoDimensions(Context context, Uri uri) throws NotAVideoFile, IOException {
+    private static Dimensions getVideoDimensions(Context context, Uri uri)
+            throws NotAVideoFile, IOException {
         MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever();
         try {
             mediaMetadataRetriever.setDataSource(context, uri);
@@ -663,16 +664,14 @@ public class FileBackend {
         }
     }
 
-    private void copyFileToPrivateStorage(File file, Uri uri) throws FileCopyException {
+    private void copyFileToPrivateStorage(final File file, final Uri uri) throws FileCopyException {
         final var parentDirectory = file.getParentFile();
         if (parentDirectory != null && parentDirectory.mkdirs()) {
-            Log.d(Config.LOGTAG,"created directory "+parentDirectory.getAbsolutePath());
+            Log.d(Config.LOGTAG, "created directory " + parentDirectory.getAbsolutePath());
         }
         try {
             if (file.createNewFile()) {
-                Log.d(
-                        Config.LOGTAG,
-                        "copy file (" + uri.toString() + ") to private storage " + file.getAbsolutePath());
+                Log.d(Config.LOGTAG, "created empty file " + file.getAbsolutePath());
             }
         } catch (final IOException e) {
             throw new FileCopyException(R.string.error_unable_to_create_temporary_file);
@@ -708,9 +707,10 @@ public class FileBackend {
         }
     }
 
-    public void copyFileToPrivateStorage(Message message, Uri uri, String type)
+    public void copyFileToPrivateStorage(final Message message, final Uri uri, final String type)
             throws FileCopyException {
-        final String mime = MimeUtils.guessMimeTypeFromUriAndMime(mXmppConnectionService, uri, type);
+        final String mime =
+                MimeUtils.guessMimeTypeFromUriAndMime(mXmppConnectionService, uri, type);
         Log.d(Config.LOGTAG, "copy " + uri.toString() + " to private storage (mime=" + mime + ")");
         String extension = MimeUtils.guessExtensionFromMimeType(mime);
         if (extension == null) {
@@ -1500,7 +1500,7 @@ public class FileBackend {
         return calcSampleSize(options, size);
     }
 
-    public void updateFileParams(Message message) {
+    public void updateFileParams(final Message message) {
         updateFileParams(message, null);
     }
 
diff --git a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
index f86371be6157f642638e28ae7b9881d6bdc9c6fd..9c75badb2f420a85fa47529e3979bcb439ad045c 100644
--- a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
+++ b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
@@ -11,12 +11,6 @@ import androidx.annotation.NonNull;
 import com.otaliastudios.transcoder.Transcoder;
 import com.otaliastudios.transcoder.TranscoderListener;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.Objects;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.PgpEngine;
@@ -27,6 +21,12 @@ import eu.siacs.conversations.ui.UiCallback;
 import eu.siacs.conversations.utils.MimeUtils;
 import eu.siacs.conversations.utils.TranscoderStrategies;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.Objects;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
 public class AttachFileToConversationRunnable implements Runnable, TranscoderListener {
 
     private final XmppConnectionService mXmppConnectionService;
@@ -38,16 +38,26 @@ public class AttachFileToConversationRunnable implements Runnable, TranscoderLis
     private final long originalFileSize;
     private int currentProgress = -1;
 
-    AttachFileToConversationRunnable(XmppConnectionService xmppConnectionService, Uri uri, String type, Message message, UiCallback<Message> callback) {
+    AttachFileToConversationRunnable(
+            XmppConnectionService xmppConnectionService,
+            Uri uri,
+            String type,
+            Message message,
+            UiCallback<Message> callback) {
         this.uri = uri;
         this.type = type;
         this.mXmppConnectionService = xmppConnectionService;
         this.message = message;
         this.callback = callback;
-        final String mimeType = MimeUtils.guessMimeTypeFromUriAndMime(mXmppConnectionService, uri, type);
-        final int autoAcceptFileSize = mXmppConnectionService.getResources().getInteger(R.integer.auto_accept_filesize);
+        final String mimeType =
+                MimeUtils.guessMimeTypeFromUriAndMime(mXmppConnectionService, uri, type);
+        final int autoAcceptFileSize =
+                mXmppConnectionService.getResources().getInteger(R.integer.auto_accept_filesize);
         this.originalFileSize = FileBackend.getFileSize(mXmppConnectionService, uri);
-        this.isVideoMessage = (mimeType != null && mimeType.startsWith("video/")) && originalFileSize > autoAcceptFileSize && !"uncompressed".equals(getVideoCompression());
+        this.isVideoMessage =
+                (mimeType != null && mimeType.startsWith("video/"))
+                        && originalFileSize > autoAcceptFileSize
+                        && !"uncompressed".equals(getVideoCompression());
     }
 
     boolean isVideoMessage() {
@@ -67,7 +77,9 @@ public class AttachFileToConversationRunnable implements Runnable, TranscoderLis
             }
         } else {
             try {
-                mXmppConnectionService.getFileBackend().copyFileToPrivateStorage(message, uri, type);
+                mXmppConnectionService
+                        .getFileBackend()
+                        .copyFileToPrivateStorage(message, uri, type);
                 mXmppConnectionService.getFileBackend().updateFileParams(message);
                 if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) {
                     final PgpEngine pgpEngine = mXmppConnectionService.getPgpEngine();
@@ -80,16 +92,26 @@ public class AttachFileToConversationRunnable implements Runnable, TranscoderLis
                     mXmppConnectionService.sendMessage(message);
                     callback.success(message);
                 }
-            } catch (FileBackend.FileCopyException e) {
+            } catch (final FileBackend.FileCopyException e) {
                 callback.error(e.getResId(), message);
             }
         }
     }
 
+    private void fallbackToProcessAsFile() {
+        final var file = mXmppConnectionService.getFileBackend().getFile(message);
+        if (file.exists() && file.delete()) {
+            Log.d(Config.LOGTAG, "deleted preexisting file " + file.getAbsolutePath());
+        }
+        XmppConnectionService.FILE_ATTACHMENT_EXECUTOR.execute(this::processAsFile);
+    }
+
     private void processAsVideo() throws FileNotFoundException {
         Log.d(Config.LOGTAG, "processing file as video");
         mXmppConnectionService.startOngoingVideoTranscodingForegroundNotification();
-        mXmppConnectionService.getFileBackend().setupRelativeFilePath(message, String.format("%s.%s", message.getUuid(), "mp4"));
+        mXmppConnectionService
+                .getFileBackend()
+                .setupRelativeFilePath(message, String.format("%s.%s", message.getUuid(), "mp4"));
         final DownloadableFile file = mXmppConnectionService.getFileBackend().getFile(message);
         if (Objects.requireNonNull(file.getParentFile()).mkdirs()) {
             Log.d(Config.LOGTAG, "created parent directory for video file");
@@ -99,16 +121,23 @@ public class AttachFileToConversationRunnable implements Runnable, TranscoderLis
 
         final Future<Void> future;
         try {
-            future = Transcoder.into(file.getAbsolutePath()).
-                addDataSource(mXmppConnectionService, uri)
-                .setVideoTrackStrategy(highQuality ? TranscoderStrategies.VIDEO_720P : TranscoderStrategies.VIDEO_360P)
-                .setAudioTrackStrategy(highQuality ? TranscoderStrategies.AUDIO_HQ : TranscoderStrategies.AUDIO_MQ)
-                .setListener(this)
-                .transcode();
+            future =
+                    Transcoder.into(file.getAbsolutePath())
+                            .addDataSource(mXmppConnectionService, uri)
+                            .setVideoTrackStrategy(
+                                    highQuality
+                                            ? TranscoderStrategies.VIDEO_720P
+                                            : TranscoderStrategies.VIDEO_360P)
+                            .setAudioTrackStrategy(
+                                    highQuality
+                                            ? TranscoderStrategies.AUDIO_HQ
+                                            : TranscoderStrategies.AUDIO_MQ)
+                            .setListener(this)
+                            .transcode();
         } catch (final RuntimeException e) {
             // transcode can already throw if there is an invalid file format or a platform bug
             mXmppConnectionService.stopOngoingVideoTranscodingForegroundNotification();
-            processAsFile();
+            fallbackToProcessAsFile();
             return;
         }
         try {
@@ -118,9 +147,9 @@ public class AttachFileToConversationRunnable implements Runnable, TranscoderLis
         } catch (final ExecutionException e) {
             if (e.getCause() instanceof Error) {
                 mXmppConnectionService.stopOngoingVideoTranscodingForegroundNotification();
-                processAsFile();
+                fallbackToProcessAsFile();
             } else {
-                Log.d(Config.LOGTAG, "ignoring execution exception. Should get handled by onTranscodeFiled() instead", e);
+                Log.d(Config.LOGTAG, "ignoring execution exception. Handled by onTranscodeFiled()");
             }
         }
     }
@@ -130,7 +159,9 @@ public class AttachFileToConversationRunnable implements Runnable, TranscoderLis
         final int p = (int) Math.round(progress * 100);
         if (p > currentProgress) {
             currentProgress = p;
-            mXmppConnectionService.getNotificationService().updateFileAddingNotification(p, message);
+            mXmppConnectionService
+                    .getNotificationService()
+                    .updateFileAddingNotification(p, message);
         }
     }
 
@@ -139,11 +170,15 @@ public class AttachFileToConversationRunnable implements Runnable, TranscoderLis
         mXmppConnectionService.stopOngoingVideoTranscodingForegroundNotification();
         final File file = mXmppConnectionService.getFileBackend().getFile(message);
         long convertedFileSize = mXmppConnectionService.getFileBackend().getFile(message).getSize();
-        Log.d(Config.LOGTAG, "originalFileSize=" + originalFileSize + " convertedFileSize=" + convertedFileSize);
+        Log.d(
+                Config.LOGTAG,
+                "originalFileSize=" + originalFileSize + " convertedFileSize=" + convertedFileSize);
         if (originalFileSize != 0 && convertedFileSize >= originalFileSize) {
             if (file.delete()) {
-                Log.d(Config.LOGTAG, "original file size was smaller. deleting and processing as file");
-                processAsFile();
+                Log.d(
+                        Config.LOGTAG,
+                        "original file size was smaller. deleting and processing as file");
+                fallbackToProcessAsFile();
                 return;
             } else {
                 Log.d(Config.LOGTAG, "unable to delete converted file");
@@ -161,14 +196,14 @@ public class AttachFileToConversationRunnable implements Runnable, TranscoderLis
     @Override
     public void onTranscodeCanceled() {
         mXmppConnectionService.stopOngoingVideoTranscodingForegroundNotification();
-        processAsFile();
+        fallbackToProcessAsFile();
     }
 
     @Override
     public void onTranscodeFailed(@NonNull final Throwable exception) {
         mXmppConnectionService.stopOngoingVideoTranscodingForegroundNotification();
         Log.d(Config.LOGTAG, "video transcoding failed", exception);
-        processAsFile();
+        fallbackToProcessAsFile();
     }
 
     @Override
@@ -176,7 +211,7 @@ public class AttachFileToConversationRunnable implements Runnable, TranscoderLis
         if (this.isVideoMessage()) {
             try {
                 processAsVideo();
-            } catch (FileNotFoundException e) {
+            } catch (final FileNotFoundException e) {
                 processAsFile();
             }
         } else {
@@ -189,7 +224,9 @@ public class AttachFileToConversationRunnable implements Runnable, TranscoderLis
     }
 
     public static String getVideoCompression(final Context context) {
-        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
-        return preferences.getString("video_compression", context.getResources().getString(R.string.video_compression));
+        final SharedPreferences preferences =
+                PreferenceManager.getDefaultSharedPreferences(context);
+        return preferences.getString(
+                "video_compression", context.getResources().getString(R.string.video_compression));
     }
 }
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index c145bebf7d47727be8b6c0dedcc5712353776818..dce715e7a18f1a5480d0a3cc0a64780ddeb8ea48 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -205,7 +205,7 @@ public class XmppConnectionService extends Service {
 
     public final CountDownLatch restoredFromDatabaseLatch = new CountDownLatch(1);
     private final static Executor FILE_OBSERVER_EXECUTOR = Executors.newSingleThreadExecutor();
-    private final static Executor FILE_ATTACHMENT_EXECUTOR = Executors.newSingleThreadExecutor();
+    public final static Executor FILE_ATTACHMENT_EXECUTOR = Executors.newSingleThreadExecutor();
 
     private final ScheduledExecutorService internalPingExecutor = Executors.newSingleThreadScheduledExecutor();
     private final static SerialSingleThreadExecutor VIDEO_COMPRESSION_EXECUTOR = new SerialSingleThreadExecutor("VideoCompression");

From 412c53ce6a61a391a04ff4d81c7b11fa4dc55f04 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 27 Nov 2024 16:35:42 +0100
Subject: [PATCH 181/357] add spotless plugin

---
 build.gradle | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/build.gradle b/build.gradle
index d47aae0c4606ad0dea1763daf07d70228cf26d9a..26d62b7b55ee63399c44038d3e8e67f9b14558d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,10 +7,12 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.5.2'
+        classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
     }
 }
 
 apply plugin: 'com.android.application'
+apply plugin: "com.diffplug.spotless"
 
 repositories {
     google()
@@ -30,6 +32,15 @@ configurations {
     quicksyImplementation
 }
 
+spotless {
+    ratchetFrom '2.17.4'
+    java {
+        target '**/*.java'
+        googleJavaFormat().aosp().reflowLongStrings()
+    }
+}
+
+
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'
 

From e5d5a66359c957d18a7fd8d9a9a37ca6bb2df480 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 27 Nov 2024 18:04:26 +0100
Subject: [PATCH 182/357] bump various dependencies

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 26d62b7b55ee63399c44038d3e8e67f9b14558d0..1dfb565d3cca29aa618c938e943e4689789b336a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,7 +50,7 @@ dependencies {
 
     implementation 'androidx.viewpager:viewpager:1.0.0'
 
-    playstoreImplementation('com.google.firebase:firebase-messaging:24.0.2') {
+    playstoreImplementation('com.google.firebase:firebase-messaging:24.1.0') {
         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'
@@ -64,7 +64,7 @@ dependencies {
     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.13.0-alpha06'
+    implementation 'com.google.android.material:material:1.13.0-alpha08'
     implementation 'androidx.work:work-runtime:2.9.1'
 
     implementation "androidx.emoji2:emoji2:1.5.0"

From 7945d46f26440034ce67cd84bb4c2bfe5c1b1d00 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 28 Nov 2024 08:14:30 +0100
Subject: [PATCH 183/357] apply spotless formatting

---
 .../persistance/FileBackend.java              |    7 +-
 .../AttachFileToConversationRunnable.java     |    4 -
 .../services/XmppConnectionService.java       | 4098 +++++++++++------
 3 files changed, 2565 insertions(+), 1544 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index af53574c5005c121b4c4380a5fe94ff8af3be8b3..179d8b7e7c632ca26bb1e2a03f67200e9f2bb283 100644
--- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
@@ -26,16 +26,13 @@ import android.util.Base64OutputStream;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.LruCache;
-
 import androidx.annotation.RequiresApi;
 import androidx.annotation.StringRes;
 import androidx.core.content.FileProvider;
 import androidx.exifinterface.media.ExifInterface;
-
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.ByteStreams;
-
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.DownloadableFile;
@@ -49,7 +46,6 @@ import eu.siacs.conversations.utils.FileUtils;
 import eu.siacs.conversations.utils.FileWriterException;
 import eu.siacs.conversations.utils.MimeUtils;
 import eu.siacs.conversations.xmpp.pep.Avatar;
-
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.File;
@@ -140,7 +136,8 @@ public class FileBackend {
                     if (dimensions.getMin() > 720) {
                         Log.d(
                                 Config.LOGTAG,
-                                "do not consider video file with min width larger than 720 for size check");
+                                "do not consider video file with min width larger than 720 for size"
+                                        + " check");
                         continue;
                     }
                 } catch (final IOException | NotAVideoFile e) {
diff --git a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
index 9c75badb2f420a85fa47529e3979bcb439ad045c..ef83f8df8b589ce1113595e0992f7260427f45f5 100644
--- a/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
+++ b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java
@@ -5,12 +5,9 @@ import android.content.SharedPreferences;
 import android.net.Uri;
 import android.preference.PreferenceManager;
 import android.util.Log;
-
 import androidx.annotation.NonNull;
-
 import com.otaliastudios.transcoder.Transcoder;
 import com.otaliastudios.transcoder.TranscoderListener;
-
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.PgpEngine;
@@ -20,7 +17,6 @@ import eu.siacs.conversations.persistance.FileBackend;
 import eu.siacs.conversations.ui.UiCallback;
 import eu.siacs.conversations.utils.MimeUtils;
 import eu.siacs.conversations.utils.TranscoderStrategies;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Objects;
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index dce715e7a18f1a5480d0a3cc0a64780ddeb8ea48..1d324232514a83f026b47ef50c0ec158eb463871 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -45,55 +45,18 @@ import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.LruCache;
 import android.util.Pair;
-
 import androidx.annotation.BoolRes;
 import androidx.annotation.IntegerRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.app.RemoteInput;
 import androidx.core.content.ContextCompat;
-
 import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 import com.google.common.base.Strings;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
-
-import org.conscrypt.Conscrypt;
-import org.jxmpp.stringprep.libidn.LibIdnXmppStringprep;
-import org.openintents.openpgp.IOpenPgpService2;
-import org.openintents.openpgp.util.OpenPgpApi;
-import org.openintents.openpgp.util.OpenPgpServiceConnection;
-
-import java.io.File;
-import java.security.Security;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.WeakHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Consumer;
-
 import eu.siacs.conversations.AppSettings;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
@@ -175,7 +138,39 @@ import eu.siacs.conversations.xmpp.mam.MamReference;
 import eu.siacs.conversations.xmpp.pep.Avatar;
 import eu.siacs.conversations.xmpp.pep.PublishOptions;
 import im.conversations.android.xmpp.model.stanza.Iq;
+import java.io.File;
+import java.security.Security;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.WeakHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
 import me.leolin.shortcutbadger.ShortcutBadger;
+import org.conscrypt.Conscrypt;
+import org.jxmpp.stringprep.libidn.LibIdnXmppStringprep;
+import org.openintents.openpgp.IOpenPgpService2;
+import org.openintents.openpgp.util.OpenPgpApi;
+import org.openintents.openpgp.util.OpenPgpServiceConnection;
 
 public class XmppConnectionService extends Service {
 
@@ -183,7 +178,8 @@ public class XmppConnectionService extends Service {
     public static final String ACTION_MARK_AS_READ = "mark_as_read";
     public static final String ACTION_SNOOZE = "snooze";
     public static final String ACTION_CLEAR_MESSAGE_NOTIFICATION = "clear_message_notification";
-    public static final String ACTION_CLEAR_MISSED_CALL_NOTIFICATION = "clear_missed_call_notification";
+    public static final String ACTION_CLEAR_MISSED_CALL_NOTIFICATION =
+            "clear_missed_call_notification";
     public static final String ACTION_DISMISS_ERROR_NOTIFICATIONS = "dismiss_error";
     public static final String ACTION_TRY_AGAIN = "try_again";
 
@@ -196,22 +192,30 @@ public class XmppConnectionService extends Service {
     public static final String ACTION_DISMISS_CALL = "dismiss_call";
     public static final String ACTION_END_CALL = "end_call";
     public static final String ACTION_PROVISION_ACCOUNT = "provision_account";
-    public static final String ACTION_CALL_INTEGRATION_SERVICE_STARTED = "call_integration_service_started";
-    private static final String ACTION_POST_CONNECTIVITY_CHANGE = "eu.siacs.conversations.POST_CONNECTIVITY_CHANGE";
-    public static final String ACTION_RENEW_UNIFIED_PUSH_ENDPOINTS = "eu.siacs.conversations.UNIFIED_PUSH_RENEW";
+    public static final String ACTION_CALL_INTEGRATION_SERVICE_STARTED =
+            "call_integration_service_started";
+    private static final String ACTION_POST_CONNECTIVITY_CHANGE =
+            "eu.siacs.conversations.POST_CONNECTIVITY_CHANGE";
+    public static final String ACTION_RENEW_UNIFIED_PUSH_ENDPOINTS =
+            "eu.siacs.conversations.UNIFIED_PUSH_RENEW";
     public static final String ACTION_QUICK_LOG = "eu.siacs.conversations.QUICK_LOG";
 
     private static final String SETTING_LAST_ACTIVITY_TS = "last_activity_timestamp";
 
     public final CountDownLatch restoredFromDatabaseLatch = new CountDownLatch(1);
-    private final static Executor FILE_OBSERVER_EXECUTOR = Executors.newSingleThreadExecutor();
-    public final static Executor FILE_ATTACHMENT_EXECUTOR = Executors.newSingleThreadExecutor();
-
-    private final ScheduledExecutorService internalPingExecutor = Executors.newSingleThreadScheduledExecutor();
-    private final static SerialSingleThreadExecutor VIDEO_COMPRESSION_EXECUTOR = new SerialSingleThreadExecutor("VideoCompression");
-    private final SerialSingleThreadExecutor mDatabaseWriterExecutor = new SerialSingleThreadExecutor("DatabaseWriter");
-    private final SerialSingleThreadExecutor mDatabaseReaderExecutor = new SerialSingleThreadExecutor("DatabaseReader");
-    private final SerialSingleThreadExecutor mNotificationExecutor = new SerialSingleThreadExecutor("NotificationExecutor");
+    private static final Executor FILE_OBSERVER_EXECUTOR = Executors.newSingleThreadExecutor();
+    public static final Executor FILE_ATTACHMENT_EXECUTOR = Executors.newSingleThreadExecutor();
+
+    private final ScheduledExecutorService internalPingExecutor =
+            Executors.newSingleThreadScheduledExecutor();
+    private static final SerialSingleThreadExecutor VIDEO_COMPRESSION_EXECUTOR =
+            new SerialSingleThreadExecutor("VideoCompression");
+    private final SerialSingleThreadExecutor mDatabaseWriterExecutor =
+            new SerialSingleThreadExecutor("DatabaseWriter");
+    private final SerialSingleThreadExecutor mDatabaseReaderExecutor =
+            new SerialSingleThreadExecutor("DatabaseReader");
+    private final SerialSingleThreadExecutor mNotificationExecutor =
+            new SerialSingleThreadExecutor("NotificationExecutor");
     private final ReplacingTaskManager mRosterSyncTaskManager = new ReplacingTaskManager();
     private final IBinder mBinder = new XmppConnectionBinder();
     private final List<Conversation> conversations = new CopyOnWriteArrayList<>();
@@ -219,17 +223,19 @@ public class XmppConnectionService extends Service {
     private final Set<String> mInProgressAvatarFetches = new HashSet<>();
     private final Set<String> mOmittedPepAvatarFetches = new HashSet<>();
     private final HashSet<Jid> mLowPingTimeoutMode = new HashSet<>();
-    private final Consumer<Iq> mDefaultIqHandler = (packet) -> {
-        if (packet.getType() != Iq.Type.RESULT) {
-            final var error = packet.getError();
-            String text = error != null ? error.findChildContent("text") : null;
-            if (text != null) {
-                Log.d(Config.LOGTAG, "received iq error: " + text);
-            }
-        }
-    };
+    private final Consumer<Iq> mDefaultIqHandler =
+            (packet) -> {
+                if (packet.getType() != Iq.Type.RESULT) {
+                    final var error = packet.getError();
+                    String text = error != null ? error.findChildContent("text") : null;
+                    if (text != null) {
+                        Log.d(Config.LOGTAG, "received iq error: " + text);
+                    }
+                }
+            };
     public DatabaseBackend databaseBackend;
-    private final ReplacingSerialSingleThreadExecutor mContactMergerExecutor = new ReplacingSerialSingleThreadExecutor("ContactMerger");
+    private final ReplacingSerialSingleThreadExecutor mContactMergerExecutor =
+            new ReplacingSerialSingleThreadExecutor("ContactMerger");
     private long mLastActivity = 0;
 
     private final AppSettings appSettings = new AppSettings(this);
@@ -237,204 +243,253 @@ public class XmppConnectionService extends Service {
     private MemorizingTrustManager mMemorizingTrustManager;
     private final NotificationService mNotificationService = new NotificationService(this);
     private final UnifiedPushBroker unifiedPushBroker = new UnifiedPushBroker(this);
-    private final ChannelDiscoveryService mChannelDiscoveryService = new ChannelDiscoveryService(this);
+    private final ChannelDiscoveryService mChannelDiscoveryService =
+            new ChannelDiscoveryService(this);
     private final ShortcutService mShortcutService = new ShortcutService(this);
     private final AtomicBoolean mInitialAddressbookSyncCompleted = new AtomicBoolean(false);
     private final AtomicBoolean mOngoingVideoTranscoding = new AtomicBoolean(false);
     private final AtomicBoolean mForceDuringOnCreate = new AtomicBoolean(false);
     private final AtomicReference<OngoingCall> ongoingCall = new AtomicReference<>();
     private final MessageGenerator mMessageGenerator = new MessageGenerator(this);
-    public OnContactStatusChanged onContactStatusChanged = (contact, online) -> {
-        Conversation conversation = find(getConversations(), contact);
-        if (conversation != null) {
-            if (online) {
-                if (contact.getPresences().size() == 1) {
-                    sendUnsentMessages(conversation);
+    public OnContactStatusChanged onContactStatusChanged =
+            (contact, online) -> {
+                Conversation conversation = find(getConversations(), contact);
+                if (conversation != null) {
+                    if (online) {
+                        if (contact.getPresences().size() == 1) {
+                            sendUnsentMessages(conversation);
+                        }
+                    }
                 }
-            }
-        }
-    };
+            };
     private final PresenceGenerator mPresenceGenerator = new PresenceGenerator(this);
     private List<Account> accounts;
-    private final JingleConnectionManager mJingleConnectionManager = new JingleConnectionManager(this);
+    private final JingleConnectionManager mJingleConnectionManager =
+            new JingleConnectionManager(this);
     private final HttpConnectionManager mHttpConnectionManager = new HttpConnectionManager(this);
     private final AvatarService mAvatarService = new AvatarService(this);
     private final MessageArchiveService mMessageArchiveService = new MessageArchiveService(this);
     private final PushManagementService mPushManagementService = new PushManagementService(this);
-    private final QuickConversationsService mQuickConversationsService = new QuickConversationsService(this);
-    private final ConversationsFileObserver fileObserver = new ConversationsFileObserver(
-            Environment.getExternalStorageDirectory().getAbsolutePath()
-    ) {
-        @Override
-        public void onEvent(final int event, final File file) {
-            markFileDeleted(file);
-        }
-    };
-    private final OnMessageAcknowledged mOnMessageAcknowledgedListener = new OnMessageAcknowledged() {
-
-        @Override
-        public boolean onMessageAcknowledged(final Account account, final Jid to, final String id) {
-            if (id.startsWith(JingleRtpConnection.JINGLE_MESSAGE_PROPOSE_ID_PREFIX)) {
-                final String sessionId = id.substring(JingleRtpConnection.JINGLE_MESSAGE_PROPOSE_ID_PREFIX.length());
-                mJingleConnectionManager.updateProposedSessionDiscovered(
-                        account,
-                        to,
-                        sessionId,
-                        JingleConnectionManager.DeviceDiscoveryState.SEARCHING_ACKNOWLEDGED
-                );
-            }
-
+    private final QuickConversationsService mQuickConversationsService =
+            new QuickConversationsService(this);
+    private final ConversationsFileObserver fileObserver =
+            new ConversationsFileObserver(
+                    Environment.getExternalStorageDirectory().getAbsolutePath()) {
+                @Override
+                public void onEvent(final int event, final File file) {
+                    markFileDeleted(file);
+                }
+            };
+    private final OnMessageAcknowledged mOnMessageAcknowledgedListener =
+            new OnMessageAcknowledged() {
 
-            final Jid bare = to.asBareJid();
+                @Override
+                public boolean onMessageAcknowledged(
+                        final Account account, final Jid to, final String id) {
+                    if (id.startsWith(JingleRtpConnection.JINGLE_MESSAGE_PROPOSE_ID_PREFIX)) {
+                        final String sessionId =
+                                id.substring(
+                                        JingleRtpConnection.JINGLE_MESSAGE_PROPOSE_ID_PREFIX
+                                                .length());
+                        mJingleConnectionManager.updateProposedSessionDiscovered(
+                                account,
+                                to,
+                                sessionId,
+                                JingleConnectionManager.DeviceDiscoveryState
+                                        .SEARCHING_ACKNOWLEDGED);
+                    }
 
-            for (final Conversation conversation : getConversations()) {
-                if (conversation.getAccount() == account && conversation.getJid().asBareJid().equals(bare)) {
-                    final Message message = conversation.findUnsentMessageWithUuid(id);
-                    if (message != null) {
-                        message.setStatus(Message.STATUS_SEND);
-                        message.setErrorMessage(null);
-                        databaseBackend.updateMessage(message, false);
-                        return true;
+                    final Jid bare = to.asBareJid();
+
+                    for (final Conversation conversation : getConversations()) {
+                        if (conversation.getAccount() == account
+                                && conversation.getJid().asBareJid().equals(bare)) {
+                            final Message message = conversation.findUnsentMessageWithUuid(id);
+                            if (message != null) {
+                                message.setStatus(Message.STATUS_SEND);
+                                message.setErrorMessage(null);
+                                databaseBackend.updateMessage(message, false);
+                                return true;
+                            }
+                        }
                     }
+                    return false;
                 }
-            }
-            return false;
-        }
-    };
+            };
 
     private boolean destroyed = false;
 
     private int unreadCount = -1;
 
-    //Ui callback listeners
-    private final Set<OnConversationUpdate> mOnConversationUpdates = Collections.newSetFromMap(new WeakHashMap<OnConversationUpdate, Boolean>());
-    private final Set<OnShowErrorToast> mOnShowErrorToasts = Collections.newSetFromMap(new WeakHashMap<OnShowErrorToast, Boolean>());
-    private final Set<OnAccountUpdate> mOnAccountUpdates = Collections.newSetFromMap(new WeakHashMap<OnAccountUpdate, Boolean>());
-    private final Set<OnCaptchaRequested> mOnCaptchaRequested = Collections.newSetFromMap(new WeakHashMap<OnCaptchaRequested, Boolean>());
-    private final Set<OnRosterUpdate> mOnRosterUpdates = Collections.newSetFromMap(new WeakHashMap<OnRosterUpdate, Boolean>());
-    private final Set<OnUpdateBlocklist> mOnUpdateBlocklist = Collections.newSetFromMap(new WeakHashMap<OnUpdateBlocklist, Boolean>());
-    private final Set<OnMucRosterUpdate> mOnMucRosterUpdate = Collections.newSetFromMap(new WeakHashMap<OnMucRosterUpdate, Boolean>());
-    private final Set<OnKeyStatusUpdated> mOnKeyStatusUpdated = Collections.newSetFromMap(new WeakHashMap<OnKeyStatusUpdated, Boolean>());
-    private final Set<OnJingleRtpConnectionUpdate> onJingleRtpConnectionUpdate = Collections.newSetFromMap(new WeakHashMap<OnJingleRtpConnectionUpdate, Boolean>());
+    // Ui callback listeners
+    private final Set<OnConversationUpdate> mOnConversationUpdates =
+            Collections.newSetFromMap(new WeakHashMap<OnConversationUpdate, Boolean>());
+    private final Set<OnShowErrorToast> mOnShowErrorToasts =
+            Collections.newSetFromMap(new WeakHashMap<OnShowErrorToast, Boolean>());
+    private final Set<OnAccountUpdate> mOnAccountUpdates =
+            Collections.newSetFromMap(new WeakHashMap<OnAccountUpdate, Boolean>());
+    private final Set<OnCaptchaRequested> mOnCaptchaRequested =
+            Collections.newSetFromMap(new WeakHashMap<OnCaptchaRequested, Boolean>());
+    private final Set<OnRosterUpdate> mOnRosterUpdates =
+            Collections.newSetFromMap(new WeakHashMap<OnRosterUpdate, Boolean>());
+    private final Set<OnUpdateBlocklist> mOnUpdateBlocklist =
+            Collections.newSetFromMap(new WeakHashMap<OnUpdateBlocklist, Boolean>());
+    private final Set<OnMucRosterUpdate> mOnMucRosterUpdate =
+            Collections.newSetFromMap(new WeakHashMap<OnMucRosterUpdate, Boolean>());
+    private final Set<OnKeyStatusUpdated> mOnKeyStatusUpdated =
+            Collections.newSetFromMap(new WeakHashMap<OnKeyStatusUpdated, Boolean>());
+    private final Set<OnJingleRtpConnectionUpdate> onJingleRtpConnectionUpdate =
+            Collections.newSetFromMap(new WeakHashMap<OnJingleRtpConnectionUpdate, Boolean>());
 
     private final Object LISTENER_LOCK = new Object();
 
-
     public final Set<String> FILENAMES_TO_IGNORE_DELETION = new HashSet<>();
 
-
-
     private final AtomicLong mLastExpiryRun = new AtomicLong(0);
-    private final LruCache<Pair<String, String>, ServiceDiscoveryResult> discoCache = new LruCache<>(20);
-    private final OnStatusChanged statusListener = new OnStatusChanged() {
-
-        @Override
-        public void onStatusChanged(final Account account) {
-            XmppConnection connection = account.getXmppConnection();
-            updateAccountUi();
+    private final LruCache<Pair<String, String>, ServiceDiscoveryResult> discoCache =
+            new LruCache<>(20);
+    private final OnStatusChanged statusListener =
+            new OnStatusChanged() {
 
-            if (account.getStatus() == Account.State.ONLINE || account.getStatus().isError()) {
-                mQuickConversationsService.signalAccountStateChange();
-            }
+                @Override
+                public void onStatusChanged(final Account account) {
+                    XmppConnection connection = account.getXmppConnection();
+                    updateAccountUi();
 
-            if (account.getStatus() == Account.State.ONLINE) {
-                synchronized (mLowPingTimeoutMode) {
-                    if (mLowPingTimeoutMode.remove(account.getJid().asBareJid())) {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": leaving low ping timeout mode");
+                    if (account.getStatus() == Account.State.ONLINE
+                            || account.getStatus().isError()) {
+                        mQuickConversationsService.signalAccountStateChange();
                     }
-                }
-                if (account.setShowErrorNotification(true)) {
-                    databaseBackend.updateAccount(account);
-                }
-                mMessageArchiveService.executePendingQueries(account);
-                if (connection != null && connection.getFeatures().csi()) {
-                    if (checkListeners()) {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + " sending csi//inactive");
-                        connection.sendInactive();
-                    } else {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + " sending csi//active");
-                        connection.sendActive();
-                    }
-                }
-                List<Conversation> conversations = getConversations();
-                for (Conversation conversation : conversations) {
-                    final boolean inProgressJoin;
-                    synchronized (account.inProgressConferenceJoins) {
-                        inProgressJoin = account.inProgressConferenceJoins.contains(conversation);
-                    }
-                    final boolean pendingJoin;
-                    synchronized (account.pendingConferenceJoins) {
-                        pendingJoin = account.pendingConferenceJoins.contains(conversation);
-                    }
-                    if (conversation.getAccount() == account
-                            && !pendingJoin
-                            && !inProgressJoin) {
-                        sendUnsentMessages(conversation);
-                    }
-                }
-                final List<Conversation> pendingLeaves;
-                synchronized (account.pendingConferenceLeaves) {
-                    pendingLeaves = new ArrayList<>(account.pendingConferenceLeaves);
-                    account.pendingConferenceLeaves.clear();
 
-                }
-                for (Conversation conversation : pendingLeaves) {
-                    leaveMuc(conversation);
-                }
-                final List<Conversation> pendingJoins;
-                synchronized (account.pendingConferenceJoins) {
-                    pendingJoins = new ArrayList<>(account.pendingConferenceJoins);
-                    account.pendingConferenceJoins.clear();
-                }
-                for (Conversation conversation : pendingJoins) {
-                    joinMuc(conversation);
-                }
-                scheduleWakeUpCall(Config.PING_MAX_INTERVAL, account.getUuid().hashCode());
-            } else if (account.getStatus() == Account.State.OFFLINE || account.getStatus() == Account.State.DISABLED || account.getStatus() == Account.State.LOGGED_OUT) {
-                resetSendingToWaiting(account);
-                if (account.isConnectionEnabled() && isInLowPingTimeoutMode(account)) {
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": went into offline state during low ping mode. reconnecting now");
-                    reconnectAccount(account, true, false);
-                } else {
-                    final int timeToReconnect = SECURE_RANDOM.nextInt(10) + 2;
-                    scheduleWakeUpCall(timeToReconnect, account.getUuid().hashCode());
-                }
-            } else if (account.getStatus() == Account.State.REGISTRATION_SUCCESSFUL) {
-                databaseBackend.updateAccount(account);
-                reconnectAccount(account, true, false);
-            } else if (account.getStatus() != Account.State.CONNECTING && account.getStatus() != Account.State.NO_INTERNET) {
-                resetSendingToWaiting(account);
-                if (connection != null && account.getStatus().isAttemptReconnect()) {
-                    final boolean aggressive = account.getStatus() == Account.State.SEE_OTHER_HOST
-                            || hasJingleRtpConnection(account);
-                    final int next = connection.getTimeToNextAttempt(aggressive);
-                    final boolean lowPingTimeoutMode = isInLowPingTimeoutMode(account);
-                    if (next <= 0) {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": error connecting account. reconnecting now. lowPingTimeout=" + lowPingTimeoutMode);
+                    if (account.getStatus() == Account.State.ONLINE) {
+                        synchronized (mLowPingTimeoutMode) {
+                            if (mLowPingTimeoutMode.remove(account.getJid().asBareJid())) {
+                                Log.d(
+                                        Config.LOGTAG,
+                                        account.getJid().asBareJid()
+                                                + ": leaving low ping timeout mode");
+                            }
+                        }
+                        if (account.setShowErrorNotification(true)) {
+                            databaseBackend.updateAccount(account);
+                        }
+                        mMessageArchiveService.executePendingQueries(account);
+                        if (connection != null && connection.getFeatures().csi()) {
+                            if (checkListeners()) {
+                                Log.d(
+                                        Config.LOGTAG,
+                                        account.getJid().asBareJid() + " sending csi//inactive");
+                                connection.sendInactive();
+                            } else {
+                                Log.d(
+                                        Config.LOGTAG,
+                                        account.getJid().asBareJid() + " sending csi//active");
+                                connection.sendActive();
+                            }
+                        }
+                        List<Conversation> conversations = getConversations();
+                        for (Conversation conversation : conversations) {
+                            final boolean inProgressJoin;
+                            synchronized (account.inProgressConferenceJoins) {
+                                inProgressJoin =
+                                        account.inProgressConferenceJoins.contains(conversation);
+                            }
+                            final boolean pendingJoin;
+                            synchronized (account.pendingConferenceJoins) {
+                                pendingJoin = account.pendingConferenceJoins.contains(conversation);
+                            }
+                            if (conversation.getAccount() == account
+                                    && !pendingJoin
+                                    && !inProgressJoin) {
+                                sendUnsentMessages(conversation);
+                            }
+                        }
+                        final List<Conversation> pendingLeaves;
+                        synchronized (account.pendingConferenceLeaves) {
+                            pendingLeaves = new ArrayList<>(account.pendingConferenceLeaves);
+                            account.pendingConferenceLeaves.clear();
+                        }
+                        for (Conversation conversation : pendingLeaves) {
+                            leaveMuc(conversation);
+                        }
+                        final List<Conversation> pendingJoins;
+                        synchronized (account.pendingConferenceJoins) {
+                            pendingJoins = new ArrayList<>(account.pendingConferenceJoins);
+                            account.pendingConferenceJoins.clear();
+                        }
+                        for (Conversation conversation : pendingJoins) {
+                            joinMuc(conversation);
+                        }
+                        scheduleWakeUpCall(Config.PING_MAX_INTERVAL, account.getUuid().hashCode());
+                    } else if (account.getStatus() == Account.State.OFFLINE
+                            || account.getStatus() == Account.State.DISABLED
+                            || account.getStatus() == Account.State.LOGGED_OUT) {
+                        resetSendingToWaiting(account);
+                        if (account.isConnectionEnabled() && isInLowPingTimeoutMode(account)) {
+                            Log.d(
+                                    Config.LOGTAG,
+                                    account.getJid().asBareJid()
+                                            + ": went into offline state during low ping mode."
+                                            + " reconnecting now");
+                            reconnectAccount(account, true, false);
+                        } else {
+                            final int timeToReconnect = SECURE_RANDOM.nextInt(10) + 2;
+                            scheduleWakeUpCall(timeToReconnect, account.getUuid().hashCode());
+                        }
+                    } else if (account.getStatus() == Account.State.REGISTRATION_SUCCESSFUL) {
+                        databaseBackend.updateAccount(account);
                         reconnectAccount(account, true, false);
-                    } else {
-                        final int attempt = connection.getAttempt() + 1;
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": error connecting account. try again in " + next + "s for the " + attempt + " time. lowPingTimeout=" + lowPingTimeoutMode+", aggressive="+aggressive);
-                        scheduleWakeUpCall(next, account.getUuid().hashCode());
-                        if (aggressive) {
-                            internalPingExecutor.schedule(
-                                    XmppConnectionService.this::manageAccountConnectionStatesInternal,
-                                    (next * 1000L) + 50,
-                                    TimeUnit.MILLISECONDS
-                            );
+                    } else if (account.getStatus() != Account.State.CONNECTING
+                            && account.getStatus() != Account.State.NO_INTERNET) {
+                        resetSendingToWaiting(account);
+                        if (connection != null && account.getStatus().isAttemptReconnect()) {
+                            final boolean aggressive =
+                                    account.getStatus() == Account.State.SEE_OTHER_HOST
+                                            || hasJingleRtpConnection(account);
+                            final int next = connection.getTimeToNextAttempt(aggressive);
+                            final boolean lowPingTimeoutMode = isInLowPingTimeoutMode(account);
+                            if (next <= 0) {
+                                Log.d(
+                                        Config.LOGTAG,
+                                        account.getJid().asBareJid()
+                                                + ": error connecting account. reconnecting now."
+                                                + " lowPingTimeout="
+                                                + lowPingTimeoutMode);
+                                reconnectAccount(account, true, false);
+                            } else {
+                                final int attempt = connection.getAttempt() + 1;
+                                Log.d(
+                                        Config.LOGTAG,
+                                        account.getJid().asBareJid()
+                                                + ": error connecting account. try again in "
+                                                + next
+                                                + "s for the "
+                                                + attempt
+                                                + " time. lowPingTimeout="
+                                                + lowPingTimeoutMode
+                                                + ", aggressive="
+                                                + aggressive);
+                                scheduleWakeUpCall(next, account.getUuid().hashCode());
+                                if (aggressive) {
+                                    internalPingExecutor.schedule(
+                                            XmppConnectionService.this
+                                                    ::manageAccountConnectionStatesInternal,
+                                            (next * 1000L) + 50,
+                                            TimeUnit.MILLISECONDS);
+                                }
+                            }
                         }
                     }
+                    getNotificationService().updateErrorNotification();
                 }
-            }
-            getNotificationService().updateErrorNotification();
-        }
-    };
+            };
     private OpenPgpServiceConnection pgpServiceConnection;
     private PgpEngine mPgpEngine = null;
     private WakeLock wakeLock;
     private LruCache<String, Bitmap> mBitmapCache;
     private final BroadcastReceiver mInternalEventReceiver = new InternalEventReceiver();
-    private final BroadcastReceiver mInternalRestrictedEventReceiver = new RestrictedEventReceiver(Arrays.asList(TorServiceUtils.ACTION_STATUS));
+    private final BroadcastReceiver mInternalRestrictedEventReceiver =
+            new RestrictedEventReceiver(Arrays.asList(TorServiceUtils.ACTION_STATUS));
     private final BroadcastReceiver mInternalScreenEventReceiver = new InternalEventReceiver();
 
     private static String generateFetchKey(Account account, final Avatar avatar) {
@@ -466,15 +521,16 @@ public class XmppConnectionService extends Service {
             return null;
         } else if (pgpServiceConnection != null && pgpServiceConnection.isBound()) {
             if (this.mPgpEngine == null) {
-                this.mPgpEngine = new PgpEngine(new OpenPgpApi(
-                        getApplicationContext(),
-                        pgpServiceConnection.getService()), this);
+                this.mPgpEngine =
+                        new PgpEngine(
+                                new OpenPgpApi(
+                                        getApplicationContext(), pgpServiceConnection.getService()),
+                                this);
             }
             return mPgpEngine;
         } else {
             return null;
         }
-
     }
 
     public OpenPgpApi getOpenPgpApi() {
@@ -499,7 +555,8 @@ public class XmppConnectionService extends Service {
         return this.mAvatarService;
     }
 
-    public void attachLocationToConversation(final Conversation conversation, final Uri uri, final UiCallback<Message> callback) {
+    public void attachLocationToConversation(
+            final Conversation conversation, final Uri uri, final UiCallback<Message> callback) {
         int encryption = conversation.getNextEncryption();
         if (encryption == Message.ENCRYPTION_PGP) {
             encryption = Message.ENCRYPTION_DECRYPTED;
@@ -514,7 +571,11 @@ public class XmppConnectionService extends Service {
         }
     }
 
-    public void attachFileToConversation(final Conversation conversation, final Uri uri, final String type, final UiCallback<Message> callback) {
+    public void attachFileToConversation(
+            final Conversation conversation,
+            final Uri uri,
+            final String type,
+            final UiCallback<Message> callback) {
         final Message message;
         if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
             message = new Message(conversation, "", Message.ENCRYPTION_DECRYPTED);
@@ -527,7 +588,8 @@ public class XmppConnectionService extends Service {
         }
         Log.d(Config.LOGTAG, "attachFile: type=" + message.getType());
         Log.d(Config.LOGTAG, "counterpart=" + message.getCounterpart());
-        final AttachFileToConversationRunnable runnable = new AttachFileToConversationRunnable(this, uri, type, message, callback);
+        final AttachFileToConversationRunnable runnable =
+                new AttachFileToConversationRunnable(this, uri, type, message, callback);
         if (runnable.isVideoMessage()) {
             VIDEO_COMPRESSION_EXECUTOR.execute(runnable);
         } else {
@@ -535,7 +597,11 @@ public class XmppConnectionService extends Service {
         }
     }
 
-    public void attachImageToConversation(final Conversation conversation, final Uri uri,  final String type, final UiCallback<Message> callback) {
+    public void attachImageToConversation(
+            final Conversation conversation,
+            final Uri uri,
+            final String type,
+            final UiCallback<Message> callback) {
         final String mimeType = MimeUtils.guessMimeTypeFromUriAndMime(this, uri, type);
         final String compressPictures = getCompressPicturesPreference();
 
@@ -543,7 +609,10 @@ public class XmppConnectionService extends Service {
                 || ("auto".equals(compressPictures) && getFileBackend().useImageAsIs(uri))
                 || (mimeType != null && mimeType.endsWith("/gif"))
                 || getFileBackend().unusualBounds(uri)) {
-            Log.d(Config.LOGTAG, conversation.getAccount().getJid().asBareJid() + ": not compressing picture. sending as file");
+            Log.d(
+                    Config.LOGTAG,
+                    conversation.getAccount().getJid().asBareJid()
+                            + ": not compressing picture. sending as file");
             attachFileToConversation(conversation, uri, mimeType, callback);
             return;
         }
@@ -558,29 +627,33 @@ public class XmppConnectionService extends Service {
             message.setType(Message.TYPE_IMAGE);
         }
         Log.d(Config.LOGTAG, "attachImage: type=" + message.getType());
-        FILE_ATTACHMENT_EXECUTOR.execute(() -> {
-            try {
-                getFileBackend().copyImageToPrivateStorage(message, uri);
-            } catch (FileBackend.ImageCompressionException e) {
-                Log.d(Config.LOGTAG, "unable to compress image. fall back to file transfer", e);
-                attachFileToConversation(conversation, uri, mimeType, callback);
-                return;
-            } catch (final FileBackend.FileCopyException e) {
-                callback.error(e.getResId(), message);
-                return;
-            }
-            if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
-                final PgpEngine pgpEngine = getPgpEngine();
-                if (pgpEngine != null) {
-                    pgpEngine.encrypt(message, callback);
-                } else if (callback != null) {
-                    callback.error(R.string.unable_to_connect_to_keychain, null);
-                }
-            } else {
-                sendMessage(message);
-                callback.success(message);
-            }
-        });
+        FILE_ATTACHMENT_EXECUTOR.execute(
+                () -> {
+                    try {
+                        getFileBackend().copyImageToPrivateStorage(message, uri);
+                    } catch (FileBackend.ImageCompressionException e) {
+                        Log.d(
+                                Config.LOGTAG,
+                                "unable to compress image. fall back to file transfer",
+                                e);
+                        attachFileToConversation(conversation, uri, mimeType, callback);
+                        return;
+                    } catch (final FileBackend.FileCopyException e) {
+                        callback.error(e.getResId(), message);
+                        return;
+                    }
+                    if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
+                        final PgpEngine pgpEngine = getPgpEngine();
+                        if (pgpEngine != null) {
+                            pgpEngine.encrypt(message, callback);
+                        } else if (callback != null) {
+                            callback.error(R.string.unable_to_connect_to_keychain, null);
+                        }
+                    } else {
+                        sendMessage(message);
+                        callback.success(message);
+                    }
+                });
     }
 
     public Conversation find(Bookmark bookmark) {
@@ -596,16 +669,26 @@ public class XmppConnectionService extends Service {
         return c != null && c.getMode() == Conversational.MODE_MULTI;
     }
 
-    public void search(final List<String> term, final String uuid, final OnSearchResultsAvailable onSearchResultsAvailable) {
+    public void search(
+            final List<String> term,
+            final String uuid,
+            final OnSearchResultsAvailable onSearchResultsAvailable) {
         MessageSearchTask.search(this, term, uuid, onSearchResultsAvailable);
     }
 
     @Override
     public int onStartCommand(final Intent intent, int flags, int startId) {
         final String action = Strings.nullToEmpty(intent == null ? null : intent.getAction());
-        final boolean needsForegroundService = intent != null && intent.getBooleanExtra(SystemEventReceiver.EXTRA_NEEDS_FOREGROUND_SERVICE, false);
+        final boolean needsForegroundService =
+                intent != null
+                        && intent.getBooleanExtra(
+                                SystemEventReceiver.EXTRA_NEEDS_FOREGROUND_SERVICE, false);
         if (needsForegroundService) {
-            Log.d(Config.LOGTAG, "toggle forced foreground service after receiving event (action=" + action + ")");
+            Log.d(
+                    Config.LOGTAG,
+                    "toggle forced foreground service after receiving event (action="
+                            + action
+                            + ")");
             toggleForegroundService(true);
         }
         final String uuid = intent == null ? null : intent.getStringExtra("uuid");
@@ -628,75 +711,93 @@ public class XmppConnectionService extends Service {
                 logoutAndSave(true);
                 return START_NOT_STICKY;
             case ACTION_CLEAR_MESSAGE_NOTIFICATION:
-                mNotificationExecutor.execute(() -> {
-                    try {
-                        final Conversation c = findConversationByUuid(uuid);
-                        if (c != null) {
-                            mNotificationService.clearMessages(c);
-                        } else {
-                            mNotificationService.clearMessages();
-                        }
-                        restoredFromDatabaseLatch.await();
+                mNotificationExecutor.execute(
+                        () -> {
+                            try {
+                                final Conversation c = findConversationByUuid(uuid);
+                                if (c != null) {
+                                    mNotificationService.clearMessages(c);
+                                } else {
+                                    mNotificationService.clearMessages();
+                                }
+                                restoredFromDatabaseLatch.await();
 
-                    } catch (InterruptedException e) {
-                        Log.d(Config.LOGTAG, "unable to process clear message notification");
-                    }
-                });
+                            } catch (InterruptedException e) {
+                                Log.d(
+                                        Config.LOGTAG,
+                                        "unable to process clear message notification");
+                            }
+                        });
                 break;
             case ACTION_CLEAR_MISSED_CALL_NOTIFICATION:
-                mNotificationExecutor.execute(() -> {
-                    try {
-                        final Conversation c = findConversationByUuid(uuid);
-                        if (c != null) {
-                            mNotificationService.clearMissedCalls(c);
-                        } else {
-                            mNotificationService.clearMissedCalls();
-                        }
-                        restoredFromDatabaseLatch.await();
+                mNotificationExecutor.execute(
+                        () -> {
+                            try {
+                                final Conversation c = findConversationByUuid(uuid);
+                                if (c != null) {
+                                    mNotificationService.clearMissedCalls(c);
+                                } else {
+                                    mNotificationService.clearMissedCalls();
+                                }
+                                restoredFromDatabaseLatch.await();
 
-                    } catch (InterruptedException e) {
-                        Log.d(Config.LOGTAG, "unable to process clear missed call notification");
-                    }
-                });
+                            } catch (InterruptedException e) {
+                                Log.d(
+                                        Config.LOGTAG,
+                                        "unable to process clear missed call notification");
+                            }
+                        });
                 break;
-            case ACTION_DISMISS_CALL: {
-                if (intent == null) {
+            case ACTION_DISMISS_CALL:
+                {
+                    if (intent == null) {
+                        break;
+                    }
+                    final String sessionId =
+                            intent.getStringExtra(RtpSessionActivity.EXTRA_SESSION_ID);
+                    Log.d(
+                            Config.LOGTAG,
+                            "received intent to dismiss call with session id " + sessionId);
+                    mJingleConnectionManager.rejectRtpSession(sessionId);
                     break;
                 }
-                final String sessionId = intent.getStringExtra(RtpSessionActivity.EXTRA_SESSION_ID);
-                Log.d(Config.LOGTAG, "received intent to dismiss call with session id " + sessionId);
-                mJingleConnectionManager.rejectRtpSession(sessionId);
-                break;
-            }
             case TorServiceUtils.ACTION_STATUS:
-                final String status = intent == null ? null : intent.getStringExtra(TorServiceUtils.EXTRA_STATUS);
-                //TODO port and host are in 'extras' - but this may not be a reliable source?
+                final String status =
+                        intent == null ? null : intent.getStringExtra(TorServiceUtils.EXTRA_STATUS);
+                // TODO port and host are in 'extras' - but this may not be a reliable source?
                 if ("ON".equals(status)) {
                     handleOrbotStartedEvent();
                     return START_STICKY;
                 }
                 break;
-            case ACTION_END_CALL: {
-                if (intent == null) {
-                    break;
-                }
-                final String sessionId = intent.getStringExtra(RtpSessionActivity.EXTRA_SESSION_ID);
-                Log.d(Config.LOGTAG, "received intent to end call with session id " + sessionId);
-                mJingleConnectionManager.endRtpSession(sessionId);
-            }
-            break;
-            case ACTION_PROVISION_ACCOUNT: {
-                if (intent == null) {
-                    break;
+            case ACTION_END_CALL:
+                {
+                    if (intent == null) {
+                        break;
+                    }
+                    final String sessionId =
+                            intent.getStringExtra(RtpSessionActivity.EXTRA_SESSION_ID);
+                    Log.d(
+                            Config.LOGTAG,
+                            "received intent to end call with session id " + sessionId);
+                    mJingleConnectionManager.endRtpSession(sessionId);
                 }
-                final String address = intent.getStringExtra("address");
-                final String password = intent.getStringExtra("password");
-                if (QuickConversationsService.isQuicksy() || Strings.isNullOrEmpty(address) || Strings.isNullOrEmpty(password)) {
+                break;
+            case ACTION_PROVISION_ACCOUNT:
+                {
+                    if (intent == null) {
+                        break;
+                    }
+                    final String address = intent.getStringExtra("address");
+                    final String password = intent.getStringExtra("password");
+                    if (QuickConversationsService.isQuicksy()
+                            || Strings.isNullOrEmpty(address)
+                            || Strings.isNullOrEmpty(password)) {
+                        break;
+                    }
+                    provisionAccount(address, password);
                     break;
                 }
-                provisionAccount(address, password);
-                break;
-            }
             case ACTION_DISMISS_ERROR_NOTIFICATIONS:
                 dismissErrorNotifications();
                 break;
@@ -704,55 +805,75 @@ public class XmppConnectionService extends Service {
                 resetAllAttemptCounts(false, true);
                 break;
             case ACTION_REPLY_TO_CONVERSATION:
-                final Bundle remoteInput = intent == null ? null : RemoteInput.getResultsFromIntent(intent);
+                final Bundle remoteInput =
+                        intent == null ? null : RemoteInput.getResultsFromIntent(intent);
                 if (remoteInput == null) {
                     break;
                 }
                 final CharSequence body = remoteInput.getCharSequence("text_reply");
-                final boolean dismissNotification = intent.getBooleanExtra("dismiss_notification", false);
+                final boolean dismissNotification =
+                        intent.getBooleanExtra("dismiss_notification", false);
                 final String lastMessageUuid = intent.getStringExtra("last_message_uuid");
                 if (body == null || body.length() <= 0) {
                     break;
                 }
-                mNotificationExecutor.execute(() -> {
-                    try {
-                        restoredFromDatabaseLatch.await();
-                        final Conversation c = findConversationByUuid(uuid);
-                        if (c != null) {
-                            directReply(c, body.toString(), lastMessageUuid, dismissNotification);
-                        }
-                    } catch (InterruptedException e) {
-                        Log.d(Config.LOGTAG, "unable to process direct reply");
-                    }
-                });
+                mNotificationExecutor.execute(
+                        () -> {
+                            try {
+                                restoredFromDatabaseLatch.await();
+                                final Conversation c = findConversationByUuid(uuid);
+                                if (c != null) {
+                                    directReply(
+                                            c,
+                                            body.toString(),
+                                            lastMessageUuid,
+                                            dismissNotification);
+                                }
+                            } catch (InterruptedException e) {
+                                Log.d(Config.LOGTAG, "unable to process direct reply");
+                            }
+                        });
                 break;
             case ACTION_MARK_AS_READ:
-                mNotificationExecutor.execute(() -> {
-                    final Conversation c = findConversationByUuid(uuid);
-                    if (c == null) {
-                        Log.d(Config.LOGTAG, "received mark read intent for unknown conversation (" + uuid + ")");
-                        return;
-                    }
-                    try {
-                        restoredFromDatabaseLatch.await();
-                        sendReadMarker(c, null);
-                    } catch (InterruptedException e) {
-                        Log.d(Config.LOGTAG, "unable to process notification read marker for conversation " + c.getName());
-                    }
-
-                });
+                mNotificationExecutor.execute(
+                        () -> {
+                            final Conversation c = findConversationByUuid(uuid);
+                            if (c == null) {
+                                Log.d(
+                                        Config.LOGTAG,
+                                        "received mark read intent for unknown conversation ("
+                                                + uuid
+                                                + ")");
+                                return;
+                            }
+                            try {
+                                restoredFromDatabaseLatch.await();
+                                sendReadMarker(c, null);
+                            } catch (InterruptedException e) {
+                                Log.d(
+                                        Config.LOGTAG,
+                                        "unable to process notification read marker for"
+                                                + " conversation "
+                                                + c.getName());
+                            }
+                        });
                 break;
             case ACTION_SNOOZE:
-                mNotificationExecutor.execute(() -> {
-                    final Conversation c = findConversationByUuid(uuid);
-                    if (c == null) {
-                        Log.d(Config.LOGTAG, "received snooze intent for unknown conversation (" + uuid + ")");
-                        return;
-                    }
-                    c.setMutedTill(System.currentTimeMillis() + 30 * 60 * 1000);
-                    mNotificationService.clearMessages(c);
-                    updateConversation(c);
-                });
+                mNotificationExecutor.execute(
+                        () -> {
+                            final Conversation c = findConversationByUuid(uuid);
+                            if (c == null) {
+                                Log.d(
+                                        Config.LOGTAG,
+                                        "received snooze intent for unknown conversation ("
+                                                + uuid
+                                                + ")");
+                                return;
+                            }
+                            c.setMutedTill(System.currentTimeMillis() + 30 * 60 * 1000);
+                            mNotificationService.clearMessages(c);
+                            updateConversation(c);
+                        });
             case AudioManager.RINGER_MODE_CHANGED_ACTION:
             case NotificationManager.ACTION_INTERRUPTION_FILTER_CHANGED:
                 if (dndOnSilentMode()) {
@@ -779,12 +900,16 @@ public class XmppConnectionService extends Service {
                 final Messenger messenger = intent.getParcelableExtra("messenger");
                 final UnifiedPushBroker.PushTargetMessenger pushTargetMessenger;
                 if (messenger != null && application != null && instance != null) {
-                    pushTargetMessenger = new UnifiedPushBroker.PushTargetMessenger(new UnifiedPushDatabase.PushTarget(application, instance),messenger);
-                    Log.d(Config.LOGTAG,"found push target messenger");
+                    pushTargetMessenger =
+                            new UnifiedPushBroker.PushTargetMessenger(
+                                    new UnifiedPushDatabase.PushTarget(application, instance),
+                                    messenger);
+                    Log.d(Config.LOGTAG, "found push target messenger");
                 } else {
                     pushTargetMessenger = null;
                 }
-                final Optional<UnifiedPushBroker.Transport> transport = renewUnifiedPushEndpoints(pushTargetMessenger);
+                final Optional<UnifiedPushBroker.Transport> transport =
+                        renewUnifiedPushEndpoints(pushTargetMessenger);
                 if (instance != null && transport.isPresent()) {
                     unifiedPushBroker.rebroadcastEndpoint(messenger, instance, transport.get());
                 }
@@ -814,7 +939,7 @@ public class XmppConnectionService extends Service {
                 }
                 return START_NOT_STICKY;
         }
-        final var extras =  intent == null ? null : intent.getExtras();
+        final var extras = intent == null ? null : intent.getExtras();
         try {
             internalPingExecutor.execute(() -> manageAccountConnectionStates(action, extras));
         } catch (final RejectedExecutionException e) {
@@ -899,7 +1024,12 @@ public class XmppConnectionService extends Service {
         }
     }
 
-    private boolean processAccountState(final Account account, final boolean interactive, final boolean isUiAction, final boolean isAccountPushed, final HashSet<Account> pingCandidates) {
+    private boolean processAccountState(
+            final Account account,
+            final boolean interactive,
+            final boolean isUiAction,
+            final boolean isAccountPushed,
+            final HashSet<Account> pingCandidates) {
         if (!account.getStatus().isAttemptReconnect()) {
             return false;
         }
@@ -915,9 +1045,17 @@ public class XmppConnectionService extends Service {
                 synchronized (mLowPingTimeoutMode) {
                     long lastReceived = account.getXmppConnection().getLastPacketReceived();
                     long lastSent = account.getXmppConnection().getLastPingSent();
-                    long pingInterval = isUiAction ? Config.PING_MIN_INTERVAL * 1000 : Config.PING_MAX_INTERVAL * 1000;
-                    long msToNextPing = (Math.max(lastReceived, lastSent) + pingInterval) - SystemClock.elapsedRealtime();
-                    int pingTimeout = mLowPingTimeoutMode.contains(account.getJid().asBareJid()) ? Config.LOW_PING_TIMEOUT * 1000 : Config.PING_TIMEOUT * 1000;
+                    long pingInterval =
+                            isUiAction
+                                    ? Config.PING_MIN_INTERVAL * 1000
+                                    : Config.PING_MAX_INTERVAL * 1000;
+                    long msToNextPing =
+                            (Math.max(lastReceived, lastSent) + pingInterval)
+                                    - SystemClock.elapsedRealtime();
+                    int pingTimeout =
+                            mLowPingTimeoutMode.contains(account.getJid().asBareJid())
+                                    ? Config.LOW_PING_TIMEOUT * 1000
+                                    : Config.PING_TIMEOUT * 1000;
                     long pingTimeoutIn = (lastSent + pingTimeout) - SystemClock.elapsedRealtime();
                     if (lastSent > lastReceived) {
                         if (pingTimeoutIn < 0) {
@@ -931,15 +1069,22 @@ public class XmppConnectionService extends Service {
                         pingCandidates.add(account);
                         if (isAccountPushed) {
                             if (mLowPingTimeoutMode.add(account.getJid().asBareJid())) {
-                                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": entering low ping timeout mode");
+                                Log.d(
+                                        Config.LOGTAG,
+                                        account.getJid().asBareJid()
+                                                + ": entering low ping timeout mode");
                             }
                             return true;
                         } else if (msToNextPing <= 0) {
                             return true;
                         } else {
-                            this.scheduleWakeUpCall((int) (msToNextPing / 1000), account.getUuid().hashCode());
+                            this.scheduleWakeUpCall(
+                                    (int) (msToNextPing / 1000), account.getUuid().hashCode());
                             if (mLowPingTimeoutMode.remove(account.getJid().asBareJid())) {
-                                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": leaving low ping timeout mode");
+                                Log.d(
+                                        Config.LOGTAG,
+                                        account.getJid().asBareJid()
+                                                + ": leaving low ping timeout mode");
                             }
                         }
                     }
@@ -947,22 +1092,37 @@ public class XmppConnectionService extends Service {
             } else if (account.getStatus() == Account.State.OFFLINE) {
                 reconnectAccount(account, true, interactive);
             } else if (account.getStatus() == Account.State.CONNECTING) {
-                long secondsSinceLastConnect = (SystemClock.elapsedRealtime() - account.getXmppConnection().getLastConnect()) / 1000;
-                long secondsSinceLastDisco = (SystemClock.elapsedRealtime() - account.getXmppConnection().getLastDiscoStarted()) / 1000;
+                long secondsSinceLastConnect =
+                        (SystemClock.elapsedRealtime()
+                                        - account.getXmppConnection().getLastConnect())
+                                / 1000;
+                long secondsSinceLastDisco =
+                        (SystemClock.elapsedRealtime()
+                                        - account.getXmppConnection().getLastDiscoStarted())
+                                / 1000;
                 long discoTimeout = Config.CONNECT_DISCO_TIMEOUT - secondsSinceLastDisco;
                 long timeout = Config.CONNECT_TIMEOUT - secondsSinceLastConnect;
                 if (timeout < 0) {
-                    Log.d(Config.LOGTAG, account.getJid() + ": time out during connect reconnecting (secondsSinceLast=" + secondsSinceLastConnect + ")");
+                    Log.d(
+                            Config.LOGTAG,
+                            account.getJid()
+                                    + ": time out during connect reconnecting (secondsSinceLast="
+                                    + secondsSinceLastConnect
+                                    + ")");
                     account.getXmppConnection().resetAttemptCount(false);
                     reconnectAccount(account, true, interactive);
                 } else if (discoTimeout < 0) {
                     account.getXmppConnection().sendDiscoTimeout();
-                    scheduleWakeUpCall((int) Math.min(timeout, discoTimeout), account.getUuid().hashCode());
+                    scheduleWakeUpCall(
+                            (int) Math.min(timeout, discoTimeout), account.getUuid().hashCode());
                 } else {
-                    scheduleWakeUpCall((int) Math.min(timeout, discoTimeout), account.getUuid().hashCode());
+                    scheduleWakeUpCall(
+                            (int) Math.min(timeout, discoTimeout), account.getUuid().hashCode());
                 }
             } else {
-                final boolean aggressive = account.getStatus() == Account.State.SEE_OTHER_HOST || hasJingleRtpConnection(account);
+                final boolean aggressive =
+                        account.getStatus() == Account.State.SEE_OTHER_HOST
+                                || hasJingleRtpConnection(account);
                 if (account.getXmppConnection().getTimeToNextAttempt(aggressive) <= 0) {
                     reconnectAccount(account, true, interactive);
                 }
@@ -972,7 +1132,7 @@ public class XmppConnectionService extends Service {
     }
 
     private void toggleSoftDisabled(final boolean softDisabled) {
-        for(final Account account : this.accounts) {
+        for (final Account account : this.accounts) {
             if (account.isEnabled()) {
                 if (account.setOption(Account.OPTION_SOFT_DISABLED, softDisabled)) {
                     updateAccount(account);
@@ -981,7 +1141,8 @@ public class XmppConnectionService extends Service {
         }
     }
 
-    public boolean processUnifiedPushMessage(final Account account, final Jid transport, final Element push) {
+    public boolean processUnifiedPushMessage(
+            final Account account, final Jid transport, final Element push) {
         return unifiedPushBroker.processPushMessage(account, transport, push);
     }
 
@@ -989,8 +1150,12 @@ public class XmppConnectionService extends Service {
         mChannelDiscoveryService.initializeMuclumbusService();
     }
 
-    public void discoverChannels(String query, ChannelDiscoveryService.Method method, ChannelDiscoveryService.OnChannelSearchResultsFound onChannelSearchResultsFound) {
-        mChannelDiscoveryService.discover(Strings.nullToEmpty(query).trim(), method, onChannelSearchResultsFound);
+    public void discoverChannels(
+            String query,
+            ChannelDiscoveryService.Method method,
+            ChannelDiscoveryService.OnChannelSearchResultsFound onChannelSearchResultsFound) {
+        mChannelDiscoveryService.discover(
+                Strings.nullToEmpty(query).trim(), method, onChannelSearchResultsFound);
     }
 
     public boolean isDataSaverDisabled() {
@@ -1003,34 +1168,38 @@ public class XmppConnectionService extends Service {
                         == ConnectivityManager.RESTRICT_BACKGROUND_STATUS_DISABLED;
     }
 
-    private void directReply(final Conversation conversation, final String body, final String lastMessageUuid, final boolean dismissAfterReply) {
-        final Message inReplyTo = lastMessageUuid == null ? null : conversation.findMessageWithUuid(lastMessageUuid);
+    private void directReply(
+            final Conversation conversation,
+            final String body,
+            final String lastMessageUuid,
+            final boolean dismissAfterReply) {
+        final Message inReplyTo =
+                lastMessageUuid == null ? null : conversation.findMessageWithUuid(lastMessageUuid);
         final Message message = new Message(conversation, body, conversation.getNextEncryption());
         if (inReplyTo != null && inReplyTo.isPrivateMessage()) {
             Message.configurePrivateMessage(message, inReplyTo.getCounterpart());
         }
         message.markUnread();
         if (message.getEncryption() == Message.ENCRYPTION_PGP) {
-            getPgpEngine().encrypt(message, new UiCallback<Message>() {
-                @Override
-                public void success(Message message) {
-                    if (dismissAfterReply) {
-                        markRead((Conversation) message.getConversation(), true);
-                    } else {
-                        mNotificationService.pushFromDirectReply(message);
-                    }
-                }
-
-                @Override
-                public void error(int errorCode, Message object) {
+            getPgpEngine()
+                    .encrypt(
+                            message,
+                            new UiCallback<Message>() {
+                                @Override
+                                public void success(Message message) {
+                                    if (dismissAfterReply) {
+                                        markRead((Conversation) message.getConversation(), true);
+                                    } else {
+                                        mNotificationService.pushFromDirectReply(message);
+                                    }
+                                }
 
-                }
+                                @Override
+                                public void error(int errorCode, Message object) {}
 
-                @Override
-                public void userInputRequired(PendingIntent pi, Message object) {
-
-                }
-            });
+                                @Override
+                                public void userInputRequired(PendingIntent pi, Message object) {}
+                            });
         } else {
             sendMessage(message);
             if (dismissAfterReply) {
@@ -1046,19 +1215,25 @@ public class XmppConnectionService extends Service {
     }
 
     private boolean manuallyChangePresence() {
-        return getBooleanPreference(AppSettings.MANUALLY_CHANGE_PRESENCE, R.bool.manually_change_presence);
+        return getBooleanPreference(
+                AppSettings.MANUALLY_CHANGE_PRESENCE, R.bool.manually_change_presence);
     }
 
     private boolean treatVibrateAsSilent() {
-        return getBooleanPreference(AppSettings.TREAT_VIBRATE_AS_SILENT, R.bool.treat_vibrate_as_silent);
+        return getBooleanPreference(
+                AppSettings.TREAT_VIBRATE_AS_SILENT, R.bool.treat_vibrate_as_silent);
     }
 
     private boolean awayWhenScreenLocked() {
-        return getBooleanPreference(AppSettings.AWAY_WHEN_SCREEN_IS_OFF, R.bool.away_when_screen_off);
+        return getBooleanPreference(
+                AppSettings.AWAY_WHEN_SCREEN_IS_OFF, R.bool.away_when_screen_off);
     }
 
     private String getCompressPicturesPreference() {
-        return getPreferences().getString("picture_compression", getResources().getString(R.string.picture_compression));
+        return getPreferences()
+                .getString(
+                        "picture_compression",
+                        getResources().getString(R.string.picture_compression));
     }
 
     private Presence.Status getTargetPresence() {
@@ -1086,10 +1261,16 @@ public class XmppConnectionService extends Service {
 
     private boolean isPhoneSilenced() {
         final NotificationManager notificationManager = getSystemService(NotificationManager.class);
-        final int filter = notificationManager == null ? NotificationManager.INTERRUPTION_FILTER_UNKNOWN : notificationManager.getCurrentInterruptionFilter();
+        final int filter =
+                notificationManager == null
+                        ? NotificationManager.INTERRUPTION_FILTER_UNKNOWN
+                        : notificationManager.getCurrentInterruptionFilter();
         final boolean notificationDnd = filter >= NotificationManager.INTERRUPTION_FILTER_PRIORITY;
         final AudioManager audioManager = getSystemService(AudioManager.class);
-        final int ringerMode = audioManager == null ? AudioManager.RINGER_MODE_NORMAL : audioManager.getRingerMode();
+        final int ringerMode =
+                audioManager == null
+                        ? AudioManager.RINGER_MODE_NORMAL
+                        : audioManager.getRingerMode();
         try {
             if (treatVibrateAsSilent()) {
                 return notificationDnd || ringerMode != AudioManager.RINGER_MODE_NORMAL;
@@ -1097,7 +1278,9 @@ public class XmppConnectionService extends Service {
                 return notificationDnd || ringerMode == AudioManager.RINGER_MODE_SILENT;
             }
         } catch (final Throwable throwable) {
-            Log.d(Config.LOGTAG, "platform bug in isPhoneSilenced (" + throwable.getMessage() + ")");
+            Log.d(
+                    Config.LOGTAG,
+                    "platform bug in isPhoneSilenced (" + throwable.getMessage() + ")");
             return notificationDnd;
         }
     }
@@ -1121,7 +1304,9 @@ public class XmppConnectionService extends Service {
     private void dismissErrorNotifications() {
         for (final Account account : this.accounts) {
             if (account.hasErrorStatus()) {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": dismissing error notification");
+                Log.d(
+                        Config.LOGTAG,
+                        account.getJid().asBareJid() + ": dismissing error notification");
                 if (account.setShowErrorNotification(false)) {
                     mDatabaseWriterExecutor.execute(() -> databaseBackend.updateAccount(account));
                 }
@@ -1135,41 +1320,50 @@ public class XmppConnectionService extends Service {
 
     public void expireOldMessages(final boolean resetHasMessagesLeftOnServer) {
         mLastExpiryRun.set(SystemClock.elapsedRealtime());
-        mDatabaseWriterExecutor.execute(() -> {
-            long timestamp = getAutomaticMessageDeletionDate();
-            if (timestamp > 0) {
-                databaseBackend.expireOldMessages(timestamp);
-                synchronized (XmppConnectionService.this.conversations) {
-                    for (Conversation conversation : XmppConnectionService.this.conversations) {
-                        conversation.expireOldMessages(timestamp);
-                        if (resetHasMessagesLeftOnServer) {
-                            conversation.messagesLoaded.set(true);
-                            conversation.setHasMessagesLeftOnServer(true);
+        mDatabaseWriterExecutor.execute(
+                () -> {
+                    long timestamp = getAutomaticMessageDeletionDate();
+                    if (timestamp > 0) {
+                        databaseBackend.expireOldMessages(timestamp);
+                        synchronized (XmppConnectionService.this.conversations) {
+                            for (Conversation conversation :
+                                    XmppConnectionService.this.conversations) {
+                                conversation.expireOldMessages(timestamp);
+                                if (resetHasMessagesLeftOnServer) {
+                                    conversation.messagesLoaded.set(true);
+                                    conversation.setHasMessagesLeftOnServer(true);
+                                }
+                            }
                         }
+                        updateConversationUi();
                     }
-                }
-                updateConversationUi();
-            }
-        });
+                });
     }
 
     public boolean hasInternetConnection() {
-        final ConnectivityManager cm = ContextCompat.getSystemService(this, ConnectivityManager.class);
+        final ConnectivityManager cm =
+                ContextCompat.getSystemService(this, ConnectivityManager.class);
         if (cm == null) {
-            return true; //if internet connection can not be checked it is probably best to just try
+            return true; // if internet connection can not be checked it is probably best to just
+            // try
         }
         try {
             if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.Q) {
                 final Network activeNetwork = cm.getActiveNetwork();
-                final NetworkCapabilities capabilities = activeNetwork == null ? null : cm.getNetworkCapabilities(activeNetwork);
-                return capabilities != null && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
+                final NetworkCapabilities capabilities =
+                        activeNetwork == null ? null : cm.getNetworkCapabilities(activeNetwork);
+                return capabilities != null
+                        && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);
             } else {
                 final NetworkInfo networkInfo = cm.getActiveNetworkInfo();
-                return networkInfo != null && (networkInfo.isConnected() || networkInfo.getType() == ConnectivityManager.TYPE_ETHERNET);
+                return networkInfo != null
+                        && (networkInfo.isConnected()
+                                || networkInfo.getType() == ConnectivityManager.TYPE_ETHERNET);
             }
         } catch (final RuntimeException e) {
             Log.d(Config.LOGTAG, "unable to check for internet connection", e);
-            return true; //if internet connection can not be checked it is probably best to just try
+            return true; // if internet connection can not be checked it is probably best to just
+            // try
         }
     }
 
@@ -1193,14 +1387,16 @@ public class XmppConnectionService extends Service {
         updateMemorizingTrustManager();
         final int maxMemory = (int) (Runtime.getRuntime().maxMemory() / 1024);
         final int cacheSize = maxMemory / 8;
-        this.mBitmapCache = new LruCache<String, Bitmap>(cacheSize) {
-            @Override
-            protected int sizeOf(final String key, final Bitmap bitmap) {
-                return bitmap.getByteCount() / 1024;
-            }
-        };
+        this.mBitmapCache =
+                new LruCache<String, Bitmap>(cacheSize) {
+                    @Override
+                    protected int sizeOf(final String key, final Bitmap bitmap) {
+                        return bitmap.getByteCount() / 1024;
+                    }
+                };
         if (mLastActivity == 0) {
-            mLastActivity = getPreferences().getLong(SETTING_LAST_ACTIVITY_TS, System.currentTimeMillis());
+            mLastActivity =
+                    getPreferences().getLong(SETTING_LAST_ACTIVITY_TS, System.currentTimeMillis());
         }
 
         Log.d(Config.LOGTAG, "initializing database...");
@@ -1232,22 +1428,30 @@ public class XmppConnectionService extends Service {
             FILE_OBSERVER_EXECUTOR.execute(this::checkForDeletedFiles);
         }
         if (Config.supportOpenPgp()) {
-            this.pgpServiceConnection = new OpenPgpServiceConnection(this, "org.sufficientlysecure.keychain", new OpenPgpServiceConnection.OnBound() {
-                @Override
-                public void onBound(final IOpenPgpService2 service) {
-                    for (Account account : accounts) {
-                        final PgpDecryptionService pgp = account.getPgpDecryptionService();
-                        if (pgp != null) {
-                            pgp.continueDecryption(true);
-                        }
-                    }
-                }
+            this.pgpServiceConnection =
+                    new OpenPgpServiceConnection(
+                            this,
+                            "org.sufficientlysecure.keychain",
+                            new OpenPgpServiceConnection.OnBound() {
+                                @Override
+                                public void onBound(final IOpenPgpService2 service) {
+                                    for (Account account : accounts) {
+                                        final PgpDecryptionService pgp =
+                                                account.getPgpDecryptionService();
+                                        if (pgp != null) {
+                                            pgp.continueDecryption(true);
+                                        }
+                                    }
+                                }
 
-                @Override
-                public void onError(final Exception exception) {
-                    Log.e(Config.LOGTAG,"could not bind to OpenKeyChain", exception);
-                }
-            });
+                                @Override
+                                public void onError(final Exception exception) {
+                                    Log.e(
+                                            Config.LOGTAG,
+                                            "could not bind to OpenKeyChain",
+                                            exception);
+                                }
+                            });
             this.pgpServiceConnection.bindToService();
         }
 
@@ -1281,32 +1485,39 @@ public class XmppConnectionService extends Service {
                 ContextCompat.RECEIVER_EXPORTED);
         mForceDuringOnCreate.set(false);
         toggleForegroundService();
-        internalPingExecutor.scheduleAtFixedRate(this::manageAccountConnectionStatesInternal,10,10,TimeUnit.SECONDS);
+        internalPingExecutor.scheduleAtFixedRate(
+                this::manageAccountConnectionStatesInternal, 10, 10, TimeUnit.SECONDS);
         final SharedPreferences sharedPreferences =
                 androidx.preference.PreferenceManager.getDefaultSharedPreferences(this);
-        sharedPreferences.registerOnSharedPreferenceChangeListener(new SharedPreferences.OnSharedPreferenceChangeListener() {
-            @Override
-            public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, @Nullable String key) {
-                Log.d(Config.LOGTAG,"preference '"+key+"' has changed");
-                if (AppSettings.KEEP_FOREGROUND_SERVICE.equals(key)) {
-                    toggleForegroundService();
-                }
-            }
-        });
+        sharedPreferences.registerOnSharedPreferenceChangeListener(
+                new SharedPreferences.OnSharedPreferenceChangeListener() {
+                    @Override
+                    public void onSharedPreferenceChanged(
+                            SharedPreferences sharedPreferences, @Nullable String key) {
+                        Log.d(Config.LOGTAG, "preference '" + key + "' has changed");
+                        if (AppSettings.KEEP_FOREGROUND_SERVICE.equals(key)) {
+                            toggleForegroundService();
+                        }
+                    }
+                });
     }
 
-
     private void checkForDeletedFiles() {
         if (destroyed) {
-            Log.d(Config.LOGTAG, "Do not check for deleted files because service has been destroyed");
+            Log.d(
+                    Config.LOGTAG,
+                    "Do not check for deleted files because service has been destroyed");
             return;
         }
         final long start = SystemClock.elapsedRealtime();
-        final List<DatabaseBackend.FilePathInfo> relativeFilePaths = databaseBackend.getFilePathInfo();
+        final List<DatabaseBackend.FilePathInfo> relativeFilePaths =
+                databaseBackend.getFilePathInfo();
         final List<DatabaseBackend.FilePathInfo> changed = new ArrayList<>();
         for (final DatabaseBackend.FilePathInfo filePath : relativeFilePaths) {
             if (destroyed) {
-                Log.d(Config.LOGTAG, "Stop checking for deleted files because service has been destroyed");
+                Log.d(
+                        Config.LOGTAG,
+                        "Stop checking for deleted files because service has been destroyed");
                 return;
             }
             final File file = fileBackend.getFileForPath(filePath.path);
@@ -1315,7 +1526,15 @@ public class XmppConnectionService extends Service {
             }
         }
         final long duration = SystemClock.elapsedRealtime() - start;
-        Log.d(Config.LOGTAG, "found " + changed.size() + " changed files on start up. total=" + relativeFilePaths.size() + ". (" + duration + "ms)");
+        Log.d(
+                Config.LOGTAG,
+                "found "
+                        + changed.size()
+                        + " changed files on start up. total="
+                        + relativeFilePaths.size()
+                        + ". ("
+                        + duration
+                        + "ms)");
         if (changed.size() > 0) {
             databaseBackend.markFilesAsChanged(changed);
             markChangedFiles(changed);
@@ -1323,15 +1542,19 @@ public class XmppConnectionService extends Service {
     }
 
     public void startContactObserver() {
-        getContentResolver().registerContentObserver(ContactsContract.Contacts.CONTENT_URI, true, new ContentObserver(null) {
-            @Override
-            public void onChange(boolean selfChange) {
-                super.onChange(selfChange);
-                if (restoredFromDatabaseLatch.getCount() == 0) {
-                    loadPhoneContacts();
-                }
-            }
-        });
+        getContentResolver()
+                .registerContentObserver(
+                        ContactsContract.Contacts.CONTENT_URI,
+                        true,
+                        new ContentObserver(null) {
+                            @Override
+                            public void onChange(boolean selfChange) {
+                                super.onChange(selfChange);
+                                if (restoredFromDatabaseLatch.getCount() == 0) {
+                                    loadPhoneContacts();
+                                }
+                            }
+                        });
     }
 
     @Override
@@ -1350,7 +1573,7 @@ public class XmppConnectionService extends Service {
             unregisterReceiver(this.mInternalRestrictedEventReceiver);
             unregisterReceiver(this.mInternalScreenEventReceiver);
         } catch (final IllegalArgumentException e) {
-            //ignored
+            // ignored
         }
         destroyed = false;
         fileObserver.stopWatching();
@@ -1375,7 +1598,7 @@ public class XmppConnectionService extends Service {
             try {
                 unregisterReceiver(this.mInternalScreenEventReceiver);
             } catch (IllegalArgumentException e) {
-                //ignored
+                // ignored
             }
         }
     }
@@ -1384,7 +1607,8 @@ public class XmppConnectionService extends Service {
         toggleForegroundService(false);
     }
 
-    public void setOngoingCall(AbstractJingleConnection.Id id, Set<Media> media, final boolean reconnecting) {
+    public void setOngoingCall(
+            AbstractJingleConnection.Id id, Set<Media> media, final boolean reconnecting) {
         ongoingCall.set(new OngoingCall(id, media, reconnecting));
         toggleForegroundService(false);
     }
@@ -1473,13 +1697,18 @@ public class XmppConnectionService extends Service {
     }
 
     public boolean foregroundNotificationNeedsUpdatingWhenErrorStateChanges() {
-        return !mOngoingVideoTranscoding.get() && ongoingCall.get() == null && Compatibility.keepForegroundService(this) && hasEnabledAccounts();
+        return !mOngoingVideoTranscoding.get()
+                && ongoingCall.get() == null
+                && Compatibility.keepForegroundService(this)
+                && hasEnabledAccounts();
     }
 
     @Override
     public void onTaskRemoved(final Intent rootIntent) {
         super.onTaskRemoved(rootIntent);
-        if ((Compatibility.keepForegroundService(this) && hasEnabledAccounts()) || mOngoingVideoTranscoding.get() || ongoingCall.get() != null) {
+        if ((Compatibility.keepForegroundService(this) && hasEnabledAccounts())
+                || mOngoingVideoTranscoding.get()
+                || ongoingCall.get() != null) {
             Log.d(Config.LOGTAG, "ignoring onTaskRemoved because foreground service is activated");
         } else {
             this.logoutAndSave(false);
@@ -1508,17 +1737,27 @@ public class XmppConnectionService extends Service {
         if (alarmManager == null) {
             return;
         }
-        final long triggerAtMillis = SystemClock.elapsedRealtime() + (Config.POST_CONNECTIVITY_CHANGE_PING_INTERVAL * 1000);
+        final long triggerAtMillis =
+                SystemClock.elapsedRealtime()
+                        + (Config.POST_CONNECTIVITY_CHANGE_PING_INTERVAL * 1000);
         final Intent intent = new Intent(this, SystemEventReceiver.class);
         intent.setAction(ACTION_POST_CONNECTIVITY_CHANGE);
         try {
-            final PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 1, intent, s()
-                    ? PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
-                    : PendingIntent.FLAG_UPDATE_CURRENT);
+            final PendingIntent pendingIntent =
+                    PendingIntent.getBroadcast(
+                            this,
+                            1,
+                            intent,
+                            s()
+                                    ? PendingIntent.FLAG_IMMUTABLE
+                                            | PendingIntent.FLAG_UPDATE_CURRENT
+                                    : PendingIntent.FLAG_UPDATE_CURRENT);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                alarmManager.setAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, triggerAtMillis, pendingIntent);
+                alarmManager.setAndAllowWhileIdle(
+                        AlarmManager.ELAPSED_REALTIME_WAKEUP, triggerAtMillis, pendingIntent);
             } else {
-                alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, triggerAtMillis, pendingIntent);
+                alarmManager.set(
+                        AlarmManager.ELAPSED_REALTIME_WAKEUP, triggerAtMillis, pendingIntent);
             }
         } catch (RuntimeException e) {
             Log.e(Config.LOGTAG, "unable to schedule alarm for post connectivity change", e);
@@ -1526,7 +1765,8 @@ public class XmppConnectionService extends Service {
     }
 
     public void scheduleWakeUpCall(final int seconds, final int requestCode) {
-        final long timeToWake = SystemClock.elapsedRealtime() + (seconds < 0 ? 1 : seconds + 1) * 1000L;
+        final long timeToWake =
+                SystemClock.elapsedRealtime() + (seconds < 0 ? 1 : seconds + 1) * 1000L;
         final AlarmManager alarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
         if (alarmManager == null) {
             return;
@@ -1553,10 +1793,17 @@ public class XmppConnectionService extends Service {
         final Intent intent = new Intent(this, SystemEventReceiver.class);
         intent.setAction(ACTION_IDLE_PING);
         try {
-            final PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, s()
-                    ? PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT
-                    : PendingIntent.FLAG_UPDATE_CURRENT);
-            alarmManager.setAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, timeToWake, pendingIntent);
+            final PendingIntent pendingIntent =
+                    PendingIntent.getBroadcast(
+                            this,
+                            0,
+                            intent,
+                            s()
+                                    ? PendingIntent.FLAG_IMMUTABLE
+                                            | PendingIntent.FLAG_UPDATE_CURRENT
+                                    : PendingIntent.FLAG_UPDATE_CURRENT);
+            alarmManager.setAndAllowWhileIdle(
+                    AlarmManager.ELAPSED_REALTIME_WAKEUP, timeToWake, pendingIntent);
         } catch (RuntimeException e) {
             Log.d(Config.LOGTAG, "unable to schedule alarm for idle ping", e);
         }
@@ -1607,11 +1854,16 @@ public class XmppConnectionService extends Service {
         final Conversation conversation = (Conversation) message.getConversation();
         account.deactivateGracePeriod();
 
-
-        if (QuickConversationsService.isQuicksy() && conversation.getMode() == Conversation.MODE_SINGLE) {
+        if (QuickConversationsService.isQuicksy()
+                && conversation.getMode() == Conversation.MODE_SINGLE) {
             final Contact contact = conversation.getContact();
             if (!contact.showInRoster() && contact.getOption(Contact.Options.SYNCED_VIA_OTHER)) {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": adding " + contact.getJid() + " on sending message");
+                Log.d(
+                        Config.LOGTAG,
+                        account.getJid().asBareJid()
+                                + ": adding "
+                                + contact.getJid()
+                                + " on sending message");
                 createContact(contact, true);
             }
         }
@@ -1621,20 +1873,23 @@ public class XmppConnectionService extends Service {
         boolean saveInDb = addToConversation;
         message.setStatus(Message.STATUS_WAITING);
 
-        if (message.getEncryption() != Message.ENCRYPTION_NONE && conversation.getMode() == Conversation.MODE_MULTI && conversation.isPrivateAndNonAnonymous()) {
-            if (conversation.setAttribute(Conversation.ATTRIBUTE_FORMERLY_PRIVATE_NON_ANONYMOUS, true)) {
+        if (message.getEncryption() != Message.ENCRYPTION_NONE
+                && conversation.getMode() == Conversation.MODE_MULTI
+                && conversation.isPrivateAndNonAnonymous()) {
+            if (conversation.setAttribute(
+                    Conversation.ATTRIBUTE_FORMERLY_PRIVATE_NON_ANONYMOUS, true)) {
                 databaseBackend.updateConversation(conversation);
             }
         }
 
         final boolean inProgressJoin = isJoinInProgress(conversation);
 
-
         if (account.isOnlineAndConnected() && !inProgressJoin) {
             switch (message.getEncryption()) {
                 case Message.ENCRYPTION_NONE:
                     if (message.needsUploading()) {
-                        if (account.httpUploadAvailable(fileBackend.getFile(message, false).getSize())
+                        if (account.httpUploadAvailable(
+                                        fileBackend.getFile(message, false).getSize())
                                 || conversation.getMode() == Conversation.MODE_MULTI
                                 || message.fixCounterpart()) {
                             this.sendFileMessage(message, delay);
@@ -1648,7 +1903,8 @@ public class XmppConnectionService extends Service {
                 case Message.ENCRYPTION_PGP:
                 case Message.ENCRYPTION_DECRYPTED:
                     if (message.needsUploading()) {
-                        if (account.httpUploadAvailable(fileBackend.getFile(message, false).getSize())
+                        if (account.httpUploadAvailable(
+                                        fileBackend.getFile(message, false).getSize())
                                 || conversation.getMode() == Conversation.MODE_MULTI
                                 || message.fixCounterpart()) {
                             this.sendFileMessage(message, delay);
@@ -1662,7 +1918,8 @@ public class XmppConnectionService extends Service {
                 case Message.ENCRYPTION_AXOLOTL:
                     message.setFingerprint(account.getAxolotlService().getOwnFingerprint());
                     if (message.needsUploading()) {
-                        if (account.httpUploadAvailable(fileBackend.getFile(message, false).getSize())
+                        if (account.httpUploadAvailable(
+                                        fileBackend.getFile(message, false).getSize())
                                 || conversation.getMode() == Conversation.MODE_MULTI
                                 || message.fixCounterpart()) {
                             this.sendFileMessage(message, delay);
@@ -1670,7 +1927,8 @@ public class XmppConnectionService extends Service {
                             break;
                         }
                     } else {
-                        XmppAxolotlMessage axolotlMessage = account.getAxolotlService().fetchAxolotlMessageFromCache(message);
+                        XmppAxolotlMessage axolotlMessage =
+                                account.getAxolotlService().fetchAxolotlMessageFromCache(message);
                         if (axolotlMessage == null) {
                             account.getAxolotlService().preparePayloadMessage(message, delay);
                         } else {
@@ -1678,11 +1936,11 @@ public class XmppConnectionService extends Service {
                         }
                     }
                     break;
-
             }
             if (packet != null) {
                 if (account.getXmppConnection().getFeatures().sm()
-                        || (conversation.getMode() == Conversation.MODE_MULTI && message.getCounterpart().isBareJid())) {
+                        || (conversation.getMode() == Conversation.MODE_MULTI
+                                && message.getCounterpart().isBareJid())) {
                     message.setStatus(Message.STATUS_UNSEND);
                 } else {
                     message.setStatus(Message.STATUS_SEND);
@@ -1694,7 +1952,7 @@ public class XmppConnectionService extends Service {
                     if (!message.needsUploading()) {
                         String pgpBody = message.getEncryptedBody();
                         String decryptedBody = message.getBody();
-                        message.setBody(pgpBody); //TODO might throw NPE
+                        message.setBody(pgpBody); // TODO might throw NPE
                         message.setEncryption(Message.ENCRYPTION_PGP);
                         if (message.edited()) {
                             message.setBody(decryptedBody);
@@ -1718,8 +1976,8 @@ public class XmppConnectionService extends Service {
             }
         }
 
-
-        boolean mucMessage = conversation.getMode() == Conversation.MODE_MULTI && !message.isPrivateMessage();
+        boolean mucMessage =
+                conversation.getMode() == Conversation.MODE_MULTI && !message.isPrivateMessage();
         if (mucMessage) {
             message.setCounterpart(conversation.getMucOptions().getSelf().getFullJid());
         }
@@ -1766,7 +2024,13 @@ public class XmppConnectionService extends Service {
                 final boolean pending = account.pendingConferenceJoins.contains(conversation);
                 final boolean inProgressJoin = inProgress || pending;
                 if (inProgressJoin) {
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": holding back message to group. inProgress=" + inProgress + ", pending=" + pending);
+                    Log.d(
+                            Config.LOGTAG,
+                            account.getJid().asBareJid()
+                                    + ": holding back message to group. inProgress="
+                                    + inProgress
+                                    + ", pending="
+                                    + pending);
                 }
                 return inProgressJoin;
             } else {
@@ -1783,11 +2047,16 @@ public class XmppConnectionService extends Service {
         sendMessage(message, true, delay);
     }
 
-    public void requestEasyOnboardingInvite(final Account account, final EasyOnboardingInvite.OnInviteRequested callback) {
+    public void requestEasyOnboardingInvite(
+            final Account account, final EasyOnboardingInvite.OnInviteRequested callback) {
         final XmppConnection connection = account.getXmppConnection();
-        final Jid jid = connection == null ? null : connection.getJidForCommand(Namespace.EASY_ONBOARDING_INVITE);
+        final Jid jid =
+                connection == null
+                        ? null
+                        : connection.getJidForCommand(Namespace.EASY_ONBOARDING_INVITE);
         if (jid == null) {
-            callback.inviteRequestFailed(getString(R.string.server_does_not_support_easy_onboarding_invites));
+            callback.inviteRequestFailed(
+                    getString(R.string.server_does_not_support_easy_onboarding_invites));
             return;
         }
         final Iq request = new Iq(Iq.Type.SET);
@@ -1795,57 +2064,72 @@ public class XmppConnectionService extends Service {
         final Element command = request.addChild("command", Namespace.COMMANDS);
         command.setAttribute("node", Namespace.EASY_ONBOARDING_INVITE);
         command.setAttribute("action", "execute");
-        sendIqPacket(account, request, (response) -> {
-            if (response.getType() == Iq.Type.RESULT) {
-                final Element resultCommand = response.findChild("command", Namespace.COMMANDS);
-                final Element x = resultCommand == null ? null : resultCommand.findChild("x", Namespace.DATA);
-                if (x != null) {
-                    final Data data = Data.parse(x);
-                    final String uri = data.getValue("uri");
-                    final String landingUrl = data.getValue("landing-url");
-                    if (uri != null) {
-                        final EasyOnboardingInvite invite = new EasyOnboardingInvite(jid.getDomain().toEscapedString(), uri, landingUrl);
-                        callback.inviteRequested(invite);
-                        return;
+        sendIqPacket(
+                account,
+                request,
+                (response) -> {
+                    if (response.getType() == Iq.Type.RESULT) {
+                        final Element resultCommand =
+                                response.findChild("command", Namespace.COMMANDS);
+                        final Element x =
+                                resultCommand == null
+                                        ? null
+                                        : resultCommand.findChild("x", Namespace.DATA);
+                        if (x != null) {
+                            final Data data = Data.parse(x);
+                            final String uri = data.getValue("uri");
+                            final String landingUrl = data.getValue("landing-url");
+                            if (uri != null) {
+                                final EasyOnboardingInvite invite =
+                                        new EasyOnboardingInvite(
+                                                jid.getDomain().toEscapedString(), uri, landingUrl);
+                                callback.inviteRequested(invite);
+                                return;
+                            }
+                        }
+                        callback.inviteRequestFailed(getString(R.string.unable_to_parse_invite));
+                        Log.d(Config.LOGTAG, response.toString());
+                    } else if (response.getType() == Iq.Type.ERROR) {
+                        callback.inviteRequestFailed(IqParser.errorMessage(response));
+                    } else {
+                        callback.inviteRequestFailed(getString(R.string.remote_server_timeout));
                     }
-                }
-                callback.inviteRequestFailed(getString(R.string.unable_to_parse_invite));
-                Log.d(Config.LOGTAG, response.toString());
-            } else if (response.getType() == Iq.Type.ERROR) {
-                callback.inviteRequestFailed(IqParser.errorMessage(response));
-            } else {
-                callback.inviteRequestFailed(getString(R.string.remote_server_timeout));
-            }
-        });
-
+                });
     }
 
     public void fetchBookmarks(final Account account) {
         final Iq iqPacket = new Iq(Iq.Type.GET);
         final Element query = iqPacket.query("jabber:iq:private");
         query.addChild("storage", Namespace.BOOKMARKS);
-        final Consumer<Iq> callback = (response) -> {
-            if (response.getType() == Iq.Type.RESULT) {
-                final Element query1 = response.query();
-                final Element storage = query1.findChild("storage", "storage:bookmarks");
-                Map<Jid, Bookmark> bookmarks = Bookmark.parseFromStorage(storage, account);
-                processBookmarksInitial(account, bookmarks, false);
-            } else {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": could not fetch bookmarks");
-            }
-        };
+        final Consumer<Iq> callback =
+                (response) -> {
+                    if (response.getType() == Iq.Type.RESULT) {
+                        final Element query1 = response.query();
+                        final Element storage = query1.findChild("storage", "storage:bookmarks");
+                        Map<Jid, Bookmark> bookmarks = Bookmark.parseFromStorage(storage, account);
+                        processBookmarksInitial(account, bookmarks, false);
+                    } else {
+                        Log.d(
+                                Config.LOGTAG,
+                                account.getJid().asBareJid() + ": could not fetch bookmarks");
+                    }
+                };
         sendIqPacket(account, iqPacket, callback);
     }
 
     public void fetchBookmarks2(final Account account) {
         final Iq retrieve = mIqGenerator.retrieveBookmarks();
-        sendIqPacket(account, retrieve, (response) -> {
-            if (response.getType() == Iq.Type.RESULT) {
-                final Element pubsub = response.findChild("pubsub", Namespace.PUBSUB);
-                final Map<Jid, Bookmark> bookmarks = Bookmark.parseFromPubSub(pubsub, account);
-                processBookmarksInitial(account, bookmarks, true);
-            }
-        });
+        sendIqPacket(
+                account,
+                retrieve,
+                (response) -> {
+                    if (response.getType() == Iq.Type.RESULT) {
+                        final Element pubsub = response.findChild("pubsub", Namespace.PUBSUB);
+                        final Map<Jid, Bookmark> bookmarks =
+                                Bookmark.parseFromPubSub(pubsub, account);
+                        processBookmarksInitial(account, bookmarks, true);
+                    }
+                });
     }
 
     public void fetchMessageDisplayedSynchronization(final Account account) {
@@ -1921,7 +2205,8 @@ public class XmppConnectionService extends Service {
         return true;
     }
 
-    public void processBookmarksInitial(final Account account, final Map<Jid, Bookmark> bookmarks, final boolean pep) {
+    public void processBookmarksInitial(
+            final Account account, final Map<Jid, Bookmark> bookmarks, final boolean pep) {
         final Set<Jid> previousBookmarks = account.getBookmarkedJids();
         for (final Bookmark bookmark : bookmarks.values()) {
             previousBookmarks.remove(bookmark.getJid().asBareJid());
@@ -1965,7 +2250,12 @@ public class XmppConnectionService extends Service {
             }
             bookmark.setConversation(conversation);
             if (pep && !bookmark.autojoin()) {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": archiving conference (" + conversation.getJid() + ") after receiving pep");
+                Log.d(
+                        Config.LOGTAG,
+                        account.getJid().asBareJid()
+                                + ": archiving conference ("
+                                + conversation.getJid()
+                                + ") after receiving pep");
                 archiveConversation(conversation, false);
             } else {
                 final MucOptions mucOptions = conversation.getMucOptions();
@@ -1973,7 +2263,13 @@ public class XmppConnectionService extends Service {
                     final String current = mucOptions.getActualNick();
                     final String proposed = mucOptions.getProposedNickPure();
                     if (current != null && !current.equals(proposed)) {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": proposed nick changed after bookmark push " + current + "->" + proposed);
+                        Log.d(
+                                Config.LOGTAG,
+                                account.getJid().asBareJid()
+                                        + ": proposed nick changed after bookmark push "
+                                        + current
+                                        + "->"
+                                        + proposed);
                         joinMuc(conversation);
                     }
                 } else {
@@ -1981,7 +2277,8 @@ public class XmppConnectionService extends Service {
                 }
             }
         } else if (bookmark.autojoin()) {
-            conversation = findOrCreateConversation(account, bookmark.getFullJid(), true, true, false);
+            conversation =
+                    findOrCreateConversation(account, bookmark.getFullJid(), true, true, false);
             bookmark.setConversation(conversation);
         }
     }
@@ -1994,11 +2291,20 @@ public class XmppConnectionService extends Service {
         account.putBookmark(bookmark);
         final XmppConnection connection = account.getXmppConnection();
         if (connection == null) {
-            Log.d(Config.LOGTAG, account.getJid().asBareJid()+": no connection. ignoring bookmark creation");
+            Log.d(
+                    Config.LOGTAG,
+                    account.getJid().asBareJid() + ": no connection. ignoring bookmark creation");
         } else if (connection.getFeatures().bookmarks2()) {
-            Log.d(Config.LOGTAG,account.getJid().asBareJid() + ": pushing bookmark via Bookmarks 2");
+            Log.d(
+                    Config.LOGTAG,
+                    account.getJid().asBareJid() + ": pushing bookmark via Bookmarks 2");
             final Element item = mIqGenerator.publishBookmarkItem(bookmark);
-            pushNodeAndEnforcePublishOptions(account, Namespace.BOOKMARKS2, item, bookmark.getJid().asBareJid().toEscapedString(), PublishOptions.persistentWhitelistAccessMaxItems());
+            pushNodeAndEnforcePublishOptions(
+                    account,
+                    Namespace.BOOKMARKS2,
+                    item,
+                    bookmark.getJid().asBareJid().toEscapedString(),
+                    PublishOptions.persistentWhitelistAccessMaxItems());
         } else if (connection.getFeatures().bookmarksConversion()) {
             pushBookmarksPep(account);
         } else {
@@ -2010,13 +2316,24 @@ public class XmppConnectionService extends Service {
         account.removeBookmark(bookmark);
         final XmppConnection connection = account.getXmppConnection();
         if (connection.getFeatures().bookmarks2()) {
-            final Iq request = mIqGenerator.deleteItem(Namespace.BOOKMARKS2, bookmark.getJid().asBareJid().toEscapedString());
-            Log.d(Config.LOGTAG,account.getJid().asBareJid() + ": removing bookmark via Bookmarks 2");
-            sendIqPacket(account, request, (response) -> {
-                if (response.getType() == Iq.Type.ERROR) {
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": unable to delete bookmark " + response.getErrorCondition());
-                }
-            });
+            final Iq request =
+                    mIqGenerator.deleteItem(
+                            Namespace.BOOKMARKS2, bookmark.getJid().asBareJid().toEscapedString());
+            Log.d(
+                    Config.LOGTAG,
+                    account.getJid().asBareJid() + ": removing bookmark via Bookmarks 2");
+            sendIqPacket(
+                    account,
+                    request,
+                    (response) -> {
+                        if (response.getType() == Iq.Type.ERROR) {
+                            Log.d(
+                                    Config.LOGTAG,
+                                    account.getJid().asBareJid()
+                                            + ": unable to delete bookmark "
+                                            + response.getErrorCondition());
+                        }
+                    });
         } else if (connection.getFeatures().bookmarksConversion()) {
             pushBookmarksPep(account);
         } else {
@@ -2041,37 +2358,72 @@ public class XmppConnectionService extends Service {
         for (final Bookmark bookmark : account.getBookmarks()) {
             storage.addChild(bookmark);
         }
-        pushNodeAndEnforcePublishOptions(account, Namespace.BOOKMARKS, storage, "current", PublishOptions.persistentWhitelistAccess());
-
-    }
-
-    private void pushNodeAndEnforcePublishOptions(final Account account, final String node, final Element element, final String id, final Bundle options) {
+        pushNodeAndEnforcePublishOptions(
+                account,
+                Namespace.BOOKMARKS,
+                storage,
+                "current",
+                PublishOptions.persistentWhitelistAccess());
+    }
+
+    private void pushNodeAndEnforcePublishOptions(
+            final Account account,
+            final String node,
+            final Element element,
+            final String id,
+            final Bundle options) {
         pushNodeAndEnforcePublishOptions(account, node, element, id, options, true);
-
     }
 
-    private void pushNodeAndEnforcePublishOptions(final Account account, final String node, final Element element, final String id, final Bundle options, final boolean retry) {
+    private void pushNodeAndEnforcePublishOptions(
+            final Account account,
+            final String node,
+            final Element element,
+            final String id,
+            final Bundle options,
+            final boolean retry) {
         final Iq packet = mIqGenerator.publishElement(node, element, id, options);
-        sendIqPacket(account, packet, (response) -> {
-            if (response.getType() == Iq.Type.RESULT) {
-                return;
-            }
-            if (retry && PublishOptions.preconditionNotMet(response)) {
-                pushNodeConfiguration(account, node, options, new OnConfigurationPushed() {
-                    @Override
-                    public void onPushSucceeded() {
-                        pushNodeAndEnforcePublishOptions(account, node, element, id, options, false);
+        sendIqPacket(
+                account,
+                packet,
+                (response) -> {
+                    if (response.getType() == Iq.Type.RESULT) {
+                        return;
                     }
+                    if (retry && PublishOptions.preconditionNotMet(response)) {
+                        pushNodeConfiguration(
+                                account,
+                                node,
+                                options,
+                                new OnConfigurationPushed() {
+                                    @Override
+                                    public void onPushSucceeded() {
+                                        pushNodeAndEnforcePublishOptions(
+                                                account, node, element, id, options, false);
+                                    }
 
-                    @Override
-                    public void onPushFailed() {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": unable to push node configuration (" + node + ")");
+                                    @Override
+                                    public void onPushFailed() {
+                                        Log.d(
+                                                Config.LOGTAG,
+                                                account.getJid().asBareJid()
+                                                        + ": unable to push node configuration ("
+                                                        + node
+                                                        + ")");
+                                    }
+                                });
+                    } else {
+                        Log.d(
+                                Config.LOGTAG,
+                                account.getJid().asBareJid()
+                                        + ": error publishing "
+                                        + node
+                                        + " (retry="
+                                        + retry
+                                        + ") "
+                                        + response);
                     }
                 });
-            } else {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": error publishing "+node+" (retry=" + retry + ") " + response);
-            }
-        });
     }
 
     private void restoreFromDatabase() {
@@ -2082,97 +2434,127 @@ public class XmppConnectionService extends Service {
             }
             Log.d(Config.LOGTAG, "restoring conversations...");
             final long startTimeConversationsRestore = SystemClock.elapsedRealtime();
-            this.conversations.addAll(databaseBackend.getConversations(Conversation.STATUS_AVAILABLE));
-            for (Iterator<Conversation> iterator = conversations.listIterator(); iterator.hasNext(); ) {
+            this.conversations.addAll(
+                    databaseBackend.getConversations(Conversation.STATUS_AVAILABLE));
+            for (Iterator<Conversation> iterator = conversations.listIterator();
+                    iterator.hasNext(); ) {
                 Conversation conversation = iterator.next();
                 Account account = accountLookupTable.get(conversation.getAccountUuid());
                 if (account != null) {
                     conversation.setAccount(account);
                 } else {
-                    Log.e(Config.LOGTAG, "unable to restore Conversations with " + conversation.getJid());
+                    Log.e(
+                            Config.LOGTAG,
+                            "unable to restore Conversations with " + conversation.getJid());
                     iterator.remove();
                 }
             }
-            long diffConversationsRestore = SystemClock.elapsedRealtime() - startTimeConversationsRestore;
-            Log.d(Config.LOGTAG, "finished restoring conversations in " + diffConversationsRestore + "ms");
-            Runnable runnable = () -> {
-                if (DatabaseBackend.requiresMessageIndexRebuild()) {
-                    DatabaseBackend.getInstance(this).rebuildMessagesIndex();
-                }
-                final long deletionDate = getAutomaticMessageDeletionDate();
-                mLastExpiryRun.set(SystemClock.elapsedRealtime());
-                if (deletionDate > 0) {
-                    Log.d(Config.LOGTAG, "deleting messages that are older than " + AbstractGenerator.getTimestamp(deletionDate));
-                    databaseBackend.expireOldMessages(deletionDate);
-                }
-                Log.d(Config.LOGTAG, "restoring roster...");
-                for (final Account account : accounts) {
-                    databaseBackend.readRoster(account.getRoster());
-                    account.initAccountServices(XmppConnectionService.this); //roster needs to be loaded at this stage
-                }
-                getBitmapCache().evictAll();
-                loadPhoneContacts();
-                Log.d(Config.LOGTAG, "restoring messages...");
-                final long startMessageRestore = SystemClock.elapsedRealtime();
-                final Conversation quickLoad = QuickLoader.get(this.conversations);
-                if (quickLoad != null) {
-                    restoreMessages(quickLoad);
-                    updateConversationUi();
-                    final long diffMessageRestore = SystemClock.elapsedRealtime() - startMessageRestore;
-                    Log.d(Config.LOGTAG, "quickly restored " + quickLoad.getName() + " after " + diffMessageRestore + "ms");
-                }
-                for (Conversation conversation : this.conversations) {
-                    if (quickLoad != conversation) {
-                        restoreMessages(conversation);
-                    }
-                }
-                mNotificationService.finishBacklog();
-                restoredFromDatabaseLatch.countDown();
-                final long diffMessageRestore = SystemClock.elapsedRealtime() - startMessageRestore;
-                Log.d(Config.LOGTAG, "finished restoring messages in " + diffMessageRestore + "ms");
-                updateConversationUi();
-            };
-            mDatabaseReaderExecutor.execute(runnable); //will contain one write command (expiry) but that's fine
+            long diffConversationsRestore =
+                    SystemClock.elapsedRealtime() - startTimeConversationsRestore;
+            Log.d(
+                    Config.LOGTAG,
+                    "finished restoring conversations in " + diffConversationsRestore + "ms");
+            Runnable runnable =
+                    () -> {
+                        if (DatabaseBackend.requiresMessageIndexRebuild()) {
+                            DatabaseBackend.getInstance(this).rebuildMessagesIndex();
+                        }
+                        final long deletionDate = getAutomaticMessageDeletionDate();
+                        mLastExpiryRun.set(SystemClock.elapsedRealtime());
+                        if (deletionDate > 0) {
+                            Log.d(
+                                    Config.LOGTAG,
+                                    "deleting messages that are older than "
+                                            + AbstractGenerator.getTimestamp(deletionDate));
+                            databaseBackend.expireOldMessages(deletionDate);
+                        }
+                        Log.d(Config.LOGTAG, "restoring roster...");
+                        for (final Account account : accounts) {
+                            databaseBackend.readRoster(account.getRoster());
+                            account.initAccountServices(
+                                    XmppConnectionService
+                                            .this); // roster needs to be loaded at this stage
+                        }
+                        getBitmapCache().evictAll();
+                        loadPhoneContacts();
+                        Log.d(Config.LOGTAG, "restoring messages...");
+                        final long startMessageRestore = SystemClock.elapsedRealtime();
+                        final Conversation quickLoad = QuickLoader.get(this.conversations);
+                        if (quickLoad != null) {
+                            restoreMessages(quickLoad);
+                            updateConversationUi();
+                            final long diffMessageRestore =
+                                    SystemClock.elapsedRealtime() - startMessageRestore;
+                            Log.d(
+                                    Config.LOGTAG,
+                                    "quickly restored "
+                                            + quickLoad.getName()
+                                            + " after "
+                                            + diffMessageRestore
+                                            + "ms");
+                        }
+                        for (Conversation conversation : this.conversations) {
+                            if (quickLoad != conversation) {
+                                restoreMessages(conversation);
+                            }
+                        }
+                        mNotificationService.finishBacklog();
+                        restoredFromDatabaseLatch.countDown();
+                        final long diffMessageRestore =
+                                SystemClock.elapsedRealtime() - startMessageRestore;
+                        Log.d(
+                                Config.LOGTAG,
+                                "finished restoring messages in " + diffMessageRestore + "ms");
+                        updateConversationUi();
+                    };
+            mDatabaseReaderExecutor.execute(
+                    runnable); // will contain one write command (expiry) but that's fine
         }
     }
 
     private void restoreMessages(Conversation conversation) {
         conversation.addAll(0, databaseBackend.getMessages(conversation, Config.PAGE_SIZE));
-        conversation.findUnsentTextMessages(message -> markMessage(message, Message.STATUS_WAITING));
+        conversation.findUnsentTextMessages(
+                message -> markMessage(message, Message.STATUS_WAITING));
         conversation.findUnreadMessagesAndCalls(mNotificationService::pushFromBacklog);
     }
 
     public void loadPhoneContacts() {
-        mContactMergerExecutor.execute(() -> {
-            final Map<Jid, JabberIdContact> contacts = JabberIdContact.load(this);
-            Log.d(Config.LOGTAG, "start merging phone contacts with roster");
-            for (final Account account : accounts) {
-                final List<Contact> withSystemAccounts = account.getRoster().getWithSystemAccounts(JabberIdContact.class);
-                for (final JabberIdContact jidContact : contacts.values()) {
-                    final Contact contact = account.getRoster().getContact(jidContact.getJid());
-                    boolean needsCacheClean = contact.setPhoneContact(jidContact);
-                    if (needsCacheClean) {
-                        getAvatarService().clear(contact);
-                    }
-                    withSystemAccounts.remove(contact);
-                }
-                for (final Contact contact : withSystemAccounts) {
-                    boolean needsCacheClean = contact.unsetPhoneContact(JabberIdContact.class);
-                    if (needsCacheClean) {
-                        getAvatarService().clear(contact);
+        mContactMergerExecutor.execute(
+                () -> {
+                    final Map<Jid, JabberIdContact> contacts = JabberIdContact.load(this);
+                    Log.d(Config.LOGTAG, "start merging phone contacts with roster");
+                    for (final Account account : accounts) {
+                        final List<Contact> withSystemAccounts =
+                                account.getRoster().getWithSystemAccounts(JabberIdContact.class);
+                        for (final JabberIdContact jidContact : contacts.values()) {
+                            final Contact contact =
+                                    account.getRoster().getContact(jidContact.getJid());
+                            boolean needsCacheClean = contact.setPhoneContact(jidContact);
+                            if (needsCacheClean) {
+                                getAvatarService().clear(contact);
+                            }
+                            withSystemAccounts.remove(contact);
+                        }
+                        for (final Contact contact : withSystemAccounts) {
+                            boolean needsCacheClean =
+                                    contact.unsetPhoneContact(JabberIdContact.class);
+                            if (needsCacheClean) {
+                                getAvatarService().clear(contact);
+                            }
+                        }
                     }
-                }
-            }
-            Log.d(Config.LOGTAG, "finished merging phone contacts");
-            mShortcutService.refresh(mInitialAddressbookSyncCompleted.compareAndSet(false, true));
-            updateRosterUi();
-            mQuickConversationsService.considerSync();
-        });
+                    Log.d(Config.LOGTAG, "finished merging phone contacts");
+                    mShortcutService.refresh(
+                            mInitialAddressbookSyncCompleted.compareAndSet(false, true));
+                    updateRosterUi();
+                    mQuickConversationsService.considerSync();
+                });
     }
 
-
     public void syncRoster(final Account account) {
-        mRosterSyncTaskManager.execute(account, () -> databaseBackend.writeRoster(account.getRoster()));
+        mRosterSyncTaskManager.execute(
+                account, () -> databaseBackend.writeRoster(account.getRoster()));
     }
 
     public List<Conversation> getConversations() {
@@ -2188,7 +2570,14 @@ public class XmppConnectionService extends Service {
         }
         final boolean isInternalFile = fileBackend.isInternalFile(file);
         final List<String> uuids = databaseBackend.markFileAsDeleted(file, isInternalFile);
-        Log.d(Config.LOGTAG, "deleted file " + file.getAbsolutePath() + " internal=" + isInternalFile + ", database hits=" + uuids.size());
+        Log.d(
+                Config.LOGTAG,
+                "deleted file "
+                        + file.getAbsolutePath()
+                        + " internal="
+                        + isInternalFile
+                        + ", database hits="
+                        + uuids.size());
         markUuidsAsDeletedFiles(uuids);
     }
 
@@ -2219,11 +2608,13 @@ public class XmppConnectionService extends Service {
         populateWithOrderedConversations(list, true, true);
     }
 
-    public void populateWithOrderedConversations(final List<Conversation> list, final boolean includeNoFileUpload) {
+    public void populateWithOrderedConversations(
+            final List<Conversation> list, final boolean includeNoFileUpload) {
         populateWithOrderedConversations(list, includeNoFileUpload, true);
     }
 
-    public void populateWithOrderedConversations(final List<Conversation> list, final boolean includeNoFileUpload, final boolean sort) {
+    public void populateWithOrderedConversations(
+            final List<Conversation> list, final boolean includeNoFileUpload, final boolean sort) {
         final List<String> orderedUuids;
         if (sort) {
             orderedUuids = null;
@@ -2239,63 +2630,85 @@ public class XmppConnectionService extends Service {
         } else {
             for (Conversation conversation : getConversations()) {
                 if (conversation.getMode() == Conversation.MODE_SINGLE
-                        || (conversation.getAccount().httpUploadAvailable() && conversation.getMucOptions().participating())) {
+                        || (conversation.getAccount().httpUploadAvailable()
+                                && conversation.getMucOptions().participating())) {
                     list.add(conversation);
                 }
             }
         }
         try {
             if (orderedUuids != null) {
-                Collections.sort(list, (a, b) -> {
-                    final int indexA = orderedUuids.indexOf(a.getUuid());
-                    final int indexB = orderedUuids.indexOf(b.getUuid());
-                    if (indexA == -1 || indexB == -1 || indexA == indexB) {
-                        return a.compareTo(b);
-                    }
-                    return indexA - indexB;
-                });
+                Collections.sort(
+                        list,
+                        (a, b) -> {
+                            final int indexA = orderedUuids.indexOf(a.getUuid());
+                            final int indexB = orderedUuids.indexOf(b.getUuid());
+                            if (indexA == -1 || indexB == -1 || indexA == indexB) {
+                                return a.compareTo(b);
+                            }
+                            return indexA - indexB;
+                        });
             } else {
                 Collections.sort(list);
             }
         } catch (IllegalArgumentException e) {
-            //ignore
+            // ignore
         }
     }
 
-    public void loadMoreMessages(final Conversation conversation, final long timestamp, final OnMoreMessagesLoaded callback) {
-        if (XmppConnectionService.this.getMessageArchiveService().queryInProgress(conversation, callback)) {
+    public void loadMoreMessages(
+            final Conversation conversation,
+            final long timestamp,
+            final OnMoreMessagesLoaded callback) {
+        if (XmppConnectionService.this
+                .getMessageArchiveService()
+                .queryInProgress(conversation, callback)) {
             return;
         } else if (timestamp == 0) {
             return;
         }
-        Log.d(Config.LOGTAG, "load more messages for " + conversation.getName() + " prior to " + MessageGenerator.getTimestamp(timestamp));
-        final Runnable runnable = () -> {
-            final Account account = conversation.getAccount();
-            List<Message> messages = databaseBackend.getMessages(conversation, 50, timestamp);
-            if (messages.size() > 0) {
-                conversation.addAll(0, messages);
-                callback.onMoreMessagesLoaded(messages.size(), conversation);
-            } else if (conversation.hasMessagesLeftOnServer()
-                    && account.isOnlineAndConnected()
-                    && conversation.getLastClearHistory().getTimestamp() == 0) {
-                final boolean mamAvailable;
-                if (conversation.getMode() == Conversation.MODE_SINGLE) {
-                    mamAvailable = account.getXmppConnection().getFeatures().mam() && !conversation.getContact().isBlocked();
-                } else {
-                    mamAvailable = conversation.getMucOptions().mamSupport();
-                }
-                if (mamAvailable) {
-                    MessageArchiveService.Query query = getMessageArchiveService().query(conversation, new MamReference(0), timestamp, false);
-                    if (query != null) {
-                        query.setCallback(callback);
-                        callback.informUser(R.string.fetching_history_from_server);
-                    } else {
-                        callback.informUser(R.string.not_fetching_history_retention_period);
+        Log.d(
+                Config.LOGTAG,
+                "load more messages for "
+                        + conversation.getName()
+                        + " prior to "
+                        + MessageGenerator.getTimestamp(timestamp));
+        final Runnable runnable =
+                () -> {
+                    final Account account = conversation.getAccount();
+                    List<Message> messages =
+                            databaseBackend.getMessages(conversation, 50, timestamp);
+                    if (messages.size() > 0) {
+                        conversation.addAll(0, messages);
+                        callback.onMoreMessagesLoaded(messages.size(), conversation);
+                    } else if (conversation.hasMessagesLeftOnServer()
+                            && account.isOnlineAndConnected()
+                            && conversation.getLastClearHistory().getTimestamp() == 0) {
+                        final boolean mamAvailable;
+                        if (conversation.getMode() == Conversation.MODE_SINGLE) {
+                            mamAvailable =
+                                    account.getXmppConnection().getFeatures().mam()
+                                            && !conversation.getContact().isBlocked();
+                        } else {
+                            mamAvailable = conversation.getMucOptions().mamSupport();
+                        }
+                        if (mamAvailable) {
+                            MessageArchiveService.Query query =
+                                    getMessageArchiveService()
+                                            .query(
+                                                    conversation,
+                                                    new MamReference(0),
+                                                    timestamp,
+                                                    false);
+                            if (query != null) {
+                                query.setCallback(callback);
+                                callback.informUser(R.string.fetching_history_from_server);
+                            } else {
+                                callback.informUser(R.string.not_fetching_history_retention_period);
+                            }
+                        }
                     }
-
-                }
-            }
-        };
+                };
         mDatabaseReaderExecutor.execute(runnable);
     }
 
@@ -2303,9 +2716,9 @@ public class XmppConnectionService extends Service {
         return this.accounts;
     }
 
-
     /**
-     * This will find all conferences with the contact as member and also the conference that is the contact (that 'fake' contact is used to store the avatar)
+     * This will find all conferences with the contact as member and also the conference that is the
+     * contact (that 'fake' contact is used to store the avatar)
      */
     public List<Conversation> findAllConferencesWith(Contact contact) {
         final ArrayList<Conversation> results = new ArrayList<>();
@@ -2314,7 +2727,8 @@ public class XmppConnectionService extends Service {
                 continue;
             }
             final MucOptions mucOptions = c.getMucOptions();
-            if (c.getJid().asBareJid().equals(contact.getJid().asBareJid()) || (mucOptions != null && mucOptions.isContactInRoom(contact))) {
+            if (c.getJid().asBareJid().equals(contact.getJid().asBareJid())
+                    || (mucOptions != null && mucOptions.isContactInRoom(contact))) {
                 results.add(c);
             }
         }
@@ -2330,7 +2744,8 @@ public class XmppConnectionService extends Service {
         return null;
     }
 
-    public Conversation find(final Iterable<Conversation> haystack, final Account account, final Jid jid) {
+    public Conversation find(
+            final Iterable<Conversation> haystack, final Account account, final Jid jid) {
         if (jid == null) {
             return null;
         }
@@ -2361,15 +2776,27 @@ public class XmppConnectionService extends Service {
         return false;
     }
 
-    public Conversation findOrCreateConversation(Account account, Jid jid, boolean muc, final boolean async) {
+    public Conversation findOrCreateConversation(
+            Account account, Jid jid, boolean muc, final boolean async) {
         return this.findOrCreateConversation(account, jid, muc, false, async);
     }
 
-    public Conversation findOrCreateConversation(final Account account, final Jid jid, final boolean muc, final boolean joinAfterCreate, final boolean async) {
+    public Conversation findOrCreateConversation(
+            final Account account,
+            final Jid jid,
+            final boolean muc,
+            final boolean joinAfterCreate,
+            final boolean async) {
         return this.findOrCreateConversation(account, jid, muc, joinAfterCreate, null, async);
     }
 
-    public Conversation findOrCreateConversation(final Account account, final Jid jid, final boolean muc, final boolean joinAfterCreate, final MessageArchiveService.Query query, final boolean async) {
+    public Conversation findOrCreateConversation(
+            final Account account,
+            final Jid jid,
+            final boolean muc,
+            final boolean joinAfterCreate,
+            final MessageArchiveService.Query query,
+            final boolean async) {
         synchronized (this.conversations) {
             Conversation conversation = find(account, jid);
             if (conversation != null) {
@@ -2398,38 +2825,45 @@ public class XmppConnectionService extends Service {
                     conversationName = jid.getLocal();
                 }
                 if (muc) {
-                    conversation = new Conversation(conversationName, account, jid,
-                            Conversation.MODE_MULTI);
+                    conversation =
+                            new Conversation(
+                                    conversationName, account, jid, Conversation.MODE_MULTI);
                 } else {
-                    conversation = new Conversation(conversationName, account, jid.asBareJid(),
-                            Conversation.MODE_SINGLE);
+                    conversation =
+                            new Conversation(
+                                    conversationName,
+                                    account,
+                                    jid.asBareJid(),
+                                    Conversation.MODE_SINGLE);
                 }
                 this.databaseBackend.createConversation(conversation);
                 loadMessagesFromDb = false;
             }
             final Conversation c = conversation;
-            final Runnable runnable = () -> {
-                if (loadMessagesFromDb) {
-                    c.addAll(0, databaseBackend.getMessages(c, Config.PAGE_SIZE));
-                    updateConversationUi();
-                    c.messagesLoaded.set(true);
-                }
-                if (account.getXmppConnection() != null
-                        && !c.getContact().isBlocked()
-                        && account.getXmppConnection().getFeatures().mam()
-                        && !muc) {
-                    if (query == null) {
-                        mMessageArchiveService.query(c);
-                    } else {
-                        if (query.getConversation() == null) {
-                            mMessageArchiveService.query(c, query.getStart(), query.isCatchup());
+            final Runnable runnable =
+                    () -> {
+                        if (loadMessagesFromDb) {
+                            c.addAll(0, databaseBackend.getMessages(c, Config.PAGE_SIZE));
+                            updateConversationUi();
+                            c.messagesLoaded.set(true);
                         }
-                    }
-                }
-                if (joinAfterCreate) {
-                    joinMuc(c);
-                }
-            };
+                        if (account.getXmppConnection() != null
+                                && !c.getContact().isBlocked()
+                                && account.getXmppConnection().getFeatures().mam()
+                                && !muc) {
+                            if (query == null) {
+                                mMessageArchiveService.query(c);
+                            } else {
+                                if (query.getConversation() == null) {
+                                    mMessageArchiveService.query(
+                                            c, query.getStart(), query.isCatchup());
+                                }
+                            }
+                        }
+                        if (joinAfterCreate) {
+                            joinMuc(c);
+                        }
+                    };
             if (async) {
                 mDatabaseReaderExecutor.execute(runnable);
             } else {
@@ -2445,7 +2879,8 @@ public class XmppConnectionService extends Service {
         archiveConversation(conversation, true);
     }
 
-    private void archiveConversation(Conversation conversation, final boolean maySynchronizeWithBookmarks) {
+    private void archiveConversation(
+            Conversation conversation, final boolean maySynchronizeWithBookmarks) {
         getNotificationService().clear(conversation);
         conversation.setStatus(Conversation.STATUS_ARCHIVED);
         conversation.setNextMessage(null);
@@ -2467,7 +2902,9 @@ public class XmppConnectionService extends Service {
                 }
                 leaveMuc(conversation);
             } else {
-                if (conversation.getContact().getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
+                if (conversation
+                        .getContact()
+                        .getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
                     stopPresenceUpdatesTo(conversation.getContact());
                 }
             }
@@ -2498,15 +2935,23 @@ public class XmppConnectionService extends Service {
 
     private void syncEnabledAccountSetting() {
         final boolean hasEnabledAccounts = hasEnabledAccounts();
-        getPreferences().edit().putBoolean(SystemEventReceiver.SETTING_ENABLED_ACCOUNTS, hasEnabledAccounts).apply();
+        getPreferences()
+                .edit()
+                .putBoolean(SystemEventReceiver.SETTING_ENABLED_ACCOUNTS, hasEnabledAccounts)
+                .apply();
         toggleSetProfilePictureActivity(hasEnabledAccounts);
     }
 
     private void toggleSetProfilePictureActivity(final boolean enabled) {
         try {
-            final ComponentName name = new ComponentName(this, ChooseAccountForProfilePictureActivity.class);
-            final int targetState = enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
-            getPackageManager().setComponentEnabledSetting(name, targetState, PackageManager.DONT_KILL_APP);
+            final ComponentName name =
+                    new ComponentName(this, ChooseAccountForProfilePictureActivity.class);
+            final int targetState =
+                    enabled
+                            ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                            : PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
+            getPackageManager()
+                    .setComponentEnabledSetting(name, targetState, PackageManager.DONT_KILL_APP);
         } catch (IllegalStateException e) {
             Log.d(Config.LOGTAG, "unable to toggle profile picture activity");
         }
@@ -2516,7 +2961,8 @@ public class XmppConnectionService extends Service {
         return this.unifiedPushBroker.reconfigurePushDistributor();
     }
 
-    private Optional<UnifiedPushBroker.Transport> renewUnifiedPushEndpoints(final UnifiedPushBroker.PushTargetMessenger pushTargetMessenger) {
+    private Optional<UnifiedPushBroker.Transport> renewUnifiedPushEndpoints(
+            final UnifiedPushBroker.PushTargetMessenger pushTargetMessenger) {
         return this.unifiedPushBroker.renewUnifiedPushEndpoints(pushTargetMessenger);
     }
 
@@ -2537,48 +2983,55 @@ public class XmppConnectionService extends Service {
     }
 
     public void createAccountFromKey(final String alias, final OnAccountCreated callback) {
-        new Thread(() -> {
-            try {
-                final X509Certificate[] chain = KeyChain.getCertificateChain(this, alias);
-                final X509Certificate cert = chain != null && chain.length > 0 ? chain[0] : null;
-                if (cert == null) {
-                    callback.informUser(R.string.unable_to_parse_certificate);
-                    return;
-                }
-                Pair<Jid, String> info = CryptoHelper.extractJidAndName(cert);
-                if (info == null) {
-                    callback.informUser(R.string.certificate_does_not_contain_jid);
-                    return;
-                }
-                if (findAccountByJid(info.first) == null) {
-                    final Account account = new Account(info.first, "");
-                    account.setPrivateKeyAlias(alias);
-                    account.setOption(Account.OPTION_DISABLED, true);
-                    account.setOption(Account.OPTION_FIXED_USERNAME, true);
-                    account.setDisplayName(info.second);
-                    createAccount(account);
-                    callback.onAccountCreated(account);
-                    if (Config.X509_VERIFICATION) {
-                        try {
-                            getMemorizingTrustManager().getNonInteractive(account.getServer()).checkClientTrusted(chain, "RSA");
-                        } catch (CertificateException e) {
-                            callback.informUser(R.string.certificate_chain_is_not_trusted);
-                        }
-                    }
-                } else {
-                    callback.informUser(R.string.account_already_exists);
-                }
-            } catch (Exception e) {
-                callback.informUser(R.string.unable_to_parse_certificate);
-            }
-        }).start();
-
+        new Thread(
+                        () -> {
+                            try {
+                                final X509Certificate[] chain =
+                                        KeyChain.getCertificateChain(this, alias);
+                                final X509Certificate cert =
+                                        chain != null && chain.length > 0 ? chain[0] : null;
+                                if (cert == null) {
+                                    callback.informUser(R.string.unable_to_parse_certificate);
+                                    return;
+                                }
+                                Pair<Jid, String> info = CryptoHelper.extractJidAndName(cert);
+                                if (info == null) {
+                                    callback.informUser(R.string.certificate_does_not_contain_jid);
+                                    return;
+                                }
+                                if (findAccountByJid(info.first) == null) {
+                                    final Account account = new Account(info.first, "");
+                                    account.setPrivateKeyAlias(alias);
+                                    account.setOption(Account.OPTION_DISABLED, true);
+                                    account.setOption(Account.OPTION_FIXED_USERNAME, true);
+                                    account.setDisplayName(info.second);
+                                    createAccount(account);
+                                    callback.onAccountCreated(account);
+                                    if (Config.X509_VERIFICATION) {
+                                        try {
+                                            getMemorizingTrustManager()
+                                                    .getNonInteractive(account.getServer())
+                                                    .checkClientTrusted(chain, "RSA");
+                                        } catch (CertificateException e) {
+                                            callback.informUser(
+                                                    R.string.certificate_chain_is_not_trusted);
+                                        }
+                                    }
+                                } else {
+                                    callback.informUser(R.string.account_already_exists);
+                                }
+                            } catch (Exception e) {
+                                callback.informUser(R.string.unable_to_parse_certificate);
+                            }
+                        })
+                .start();
     }
 
     public void updateKeyInAccount(final Account account, final String alias) {
         Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": update key in account " + alias);
         try {
-            X509Certificate[] chain = KeyChain.getCertificateChain(XmppConnectionService.this, alias);
+            X509Certificate[] chain =
+                    KeyChain.getCertificateChain(XmppConnectionService.this, alias);
             Log.d(Config.LOGTAG, account.getJid().asBareJid() + " loaded certificate chain");
             Pair<Jid, String> info = CryptoHelper.extractJidAndName(chain[0]);
             if (info == null) {
@@ -2591,7 +3044,9 @@ public class XmppConnectionService extends Service {
                 databaseBackend.updateAccount(account);
                 if (Config.X509_VERIFICATION) {
                     try {
-                        getMemorizingTrustManager().getNonInteractive().checkClientTrusted(chain, "RSA");
+                        getMemorizingTrustManager()
+                                .getNonInteractive()
+                                .checkClientTrusted(chain, "RSA");
                     } catch (CertificateException e) {
                         showErrorToastInUi(R.string.certificate_chain_is_not_trusted);
                     }
@@ -2625,32 +3080,41 @@ public class XmppConnectionService extends Service {
         }
     }
 
-    public void updateAccountPasswordOnServer(final Account account, final String newPassword, final OnAccountPasswordChanged callback) {
+    public void updateAccountPasswordOnServer(
+            final Account account,
+            final String newPassword,
+            final OnAccountPasswordChanged callback) {
         final Iq iq = getIqGenerator().generateSetPassword(account, newPassword);
-        sendIqPacket(account, iq, (packet) -> {
-            if (packet.getType() == Iq.Type.RESULT) {
-                account.setPassword(newPassword);
-                account.setOption(Account.OPTION_MAGIC_CREATE, false);
-                databaseBackend.updateAccount(account);
-                callback.onPasswordChangeSucceeded();
-            } else {
-                callback.onPasswordChangeFailed();
-            }
-        });
+        sendIqPacket(
+                account,
+                iq,
+                (packet) -> {
+                    if (packet.getType() == Iq.Type.RESULT) {
+                        account.setPassword(newPassword);
+                        account.setOption(Account.OPTION_MAGIC_CREATE, false);
+                        databaseBackend.updateAccount(account);
+                        callback.onPasswordChangeSucceeded();
+                    } else {
+                        callback.onPasswordChangeFailed();
+                    }
+                });
     }
 
     public void unregisterAccount(final Account account, final Consumer<Boolean> callback) {
         final Iq iqPacket = new Iq(Iq.Type.SET);
-        final Element query = iqPacket.addChild("query",Namespace.REGISTER);
+        final Element query = iqPacket.addChild("query", Namespace.REGISTER);
         query.addChild("remove");
-        sendIqPacket(account, iqPacket, (response) -> {
-            if (response.getType() == Iq.Type.RESULT) {
-                deleteAccount(account);
-                callback.accept(true);
-            } else {
-                callback.accept(false);
-            }
-        });
+        sendIqPacket(
+                account,
+                iqPacket,
+                (response) -> {
+                    if (response.getType() == Iq.Type.RESULT) {
+                        deleteAccount(account);
+                        callback.accept(true);
+                    } else {
+                        callback.accept(false);
+                    }
+                });
     }
 
     public void deleteAccount(final Account account) {
@@ -2673,11 +3137,14 @@ public class XmppConnectionService extends Service {
             if (account.getXmppConnection() != null) {
                 new Thread(() -> disconnect(account, !connected)).start();
             }
-            final Runnable runnable = () -> {
-                if (!databaseBackend.deleteAccount(account)) {
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": unable to delete account");
-                }
-            };
+            final Runnable runnable =
+                    () -> {
+                        if (!databaseBackend.deleteAccount(account)) {
+                            Log.d(
+                                    Config.LOGTAG,
+                                    account.getJid().asBareJid() + ": unable to delete account");
+                        }
+                    };
             mDatabaseWriterExecutor.execute(runnable);
             this.accounts.remove(account);
             if (CallIntegration.hasSystemFeature(this)) {
@@ -2696,7 +3163,10 @@ public class XmppConnectionService extends Service {
         synchronized (LISTENER_LOCK) {
             remainingListeners = checkListeners();
             if (!this.mOnConversationUpdates.add(listener)) {
-                Log.w(Config.LOGTAG, listener.getClass().getName() + " is already registered as ConversationListChangedListener");
+                Log.w(
+                        Config.LOGTAG,
+                        listener.getClass().getName()
+                                + " is already registered as ConversationListChangedListener");
             }
             this.mNotificationService.setIsInForeground(this.mOnConversationUpdates.size() > 0);
         }
@@ -2722,7 +3192,10 @@ public class XmppConnectionService extends Service {
         synchronized (LISTENER_LOCK) {
             remainingListeners = checkListeners();
             if (!this.mOnShowErrorToasts.add(listener)) {
-                Log.w(Config.LOGTAG, listener.getClass().getName() + " is already registered as OnShowErrorToastListener");
+                Log.w(
+                        Config.LOGTAG,
+                        listener.getClass().getName()
+                                + " is already registered as OnShowErrorToastListener");
             }
         }
         if (remainingListeners) {
@@ -2746,7 +3219,10 @@ public class XmppConnectionService extends Service {
         synchronized (LISTENER_LOCK) {
             remainingListeners = checkListeners();
             if (!this.mOnAccountUpdates.add(listener)) {
-                Log.w(Config.LOGTAG, listener.getClass().getName() + " is already registered as OnAccountListChangedtListener");
+                Log.w(
+                        Config.LOGTAG,
+                        listener.getClass().getName()
+                                + " is already registered as OnAccountListChangedtListener");
             }
         }
         if (remainingListeners) {
@@ -2770,7 +3246,10 @@ public class XmppConnectionService extends Service {
         synchronized (LISTENER_LOCK) {
             remainingListeners = checkListeners();
             if (!this.mOnCaptchaRequested.add(listener)) {
-                Log.w(Config.LOGTAG, listener.getClass().getName() + " is already registered as OnCaptchaRequestListener");
+                Log.w(
+                        Config.LOGTAG,
+                        listener.getClass().getName()
+                                + " is already registered as OnCaptchaRequestListener");
             }
         }
         if (remainingListeners) {
@@ -2794,7 +3273,10 @@ public class XmppConnectionService extends Service {
         synchronized (LISTENER_LOCK) {
             remainingListeners = checkListeners();
             if (!this.mOnRosterUpdates.add(listener)) {
-                Log.w(Config.LOGTAG, listener.getClass().getName() + " is already registered as OnRosterUpdateListener");
+                Log.w(
+                        Config.LOGTAG,
+                        listener.getClass().getName()
+                                + " is already registered as OnRosterUpdateListener");
             }
         }
         if (remainingListeners) {
@@ -2818,7 +3300,10 @@ public class XmppConnectionService extends Service {
         synchronized (LISTENER_LOCK) {
             remainingListeners = checkListeners();
             if (!this.mOnUpdateBlocklist.add(listener)) {
-                Log.w(Config.LOGTAG, listener.getClass().getName() + " is already registered as OnUpdateBlocklistListener");
+                Log.w(
+                        Config.LOGTAG,
+                        listener.getClass().getName()
+                                + " is already registered as OnUpdateBlocklistListener");
             }
         }
         if (remainingListeners) {
@@ -2842,7 +3327,10 @@ public class XmppConnectionService extends Service {
         synchronized (LISTENER_LOCK) {
             remainingListeners = checkListeners();
             if (!this.mOnKeyStatusUpdated.add(listener)) {
-                Log.w(Config.LOGTAG, listener.getClass().getName() + " is already registered as OnKeyStatusUpdateListener");
+                Log.w(
+                        Config.LOGTAG,
+                        listener.getClass().getName()
+                                + " is already registered as OnKeyStatusUpdateListener");
             }
         }
         if (remainingListeners) {
@@ -2866,7 +3354,10 @@ public class XmppConnectionService extends Service {
         synchronized (LISTENER_LOCK) {
             remainingListeners = checkListeners();
             if (!this.onJingleRtpConnectionUpdate.add(listener)) {
-                Log.w(Config.LOGTAG, listener.getClass().getName() + " is already registered as OnJingleRtpConnectionUpdate");
+                Log.w(
+                        Config.LOGTAG,
+                        listener.getClass().getName()
+                                + " is already registered as OnJingleRtpConnectionUpdate");
             }
         }
         if (remainingListeners) {
@@ -2890,7 +3381,10 @@ public class XmppConnectionService extends Service {
         synchronized (LISTENER_LOCK) {
             remainingListeners = checkListeners();
             if (!this.mOnMucRosterUpdate.add(listener)) {
-                Log.w(Config.LOGTAG, listener.getClass().getName() + " is already registered as OnMucRosterListener");
+                Log.w(
+                        Config.LOGTAG,
+                        listener.getClass().getName()
+                                + " is already registered as OnMucRosterListener");
             }
         }
         if (remainingListeners) {
@@ -2940,7 +3434,10 @@ public class XmppConnectionService extends Service {
                         connection.sendActive();
                     }
                     if (broadcastLastActivity) {
-                        sendPresence(account, false); //send new presence but don't include idle because we are not
+                        sendPresence(
+                                account,
+                                false); // send new presence but don't include idle because we are
+                        // not
                     }
                 }
             }
@@ -2976,7 +3473,8 @@ public class XmppConnectionService extends Service {
     public void connectMultiModeConversations(Account account) {
         List<Conversation> conversations = getConversations();
         for (Conversation conversation : conversations) {
-            if (conversation.getMode() == Conversation.MODE_MULTI && conversation.getAccount() == account) {
+            if (conversation.getMode() == Conversation.MODE_MULTI
+                    && conversation.getAccount() == account) {
                 joinMuc(conversation);
             }
         }
@@ -2986,13 +3484,19 @@ public class XmppConnectionService extends Service {
         final Account account = conversation.getAccount();
         synchronized (account.inProgressConferenceJoins) {
             if (account.inProgressConferenceJoins.contains(conversation)) {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": canceling muc self ping because join is already under way");
+                Log.d(
+                        Config.LOGTAG,
+                        account.getJid().asBareJid()
+                                + ": canceling muc self ping because join is already under way");
                 return;
             }
         }
         synchronized (account.inProgressConferencePings) {
             if (!account.inProgressConferencePings.add(conversation)) {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": canceling muc self ping because ping is already under way");
+                Log.d(
+                        Config.LOGTAG,
+                        account.getJid().asBareJid()
+                                + ": canceling muc self ping because ping is already under way");
                 return;
             }
         }
@@ -3000,23 +3504,45 @@ public class XmppConnectionService extends Service {
         final Iq ping = new Iq(Iq.Type.GET);
         ping.setTo(self);
         ping.addChild("ping", Namespace.PING);
-        sendIqPacket(conversation.getAccount(), ping, (response) -> {
-            if (response.getType() == Iq.Type.ERROR) {
-                final var error = response.getError();
-                if (error == null || error.hasChild("service-unavailable") || error.hasChild("feature-not-implemented") || error.hasChild("item-not-found")) {
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": ping to " + self + " came back as ignorable error");
-                } else {
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": ping to " + self + " failed. attempting rejoin");
-                    joinMuc(conversation);
-                }
-            } else if (response.getType() == Iq.Type.RESULT) {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": ping to " + self + " came back fine");
-            }
-            synchronized (account.inProgressConferencePings) {
-                account.inProgressConferencePings.remove(conversation);
-            }
-        });
+        sendIqPacket(
+                conversation.getAccount(),
+                ping,
+                (response) -> {
+                    if (response.getType() == Iq.Type.ERROR) {
+                        final var error = response.getError();
+                        if (error == null
+                                || error.hasChild("service-unavailable")
+                                || error.hasChild("feature-not-implemented")
+                                || error.hasChild("item-not-found")) {
+                            Log.d(
+                                    Config.LOGTAG,
+                                    account.getJid().asBareJid()
+                                            + ": ping to "
+                                            + self
+                                            + " came back as ignorable error");
+                        } else {
+                            Log.d(
+                                    Config.LOGTAG,
+                                    account.getJid().asBareJid()
+                                            + ": ping to "
+                                            + self
+                                            + " failed. attempting rejoin");
+                            joinMuc(conversation);
+                        }
+                    } else if (response.getType() == Iq.Type.RESULT) {
+                        Log.d(
+                                Config.LOGTAG,
+                                account.getJid().asBareJid()
+                                        + ": ping to "
+                                        + self
+                                        + " came back fine");
+                    }
+                    synchronized (account.inProgressConferencePings) {
+                        account.inProgressConferencePings.remove(conversation);
+                    }
+                });
     }
+
     public void joinMuc(Conversation conversation) {
         joinMuc(conversation, null, false);
     }
@@ -3029,7 +3555,10 @@ public class XmppConnectionService extends Service {
         joinMuc(conversation, onConferenceJoined, false);
     }
 
-    private void joinMuc(Conversation conversation, final OnConferenceJoined onConferenceJoined, final boolean followedInvite) {
+    private void joinMuc(
+            Conversation conversation,
+            final OnConferenceJoined onConferenceJoined,
+            final boolean followedInvite) {
         final Account account = conversation.getAccount();
         synchronized (account.pendingConferenceJoins) {
             account.pendingConferenceJoins.remove(conversation);
@@ -3049,100 +3578,133 @@ public class XmppConnectionService extends Service {
                 conversation.getMucOptions().flagNoAutoPushConfiguration();
             }
             conversation.setHasMessagesLeftOnServer(false);
-            fetchConferenceConfiguration(conversation, new OnConferenceConfigurationFetched() {
-
-                private void join(Conversation conversation) {
-                    Account account = conversation.getAccount();
-                    final MucOptions mucOptions = conversation.getMucOptions();
-
-                    if (mucOptions.nonanonymous() && !mucOptions.membersOnly() && !conversation.getBooleanAttribute("accept_non_anonymous", false)) {
-                        synchronized (account.inProgressConferenceJoins) {
-                            account.inProgressConferenceJoins.remove(conversation);
-                        }
-                        mucOptions.setError(MucOptions.Error.NON_ANONYMOUS);
-                        updateConversationUi();
-                        if (onConferenceJoined != null) {
-                            onConferenceJoined.onConferenceJoined(conversation);
-                        }
-                        return;
-                    }
+            fetchConferenceConfiguration(
+                    conversation,
+                    new OnConferenceConfigurationFetched() {
+
+                        private void join(Conversation conversation) {
+                            Account account = conversation.getAccount();
+                            final MucOptions mucOptions = conversation.getMucOptions();
+
+                            if (mucOptions.nonanonymous()
+                                    && !mucOptions.membersOnly()
+                                    && !conversation.getBooleanAttribute(
+                                            "accept_non_anonymous", false)) {
+                                synchronized (account.inProgressConferenceJoins) {
+                                    account.inProgressConferenceJoins.remove(conversation);
+                                }
+                                mucOptions.setError(MucOptions.Error.NON_ANONYMOUS);
+                                updateConversationUi();
+                                if (onConferenceJoined != null) {
+                                    onConferenceJoined.onConferenceJoined(conversation);
+                                }
+                                return;
+                            }
 
-                    final Jid joinJid = mucOptions.getSelf().getFullJid();
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid().toString() + ": joining conversation " + joinJid.toString());
-                    final var packet = mPresenceGenerator.selfPresence(account, Presence.Status.ONLINE, mucOptions.nonanonymous() || onConferenceJoined != null);
-                    packet.setTo(joinJid);
-                    Element x = packet.addChild("x", "http://jabber.org/protocol/muc");
-                    if (conversation.getMucOptions().getPassword() != null) {
-                        x.addChild("password").setContent(mucOptions.getPassword());
-                    }
+                            final Jid joinJid = mucOptions.getSelf().getFullJid();
+                            Log.d(
+                                    Config.LOGTAG,
+                                    account.getJid().asBareJid().toString()
+                                            + ": joining conversation "
+                                            + joinJid.toString());
+                            final var packet =
+                                    mPresenceGenerator.selfPresence(
+                                            account,
+                                            Presence.Status.ONLINE,
+                                            mucOptions.nonanonymous()
+                                                    || onConferenceJoined != null);
+                            packet.setTo(joinJid);
+                            Element x = packet.addChild("x", "http://jabber.org/protocol/muc");
+                            if (conversation.getMucOptions().getPassword() != null) {
+                                x.addChild("password").setContent(mucOptions.getPassword());
+                            }
 
-                    if (mucOptions.mamSupport()) {
-                        // Use MAM instead of the limited muc history to get history
-                        x.addChild("history").setAttribute("maxchars", "0");
-                    } else {
-                        // Fallback to muc history
-                        x.addChild("history").setAttribute("since", PresenceGenerator.getTimestamp(conversation.getLastMessageTransmitted().getTimestamp()));
-                    }
-                    sendPresencePacket(account, packet);
-                    if (onConferenceJoined != null) {
-                        onConferenceJoined.onConferenceJoined(conversation);
-                    }
-                    if (!joinJid.equals(conversation.getJid())) {
-                        conversation.setContactJid(joinJid);
-                        databaseBackend.updateConversation(conversation);
-                    }
+                            if (mucOptions.mamSupport()) {
+                                // Use MAM instead of the limited muc history to get history
+                                x.addChild("history").setAttribute("maxchars", "0");
+                            } else {
+                                // Fallback to muc history
+                                x.addChild("history")
+                                        .setAttribute(
+                                                "since",
+                                                PresenceGenerator.getTimestamp(
+                                                        conversation
+                                                                .getLastMessageTransmitted()
+                                                                .getTimestamp()));
+                            }
+                            sendPresencePacket(account, packet);
+                            if (onConferenceJoined != null) {
+                                onConferenceJoined.onConferenceJoined(conversation);
+                            }
+                            if (!joinJid.equals(conversation.getJid())) {
+                                conversation.setContactJid(joinJid);
+                                databaseBackend.updateConversation(conversation);
+                            }
 
-                    if (mucOptions.mamSupport()) {
-                        getMessageArchiveService().catchupMUC(conversation);
-                    }
-                    if (mucOptions.isPrivateAndNonAnonymous()) {
-                        fetchConferenceMembers(conversation);
-
-                        if (followedInvite) {
-                            final Bookmark bookmark = conversation.getBookmark();
-                            if (bookmark != null) {
-                                if (!bookmark.autojoin()) {
-                                    bookmark.setAutojoin(true);
-                                    createBookmark(account, bookmark);
+                            if (mucOptions.mamSupport()) {
+                                getMessageArchiveService().catchupMUC(conversation);
+                            }
+                            if (mucOptions.isPrivateAndNonAnonymous()) {
+                                fetchConferenceMembers(conversation);
+
+                                if (followedInvite) {
+                                    final Bookmark bookmark = conversation.getBookmark();
+                                    if (bookmark != null) {
+                                        if (!bookmark.autojoin()) {
+                                            bookmark.setAutojoin(true);
+                                            createBookmark(account, bookmark);
+                                        }
+                                    } else {
+                                        saveConversationAsBookmark(conversation, null);
+                                    }
                                 }
-                            } else {
-                                saveConversationAsBookmark(conversation, null);
+                            }
+                            synchronized (account.inProgressConferenceJoins) {
+                                account.inProgressConferenceJoins.remove(conversation);
+                                sendUnsentMessages(conversation);
                             }
                         }
-                    }
-                    synchronized (account.inProgressConferenceJoins) {
-                        account.inProgressConferenceJoins.remove(conversation);
-                        sendUnsentMessages(conversation);
-                    }
-                }
 
-                @Override
-                public void onConferenceConfigurationFetched(Conversation conversation) {
-                    if (conversation.getStatus() == Conversation.STATUS_ARCHIVED) {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": conversation (" + conversation.getJid() + ") got archived before IQ result");
-                        return;
-                    }
-                    join(conversation);
-                }
+                        @Override
+                        public void onConferenceConfigurationFetched(Conversation conversation) {
+                            if (conversation.getStatus() == Conversation.STATUS_ARCHIVED) {
+                                Log.d(
+                                        Config.LOGTAG,
+                                        account.getJid().asBareJid()
+                                                + ": conversation ("
+                                                + conversation.getJid()
+                                                + ") got archived before IQ result");
+                                return;
+                            }
+                            join(conversation);
+                        }
 
-                @Override
-                public void onFetchFailed(final Conversation conversation, final String errorCondition) {
-                    if (conversation.getStatus() == Conversation.STATUS_ARCHIVED) {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": conversation (" + conversation.getJid() + ") got archived before IQ result");
-                        return;
-                    }
-                    if ("remote-server-not-found".equals(errorCondition)) {
-                        synchronized (account.inProgressConferenceJoins) {
-                            account.inProgressConferenceJoins.remove(conversation);
+                        @Override
+                        public void onFetchFailed(
+                                final Conversation conversation, final String errorCondition) {
+                            if (conversation.getStatus() == Conversation.STATUS_ARCHIVED) {
+                                Log.d(
+                                        Config.LOGTAG,
+                                        account.getJid().asBareJid()
+                                                + ": conversation ("
+                                                + conversation.getJid()
+                                                + ") got archived before IQ result");
+                                return;
+                            }
+                            if ("remote-server-not-found".equals(errorCondition)) {
+                                synchronized (account.inProgressConferenceJoins) {
+                                    account.inProgressConferenceJoins.remove(conversation);
+                                }
+                                conversation
+                                        .getMucOptions()
+                                        .setError(MucOptions.Error.SERVER_NOT_FOUND);
+                                updateConversationUi();
+                            } else {
+                                join(conversation);
+                                fetchConferenceConfiguration(conversation);
+                            }
                         }
-                        conversation.getMucOptions().setError(MucOptions.Error.SERVER_NOT_FOUND);
-                        updateConversationUi();
-                    } else {
-                        join(conversation);
-                        fetchConferenceConfiguration(conversation);
-                    }
-                }
-            });
+                    });
             updateConversationUi();
         } else {
             synchronized (account.pendingConferenceJoins) {
@@ -3158,65 +3720,88 @@ public class XmppConnectionService extends Service {
         final Account account = conversation.getAccount();
         final AxolotlService axolotlService = account.getAxolotlService();
         final String[] affiliations = {"member", "admin", "owner"};
-        final Consumer<Iq> callback = new Consumer<Iq>() {
+        final Consumer<Iq> callback =
+                new Consumer<Iq>() {
 
-            private int i = 0;
-            private boolean success = true;
+                    private int i = 0;
+                    private boolean success = true;
 
-            @Override
-            public void accept(Iq response) {
-                final boolean omemoEnabled = conversation.getNextEncryption() == Message.ENCRYPTION_AXOLOTL;
-                Element query = response.query("http://jabber.org/protocol/muc#admin");
-                if (response.getType() == Iq.Type.RESULT && query != null) {
-                    for (Element child : query.getChildren()) {
-                        if ("item".equals(child.getName())) {
-                            MucOptions.User user = AbstractParser.parseItem(conversation, child);
-                            if (!user.realJidMatchesAccount()) {
-                                boolean isNew = conversation.getMucOptions().updateUser(user);
-                                Contact contact = user.getContact();
-                                if (omemoEnabled
-                                        && isNew
-                                        && user.getRealJid() != null
-                                        && (contact == null || !contact.mutualPresenceSubscription())
-                                        && axolotlService.hasEmptyDeviceList(user.getRealJid())) {
-                                    axolotlService.fetchDeviceIds(user.getRealJid());
+                    @Override
+                    public void accept(Iq response) {
+                        final boolean omemoEnabled =
+                                conversation.getNextEncryption() == Message.ENCRYPTION_AXOLOTL;
+                        Element query = response.query("http://jabber.org/protocol/muc#admin");
+                        if (response.getType() == Iq.Type.RESULT && query != null) {
+                            for (Element child : query.getChildren()) {
+                                if ("item".equals(child.getName())) {
+                                    MucOptions.User user =
+                                            AbstractParser.parseItem(conversation, child);
+                                    if (!user.realJidMatchesAccount()) {
+                                        boolean isNew =
+                                                conversation.getMucOptions().updateUser(user);
+                                        Contact contact = user.getContact();
+                                        if (omemoEnabled
+                                                && isNew
+                                                && user.getRealJid() != null
+                                                && (contact == null
+                                                        || !contact.mutualPresenceSubscription())
+                                                && axolotlService.hasEmptyDeviceList(
+                                                        user.getRealJid())) {
+                                            axolotlService.fetchDeviceIds(user.getRealJid());
+                                        }
+                                    }
                                 }
                             }
+                        } else {
+                            success = false;
+                            Log.d(
+                                    Config.LOGTAG,
+                                    account.getJid().asBareJid()
+                                            + ": could not request affiliation "
+                                            + affiliations[i]
+                                            + " in "
+                                            + conversation.getJid().asBareJid());
                         }
-                    }
-                } else {
-                    success = false;
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": could not request affiliation " + affiliations[i] + " in " + conversation.getJid().asBareJid());
-                }
-                ++i;
-                if (i >= affiliations.length) {
-                    List<Jid> members = conversation.getMucOptions().getMembers(true);
-                    if (success) {
-                        List<Jid> cryptoTargets = conversation.getAcceptedCryptoTargets();
-                        boolean changed = false;
-                        for (ListIterator<Jid> iterator = cryptoTargets.listIterator(); iterator.hasNext(); ) {
-                            Jid jid = iterator.next();
-                            if (!members.contains(jid) && !members.contains(jid.getDomain())) {
-                                iterator.remove();
-                                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": removed " + jid + " from crypto targets of " + conversation.getName());
-                                changed = true;
+                        ++i;
+                        if (i >= affiliations.length) {
+                            List<Jid> members = conversation.getMucOptions().getMembers(true);
+                            if (success) {
+                                List<Jid> cryptoTargets = conversation.getAcceptedCryptoTargets();
+                                boolean changed = false;
+                                for (ListIterator<Jid> iterator = cryptoTargets.listIterator();
+                                        iterator.hasNext(); ) {
+                                    Jid jid = iterator.next();
+                                    if (!members.contains(jid)
+                                            && !members.contains(jid.getDomain())) {
+                                        iterator.remove();
+                                        Log.d(
+                                                Config.LOGTAG,
+                                                account.getJid().asBareJid()
+                                                        + ": removed "
+                                                        + jid
+                                                        + " from crypto targets of "
+                                                        + conversation.getName());
+                                        changed = true;
+                                    }
+                                }
+                                if (changed) {
+                                    conversation.setAcceptedCryptoTargets(cryptoTargets);
+                                    updateConversation(conversation);
+                                }
                             }
-                        }
-                        if (changed) {
-                            conversation.setAcceptedCryptoTargets(cryptoTargets);
-                            updateConversation(conversation);
+                            getAvatarService().clear(conversation);
+                            updateMucRosterUi();
+                            updateConversationUi();
                         }
                     }
-                    getAvatarService().clear(conversation);
-                    updateMucRosterUi();
-                    updateConversationUi();
-                }
-            }
-        };
+                };
         for (String affiliation : affiliations) {
-            sendIqPacket(account, mIqGenerator.queryAffiliation(conversation, affiliation), callback);
+            sendIqPacket(
+                    account, mIqGenerator.queryAffiliation(conversation, affiliation), callback);
         }
-        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": fetching members for " + conversation.getName());
+        Log.d(
+                Config.LOGTAG,
+                account.getJid().asBareJid() + ": fetching members for " + conversation.getName());
     }
 
     public void providePasswordForMuc(final Conversation conversation, final String password) {
@@ -3254,47 +3839,72 @@ public class XmppConnectionService extends Service {
 
     private void deletePepNode(final Account account, final String node, final Runnable runnable) {
         final Iq request = mIqGenerator.deleteNode(node);
-        sendIqPacket(account, request, (packet) -> {
-            if (packet.getType() == Iq.Type.RESULT) {
-                Log.d(Config.LOGTAG,account.getJid().asBareJid()+": successfully deleted pep node "+node);
-                if (runnable != null) {
-                    runnable.run();
-                }
-            } else {
-                Log.d(Config.LOGTAG,account.getJid().asBareJid()+": failed to delete "+ packet);
-            }
-        });
+        sendIqPacket(
+                account,
+                request,
+                (packet) -> {
+                    if (packet.getType() == Iq.Type.RESULT) {
+                        Log.d(
+                                Config.LOGTAG,
+                                account.getJid().asBareJid()
+                                        + ": successfully deleted pep node "
+                                        + node);
+                        if (runnable != null) {
+                            runnable.run();
+                        }
+                    } else {
+                        Log.d(
+                                Config.LOGTAG,
+                                account.getJid().asBareJid() + ": failed to delete " + packet);
+                    }
+                });
     }
 
     private void deleteVcardAvatar(final Account account, @NonNull final Runnable runnable) {
         final Iq retrieveVcard = mIqGenerator.retrieveVcardAvatar(account.getJid().asBareJid());
-        sendIqPacket(account, retrieveVcard, (response) -> {
-            if (response.getType() != Iq.Type.RESULT) {
-                Log.d(Config.LOGTAG,account.getJid().asBareJid()+": no vCard set. nothing to do");
-                return;
-            }
-            final Element vcard = response.findChild("vCard", "vcard-temp");
-            if (vcard == null) {
-                Log.d(Config.LOGTAG,account.getJid().asBareJid()+": no vCard set. nothing to do");
-                return;
-            }
-            Element photo = vcard.findChild("PHOTO");
-            if (photo == null) {
-                photo = vcard.addChild("PHOTO");
-            }
-            photo.clearChildren();
-            final Iq publication = new Iq(Iq.Type.SET);
-            publication.setTo(account.getJid().asBareJid());
-            publication.addChild(vcard);
-            sendIqPacket(account, publication, (publicationResponse) -> {
-                if (publicationResponse.getType() == Iq.Type.RESULT) {
-                    Log.d(Config.LOGTAG,account.getJid().asBareJid()+": successfully deleted vcard avatar");
-                    runnable.run();
-                } else {
-                    Log.d(Config.LOGTAG, "failed to publish vcard " + publicationResponse.getErrorCondition());
-                }
-            });
-        });
+        sendIqPacket(
+                account,
+                retrieveVcard,
+                (response) -> {
+                    if (response.getType() != Iq.Type.RESULT) {
+                        Log.d(
+                                Config.LOGTAG,
+                                account.getJid().asBareJid() + ": no vCard set. nothing to do");
+                        return;
+                    }
+                    final Element vcard = response.findChild("vCard", "vcard-temp");
+                    if (vcard == null) {
+                        Log.d(
+                                Config.LOGTAG,
+                                account.getJid().asBareJid() + ": no vCard set. nothing to do");
+                        return;
+                    }
+                    Element photo = vcard.findChild("PHOTO");
+                    if (photo == null) {
+                        photo = vcard.addChild("PHOTO");
+                    }
+                    photo.clearChildren();
+                    final Iq publication = new Iq(Iq.Type.SET);
+                    publication.setTo(account.getJid().asBareJid());
+                    publication.addChild(vcard);
+                    sendIqPacket(
+                            account,
+                            publication,
+                            (publicationResponse) -> {
+                                if (publicationResponse.getType() == Iq.Type.RESULT) {
+                                    Log.d(
+                                            Config.LOGTAG,
+                                            account.getJid().asBareJid()
+                                                    + ": successfully deleted vcard avatar");
+                                    runnable.run();
+                                } else {
+                                    Log.d(
+                                            Config.LOGTAG,
+                                            "failed to publish vcard "
+                                                    + publicationResponse.getErrorCondition());
+                                }
+                            });
+                });
     }
 
     private boolean hasEnabledAccounts() {
@@ -3309,18 +3919,32 @@ public class XmppConnectionService extends Service {
         return false;
     }
 
-
-    public void getAttachments(final Conversation conversation, int limit, final OnMediaLoaded onMediaLoaded) {
-        getAttachments(conversation.getAccount(), conversation.getJid().asBareJid(), limit, onMediaLoaded);
+    public void getAttachments(
+            final Conversation conversation, int limit, final OnMediaLoaded onMediaLoaded) {
+        getAttachments(
+                conversation.getAccount(), conversation.getJid().asBareJid(), limit, onMediaLoaded);
     }
 
-    public void getAttachments(final Account account, final Jid jid, final int limit, final OnMediaLoaded onMediaLoaded) {
+    public void getAttachments(
+            final Account account,
+            final Jid jid,
+            final int limit,
+            final OnMediaLoaded onMediaLoaded) {
         getAttachments(account.getUuid(), jid.asBareJid(), limit, onMediaLoaded);
     }
 
-
-    public void getAttachments(final String account, final Jid jid, final int limit, final OnMediaLoaded onMediaLoaded) {
-        new Thread(() -> onMediaLoaded.onMediaLoaded(fileBackend.convertToAttachments(databaseBackend.getRelativeFilePaths(account, jid, limit)))).start();
+    public void getAttachments(
+            final String account,
+            final Jid jid,
+            final int limit,
+            final OnMediaLoaded onMediaLoaded) {
+        new Thread(
+                        () ->
+                                onMediaLoaded.onMediaLoaded(
+                                        fileBackend.convertToAttachments(
+                                                databaseBackend.getRelativeFilePaths(
+                                                        account, jid, limit))))
+                .start();
     }
 
     public void persistSelfNick(final MucOptions.User self, final boolean modified) {
@@ -3456,13 +4080,19 @@ public class XmppConnectionService extends Service {
             account.pendingConferenceLeaves.remove(conversation);
         }
         if (account.getStatus() == Account.State.ONLINE || now) {
-            sendPresencePacket(conversation.getAccount(), mPresenceGenerator.leave(conversation.getMucOptions()));
+            sendPresencePacket(
+                    conversation.getAccount(),
+                    mPresenceGenerator.leave(conversation.getMucOptions()));
             conversation.getMucOptions().setOffline();
             Bookmark bookmark = conversation.getBookmark();
             if (bookmark != null) {
                 bookmark.setConversation(null);
             }
-            Log.d(Config.LOGTAG, conversation.getAccount().getJid().asBareJid() + ": leaving muc " + conversation.getJid());
+            Log.d(
+                    Config.LOGTAG,
+                    conversation.getAccount().getJid().asBareJid()
+                            + ": leaving muc "
+                            + conversation.getJid());
         } else {
             synchronized (account.pendingConferenceLeaves) {
                 account.pendingConferenceLeaves.add(conversation);
@@ -3489,37 +4119,57 @@ public class XmppConnectionService extends Service {
         return null;
     }
 
-
-    public void createPublicChannel(final Account account, final String name, final Jid address, final UiCallback<Conversation> callback) {
-        joinMuc(findOrCreateConversation(account, address, true, false, true), conversation -> {
-            final Bundle configuration = IqGenerator.defaultChannelConfiguration();
-            if (!TextUtils.isEmpty(name)) {
-                configuration.putString("muc#roomconfig_roomname", name);
-            }
-            pushConferenceConfiguration(conversation, configuration, new OnConfigurationPushed() {
-                @Override
-                public void onPushSucceeded() {
-                    saveConversationAsBookmark(conversation, name);
-                    callback.success(conversation);
-                }
-
-                @Override
-                public void onPushFailed() {
-                    if (conversation.getMucOptions().getSelf().getAffiliation().ranks(MucOptions.Affiliation.OWNER)) {
-                        callback.error(R.string.unable_to_set_channel_configuration, conversation);
-                    } else {
-                        callback.error(R.string.joined_an_existing_channel, conversation);
+    public void createPublicChannel(
+            final Account account,
+            final String name,
+            final Jid address,
+            final UiCallback<Conversation> callback) {
+        joinMuc(
+                findOrCreateConversation(account, address, true, false, true),
+                conversation -> {
+                    final Bundle configuration = IqGenerator.defaultChannelConfiguration();
+                    if (!TextUtils.isEmpty(name)) {
+                        configuration.putString("muc#roomconfig_roomname", name);
                     }
-                }
-            });
-        });
+                    pushConferenceConfiguration(
+                            conversation,
+                            configuration,
+                            new OnConfigurationPushed() {
+                                @Override
+                                public void onPushSucceeded() {
+                                    saveConversationAsBookmark(conversation, name);
+                                    callback.success(conversation);
+                                }
+
+                                @Override
+                                public void onPushFailed() {
+                                    if (conversation
+                                            .getMucOptions()
+                                            .getSelf()
+                                            .getAffiliation()
+                                            .ranks(MucOptions.Affiliation.OWNER)) {
+                                        callback.error(
+                                                R.string.unable_to_set_channel_configuration,
+                                                conversation);
+                                    } else {
+                                        callback.error(
+                                                R.string.joined_an_existing_channel, conversation);
+                                    }
+                                }
+                            });
+                });
     }
 
-    public boolean createAdhocConference(final Account account,
-                                         final String name,
-                                         final Iterable<Jid> jids,
-                                         final UiCallback<Conversation> callback) {
-        Log.d(Config.LOGTAG, account.getJid().asBareJid().toString() + ": creating adhoc conference with " + jids.toString());
+    public boolean createAdhocConference(
+            final Account account,
+            final String name,
+            final Iterable<Jid> jids,
+            final UiCallback<Conversation> callback) {
+        Log.d(
+                Config.LOGTAG,
+                account.getJid().asBareJid().toString()
+                        + ": creating adhoc conference with "
+                        + jids.toString());
         if (account.getStatus() == Account.State.ONLINE) {
             try {
                 String server = findConferenceServer(account);
@@ -3527,44 +4177,61 @@ public class XmppConnectionService extends Service {
                     if (callback != null) {
                         callback.error(R.string.no_conference_server_found, null);
                     }
-                    return false;
-                }
-                final Jid jid = Jid.of(CryptoHelper.pronounceable(), server, null);
-                final Conversation conversation = findOrCreateConversation(account, jid, true, false, true);
-                joinMuc(conversation, new OnConferenceJoined() {
-                    @Override
-                    public void onConferenceJoined(final Conversation conversation) {
-                        final Bundle configuration = IqGenerator.defaultGroupChatConfiguration();
-                        if (!TextUtils.isEmpty(name)) {
-                            configuration.putString("muc#roomconfig_roomname", name);
-                        }
-                        pushConferenceConfiguration(conversation, configuration, new OnConfigurationPushed() {
-                            @Override
-                            public void onPushSucceeded() {
-                                for (Jid invite : jids) {
-                                    invite(conversation, invite);
-                                }
-                                for (String resource : account.getSelfContact().getPresences().toResourceArray()) {
-                                    Jid other = account.getJid().withResource(resource);
-                                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": sending direct invite to " + other);
-                                    directInvite(conversation, other);
-                                }
-                                saveConversationAsBookmark(conversation, name);
-                                if (callback != null) {
-                                    callback.success(conversation);
-                                }
-                            }
-
+                    return false;
+                }
+                final Jid jid = Jid.of(CryptoHelper.pronounceable(), server, null);
+                final Conversation conversation =
+                        findOrCreateConversation(account, jid, true, false, true);
+                joinMuc(
+                        conversation,
+                        new OnConferenceJoined() {
                             @Override
-                            public void onPushFailed() {
-                                archiveConversation(conversation);
-                                if (callback != null) {
-                                    callback.error(R.string.conference_creation_failed, conversation);
+                            public void onConferenceJoined(final Conversation conversation) {
+                                final Bundle configuration =
+                                        IqGenerator.defaultGroupChatConfiguration();
+                                if (!TextUtils.isEmpty(name)) {
+                                    configuration.putString("muc#roomconfig_roomname", name);
                                 }
+                                pushConferenceConfiguration(
+                                        conversation,
+                                        configuration,
+                                        new OnConfigurationPushed() {
+                                            @Override
+                                            public void onPushSucceeded() {
+                                                for (Jid invite : jids) {
+                                                    invite(conversation, invite);
+                                                }
+                                                for (String resource :
+                                                        account.getSelfContact()
+                                                                .getPresences()
+                                                                .toResourceArray()) {
+                                                    Jid other =
+                                                            account.getJid().withResource(resource);
+                                                    Log.d(
+                                                            Config.LOGTAG,
+                                                            account.getJid().asBareJid()
+                                                                    + ": sending direct invite to "
+                                                                    + other);
+                                                    directInvite(conversation, other);
+                                                }
+                                                saveConversationAsBookmark(conversation, name);
+                                                if (callback != null) {
+                                                    callback.success(conversation);
+                                                }
+                                            }
+
+                                            @Override
+                                            public void onPushFailed() {
+                                                archiveConversation(conversation);
+                                                if (callback != null) {
+                                                    callback.error(
+                                                            R.string.conference_creation_failed,
+                                                            conversation);
+                                                }
+                                            }
+                                        });
                             }
                         });
-                    }
-                });
                 return true;
             } catch (IllegalArgumentException e) {
                 if (callback != null) {
@@ -3584,75 +4251,121 @@ public class XmppConnectionService extends Service {
         fetchConferenceConfiguration(conversation, null);
     }
 
-    public void fetchConferenceConfiguration(final Conversation conversation, final OnConferenceConfigurationFetched callback) {
+    public void fetchConferenceConfiguration(
+            final Conversation conversation, final OnConferenceConfigurationFetched callback) {
         final Iq request = mIqGenerator.queryDiscoInfo(conversation.getJid().asBareJid());
         final var account = conversation.getAccount();
-        sendIqPacket(account, request, response -> {
-            if (response.getType() == Iq.Type.RESULT) {
-                final MucOptions mucOptions = conversation.getMucOptions();
-                final Bookmark bookmark = conversation.getBookmark();
-                final boolean sameBefore = StringUtils.equals(bookmark == null ? null : bookmark.getBookmarkName(), mucOptions.getName());
-
-                if (mucOptions.updateConfiguration(new ServiceDiscoveryResult(response))) {
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": muc configuration changed for " + conversation.getJid().asBareJid());
-                    updateConversation(conversation);
-                }
-
-                if (bookmark != null && (sameBefore || bookmark.getBookmarkName() == null)) {
-                    if (bookmark.setBookmarkName(StringUtils.nullOnEmpty(mucOptions.getName()))) {
-                        createBookmark(account, bookmark);
-                    }
-                }
-
+        sendIqPacket(
+                account,
+                request,
+                response -> {
+                    if (response.getType() == Iq.Type.RESULT) {
+                        final MucOptions mucOptions = conversation.getMucOptions();
+                        final Bookmark bookmark = conversation.getBookmark();
+                        final boolean sameBefore =
+                                StringUtils.equals(
+                                        bookmark == null ? null : bookmark.getBookmarkName(),
+                                        mucOptions.getName());
+
+                        if (mucOptions.updateConfiguration(new ServiceDiscoveryResult(response))) {
+                            Log.d(
+                                    Config.LOGTAG,
+                                    account.getJid().asBareJid()
+                                            + ": muc configuration changed for "
+                                            + conversation.getJid().asBareJid());
+                            updateConversation(conversation);
+                        }
 
-                if (callback != null) {
-                    callback.onConferenceConfigurationFetched(conversation);
-                }
+                        if (bookmark != null
+                                && (sameBefore || bookmark.getBookmarkName() == null)) {
+                            if (bookmark.setBookmarkName(
+                                    StringUtils.nullOnEmpty(mucOptions.getName()))) {
+                                createBookmark(account, bookmark);
+                            }
+                        }
 
+                        if (callback != null) {
+                            callback.onConferenceConfigurationFetched(conversation);
+                        }
 
-                updateConversationUi();
-            } else if (response.getType() == Iq.Type.TIMEOUT) {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": received timeout waiting for conference configuration fetch");
-            } else {
-                if (callback != null) {
-                    callback.onFetchFailed(conversation, response.getErrorCondition());
-                }
-            }
-        });
+                        updateConversationUi();
+                    } else if (response.getType() == Iq.Type.TIMEOUT) {
+                        Log.d(
+                                Config.LOGTAG,
+                                account.getJid().asBareJid()
+                                        + ": received timeout waiting for conference configuration"
+                                        + " fetch");
+                    } else {
+                        if (callback != null) {
+                            callback.onFetchFailed(conversation, response.getErrorCondition());
+                        }
+                    }
+                });
     }
 
-    public void pushNodeConfiguration(Account account, final String node, final Bundle options, final OnConfigurationPushed callback) {
+    public void pushNodeConfiguration(
+            Account account,
+            final String node,
+            final Bundle options,
+            final OnConfigurationPushed callback) {
         pushNodeConfiguration(account, account.getJid().asBareJid(), node, options, callback);
     }
 
-    public void pushNodeConfiguration(Account account, final Jid jid, final String node, final Bundle options, final OnConfigurationPushed callback) {
+    public void pushNodeConfiguration(
+            Account account,
+            final Jid jid,
+            final String node,
+            final Bundle options,
+            final OnConfigurationPushed callback) {
         Log.d(Config.LOGTAG, "pushing node configuration");
-        sendIqPacket(account, mIqGenerator.requestPubsubConfiguration(jid, node), responseToRequest -> {
-            if (responseToRequest.getType() == Iq.Type.RESULT) {
-                Element pubsub = responseToRequest.findChild("pubsub", "http://jabber.org/protocol/pubsub#owner");
-                Element configuration = pubsub == null ? null : pubsub.findChild("configure");
-                Element x = configuration == null ? null : configuration.findChild("x", Namespace.DATA);
-                if (x != null) {
-                    final Data data = Data.parse(x);
-                    data.submit(options);
-                    sendIqPacket(account, mIqGenerator.publishPubsubConfiguration(jid, node, data), responseToPublish -> {
-                        if (responseToPublish.getType() == Iq.Type.RESULT && callback != null) {
-                            Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": successfully changed node configuration for node " + node);
-                            callback.onPushSucceeded();
-                        } else if (responseToPublish.getType() == Iq.Type.ERROR && callback != null) {
+        sendIqPacket(
+                account,
+                mIqGenerator.requestPubsubConfiguration(jid, node),
+                responseToRequest -> {
+                    if (responseToRequest.getType() == Iq.Type.RESULT) {
+                        Element pubsub =
+                                responseToRequest.findChild(
+                                        "pubsub", "http://jabber.org/protocol/pubsub#owner");
+                        Element configuration =
+                                pubsub == null ? null : pubsub.findChild("configure");
+                        Element x =
+                                configuration == null
+                                        ? null
+                                        : configuration.findChild("x", Namespace.DATA);
+                        if (x != null) {
+                            final Data data = Data.parse(x);
+                            data.submit(options);
+                            sendIqPacket(
+                                    account,
+                                    mIqGenerator.publishPubsubConfiguration(jid, node, data),
+                                    responseToPublish -> {
+                                        if (responseToPublish.getType() == Iq.Type.RESULT
+                                                && callback != null) {
+                                            Log.d(
+                                                    Config.LOGTAG,
+                                                    account.getJid().asBareJid()
+                                                            + ": successfully changed node"
+                                                            + " configuration for node "
+                                                            + node);
+                                            callback.onPushSucceeded();
+                                        } else if (responseToPublish.getType() == Iq.Type.ERROR
+                                                && callback != null) {
+                                            callback.onPushFailed();
+                                        }
+                                    });
+                        } else if (callback != null) {
                             callback.onPushFailed();
                         }
-                    });
-                } else if (callback != null) {
-                    callback.onPushFailed();
-                }
-            } else if (responseToRequest.getType() == Iq.Type.ERROR && callback != null) {
-                callback.onPushFailed();
-            }
-        });
+                    } else if (responseToRequest.getType() == Iq.Type.ERROR && callback != null) {
+                        callback.onPushFailed();
+                    }
+                });
     }
 
-    public void pushConferenceConfiguration(final Conversation conversation, final Bundle options, final OnConfigurationPushed callback) {
+    public void pushConferenceConfiguration(
+            final Conversation conversation,
+            final Bundle options,
+            final OnConfigurationPushed callback) {
         if (options.getString("muc#roomconfig_whois", "moderators").equals("anyone")) {
             conversation.setAttribute("accept_non_anonymous", true);
             updateConversation(conversation);
@@ -3671,81 +4384,110 @@ public class XmppConnectionService extends Service {
         final Iq request = new Iq(Iq.Type.GET);
         request.setTo(conversation.getJid().asBareJid());
         request.query("http://jabber.org/protocol/muc#owner");
-        sendIqPacket(account, request, response -> {
-            if (response.getType() == Iq.Type.RESULT) {
-                final Data data = Data.parse(response.query().findChild("x", Namespace.DATA));
-                data.submit(options);
-                final Iq set = new Iq(Iq.Type.SET);
-                set.setTo(conversation.getJid().asBareJid());
-                set.query("http://jabber.org/protocol/muc#owner").addChild(data);
-                sendIqPacket(account, set, packet -> {
-                    if (callback != null) {
-                        if (packet.getType() == Iq.Type.RESULT) {
-                            callback.onPushSucceeded();
-                        } else {
-                            Log.d(Config.LOGTAG,"failed: "+packet.toString());
+        sendIqPacket(
+                account,
+                request,
+                response -> {
+                    if (response.getType() == Iq.Type.RESULT) {
+                        final Data data =
+                                Data.parse(response.query().findChild("x", Namespace.DATA));
+                        data.submit(options);
+                        final Iq set = new Iq(Iq.Type.SET);
+                        set.setTo(conversation.getJid().asBareJid());
+                        set.query("http://jabber.org/protocol/muc#owner").addChild(data);
+                        sendIqPacket(
+                                account,
+                                set,
+                                packet -> {
+                                    if (callback != null) {
+                                        if (packet.getType() == Iq.Type.RESULT) {
+                                            callback.onPushSucceeded();
+                                        } else {
+                                            Log.d(Config.LOGTAG, "failed: " + packet.toString());
+                                            callback.onPushFailed();
+                                        }
+                                    }
+                                });
+                    } else {
+                        if (callback != null) {
                             callback.onPushFailed();
                         }
                     }
                 });
-            } else {
-                if (callback != null) {
-                    callback.onPushFailed();
-                }
-            }
-        });
     }
 
     public void pushSubjectToConference(final Conversation conference, final String subject) {
-        final var packet = this.getMessageGenerator().conferenceSubject(conference, StringUtils.nullOnEmpty(subject));
+        final var packet =
+                this.getMessageGenerator()
+                        .conferenceSubject(conference, StringUtils.nullOnEmpty(subject));
         this.sendMessagePacket(conference.getAccount(), packet);
     }
 
-    public void changeAffiliationInConference(final Conversation conference, Jid user, final MucOptions.Affiliation affiliation, final OnAffiliationChanged callback) {
+    public void changeAffiliationInConference(
+            final Conversation conference,
+            Jid user,
+            final MucOptions.Affiliation affiliation,
+            final OnAffiliationChanged callback) {
         final Jid jid = user.asBareJid();
-        final Iq request = this.mIqGenerator.changeAffiliation(conference, jid, affiliation.toString());
-        sendIqPacket(conference.getAccount(), request, (response) -> {
-            if (response.getType() == Iq.Type.RESULT) {
-                conference.getMucOptions().changeAffiliation(jid, affiliation);
-                getAvatarService().clear(conference);
-                if (callback != null) {
-                    callback.onAffiliationChangedSuccessful(jid);
-                } else {
-                    Log.d(Config.LOGTAG, "changed affiliation of " + user + " to " + affiliation);
-                }
-            } else if (callback != null) {
-                callback.onAffiliationChangeFailed(jid, R.string.could_not_change_affiliation);
-            } else {
-                Log.d(Config.LOGTAG, "unable to change affiliation");
-            }
-        });
+        final Iq request =
+                this.mIqGenerator.changeAffiliation(conference, jid, affiliation.toString());
+        sendIqPacket(
+                conference.getAccount(),
+                request,
+                (response) -> {
+                    if (response.getType() == Iq.Type.RESULT) {
+                        conference.getMucOptions().changeAffiliation(jid, affiliation);
+                        getAvatarService().clear(conference);
+                        if (callback != null) {
+                            callback.onAffiliationChangedSuccessful(jid);
+                        } else {
+                            Log.d(
+                                    Config.LOGTAG,
+                                    "changed affiliation of " + user + " to " + affiliation);
+                        }
+                    } else if (callback != null) {
+                        callback.onAffiliationChangeFailed(
+                                jid, R.string.could_not_change_affiliation);
+                    } else {
+                        Log.d(Config.LOGTAG, "unable to change affiliation");
+                    }
+                });
     }
 
-    public void changeRoleInConference(final Conversation conference, final String nick, MucOptions.Role role) {
-        final var account =conference.getAccount();
+    public void changeRoleInConference(
+            final Conversation conference, final String nick, MucOptions.Role role) {
+        final var account = conference.getAccount();
         final Iq request = this.mIqGenerator.changeRole(conference, nick, role.toString());
-        sendIqPacket(account, request, (packet) -> {
-            if (packet.getType() != Iq.Type.RESULT) {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + " unable to change role of " + nick);
-            }
-        });
+        sendIqPacket(
+                account,
+                request,
+                (packet) -> {
+                    if (packet.getType() != Iq.Type.RESULT) {
+                        Log.d(
+                                Config.LOGTAG,
+                                account.getJid().asBareJid() + " unable to change role of " + nick);
+                    }
+                });
     }
 
     public void destroyRoom(final Conversation conversation, final OnRoomDestroy callback) {
         final Iq request = new Iq(Iq.Type.SET);
         request.setTo(conversation.getJid().asBareJid());
         request.query("http://jabber.org/protocol/muc#owner").addChild("destroy");
-        sendIqPacket(conversation.getAccount(), request, response -> {
-            if (response.getType() == Iq.Type.RESULT) {
-                if (callback != null) {
-                    callback.onRoomDestroySucceeded();
-                }
-            } else if (response.getType() == Iq.Type.ERROR) {
-                if (callback != null) {
-                    callback.onRoomDestroyFailed();
-                }
-            }
-        });
+        sendIqPacket(
+                conversation.getAccount(),
+                request,
+                response -> {
+                    if (response.getType() == Iq.Type.RESULT) {
+                        if (callback != null) {
+                            callback.onRoomDestroySucceeded();
+                        }
+                    } else if (response.getType() == Iq.Type.ERROR) {
+                        if (callback != null) {
+                            callback.onRoomDestroyFailed();
+                        }
+                    }
+                });
     }
 
     private void disconnect(final Account account, boolean force) {
@@ -3807,7 +4549,8 @@ public class XmppConnectionService extends Service {
         createContact(contact, autoGrant, null);
     }
 
-    public void createContact(final Contact contact, final boolean autoGrant, final String preAuth) {
+    public void createContact(
+            final Contact contact, final boolean autoGrant, final String preAuth) {
         if (autoGrant) {
             contact.setOption(Contact.Options.PREEMPTIVE_GRANT);
             contact.setOption(Contact.Options.ASKING);
@@ -3825,9 +4568,9 @@ public class XmppConnectionService extends Service {
         final Account account = contact.getAccount();
         if (account.getStatus() == Account.State.ONLINE) {
             final boolean ask = contact.getOption(Contact.Options.ASKING);
-            final boolean sendUpdates = contact
-                    .getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)
-                    && contact.getOption(Contact.Options.PREEMPTIVE_GRANT);
+            final boolean sendUpdates =
+                    contact.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)
+                            && contact.getOption(Contact.Options.PREEMPTIVE_GRANT);
             final Iq iq = new Iq(Iq.Type.SET);
             iq.query(Namespace.ROSTER).addChild(contact.asElement());
             account.getXmppConnection().sendIqPacket(iq, mDefaultIqHandler);
@@ -3835,86 +4578,114 @@ public class XmppConnectionService extends Service {
                 sendPresencePacket(account, mPresenceGenerator.sendPresenceUpdatesTo(contact));
             }
             if (ask) {
-                sendPresencePacket(account, mPresenceGenerator.requestPresenceUpdatesFrom(contact, preAuth));
+                sendPresencePacket(
+                        account, mPresenceGenerator.requestPresenceUpdatesFrom(contact, preAuth));
             }
         } else {
             syncRoster(contact.getAccount());
         }
     }
 
-    public void publishMucAvatar(final Conversation conversation, final Uri image, final OnAvatarPublication callback) {
-        new Thread(() -> {
-            final Bitmap.CompressFormat format = Config.AVATAR_FORMAT;
-            final int size = Config.AVATAR_SIZE;
-            final Avatar avatar = getFileBackend().getPepAvatar(image, size, format);
-            if (avatar != null) {
-                if (!getFileBackend().save(avatar)) {
-                    callback.onAvatarPublicationFailed(R.string.error_saving_avatar);
-                    return;
-                }
-                avatar.owner = conversation.getJid().asBareJid();
-                publishMucAvatar(conversation, avatar, callback);
-            } else {
-                callback.onAvatarPublicationFailed(R.string.error_publish_avatar_converting);
-            }
-        }).start();
-    }
-
-    public void publishAvatar(final Account account, final Uri image, final OnAvatarPublication callback) {
-        new Thread(() -> {
-            final Bitmap.CompressFormat format = Config.AVATAR_FORMAT;
-            final int size = Config.AVATAR_SIZE;
-            final Avatar avatar = getFileBackend().getPepAvatar(image, size, format);
-            if (avatar != null) {
-                if (!getFileBackend().save(avatar)) {
-                    Log.d(Config.LOGTAG, "unable to save vcard");
-                    callback.onAvatarPublicationFailed(R.string.error_saving_avatar);
-                    return;
-                }
-                publishAvatar(account, avatar, callback);
-            } else {
-                callback.onAvatarPublicationFailed(R.string.error_publish_avatar_converting);
-            }
-        }).start();
-
+    public void publishMucAvatar(
+            final Conversation conversation, final Uri image, final OnAvatarPublication callback) {
+        new Thread(
+                        () -> {
+                            final Bitmap.CompressFormat format = Config.AVATAR_FORMAT;
+                            final int size = Config.AVATAR_SIZE;
+                            final Avatar avatar =
+                                    getFileBackend().getPepAvatar(image, size, format);
+                            if (avatar != null) {
+                                if (!getFileBackend().save(avatar)) {
+                                    callback.onAvatarPublicationFailed(
+                                            R.string.error_saving_avatar);
+                                    return;
+                                }
+                                avatar.owner = conversation.getJid().asBareJid();
+                                publishMucAvatar(conversation, avatar, callback);
+                            } else {
+                                callback.onAvatarPublicationFailed(
+                                        R.string.error_publish_avatar_converting);
+                            }
+                        })
+                .start();
+    }
+
+    public void publishAvatar(
+            final Account account, final Uri image, final OnAvatarPublication callback) {
+        new Thread(
+                        () -> {
+                            final Bitmap.CompressFormat format = Config.AVATAR_FORMAT;
+                            final int size = Config.AVATAR_SIZE;
+                            final Avatar avatar =
+                                    getFileBackend().getPepAvatar(image, size, format);
+                            if (avatar != null) {
+                                if (!getFileBackend().save(avatar)) {
+                                    Log.d(Config.LOGTAG, "unable to save vcard");
+                                    callback.onAvatarPublicationFailed(
+                                            R.string.error_saving_avatar);
+                                    return;
+                                }
+                                publishAvatar(account, avatar, callback);
+                            } else {
+                                callback.onAvatarPublicationFailed(
+                                        R.string.error_publish_avatar_converting);
+                            }
+                        })
+                .start();
     }
 
-    private void publishMucAvatar(Conversation conversation, Avatar avatar, OnAvatarPublication callback) {
+    private void publishMucAvatar(
+            Conversation conversation, Avatar avatar, OnAvatarPublication callback) {
         final var account = conversation.getAccount();
         final Iq retrieve = mIqGenerator.retrieveVcardAvatar(avatar);
-        sendIqPacket(account, retrieve, (response) -> {
-            boolean itemNotFound = response.getType() == Iq.Type.ERROR && response.hasChild("error") && response.findChild("error").hasChild("item-not-found");
-            if (response.getType() == Iq.Type.RESULT || itemNotFound) {
-                Element vcard = response.findChild("vCard", "vcard-temp");
-                if (vcard == null) {
-                    vcard = new Element("vCard", "vcard-temp");
-                }
-                Element photo = vcard.findChild("PHOTO");
-                if (photo == null) {
-                    photo = vcard.addChild("PHOTO");
-                }
-                photo.clearChildren();
-                photo.addChild("TYPE").setContent(avatar.type);
-                photo.addChild("BINVAL").setContent(avatar.image);
-                final Iq publication = new Iq(Iq.Type.SET);
-                publication.setTo(conversation.getJid().asBareJid());
-                publication.addChild(vcard);
-                sendIqPacket(account, publication, (publicationResponse) -> {
-                    if (publicationResponse.getType() == Iq.Type.RESULT) {
-                        callback.onAvatarPublicationSucceeded();
+        sendIqPacket(
+                account,
+                retrieve,
+                (response) -> {
+                    boolean itemNotFound =
+                            response.getType() == Iq.Type.ERROR
+                                    && response.hasChild("error")
+                                    && response.findChild("error").hasChild("item-not-found");
+                    if (response.getType() == Iq.Type.RESULT || itemNotFound) {
+                        Element vcard = response.findChild("vCard", "vcard-temp");
+                        if (vcard == null) {
+                            vcard = new Element("vCard", "vcard-temp");
+                        }
+                        Element photo = vcard.findChild("PHOTO");
+                        if (photo == null) {
+                            photo = vcard.addChild("PHOTO");
+                        }
+                        photo.clearChildren();
+                        photo.addChild("TYPE").setContent(avatar.type);
+                        photo.addChild("BINVAL").setContent(avatar.image);
+                        final Iq publication = new Iq(Iq.Type.SET);
+                        publication.setTo(conversation.getJid().asBareJid());
+                        publication.addChild(vcard);
+                        sendIqPacket(
+                                account,
+                                publication,
+                                (publicationResponse) -> {
+                                    if (publicationResponse.getType() == Iq.Type.RESULT) {
+                                        callback.onAvatarPublicationSucceeded();
+                                    } else {
+                                        Log.d(
+                                                Config.LOGTAG,
+                                                "failed to publish vcard "
+                                                        + publicationResponse.getErrorCondition());
+                                        callback.onAvatarPublicationFailed(
+                                                R.string.error_publish_avatar_server_reject);
+                                    }
+                                });
                     } else {
-                        Log.d(Config.LOGTAG, "failed to publish vcard " + publicationResponse.getErrorCondition());
-                        callback.onAvatarPublicationFailed(R.string.error_publish_avatar_server_reject);
+                        Log.d(Config.LOGTAG, "failed to request vcard " + response);
+                        callback.onAvatarPublicationFailed(
+                                R.string.error_publish_avatar_no_server_support);
                     }
                 });
-            } else {
-                Log.d(Config.LOGTAG, "failed to request vcard " + response);
-                callback.onAvatarPublicationFailed(R.string.error_publish_avatar_no_server_support);
-            }
-        });
     }
 
-    public void publishAvatar(Account account, final Avatar avatar, final OnAvatarPublication callback) {
+    public void publishAvatar(
+            Account account, final Avatar avatar, final OnAvatarPublication callback) {
         final Bundle options;
         if (account.getXmppConnection().getFeatures().pepPublishOptions()) {
             options = PublishOptions.openAccess();
@@ -3924,118 +4695,193 @@ public class XmppConnectionService extends Service {
         publishAvatar(account, avatar, options, true, callback);
     }
 
-    public void publishAvatar(Account account, final Avatar avatar, final Bundle options, final boolean retry, final OnAvatarPublication callback) {
-        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": publishing avatar. options=" + options);
+    public void publishAvatar(
+            Account account,
+            final Avatar avatar,
+            final Bundle options,
+            final boolean retry,
+            final OnAvatarPublication callback) {
+        Log.d(
+                Config.LOGTAG,
+                account.getJid().asBareJid() + ": publishing avatar. options=" + options);
         final Iq packet = this.mIqGenerator.publishAvatar(avatar, options);
-        this.sendIqPacket(account, packet, result -> {
-            if (result.getType() == Iq.Type.RESULT) {
-                publishAvatarMetadata(account, avatar, options, true, callback);
-            } else if (retry && PublishOptions.preconditionNotMet(result)) {
-                pushNodeConfiguration(account, Namespace.AVATAR_DATA, options, new OnConfigurationPushed() {
-                    @Override
-                    public void onPushSucceeded() {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": changed node configuration for avatar node");
-                        publishAvatar(account, avatar, options, false, callback);
-                    }
+        this.sendIqPacket(
+                account,
+                packet,
+                result -> {
+                    if (result.getType() == Iq.Type.RESULT) {
+                        publishAvatarMetadata(account, avatar, options, true, callback);
+                    } else if (retry && PublishOptions.preconditionNotMet(result)) {
+                        pushNodeConfiguration(
+                                account,
+                                Namespace.AVATAR_DATA,
+                                options,
+                                new OnConfigurationPushed() {
+                                    @Override
+                                    public void onPushSucceeded() {
+                                        Log.d(
+                                                Config.LOGTAG,
+                                                account.getJid().asBareJid()
+                                                        + ": changed node configuration for avatar"
+                                                        + " node");
+                                        publishAvatar(account, avatar, options, false, callback);
+                                    }
 
-                    @Override
-                    public void onPushFailed() {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": unable to change node configuration for avatar node");
-                        publishAvatar(account, avatar, null, false, callback);
+                                    @Override
+                                    public void onPushFailed() {
+                                        Log.d(
+                                                Config.LOGTAG,
+                                                account.getJid().asBareJid()
+                                                        + ": unable to change node configuration"
+                                                        + " for avatar node");
+                                        publishAvatar(account, avatar, null, false, callback);
+                                    }
+                                });
+                    } else {
+                        Element error = result.findChild("error");
+                        Log.d(
+                                Config.LOGTAG,
+                                account.getJid().asBareJid()
+                                        + ": server rejected avatar "
+                                        + (avatar.size / 1024)
+                                        + "KiB "
+                                        + (error != null ? error.toString() : ""));
+                        if (callback != null) {
+                            callback.onAvatarPublicationFailed(
+                                    R.string.error_publish_avatar_server_reject);
+                        }
                     }
                 });
-            } else {
-                Element error = result.findChild("error");
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": server rejected avatar " + (avatar.size / 1024) + "KiB " + (error != null ? error.toString() : ""));
-                if (callback != null) {
-                    callback.onAvatarPublicationFailed(R.string.error_publish_avatar_server_reject);
-                }
-            }
-        });
     }
 
-    public void publishAvatarMetadata(Account account, final Avatar avatar, final Bundle options, final boolean retry, final OnAvatarPublication callback) {
-        final Iq packet = XmppConnectionService.this.mIqGenerator.publishAvatarMetadata(avatar, options);
-        sendIqPacket(account, packet, result -> {
-            if (result.getType() == Iq.Type.RESULT) {
-                if (account.setAvatar(avatar.getFilename())) {
-                    getAvatarService().clear(account);
-                    databaseBackend.updateAccount(account);
-                    notifyAccountAvatarHasChanged(account);
-                }
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": published avatar " + (avatar.size / 1024) + "KiB");
-                if (callback != null) {
-                    callback.onAvatarPublicationSucceeded();
-                }
-            } else if (retry && PublishOptions.preconditionNotMet(result)) {
-                pushNodeConfiguration(account, Namespace.AVATAR_METADATA, options, new OnConfigurationPushed() {
-                    @Override
-                    public void onPushSucceeded() {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": changed node configuration for avatar meta data node");
-                        publishAvatarMetadata(account, avatar, options, false, callback);
-                    }
+    public void publishAvatarMetadata(
+            Account account,
+            final Avatar avatar,
+            final Bundle options,
+            final boolean retry,
+            final OnAvatarPublication callback) {
+        final Iq packet =
+                XmppConnectionService.this.mIqGenerator.publishAvatarMetadata(avatar, options);
+        sendIqPacket(
+                account,
+                packet,
+                result -> {
+                    if (result.getType() == Iq.Type.RESULT) {
+                        if (account.setAvatar(avatar.getFilename())) {
+                            getAvatarService().clear(account);
+                            databaseBackend.updateAccount(account);
+                            notifyAccountAvatarHasChanged(account);
+                        }
+                        Log.d(
+                                Config.LOGTAG,
+                                account.getJid().asBareJid()
+                                        + ": published avatar "
+                                        + (avatar.size / 1024)
+                                        + "KiB");
+                        if (callback != null) {
+                            callback.onAvatarPublicationSucceeded();
+                        }
+                    } else if (retry && PublishOptions.preconditionNotMet(result)) {
+                        pushNodeConfiguration(
+                                account,
+                                Namespace.AVATAR_METADATA,
+                                options,
+                                new OnConfigurationPushed() {
+                                    @Override
+                                    public void onPushSucceeded() {
+                                        Log.d(
+                                                Config.LOGTAG,
+                                                account.getJid().asBareJid()
+                                                        + ": changed node configuration for avatar"
+                                                        + " meta data node");
+                                        publishAvatarMetadata(
+                                                account, avatar, options, false, callback);
+                                    }
 
-                    @Override
-                    public void onPushFailed() {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": unable to change node configuration for avatar meta data node");
-                        publishAvatarMetadata(account, avatar, null, false, callback);
+                                    @Override
+                                    public void onPushFailed() {
+                                        Log.d(
+                                                Config.LOGTAG,
+                                                account.getJid().asBareJid()
+                                                        + ": unable to change node configuration"
+                                                        + " for avatar meta data node");
+                                        publishAvatarMetadata(
+                                                account, avatar, null, false, callback);
+                                    }
+                                });
+                    } else {
+                        if (callback != null) {
+                            callback.onAvatarPublicationFailed(
+                                    R.string.error_publish_avatar_server_reject);
+                        }
                     }
                 });
-            } else {
-                if (callback != null) {
-                    callback.onAvatarPublicationFailed(R.string.error_publish_avatar_server_reject);
-                }
-            }
-        });
     }
 
     public void republishAvatarIfNeeded(Account account) {
         if (account.getAxolotlService().isPepBroken()) {
-            Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": skipping republication of avatar because pep is broken");
+            Log.d(
+                    Config.LOGTAG,
+                    account.getJid().asBareJid()
+                            + ": skipping republication of avatar because pep is broken");
             return;
         }
         final Iq packet = this.mIqGenerator.retrieveAvatarMetaData(null);
-        this.sendIqPacket(account, packet, new Consumer<Iq>() {
-
-            private Avatar parseAvatar(Iq packet) {
-                Element pubsub = packet.findChild("pubsub", "http://jabber.org/protocol/pubsub");
-                if (pubsub != null) {
-                    Element items = pubsub.findChild("items");
-                    if (items != null) {
-                        return Avatar.parseMetadata(items);
+        this.sendIqPacket(
+                account,
+                packet,
+                new Consumer<Iq>() {
+
+                    private Avatar parseAvatar(Iq packet) {
+                        Element pubsub =
+                                packet.findChild("pubsub", "http://jabber.org/protocol/pubsub");
+                        if (pubsub != null) {
+                            Element items = pubsub.findChild("items");
+                            if (items != null) {
+                                return Avatar.parseMetadata(items);
+                            }
+                        }
+                        return null;
                     }
-                }
-                return null;
-            }
 
-            private boolean errorIsItemNotFound(Iq packet) {
-                Element error = packet.findChild("error");
-                return packet.getType() == Iq.Type.ERROR
-                        && error != null
-                        && error.hasChild("item-not-found");
-            }
+                    private boolean errorIsItemNotFound(Iq packet) {
+                        Element error = packet.findChild("error");
+                        return packet.getType() == Iq.Type.ERROR
+                                && error != null
+                                && error.hasChild("item-not-found");
+                    }
 
-            @Override
-            public void accept(final Iq packet) {
-                if (packet.getType() == Iq.Type.RESULT || errorIsItemNotFound(packet)) {
-                    Avatar serverAvatar = parseAvatar(packet);
-                    if (serverAvatar == null && account.getAvatar() != null) {
-                        Avatar avatar = fileBackend.getStoredPepAvatar(account.getAvatar());
-                        if (avatar != null) {
-                            Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": avatar on server was null. republishing");
-                            publishAvatar(account, fileBackend.getStoredPepAvatar(account.getAvatar()), null);
-                        } else {
-                            Log.e(Config.LOGTAG, account.getJid().asBareJid() + ": error rereading avatar");
+                    @Override
+                    public void accept(final Iq packet) {
+                        if (packet.getType() == Iq.Type.RESULT || errorIsItemNotFound(packet)) {
+                            Avatar serverAvatar = parseAvatar(packet);
+                            if (serverAvatar == null && account.getAvatar() != null) {
+                                Avatar avatar = fileBackend.getStoredPepAvatar(account.getAvatar());
+                                if (avatar != null) {
+                                    Log.d(
+                                            Config.LOGTAG,
+                                            account.getJid().asBareJid()
+                                                    + ": avatar on server was null. republishing");
+                                    publishAvatar(
+                                            account,
+                                            fileBackend.getStoredPepAvatar(account.getAvatar()),
+                                            null);
+                                } else {
+                                    Log.e(
+                                            Config.LOGTAG,
+                                            account.getJid().asBareJid()
+                                                    + ": error rereading avatar");
+                                }
+                            }
                         }
                     }
-                }
-            }
-        });
+                });
     }
 
     public void cancelAvatarFetches(final Account account) {
         synchronized (mInProgressAvatarFetches) {
-            for (final Iterator<String> iterator = mInProgressAvatarFetches.iterator(); iterator.hasNext(); ) {
+            for (final Iterator<String> iterator = mInProgressAvatarFetches.iterator();
+                    iterator.hasNext(); ) {
                 final String KEY = iterator.next();
                 if (KEY.startsWith(account.getJid().asBareJid() + "_")) {
                     iterator.remove();
@@ -4048,7 +4894,8 @@ public class XmppConnectionService extends Service {
         fetchAvatar(account, avatar, null);
     }
 
-    public void fetchAvatar(Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
+    public void fetchAvatar(
+            Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
         final String KEY = generateFetchKey(account, avatar);
         synchronized (this.mInProgressAvatarFetches) {
             if (mInProgressAvatarFetches.add(KEY)) {
@@ -4065,159 +4912,208 @@ public class XmppConnectionService extends Service {
             } else if (avatar.origin == Avatar.Origin.PEP) {
                 mOmittedPepAvatarFetches.add(KEY);
             } else {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": already fetching " + avatar.origin + " avatar for " + avatar.owner);
+                Log.d(
+                        Config.LOGTAG,
+                        account.getJid().asBareJid()
+                                + ": already fetching "
+                                + avatar.origin
+                                + " avatar for "
+                                + avatar.owner);
             }
         }
     }
 
-    private void fetchAvatarPep(final Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
+    private void fetchAvatarPep(
+            final Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
         final Iq packet = this.mIqGenerator.retrievePepAvatar(avatar);
-        sendIqPacket(account, packet, (result) -> {
-            synchronized (mInProgressAvatarFetches) {
-                mInProgressAvatarFetches.remove(generateFetchKey(account, avatar));
-            }
-            final String ERROR = account.getJid().asBareJid() + ": fetching avatar for " + avatar.owner + " failed ";
-            if (result.getType() == Iq.Type.RESULT) {
-                avatar.image = IqParser.avatarData(result);
-                if (avatar.image != null) {
-                    if (getFileBackend().save(avatar)) {
-                        if (account.getJid().asBareJid().equals(avatar.owner)) {
-                            if (account.setAvatar(avatar.getFilename())) {
-                                databaseBackend.updateAccount(account);
+        sendIqPacket(
+                account,
+                packet,
+                (result) -> {
+                    synchronized (mInProgressAvatarFetches) {
+                        mInProgressAvatarFetches.remove(generateFetchKey(account, avatar));
+                    }
+                    final String ERROR =
+                            account.getJid().asBareJid()
+                                    + ": fetching avatar for "
+                                    + avatar.owner
+                                    + " failed ";
+                    if (result.getType() == Iq.Type.RESULT) {
+                        avatar.image = IqParser.avatarData(result);
+                        if (avatar.image != null) {
+                            if (getFileBackend().save(avatar)) {
+                                if (account.getJid().asBareJid().equals(avatar.owner)) {
+                                    if (account.setAvatar(avatar.getFilename())) {
+                                        databaseBackend.updateAccount(account);
+                                    }
+                                    getAvatarService().clear(account);
+                                    updateConversationUi();
+                                    updateAccountUi();
+                                } else {
+                                    final Contact contact =
+                                            account.getRoster().getContact(avatar.owner);
+                                    contact.setAvatar(avatar);
+                                    syncRoster(account);
+                                    getAvatarService().clear(contact);
+                                    updateConversationUi();
+                                    updateRosterUi();
+                                }
+                                if (callback != null) {
+                                    callback.success(avatar);
+                                }
+                                Log.d(
+                                        Config.LOGTAG,
+                                        account.getJid().asBareJid()
+                                                + ": successfully fetched pep avatar for "
+                                                + avatar.owner);
+                                return;
                             }
-                            getAvatarService().clear(account);
-                            updateConversationUi();
-                            updateAccountUi();
                         } else {
-                            final Contact contact = account.getRoster().getContact(avatar.owner);
-                            contact.setAvatar(avatar);
-                            syncRoster(account);
-                            getAvatarService().clear(contact);
-                            updateConversationUi();
-                            updateRosterUi();
+
+                            Log.d(Config.LOGTAG, ERROR + "(parsing error)");
                         }
-                        if (callback != null) {
-                            callback.success(avatar);
+                    } else {
+                        Element error = result.findChild("error");
+                        if (error == null) {
+                            Log.d(Config.LOGTAG, ERROR + "(server error)");
+                        } else {
+                            Log.d(Config.LOGTAG, ERROR + error.toString());
                         }
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": successfully fetched pep avatar for " + avatar.owner);
-                        return;
                     }
-                } else {
-
-                    Log.d(Config.LOGTAG, ERROR + "(parsing error)");
-                }
-            } else {
-                Element error = result.findChild("error");
-                if (error == null) {
-                    Log.d(Config.LOGTAG, ERROR + "(server error)");
-                } else {
-                    Log.d(Config.LOGTAG, ERROR + error.toString());
-                }
-            }
-            if (callback != null) {
-                callback.error(0, null);
-            }
-
-        });
+                    if (callback != null) {
+                        callback.error(0, null);
+                    }
+                });
     }
 
-    private void fetchAvatarVcard(final Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
+    private void fetchAvatarVcard(
+            final Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
         final Iq packet = this.mIqGenerator.retrieveVcardAvatar(avatar);
-        this.sendIqPacket(account, packet, response -> {
-            final boolean previouslyOmittedPepFetch;
-            synchronized (mInProgressAvatarFetches) {
-                final String KEY = generateFetchKey(account, avatar);
-                mInProgressAvatarFetches.remove(KEY);
-                previouslyOmittedPepFetch = mOmittedPepAvatarFetches.remove(KEY);
-            }
-            if (response.getType() == Iq.Type.RESULT) {
-                Element vCard = response.findChild("vCard", "vcard-temp");
-                Element photo = vCard != null ? vCard.findChild("PHOTO") : null;
-                String image = photo != null ? photo.findChildContent("BINVAL") : null;
-                if (image != null) {
-                    avatar.image = image;
-                    if (getFileBackend().save(avatar)) {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid()
-                                + ": successfully fetched vCard avatar for " + avatar.owner + " omittedPep=" + previouslyOmittedPepFetch);
-                        if (avatar.owner.isBareJid()) {
-                            if (account.getJid().asBareJid().equals(avatar.owner) && account.getAvatar() == null) {
-                                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": had no avatar. replacing with vcard");
-                                account.setAvatar(avatar.getFilename());
-                                databaseBackend.updateAccount(account);
-                                getAvatarService().clear(account);
-                                updateAccountUi();
-                            } else {
-                                final Contact contact = account.getRoster().getContact(avatar.owner);
-                                contact.setAvatar(avatar, previouslyOmittedPepFetch);
-                                syncRoster(account);
-                                getAvatarService().clear(contact);
-                                updateRosterUi();
-                            }
-                            updateConversationUi();
-                        } else {
-                            Conversation conversation = find(account, avatar.owner.asBareJid());
-                            if (conversation != null && conversation.getMode() == Conversation.MODE_MULTI) {
-                                MucOptions.User user = conversation.getMucOptions().findUserByFullJid(avatar.owner);
-                                if (user != null) {
-                                    if (user.setAvatar(avatar)) {
-                                        getAvatarService().clear(user);
-                                        updateConversationUi();
-                                        updateMucRosterUi();
-                                    }
-                                    if (user.getRealJid() != null) {
-                                        Contact contact = account.getRoster().getContact(user.getRealJid());
-                                        contact.setAvatar(avatar);
+        this.sendIqPacket(
+                account,
+                packet,
+                response -> {
+                    final boolean previouslyOmittedPepFetch;
+                    synchronized (mInProgressAvatarFetches) {
+                        final String KEY = generateFetchKey(account, avatar);
+                        mInProgressAvatarFetches.remove(KEY);
+                        previouslyOmittedPepFetch = mOmittedPepAvatarFetches.remove(KEY);
+                    }
+                    if (response.getType() == Iq.Type.RESULT) {
+                        Element vCard = response.findChild("vCard", "vcard-temp");
+                        Element photo = vCard != null ? vCard.findChild("PHOTO") : null;
+                        String image = photo != null ? photo.findChildContent("BINVAL") : null;
+                        if (image != null) {
+                            avatar.image = image;
+                            if (getFileBackend().save(avatar)) {
+                                Log.d(
+                                        Config.LOGTAG,
+                                        account.getJid().asBareJid()
+                                                + ": successfully fetched vCard avatar for "
+                                                + avatar.owner
+                                                + " omittedPep="
+                                                + previouslyOmittedPepFetch);
+                                if (avatar.owner.isBareJid()) {
+                                    if (account.getJid().asBareJid().equals(avatar.owner)
+                                            && account.getAvatar() == null) {
+                                        Log.d(
+                                                Config.LOGTAG,
+                                                account.getJid().asBareJid()
+                                                        + ": had no avatar. replacing with vcard");
+                                        account.setAvatar(avatar.getFilename());
+                                        databaseBackend.updateAccount(account);
+                                        getAvatarService().clear(account);
+                                        updateAccountUi();
+                                    } else {
+                                        final Contact contact =
+                                                account.getRoster().getContact(avatar.owner);
+                                        contact.setAvatar(avatar, previouslyOmittedPepFetch);
                                         syncRoster(account);
                                         getAvatarService().clear(contact);
                                         updateRosterUi();
                                     }
+                                    updateConversationUi();
+                                } else {
+                                    Conversation conversation =
+                                            find(account, avatar.owner.asBareJid());
+                                    if (conversation != null
+                                            && conversation.getMode() == Conversation.MODE_MULTI) {
+                                        MucOptions.User user =
+                                                conversation
+                                                        .getMucOptions()
+                                                        .findUserByFullJid(avatar.owner);
+                                        if (user != null) {
+                                            if (user.setAvatar(avatar)) {
+                                                getAvatarService().clear(user);
+                                                updateConversationUi();
+                                                updateMucRosterUi();
+                                            }
+                                            if (user.getRealJid() != null) {
+                                                Contact contact =
+                                                        account.getRoster()
+                                                                .getContact(user.getRealJid());
+                                                contact.setAvatar(avatar);
+                                                syncRoster(account);
+                                                getAvatarService().clear(contact);
+                                                updateRosterUi();
+                                            }
+                                        }
+                                    }
                                 }
                             }
                         }
                     }
-                }
-            }
-        });
+                });
     }
 
     public void checkForAvatar(final Account account, final UiCallback<Avatar> callback) {
         final Iq packet = this.mIqGenerator.retrieveAvatarMetaData(null);
-        this.sendIqPacket(account, packet, response -> {
-            if (response.getType() == Iq.Type.RESULT) {
-                Element pubsub = response.findChild("pubsub", "http://jabber.org/protocol/pubsub");
-                if (pubsub != null) {
-                    Element items = pubsub.findChild("items");
-                    if (items != null) {
-                        Avatar avatar = Avatar.parseMetadata(items);
-                        if (avatar != null) {
-                            avatar.owner = account.getJid().asBareJid();
-                            if (fileBackend.isAvatarCached(avatar)) {
-                                if (account.setAvatar(avatar.getFilename())) {
-                                    databaseBackend.updateAccount(account);
+        this.sendIqPacket(
+                account,
+                packet,
+                response -> {
+                    if (response.getType() == Iq.Type.RESULT) {
+                        Element pubsub =
+                                response.findChild("pubsub", "http://jabber.org/protocol/pubsub");
+                        if (pubsub != null) {
+                            Element items = pubsub.findChild("items");
+                            if (items != null) {
+                                Avatar avatar = Avatar.parseMetadata(items);
+                                if (avatar != null) {
+                                    avatar.owner = account.getJid().asBareJid();
+                                    if (fileBackend.isAvatarCached(avatar)) {
+                                        if (account.setAvatar(avatar.getFilename())) {
+                                            databaseBackend.updateAccount(account);
+                                        }
+                                        getAvatarService().clear(account);
+                                        callback.success(avatar);
+                                    } else {
+                                        fetchAvatarPep(account, avatar, callback);
+                                    }
+                                    return;
                                 }
-                                getAvatarService().clear(account);
-                                callback.success(avatar);
-                            } else {
-                                fetchAvatarPep(account, avatar, callback);
                             }
-                            return;
                         }
                     }
-                }
-            }
-            callback.error(0, null);
-        });
+                    callback.error(0, null);
+                });
     }
 
     public void notifyAccountAvatarHasChanged(final Account account) {
         final XmppConnection connection = account.getXmppConnection();
         if (connection != null && connection.getFeatures().bookmarksConversion()) {
-            Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": avatar changed. resending presence to online group chats");
+            Log.d(
+                    Config.LOGTAG,
+                    account.getJid().asBareJid()
+                            + ": avatar changed. resending presence to online group chats");
             for (Conversation conversation : conversations) {
-                if (conversation.getAccount() == account && conversation.getMode() == Conversational.MODE_MULTI) {
+                if (conversation.getAccount() == account
+                        && conversation.getMode() == Conversational.MODE_MULTI) {
                     final MucOptions mucOptions = conversation.getMucOptions();
                     if (mucOptions.online()) {
-                        final var packet = mPresenceGenerator.selfPresence(account, Presence.Status.ONLINE, mucOptions.nonanonymous());
+                        final var packet =
+                                mPresenceGenerator.selfPresence(
+                                        account, Presence.Status.ONLINE, mucOptions.nonanonymous());
                         packet.setTo(mucOptions.getSelf().getFullJid());
                         connection.sendPresencePacket(packet);
                     }
@@ -4244,7 +5140,8 @@ public class XmppConnectionService extends Service {
         mDatabaseWriterExecutor.execute(() -> databaseBackend.updateConversation(conversation));
     }
 
-    private void reconnectAccount(final Account account, final boolean force, final boolean interactive) {
+    private void reconnectAccount(
+            final Account account, final boolean force, final boolean interactive) {
         synchronized (account) {
             final XmppConnection existingConnection = account.getXmppConnection();
             final XmppConnection connection;
@@ -4287,8 +5184,15 @@ public class XmppConnectionService extends Service {
     }
 
     public void invite(final Conversation conversation, final Jid contact) {
-        Log.d(Config.LOGTAG, conversation.getAccount().getJid().asBareJid() + ": inviting " + contact + " to " + conversation.getJid().asBareJid());
-        final MucOptions.User user = conversation.getMucOptions().findUserByRealJid(contact.asBareJid());
+        Log.d(
+                Config.LOGTAG,
+                conversation.getAccount().getJid().asBareJid()
+                        + ": inviting "
+                        + contact
+                        + " to "
+                        + conversation.getJid().asBareJid());
+        final MucOptions.User user =
+                conversation.getMucOptions().findUserByRealJid(contact.asBareJid());
         if (user == null || user.getAffiliation() == MucOptions.Affiliation.OUTCAST) {
             changeAffiliationInConference(conversation, contact, MucOptions.Affiliation.NONE, null);
         }
@@ -4304,21 +5208,29 @@ public class XmppConnectionService extends Service {
     public void resetSendingToWaiting(Account account) {
         for (Conversation conversation : getConversations()) {
             if (conversation.getAccount() == account) {
-                conversation.findUnsentTextMessages(message -> markMessage(message, Message.STATUS_WAITING));
+                conversation.findUnsentTextMessages(
+                        message -> markMessage(message, Message.STATUS_WAITING));
             }
         }
     }
 
-    public Message markMessage(final Account account, final Jid recipient, final String uuid, final int status) {
+    public Message markMessage(
+            final Account account, final Jid recipient, final String uuid, final int status) {
         return markMessage(account, recipient, uuid, status, null);
     }
 
-    public Message markMessage(final Account account, final Jid recipient, final String uuid, final int status, String errorMessage) {
+    public Message markMessage(
+            final Account account,
+            final Jid recipient,
+            final String uuid,
+            final int status,
+            String errorMessage) {
         if (uuid == null) {
             return null;
         }
         for (Conversation conversation : getConversations()) {
-            if (conversation.getJid().asBareJid().equals(recipient) && conversation.getAccount() == account) {
+            if (conversation.getJid().asBareJid().equals(recipient)
+                    && conversation.getAccount() == account) {
                 final Message message = conversation.findSentMessageWithUuidOrRemoteId(uuid);
                 if (message != null) {
                     markMessage(message, status, errorMessage);
@@ -4329,11 +5241,20 @@ public class XmppConnectionService extends Service {
         return null;
     }
 
-    public boolean markMessage(final Conversation conversation, final String uuid, final int status, final String serverMessageId) {
+    public boolean markMessage(
+            final Conversation conversation,
+            final String uuid,
+            final int status,
+            final String serverMessageId) {
         return markMessage(conversation, uuid, status, serverMessageId, null);
     }
 
-    public boolean markMessage(final Conversation conversation, final String uuid, final int status, final String serverMessageId, final LocalizedContent body) {
+    public boolean markMessage(
+            final Conversation conversation,
+            final String uuid,
+            final int status,
+            final String serverMessageId,
+            final LocalizedContent body) {
         if (uuid == null) {
             return false;
         } else {
@@ -4371,14 +5292,19 @@ public class XmppConnectionService extends Service {
         markMessage(message, status, null);
     }
 
-
     public void markMessage(final Message message, final int status, final String errorMessage) {
         markMessage(message, status, errorMessage, false);
     }
 
-    public void markMessage(final Message message, final int status, final String errorMessage, final boolean includeBody) {
+    public void markMessage(
+            final Message message,
+            final int status,
+            final String errorMessage,
+            final boolean includeBody) {
         final int oldStatus = message.getStatus();
-        if (status == Message.STATUS_SEND_FAILED && (oldStatus == Message.STATUS_SEND_RECEIVED || oldStatus == Message.STATUS_SEND_DISPLAYED)) {
+        if (status == Message.STATUS_SEND_FAILED
+                && (oldStatus == Message.STATUS_SEND_RECEIVED
+                        || oldStatus == Message.STATUS_SEND_DISPLAYED)) {
             return;
         }
         if (status == Message.STATUS_SEND_RECEIVED && oldStatus == Message.STATUS_SEND_DISPLAYED) {
@@ -4398,7 +5324,10 @@ public class XmppConnectionService extends Service {
     }
 
     public long getAutomaticMessageDeletionDate() {
-        final long timeout = getLongPreference(AppSettings.AUTOMATIC_MESSAGE_DELETION, R.integer.automatic_message_deletion);
+        final long timeout =
+                getLongPreference(
+                        AppSettings.AUTOMATIC_MESSAGE_DELETION,
+                        R.integer.automatic_message_deletion);
         return timeout == 0 ? timeout : (System.currentTimeMillis() - (timeout * 1000));
     }
 
@@ -4428,11 +5357,14 @@ public class XmppConnectionService extends Service {
     }
 
     public boolean useTorToConnect() {
-        return QuickConversationsService.isConversations() && getBooleanPreference("use_tor", R.bool.use_tor);
+        return QuickConversationsService.isConversations()
+                && getBooleanPreference("use_tor", R.bool.use_tor);
     }
 
     public boolean showExtendedConnectionOptions() {
-        return QuickConversationsService.isConversations() && getBooleanPreference(AppSettings.SHOW_CONNECTION_OPTIONS, R.bool.show_connection_options);
+        return QuickConversationsService.isConversations()
+                && getBooleanPreference(
+                        AppSettings.SHOW_CONNECTION_OPTIONS, R.bool.show_connection_options);
     }
 
     public boolean broadcastLastActivity() {
@@ -4447,7 +5379,6 @@ public class XmppConnectionService extends Service {
         return count;
     }
 
-
     private <T> List<T> threadSafeList(Set<T> set) {
         synchronized (LISTENER_LOCK) {
             return set.isEmpty() ? Collections.emptyList() : new ArrayList<>(set);
@@ -4466,14 +5397,22 @@ public class XmppConnectionService extends Service {
         }
     }
 
-    public void notifyJingleRtpConnectionUpdate(final Account account, final Jid with, final String sessionId, final RtpEndUserState state) {
-        for (OnJingleRtpConnectionUpdate listener : threadSafeList(this.onJingleRtpConnectionUpdate)) {
+    public void notifyJingleRtpConnectionUpdate(
+            final Account account,
+            final Jid with,
+            final String sessionId,
+            final RtpEndUserState state) {
+        for (OnJingleRtpConnectionUpdate listener :
+                threadSafeList(this.onJingleRtpConnectionUpdate)) {
             listener.onJingleRtpConnectionUpdate(account, with, sessionId, state);
         }
     }
 
-    public void notifyJingleRtpConnectionUpdate(CallIntegration.AudioDevice selectedAudioDevice, Set<CallIntegration.AudioDevice> availableAudioDevices) {
-        for (OnJingleRtpConnectionUpdate listener : threadSafeList(this.onJingleRtpConnectionUpdate)) {
+    public void notifyJingleRtpConnectionUpdate(
+            CallIntegration.AudioDevice selectedAudioDevice,
+            Set<CallIntegration.AudioDevice> availableAudioDevices) {
+        for (OnJingleRtpConnectionUpdate listener :
+                threadSafeList(this.onJingleRtpConnectionUpdate)) {
             listener.onAudioDeviceChanged(selectedAudioDevice, availableAudioDevices);
         }
     }
@@ -4493,8 +5432,12 @@ public class XmppConnectionService extends Service {
     public boolean displayCaptchaRequest(Account account, String id, Data data, Bitmap captcha) {
         if (mOnCaptchaRequested.size() > 0) {
             DisplayMetrics metrics = getApplicationContext().getResources().getDisplayMetrics();
-            Bitmap scaled = Bitmap.createScaledBitmap(captcha, (int) (captcha.getWidth() * metrics.scaledDensity),
-                    (int) (captcha.getHeight() * metrics.scaledDensity), false);
+            Bitmap scaled =
+                    Bitmap.createScaledBitmap(
+                            captcha,
+                            (int) (captcha.getWidth() * metrics.scaledDensity),
+                            (int) (captcha.getHeight() * metrics.scaledDensity),
+                            false);
             for (OnCaptchaRequested listener : threadSafeList(this.mOnCaptchaRequested)) {
                 listener.onCaptchaRequested(account, id, data, scaled);
             }
@@ -4551,7 +5494,10 @@ public class XmppConnectionService extends Service {
     public Conversation findUniqueConversationByJid(XmppUri xmppUri) {
         List<Conversation> findings = new ArrayList<>();
         for (Conversation c : getConversations()) {
-            if (c.getAccount().isEnabled() && c.getJid().asBareJid().equals(xmppUri.getJid()) && ((c.getMode() == Conversational.MODE_MULTI) == xmppUri.isAction(XmppUri.ACTION_JOIN))) {
+            if (c.getAccount().isEnabled()
+                    && c.getJid().asBareJid().equals(xmppUri.getJid())
+                    && ((c.getMode() == Conversational.MODE_MULTI)
+                            == xmppUri.isAction(XmppUri.ACTION_JOIN))) {
                 findings.add(c);
             }
         }
@@ -4566,17 +5512,19 @@ public class XmppConnectionService extends Service {
         markRead(conversation, null, true);
     }
 
-    public List<Message> markRead(final Conversation conversation, String upToUuid, boolean dismiss) {
+    public List<Message> markRead(
+            final Conversation conversation, String upToUuid, boolean dismiss) {
         if (dismiss) {
             mNotificationService.clear(conversation);
         }
         final List<Message> readMessages = conversation.markRead(upToUuid);
         if (readMessages.size() > 0) {
-            Runnable runnable = () -> {
-                for (Message message : readMessages) {
-                    databaseBackend.updateMessage(message, false);
-                }
-            };
+            Runnable runnable =
+                    () -> {
+                        for (Message message : readMessages) {
+                            databaseBackend.updateMessage(message, false);
+                        }
+                    };
             mDatabaseWriterExecutor.execute(runnable);
             updateConversationUi();
             updateUnreadCountBadge();
@@ -4639,7 +5587,7 @@ public class XmppConnectionService extends Service {
             if (!last.isPrivateMessage()) {
                 packet.setTo(packet.getTo().asBareJid());
             }
-            Log.d(Config.LOGTAG,account.getJid().asBareJid()+": server assisted "+packet);
+            Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": server assisted " + packet);
             this.sendMessagePacket(account, packet);
         } else {
             publishMds(last);
@@ -4679,12 +5627,15 @@ public class XmppConnectionService extends Service {
         } else {
             itemId = conversation.getJid().asBareJid();
         }
-        Log.d(Config.LOGTAG,"publishing mds for "+itemId+"/"+stanzaId);
+        Log.d(Config.LOGTAG, "publishing mds for " + itemId + "/" + stanzaId);
         publishMds(account, itemId, stanzaId, conversation);
     }
 
     private void publishMds(
-            final Account account, final Jid itemId, final String stanzaId, final Conversation conversation) {
+            final Account account,
+            final Jid itemId,
+            final String stanzaId,
+            final Conversation conversation) {
         final var item = mIqGenerator.mdsDisplayed(stanzaId, conversation);
         pushNodeAndEnforcePublishOptions(
                 account,
@@ -4792,7 +5743,10 @@ public class XmppConnectionService extends Service {
             }
         }
         if (Config.QUICKSY_DOMAIN != null) {
-            hosts.remove(Config.QUICKSY_DOMAIN.toEscapedString()); //we only want to show this when we type a e164 number
+            hosts.remove(
+                    Config.QUICKSY_DOMAIN
+                            .toEscapedString()); // we only want to show this when we type a e164
+            // number
         }
         if (Config.MAGIC_CREATE_DOMAIN != null) {
             hosts.add(Config.MAGIC_CREATE_DOMAIN);
@@ -4817,14 +5771,18 @@ public class XmppConnectionService extends Service {
         return mucServers;
     }
 
-    public void sendMessagePacket(final Account account, final im.conversations.android.xmpp.model.stanza.Message packet) {
+    public void sendMessagePacket(
+            final Account account,
+            final im.conversations.android.xmpp.model.stanza.Message packet) {
         final XmppConnection connection = account.getXmppConnection();
         if (connection != null) {
             connection.sendMessagePacket(packet);
         }
     }
 
-    public void sendPresencePacket(final Account account, final im.conversations.android.xmpp.model.stanza.Presence packet) {
+    public void sendPresencePacket(
+            final Account account,
+            final im.conversations.android.xmpp.model.stanza.Presence packet) {
         final XmppConnection connection = account.getXmppConnection();
         if (connection != null) {
             connection.sendPresencePacket(packet);
@@ -4861,8 +5819,10 @@ public class XmppConnectionService extends Service {
         }
         final var packet = mPresenceGenerator.selfPresence(account, status);
         if (mLastActivity > 0 && includeIdleTimestamp) {
-            long since = Math.min(mLastActivity, System.currentTimeMillis()); //don't send future dates
-            packet.addChild("idle", Namespace.IDLE).setAttribute("since", AbstractGenerator.getTimestamp(since));
+            long since =
+                    Math.min(mLastActivity, System.currentTimeMillis()); // don't send future dates
+            packet.addChild("idle", Namespace.IDLE)
+                    .setAttribute("since", AbstractGenerator.getTimestamp(since));
         }
         sendPresencePacket(account, packet);
     }
@@ -4890,8 +5850,6 @@ public class XmppConnectionService extends Service {
         }
     }
 
-
-
     private void sendOfflinePresence(final Account account) {
         Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": sending offline presence");
         sendPresencePacket(account, mPresenceGenerator.sendOfflinePresence(account));
@@ -4929,7 +5887,8 @@ public class XmppConnectionService extends Service {
         ArrayList<Contact> contacts = new ArrayList<>();
         for (Account account : getAccounts()) {
             if ((account.isEnabled() || accountJid != null)
-                    && (accountJid == null || accountJid.equals(account.getJid().asBareJid().toString()))) {
+                    && (accountJid == null
+                            || accountJid.equals(account.getJid().asBareJid().toString()))) {
                 Contact contact = account.getRoster().getContactFromContactList(jid);
                 if (contact != null) {
                     contacts.add(contact);
@@ -4941,7 +5900,9 @@ public class XmppConnectionService extends Service {
 
     public Conversation findFirstMuc(Jid jid) {
         for (Conversation conversation : getConversations()) {
-            if (conversation.getAccount().isEnabled() && conversation.getJid().asBareJid().equals(jid.asBareJid()) && conversation.getMode() == Conversation.MODE_MULTI) {
+            if (conversation.getAccount().isEnabled()
+                    && conversation.getJid().asBareJid().equals(jid.asBareJid())
+                    && conversation.getMode() == Conversation.MODE_MULTI) {
                 return conversation;
             }
         }
@@ -4990,25 +5951,30 @@ public class XmppConnectionService extends Service {
             reference = null;
         }
         conversation.clearMessages();
-        conversation.setHasMessagesLeftOnServer(false); //avoid messages getting loaded through mam
+        conversation.setHasMessagesLeftOnServer(false); // avoid messages getting loaded through mam
         conversation.setLastClearHistory(clearDate, reference);
-        Runnable runnable = () -> {
-            databaseBackend.deleteMessagesInConversation(conversation);
-            databaseBackend.updateConversation(conversation);
-        };
+        Runnable runnable =
+                () -> {
+                    databaseBackend.deleteMessagesInConversation(conversation);
+                    databaseBackend.updateConversation(conversation);
+                };
         mDatabaseWriterExecutor.execute(runnable);
     }
 
-    public boolean sendBlockRequest(final Blockable blockable, final boolean reportSpam, final String serverMsgId) {
+    public boolean sendBlockRequest(
+            final Blockable blockable, final boolean reportSpam, final String serverMsgId) {
         if (blockable != null && blockable.getBlockedJid() != null) {
             final var account = blockable.getAccount();
             final Jid jid = blockable.getBlockedJid();
-            this.sendIqPacket(account, getIqGenerator().generateSetBlockRequest(jid, reportSpam, serverMsgId), (response) -> {
-                if (response.getType() == Iq.Type.RESULT) {
-                    account.getBlocklist().add(jid);
-                    updateBlocklistUi(OnUpdateBlocklist.Status.BLOCKED);
-                }
-            });
+            this.sendIqPacket(
+                    account,
+                    getIqGenerator().generateSetBlockRequest(jid, reportSpam, serverMsgId),
+                    (response) -> {
+                        if (response.getType() == Iq.Type.RESULT) {
+                            account.getBlocklist().add(jid);
+                            updateBlocklistUi(OnUpdateBlocklist.Status.BLOCKED);
+                        }
+                    });
             if (blockable.getBlockedJid().isFullJid()) {
                 return false;
             } else if (removeBlockedConversations(blockable.getAccount(), jid)) {
@@ -5027,15 +5993,24 @@ public class XmppConnectionService extends Service {
         synchronized (this.conversations) {
             boolean domainJid = blockedJid.getLocal() == null;
             for (Conversation conversation : this.conversations) {
-                boolean jidMatches = (domainJid && blockedJid.getDomain().equals(conversation.getJid().getDomain()))
-                        || blockedJid.equals(conversation.getJid().asBareJid());
+                boolean jidMatches =
+                        (domainJid
+                                        && blockedJid
+                                                .getDomain()
+                                                .equals(conversation.getJid().getDomain()))
+                                || blockedJid.equals(conversation.getJid().asBareJid());
                 if (conversation.getAccount() == account
                         && conversation.getMode() == Conversation.MODE_SINGLE
                         && jidMatches) {
                     this.conversations.remove(conversation);
                     markRead(conversation);
                     conversation.setStatus(Conversation.STATUS_ARCHIVED);
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": archiving conversation " + conversation.getJid().asBareJid() + " because jid was blocked");
+                    Log.d(
+                            Config.LOGTAG,
+                            account.getJid().asBareJid()
+                                    + ": archiving conversation "
+                                    + conversation.getJid().asBareJid()
+                                    + " because jid was blocked");
                     updateConversation(conversation);
                     removed = true;
                 }
@@ -5048,12 +6023,15 @@ public class XmppConnectionService extends Service {
         if (blockable != null && blockable.getJid() != null) {
             final var account = blockable.getAccount();
             final Jid jid = blockable.getBlockedJid();
-            this.sendIqPacket(account, getIqGenerator().generateSetUnblockRequest(jid), response -> {
-                if (response.getType() == Iq.Type.RESULT) {
-                    account.getBlocklist().remove(jid);
-                    updateBlocklistUi(OnUpdateBlocklist.Status.UNBLOCKED);
-                }
-            });
+            this.sendIqPacket(
+                    account,
+                    getIqGenerator().generateSetUnblockRequest(jid),
+                    response -> {
+                        if (response.getType() == Iq.Type.RESULT) {
+                            account.getBlocklist().remove(jid);
+                            updateBlocklistUi(OnUpdateBlocklist.Status.UNBLOCKED);
+                        }
+                    });
         }
     }
 
@@ -5066,11 +6044,18 @@ public class XmppConnectionService extends Service {
             request = mIqGenerator.publishNick(displayName);
         }
         mAvatarService.clear(account);
-        sendIqPacket(account, request, (packet) -> {
-            if (packet.getType() == Iq.Type.ERROR) {
-                Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": unable to modify nick name " + packet);
-            }
-        });
+        sendIqPacket(
+                account,
+                request,
+                (packet) -> {
+                    if (packet.getType() == Iq.Type.ERROR) {
+                        Log.d(
+                                Config.LOGTAG,
+                                account.getJid().asBareJid()
+                                        + ": unable to modify nick name "
+                                        + packet);
+                    }
+                });
     }
 
     public ServiceDiscoveryResult getCachedServiceDiscoveryResult(Pair<String, String> key) {
@@ -5104,24 +6089,51 @@ public class XmppConnectionService extends Service {
             if (node != null && ver != null) {
                 query.setAttribute("node", node + "#" + ver);
             }
-            Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": making disco request for " + key.second + " to " + jid);
-            sendIqPacket(account, request, (response) -> {
-                if (response.getType() == Iq.Type.RESULT) {
-                    final ServiceDiscoveryResult discoveryResult = new ServiceDiscoveryResult(response);
-                    if (presence.getVer().equals(discoveryResult.getVer())) {
-                        databaseBackend.insertDiscoveryResult(discoveryResult);
-                        injectServiceDiscoveryResult(account.getRoster(), presence.getHash(), presence.getVer(), discoveryResult);
-                    } else {
-                        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": mismatch in caps for contact " + jid + " " + presence.getVer() + " vs " + discoveryResult.getVer());
-                    }
-                } else {
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": unable to fetch caps from " + jid);
-                }
-            });
+            Log.d(
+                    Config.LOGTAG,
+                    account.getJid().asBareJid()
+                            + ": making disco request for "
+                            + key.second
+                            + " to "
+                            + jid);
+            sendIqPacket(
+                    account,
+                    request,
+                    (response) -> {
+                        if (response.getType() == Iq.Type.RESULT) {
+                            final ServiceDiscoveryResult discoveryResult =
+                                    new ServiceDiscoveryResult(response);
+                            if (presence.getVer().equals(discoveryResult.getVer())) {
+                                databaseBackend.insertDiscoveryResult(discoveryResult);
+                                injectServiceDiscoveryResult(
+                                        account.getRoster(),
+                                        presence.getHash(),
+                                        presence.getVer(),
+                                        discoveryResult);
+                            } else {
+                                Log.d(
+                                        Config.LOGTAG,
+                                        account.getJid().asBareJid()
+                                                + ": mismatch in caps for contact "
+                                                + jid
+                                                + " "
+                                                + presence.getVer()
+                                                + " vs "
+                                                + discoveryResult.getVer());
+                            }
+                        } else {
+                            Log.d(
+                                    Config.LOGTAG,
+                                    account.getJid().asBareJid()
+                                            + ": unable to fetch caps from "
+                                            + jid);
+                        }
+                    });
         }
     }
 
-    private void injectServiceDiscoveryResult(Roster roster, String hash, String ver, ServiceDiscoveryResult disco) {
+    private void injectServiceDiscoveryResult(
+            Roster roster, String hash, String ver, ServiceDiscoveryResult disco) {
         boolean rosterNeedsSync = false;
         for (final Contact contact : roster.getContacts()) {
             boolean serviceDiscoverySet = false;
@@ -5144,14 +6156,17 @@ public class XmppConnectionService extends Service {
         final MessageArchiveService.Version version = MessageArchiveService.Version.get(account);
         final Iq request = new Iq(Iq.Type.GET);
         request.addChild("prefs", version.namespace);
-        sendIqPacket(account, request, (packet) -> {
-            final Element prefs = packet.findChild("prefs", version.namespace);
-            if (packet.getType() == Iq.Type.RESULT && prefs != null) {
-                callback.onPreferencesFetched(prefs);
-            } else {
-                callback.onPreferencesFetchFailed();
-            }
-        });
+        sendIqPacket(
+                account,
+                request,
+                (packet) -> {
+                    final Element prefs = packet.findChild("prefs", version.namespace);
+                    if (packet.getType() == Iq.Type.RESULT && prefs != null) {
+                        callback.onPreferencesFetched(prefs);
+                    } else {
+                        callback.onPreferencesFetchFailed();
+                    }
+                });
     }
 
     public PushManagementService getPushManagementService() {
@@ -5200,11 +6215,13 @@ public class XmppConnectionService extends Service {
         for (XmppUri.Fingerprint fp : fingerprints) {
             if (fp.type == XmppUri.FingerprintType.OMEMO) {
                 String fingerprint = "05" + fp.fingerprint.replaceAll("\\s", "");
-                FingerprintStatus fingerprintStatus = axolotlService.getFingerprintTrust(fingerprint);
+                FingerprintStatus fingerprintStatus =
+                        axolotlService.getFingerprintTrust(fingerprint);
                 if (fingerprintStatus != null) {
                     if (!fingerprintStatus.isVerified()) {
                         performedVerification = true;
-                        axolotlService.setFingerprintTrust(fingerprint, fingerprintStatus.toVerified());
+                        axolotlService.setFingerprintTrust(
+                                fingerprint, fingerprintStatus.toVerified());
                     }
                 } else {
                     axolotlService.preVerifyFingerprint(contact, fingerprint);
@@ -5221,10 +6238,12 @@ public class XmppConnectionService extends Service {
             if (fp.type == XmppUri.FingerprintType.OMEMO) {
                 String fingerprint = "05" + fp.fingerprint.replaceAll("\\s", "");
                 Log.d(Config.LOGTAG, "trying to verify own fp=" + fingerprint);
-                FingerprintStatus fingerprintStatus = axolotlService.getFingerprintTrust(fingerprint);
+                FingerprintStatus fingerprintStatus =
+                        axolotlService.getFingerprintTrust(fingerprint);
                 if (fingerprintStatus != null) {
                     if (!fingerprintStatus.isVerified()) {
-                        axolotlService.setFingerprintTrust(fingerprint, fingerprintStatus.toVerified());
+                        axolotlService.setFingerprintTrust(
+                                fingerprint, fingerprintStatus.toVerified());
                         verifiedSomething = true;
                     }
                 } else {
@@ -5297,9 +6316,15 @@ public class XmppConnectionService extends Service {
     }
 
     public interface OnJingleRtpConnectionUpdate {
-        void onJingleRtpConnectionUpdate(final Account account, final Jid with, final String sessionId, final RtpEndUserState state);
+        void onJingleRtpConnectionUpdate(
+                final Account account,
+                final Jid with,
+                final String sessionId,
+                final RtpEndUserState state);
 
-        void onAudioDeviceChanged(CallIntegration.AudioDevice selectedAudioDevice, Set<CallIntegration.AudioDevice> availableAudioDevices);
+        void onAudioDeviceChanged(
+                CallIntegration.AudioDevice selectedAudioDevice,
+                Set<CallIntegration.AudioDevice> availableAudioDevices);
     }
 
     public interface OnAccountUpdate {
@@ -5364,9 +6389,9 @@ public class XmppConnectionService extends Service {
         public void onReceive(final Context context, final Intent intent) {
             final String action = intent == null ? null : intent.getAction();
             if (allowedActions.contains(action)) {
-                onStartCommand(intent,0,0);
+                onStartCommand(intent, 0, 0);
             } else {
-                Log.e(Config.LOGTAG,"restricting broadcast of event "+action);
+                Log.e(Config.LOGTAG, "restricting broadcast of event " + action);
             }
         }
     }
@@ -5376,7 +6401,8 @@ public class XmppConnectionService extends Service {
         public final Set<Media> media;
         public final boolean reconnecting;
 
-        public OngoingCall(AbstractJingleConnection.Id id, Set<Media> media, final boolean reconnecting) {
+        public OngoingCall(
+                AbstractJingleConnection.Id id, Set<Media> media, final boolean reconnecting) {
             this.id = id;
             this.media = media;
             this.reconnecting = reconnecting;
@@ -5387,7 +6413,9 @@ public class XmppConnectionService extends Service {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
             OngoingCall that = (OngoingCall) o;
-            return reconnecting == that.reconnecting && Objects.equal(id, that.id) && Objects.equal(media, that.media);
+            return reconnecting == that.reconnecting
+                    && Objects.equal(id, that.id)
+                    && Objects.equal(media, that.media);
         }
 
         @Override

From da385845c2d4284e34ba9a747d6c8da49a77c081 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 28 Nov 2024 10:37:17 +0100
Subject: [PATCH 184/357] do not merge message bubbles

---
 .../conversations/entities/Conversation.java  | 249 +++++++-----
 .../siacs/conversations/entities/Message.java | 290 ++++++--------
 .../services/XmppConnectionService.java       |  22 +-
 .../ui/ConversationFragment.java              | 128 +++---
 .../ui/adapter/MessageAdapter.java            |  61 ++-
 .../conversations/ui/util/ShareUtil.java      | 129 +++---
 .../conversations/utils/MessageUtils.java     |  26 +-
 .../conversations/utils/StylingHelper.java    | 378 +++++++++---------
 8 files changed, 647 insertions(+), 636 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index bf8bdd7fb1d729cb73070b02f85f5a788cebdb58..0fec5bcb3d64ffee9cb0250a13635e0c84b6bf27 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -1,27 +1,16 @@
 package eu.siacs.conversations.entities;
 
+import static eu.siacs.conversations.entities.Bookmark.printableValue;
+
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.text.TextUtils;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
+import com.google.common.base.Strings;
 import com.google.common.collect.ComparisonChain;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.crypto.OmemoSetting;
 import eu.siacs.conversations.crypto.PgpDecryptionService;
@@ -34,11 +23,17 @@ import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.chatstate.ChatState;
 import eu.siacs.conversations.xmpp.mam.MamReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
-import static eu.siacs.conversations.entities.Bookmark.printableValue;
-
-
-public class Conversation extends AbstractEntity implements Blockable, Comparable<Conversation>, Conversational, AvatarService.Avatarable {
+public class Conversation extends AbstractEntity
+        implements Blockable, Comparable<Conversation>, Conversational, AvatarService.Avatarable {
     public static final String TABLENAME = "conversations";
 
     public static final int STATUS_AVAILABLE = 0;
@@ -56,7 +51,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     public static final String ATTRIBUTE_MUTED_TILL = "muted_till";
     public static final String ATTRIBUTE_ALWAYS_NOTIFY = "always_notify";
     public static final String ATTRIBUTE_LAST_CLEAR_HISTORY = "last_clear_history";
-    public static final String ATTRIBUTE_FORMERLY_PRIVATE_NON_ANONYMOUS = "formerly_private_non_anonymous";
+    public static final String ATTRIBUTE_FORMERLY_PRIVATE_NON_ANONYMOUS =
+            "formerly_private_non_anonymous";
     public static final String ATTRIBUTE_PINNED_ON_TOP = "pinned_on_top";
     static final String ATTRIBUTE_MUC_PASSWORD = "muc_password";
     static final String ATTRIBUTE_MEMBERS_ONLY = "members_only";
@@ -78,7 +74,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     private int status;
     private final long created;
     private int mode;
-    private JSONObject attributes;
+    private final JSONObject attributes;
     private Jid nextCounterpart;
     private transient MucOptions mucOptions = null;
     private boolean messagesLeftOnServer = true;
@@ -87,17 +83,31 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     private String mFirstMamReference = null;
     private String displayState = null;
 
-    public Conversation(final String name, final Account account, final Jid contactJid,
-                        final int mode) {
-        this(java.util.UUID.randomUUID().toString(), name, null, account
-                        .getUuid(), contactJid, System.currentTimeMillis(),
-                STATUS_AVAILABLE, mode, "");
+    public Conversation(
+            final String name, final Account account, final Jid contactJid, final int mode) {
+        this(
+                java.util.UUID.randomUUID().toString(),
+                name,
+                null,
+                account.getUuid(),
+                contactJid,
+                System.currentTimeMillis(),
+                STATUS_AVAILABLE,
+                mode,
+                "");
         this.account = account;
     }
 
-    public Conversation(final String uuid, final String name, final String contactUuid,
-                        final String accountUuid, final Jid contactJid, final long created, final int status,
-                        final int mode, final String attributes) {
+    public Conversation(
+            final String uuid,
+            final String name,
+            final String contactUuid,
+            final String accountUuid,
+            final Jid contactJid,
+            final long created,
+            final int status,
+            final int mode,
+            final String attributes) {
         this.uuid = uuid;
         this.name = name;
         this.contactUuid = contactUuid;
@@ -106,26 +116,37 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         this.created = created;
         this.status = status;
         this.mode = mode;
-        try {
-            this.attributes = new JSONObject(attributes == null ? "" : attributes);
-        } catch (JSONException e) {
-            this.attributes = new JSONObject();
+        this.attributes = parseAttributes(attributes);
+    }
+
+    private static JSONObject parseAttributes(final String attributes) {
+        if (Strings.isNullOrEmpty(attributes)) {
+            return new JSONObject();
+        } else {
+            try {
+                return new JSONObject(attributes);
+            } catch (final JSONException e) {
+                return new JSONObject();
+            }
         }
     }
 
-    public static Conversation fromCursor(Cursor cursor) {
-        return new Conversation(cursor.getString(cursor.getColumnIndex(UUID)),
-                cursor.getString(cursor.getColumnIndex(NAME)),
-                cursor.getString(cursor.getColumnIndex(CONTACT)),
-                cursor.getString(cursor.getColumnIndex(ACCOUNT)),
-                JidHelper.parseOrFallbackToInvalid(cursor.getString(cursor.getColumnIndex(CONTACTJID))),
-                cursor.getLong(cursor.getColumnIndex(CREATED)),
-                cursor.getInt(cursor.getColumnIndex(STATUS)),
-                cursor.getInt(cursor.getColumnIndex(MODE)),
-                cursor.getString(cursor.getColumnIndex(ATTRIBUTES)));
+    public static Conversation fromCursor(final Cursor cursor) {
+        return new Conversation(
+                cursor.getString(cursor.getColumnIndexOrThrow(UUID)),
+                cursor.getString(cursor.getColumnIndexOrThrow(NAME)),
+                cursor.getString(cursor.getColumnIndexOrThrow(CONTACT)),
+                cursor.getString(cursor.getColumnIndexOrThrow(ACCOUNT)),
+                JidHelper.parseOrFallbackToInvalid(
+                        cursor.getString(cursor.getColumnIndexOrThrow(CONTACTJID))),
+                cursor.getLong(cursor.getColumnIndexOrThrow(CREATED)),
+                cursor.getInt(cursor.getColumnIndexOrThrow(STATUS)),
+                cursor.getInt(cursor.getColumnIndexOrThrow(MODE)),
+                cursor.getString(cursor.getColumnIndexOrThrow(ATTRIBUTES)));
     }
 
-    public static Message getLatestMarkableMessage(final List<Message> messages, boolean isPrivateAndNonAnonymousMuc) {
+    public static Message getLatestMarkableMessage(
+            final List<Message> messages, boolean isPrivateAndNonAnonymousMuc) {
         for (int i = messages.size() - 1; i >= 0; --i) {
             final Message message = messages.get(i);
             if (message.getStatus() <= Message.STATUS_RECEIVED
@@ -146,10 +167,13 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         }
         final String contact = conversation.getJid().getDomain().toEscapedString();
         final String account = conversation.getAccount().getServer();
-        if (Config.OMEMO_EXCEPTIONS.matchesContactDomain(contact) || Config.OMEMO_EXCEPTIONS.ACCOUNT_DOMAINS.contains(account)) {
+        if (Config.OMEMO_EXCEPTIONS.matchesContactDomain(contact)
+                || Config.OMEMO_EXCEPTIONS.ACCOUNT_DOMAINS.contains(account)) {
             return false;
         }
-        return conversation.isSingleOrPrivateAndNonAnonymous() || conversation.getBooleanAttribute(ATTRIBUTE_FORMERLY_PRIVATE_NON_ANONYMOUS, false);
+        return conversation.isSingleOrPrivateAndNonAnonymous()
+                || conversation.getBooleanAttribute(
+                        ATTRIBUTE_FORMERLY_PRIVATE_NON_ANONYMOUS, false);
     }
 
     public boolean hasMessagesLeftOnServer() {
@@ -193,7 +217,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     public int countFailedDeliveries() {
         int count = 0;
         synchronized (this.messages) {
-            for(final Message message : this.messages) {
+            for (final Message message : this.messages) {
                 if (message.getStatus() == Message.STATUS_SEND_FAILED) {
                     ++count;
                 }
@@ -216,12 +240,12 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         return null;
     }
 
-
     public Message findUnsentMessageWithUuid(String uuid) {
         synchronized (this.messages) {
             for (final Message message : this.messages) {
                 final int s = message.getStatus();
-                if ((s == Message.STATUS_UNSEND || s == Message.STATUS_WAITING) && message.getUuid().equals(uuid)) {
+                if ((s == Message.STATUS_UNSEND || s == Message.STATUS_WAITING)
+                        && message.getUuid().equals(uuid)) {
                     return message;
                 }
             }
@@ -262,10 +286,16 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         synchronized (this.messages) {
             for (final Message message : this.messages) {
                 final Transferable transferable = message.getTransferable();
-                final boolean unInitiatedButKnownSize = MessageUtils.unInitiatedButKnownSize(message);
+                final boolean unInitiatedButKnownSize =
+                        MessageUtils.unInitiatedButKnownSize(message);
                 if (message.getUuid().equals(uuid)
                         && message.getEncryption() != Message.ENCRYPTION_PGP
-                        && (message.isFileOrImage() || message.treatAsDownloadable() || unInitiatedButKnownSize || (transferable != null && transferable.getStatus() != Transferable.STATUS_UPLOADING))) {
+                        && (message.isFileOrImage()
+                                || message.treatAsDownloadable()
+                                || unInitiatedButKnownSize
+                                || (transferable != null
+                                        && transferable.getStatus()
+                                                != Transferable.STATUS_UPLOADING))) {
                     return message;
                 }
             }
@@ -292,7 +322,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                 if (uuids.contains(message.getUuid())) {
                     message.setDeleted(true);
                     deleted = true;
-                    if (message.getEncryption() == Message.ENCRYPTION_PGP && pgpDecryptionService != null) {
+                    if (message.getEncryption() == Message.ENCRYPTION_PGP
+                            && pgpDecryptionService != null) {
                         pgpDecryptionService.discard(message);
                     }
                 }
@@ -310,7 +341,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                     if (file.uuid.toString().equals(message.getUuid())) {
                         message.setDeleted(file.deleted);
                         changed = true;
-                        if (file.deleted && message.getEncryption() == Message.ENCRYPTION_PGP && pgpDecryptionService != null) {
+                        if (file.deleted
+                                && message.getEncryption() == Message.ENCRYPTION_PGP
+                                && pgpDecryptionService != null) {
                             pgpDecryptionService.discard(message);
                         }
                     }
@@ -338,7 +371,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     }
 
     public boolean setOutgoingChatState(ChatState state) {
-        if (mode == MODE_SINGLE && !getContact().isSelf() || (isPrivateAndNonAnonymous() && getNextCounterpart() == null)) {
+        if (mode == MODE_SINGLE && !getContact().isSelf()
+                || (isPrivateAndNonAnonymous() && getNextCounterpart() == null)) {
             if (this.mOutgoingChatState != state) {
                 this.mOutgoingChatState = state;
                 return true;
@@ -371,7 +405,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         final ArrayList<Message> results = new ArrayList<>();
         synchronized (this.messages) {
             for (Message message : this.messages) {
-                if ((message.getType() == Message.TYPE_TEXT || message.hasFileOnRemoteHost()) && message.getStatus() == Message.STATUS_UNSEND) {
+                if ((message.getType() == Message.TYPE_TEXT || message.hasFileOnRemoteHost())
+                        && message.getStatus() == Message.STATUS_UNSEND) {
                     results.add(message);
                 }
             }
@@ -386,7 +421,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
             for (Message message : this.messages) {
                 if (id.equals(message.getUuid())
                         || (message.getStatus() >= Message.STATUS_SEND
-                        && id.equals(message.getRemoteMsgId()))) {
+                                && id.equals(message.getRemoteMsgId()))) {
                     return message;
                 }
             }
@@ -405,7 +440,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         return null;
     }
 
-    public Message findMessageWithRemoteIdAndCounterpart(String id, Jid counterpart, boolean received, boolean carbon) {
+    public Message findMessageWithRemoteIdAndCounterpart(
+            String id, Jid counterpart, boolean received, boolean carbon) {
         synchronized (this.messages) {
             for (int i = this.messages.size() - 1; i >= 0; --i) {
                 final Message message = messages.get(i);
@@ -413,9 +449,12 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                 if (mcp == null) {
                     continue;
                 }
-                if (mcp.equals(counterpart) && ((message.getStatus() == Message.STATUS_RECEIVED) == received)
+                if (mcp.equals(counterpart)
+                        && ((message.getStatus() == Message.STATUS_RECEIVED) == received)
                         && (carbon == message.isCarbon() || received)) {
-                    if (id.equals(message.getRemoteMsgId()) && !message.isFileOrImage() && !message.treatAsDownloadable()) {
+                    if (id.equals(message.getRemoteMsgId())
+                            && !message.isFileOrImage()
+                            && !message.treatAsDownloadable()) {
                         return message;
                     } else {
                         return null;
@@ -452,7 +491,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     public Message findReceivedWithRemoteId(final String id) {
         synchronized (this.messages) {
             for (final Message message : this.messages) {
-                if (message.getStatus() == Message.STATUS_RECEIVED && id.equals(message.getRemoteMsgId())) {
+                if (message.getStatus() == Message.STATUS_RECEIVED
+                        && id.equals(message.getRemoteMsgId())) {
                     return message;
                 }
             }
@@ -487,11 +527,6 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
             messages.clear();
             messages.addAll(this.messages);
         }
-        for (Iterator<Message> iterator = messages.iterator(); iterator.hasNext(); ) {
-            if (iterator.next().wasMergedIntoPrevious()) {
-                iterator.remove();
-            }
-        }
     }
 
     @Override
@@ -548,7 +583,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     }
 
     public boolean setCorrectingMessage(Message correctingMessage) {
-        setAttribute(ATTRIBUTE_CORRECTING_MESSAGE, correctingMessage == null ? null : correctingMessage.getUuid());
+        setAttribute(
+                ATTRIBUTE_CORRECTING_MESSAGE,
+                correctingMessage == null ? null : correctingMessage.getUuid());
         return correctingMessage == null && draftMessage != null;
     }
 
@@ -564,7 +601,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     @Override
     public int compareTo(@NonNull Conversation another) {
         return ComparisonChain.start()
-                .compareFalseFirst(another.getBooleanAttribute(ATTRIBUTE_PINNED_ON_TOP, false), getBooleanAttribute(ATTRIBUTE_PINNED_ON_TOP, false))
+                .compareFalseFirst(
+                        another.getBooleanAttribute(ATTRIBUTE_PINNED_ON_TOP, false),
+                        getBooleanAttribute(ATTRIBUTE_PINNED_ON_TOP, false))
                 .compare(another.getSortableTime(), getSortableTime())
                 .result();
     }
@@ -589,7 +628,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
 
     public boolean isRead() {
         synchronized (this.messages) {
-            for(final Message message : Lists.reverse(this.messages)) {
+            for (final Message message : Lists.reverse(this.messages)) {
                 if (message.isRead() && message.getType() == Message.TYPE_RTP_SESSION) {
                     continue;
                 }
@@ -628,8 +667,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         }
     }
 
-    public @NonNull
-    CharSequence getName() {
+    public @NonNull CharSequence getName() {
         if (getMode() == MODE_MULTI) {
             final String roomName = getMucOptions().getName();
             final String subject = getMucOptions().getSubject();
@@ -649,7 +687,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                     return contactJid.getLocal() != null ? contactJid.getLocal() : contactJid;
                 }
             }
-        } else if ((QuickConversationsService.isConversations() || !Config.QUICKSY_DOMAIN.equals(contactJid.getDomain())) && isWithStranger()) {
+        } else if ((QuickConversationsService.isConversations()
+                        || !Config.QUICKSY_DOMAIN.equals(contactJid.getDomain()))
+                && isWithStranger()) {
             return contactJid;
         } else {
             return this.getContact().getDisplayName();
@@ -713,9 +753,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         this.mode = mode;
     }
 
-    /**
-     * short for is Private and Non-anonymous
-     */
+    /** short for is Private and Non-anonymous */
     public boolean isSingleOrPrivateAndNonAnonymous() {
         return mode == MODE_SINGLE || isPrivateAndNonAnonymous();
     }
@@ -752,7 +790,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
             return Message.ENCRYPTION_NONE;
         }
         if (OmemoSetting.isAlways()) {
-            return suitableForOmemoByDefault(this) ? Message.ENCRYPTION_AXOLOTL : Message.ENCRYPTION_NONE;
+            return suitableForOmemoByDefault(this)
+                    ? Message.ENCRYPTION_AXOLOTL
+                    : Message.ENCRYPTION_NONE;
         }
         final int defaultEncryption;
         if (suitableForOmemoByDefault(this)) {
@@ -777,8 +817,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         return nextMessage == null ? "" : nextMessage;
     }
 
-    public @Nullable
-    Draft getDraft() {
+    public @Nullable Draft getDraft() {
         long timestamp = getLongAttribute(ATTRIBUTE_NEXT_MESSAGE_TIMESTAMP, 0);
         if (timestamp > getLatestMessage().getTimeSent()) {
             String message = getAttribute(ATTRIBUTE_NEXT_MESSAGE);
@@ -794,7 +833,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         boolean changed = !getNextMessage().equals(message);
         this.setAttribute(ATTRIBUTE_NEXT_MESSAGE, message);
         if (changed) {
-            this.setAttribute(ATTRIBUTE_NEXT_MESSAGE_TIMESTAMP, message == null ? 0 : System.currentTimeMillis());
+            this.setAttribute(
+                    ATTRIBUTE_NEXT_MESSAGE_TIMESTAMP,
+                    message == null ? 0 : System.currentTimeMillis());
         }
         return changed;
     }
@@ -822,7 +863,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         synchronized (this.messages) {
             for (int i = this.messages.size() - 1; i >= 0; --i) {
                 Message message = this.messages.get(i);
-                if (message.getStatus() == Message.STATUS_UNSEND || message.getStatus() == Message.STATUS_SEND) {
+                if (message.getStatus() == Message.STATUS_UNSEND
+                        || message.getStatus() == Message.STATUS_SEND) {
                     String otherBody;
                     if (message.hasFileOnRemoteHost()) {
                         otherBody = message.getFileParams().url;
@@ -842,7 +884,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         synchronized (this.messages) {
             for (int i = this.messages.size() - 1; i >= 0; --i) {
                 final Message message = this.messages.get(i);
-                if ((message.getStatus() == s) && (message.getType() == Message.TYPE_RTP_SESSION) && sessionId.equals(message.getRemoteMsgId())) {
+                if ((message.getStatus() == s)
+                        && (message.getType() == Message.TYPE_RTP_SESSION)
+                        && sessionId.equals(message.getRemoteMsgId())) {
                     return message;
                 }
             }
@@ -856,7 +900,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         }
         synchronized (this.messages) {
             for (Message message : this.messages) {
-                if (serverMsgId.equals(message.getServerMsgId()) || remoteMsgId.equals(message.getRemoteMsgId())) {
+                if (serverMsgId.equals(message.getServerMsgId())
+                        || remoteMsgId.equals(message.getRemoteMsgId())) {
                     return true;
                 }
             }
@@ -871,10 +916,14 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
             for (int i = this.messages.size() - 1; i >= 0; --i) {
                 final Message message = this.messages.get(i);
                 if (message.isPrivateMessage()) {
-                    continue; //it's unsafe to use private messages as anchor. They could be coming from user archive
+                    continue; // it's unsafe to use private messages as anchor. They could be coming
+                    // from user archive
                 }
-                if (message.getStatus() == Message.STATUS_RECEIVED || message.isCarbon() || message.getServerMsgId() != null) {
-                    lastReceived = new MamReference(message.getTimeSent(), message.getServerMsgId());
+                if (message.getStatus() == Message.STATUS_RECEIVED
+                        || message.isCarbon()
+                        || message.getServerMsgId() != null) {
+                    lastReceived =
+                            new MamReference(message.getTimeSent(), message.getServerMsgId());
                     break;
                 }
             }
@@ -891,7 +940,10 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     }
 
     public boolean alwaysNotify() {
-        return mode == MODE_SINGLE || getBooleanAttribute(ATTRIBUTE_ALWAYS_NOTIFY, Config.ALWAYS_NOTIFY_BY_DEFAULT || isPrivateAndNonAnonymous());
+        return mode == MODE_SINGLE
+                || getBooleanAttribute(
+                        ATTRIBUTE_ALWAYS_NOTIFY,
+                        Config.ALWAYS_NOTIFY_BY_DEFAULT || isPrivateAndNonAnonymous());
     }
 
     public boolean setAttribute(String key, boolean value) {
@@ -957,11 +1009,11 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                     try {
                         list.add(Jid.of(array.getString(i)));
                     } catch (IllegalArgumentException e) {
-                        //ignored
+                        // ignored
                     }
                 }
             } catch (JSONException e) {
-                //ignored
+                // ignored
             }
         }
         return list;
@@ -1023,7 +1075,8 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
 
     public void expireOldMessages(long timestamp) {
         synchronized (this.messages) {
-            for (ListIterator<Message> iterator = this.messages.listIterator(); iterator.hasNext(); ) {
+            for (ListIterator<Message> iterator = this.messages.listIterator();
+                    iterator.hasNext(); ) {
                 if (iterator.next().getTimeSent() < timestamp) {
                     iterator.remove();
                 }
@@ -1034,15 +1087,17 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
 
     public void sort() {
         synchronized (this.messages) {
-            Collections.sort(this.messages, (left, right) -> {
-                if (left.getTimeSent() < right.getTimeSent()) {
-                    return -1;
-                } else if (left.getTimeSent() > right.getTimeSent()) {
-                    return 1;
-                } else {
-                    return 0;
-                }
-            });
+            Collections.sort(
+                    this.messages,
+                    (left, right) -> {
+                        if (left.getTimeSent() < right.getTimeSent()) {
+                            return -1;
+                        } else if (left.getTimeSent() > right.getTimeSent()) {
+                            return 1;
+                        } else {
+                            return 0;
+                        }
+                    });
             untieMessages();
         }
     }
@@ -1056,7 +1111,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     public int unreadCount() {
         synchronized (this.messages) {
             int count = 0;
-            for(final Message message : Lists.reverse(this.messages)) {
+            for (final Message message : Lists.reverse(this.messages)) {
                 if (message.isRead()) {
                     if (message.getType() == Message.TYPE_RTP_SESSION) {
                         continue;
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 6fb1ec2bd1e5c470635a8e3989d3e91ace474967..b29c1fac5bc05b60472c94768264d0a77fcc075e 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -3,26 +3,11 @@ package eu.siacs.conversations.entities;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.graphics.Color;
-import android.text.SpannableStringBuilder;
 import android.util.Log;
-
 import com.google.common.base.Strings;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.primitives.Longs;
-
-import org.json.JSONException;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
-
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.crypto.axolotl.AxolotlService;
 import eu.siacs.conversations.crypto.axolotl.FingerprintStatus;
@@ -36,6 +21,15 @@ import eu.siacs.conversations.utils.MessageUtils;
 import eu.siacs.conversations.utils.MimeUtils;
 import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.xmpp.Jid;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
+import org.json.JSONException;
 
 public class Message extends AbstractEntity implements AvatarService.Avatarable {
 
@@ -94,7 +88,6 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
 
     public static final String ERROR_MESSAGE_CANCELLED = "eu.siacs.conversations.cancelled";
 
-
     public boolean markable = false;
     protected String conversationUuid;
     protected Jid counterpart;
@@ -140,7 +133,9 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public Message(Conversational conversation, String body, int encryption, int status) {
-        this(conversation, java.util.UUID.randomUUID().toString(),
+        this(
+                conversation,
+                java.util.UUID.randomUUID().toString(),
                 conversation.getUuid(),
                 conversation.getJid() == null ? null : conversation.getJid().asBareJid(),
                 null,
@@ -167,7 +162,9 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public Message(Conversation conversation, int status, int type, final String remoteMsgId) {
-        this(conversation, java.util.UUID.randomUUID().toString(),
+        this(
+                conversation,
+                java.util.UUID.randomUUID().toString(),
                 conversation.getUuid(),
                 conversation.getJid() == null ? null : conversation.getJid().asBareJid(),
                 null,
@@ -193,13 +190,32 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
                 Collections.emptyList());
     }
 
-    protected Message(final Conversational conversation, final String uuid, final String conversationUUid, final Jid counterpart,
-                      final Jid trueCounterpart, final String body, final long timeSent,
-                      final int encryption, final int status, final int type, final boolean carbon,
-                      final String remoteMsgId, final String relativeFilePath,
-                      final String serverMsgId, final String fingerprint, final boolean read,
-                      final String edited, final boolean oob, final String errorMessage, final Set<ReadByMarker> readByMarkers,
-                      final boolean markable, final boolean deleted, final String bodyLanguage, final String occupantId, final Collection<Reaction> reactions) {
+    protected Message(
+            final Conversational conversation,
+            final String uuid,
+            final String conversationUUid,
+            final Jid counterpart,
+            final Jid trueCounterpart,
+            final String body,
+            final long timeSent,
+            final int encryption,
+            final int status,
+            final int type,
+            final boolean carbon,
+            final String remoteMsgId,
+            final String relativeFilePath,
+            final String serverMsgId,
+            final String fingerprint,
+            final boolean read,
+            final String edited,
+            final boolean oob,
+            final String errorMessage,
+            final Set<ReadByMarker> readByMarkers,
+            final boolean markable,
+            final boolean deleted,
+            final String bodyLanguage,
+            final String occupantId,
+            final Collection<Reaction> reactions) {
         this.conversation = conversation;
         this.uuid = uuid;
         this.conversationUuid = conversationUUid;
@@ -228,7 +244,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public static Message fromCursor(final Cursor cursor, final Conversation conversation) {
-        return new Message(conversation,
+        return new Message(
+                conversation,
                 cursor.getString(cursor.getColumnIndexOrThrow(UUID)),
                 cursor.getString(cursor.getColumnIndexOrThrow(CONVERSATION)),
                 fromString(cursor.getString(cursor.getColumnIndexOrThrow(COUNTERPART))),
@@ -247,14 +264,13 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
                 cursor.getString(cursor.getColumnIndexOrThrow(EDITED)),
                 cursor.getInt(cursor.getColumnIndexOrThrow(OOB)) > 0,
                 cursor.getString(cursor.getColumnIndexOrThrow(ERROR_MESSAGE)),
-                ReadByMarker.fromJsonString(cursor.getString(cursor.getColumnIndexOrThrow(READ_BY_MARKERS))),
+                ReadByMarker.fromJsonString(
+                        cursor.getString(cursor.getColumnIndexOrThrow(READ_BY_MARKERS))),
                 cursor.getInt(cursor.getColumnIndexOrThrow(MARKABLE)) > 0,
                 cursor.getInt(cursor.getColumnIndexOrThrow(DELETED)) > 0,
                 cursor.getString(cursor.getColumnIndexOrThrow(BODY_LANGUAGE)),
                 cursor.getString(cursor.getColumnIndexOrThrow(OCCUPANT_ID)),
-                Reaction.fromString(cursor.getString(cursor.getColumnIndexOrThrow(REACTIONS)))
-
-        );
+                Reaction.fromString(cursor.getString(cursor.getColumnIndexOrThrow(REACTIONS))));
     }
 
     private static Jid fromString(String value) {
@@ -298,7 +314,11 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         } else {
             values.put(TRUE_COUNTERPART, trueCounterpart.toString());
         }
-        values.put(BODY, body.length() > Config.MAX_STORAGE_MESSAGE_CHARS ? body.substring(0, Config.MAX_STORAGE_MESSAGE_CHARS) : body);
+        values.put(
+                BODY,
+                body.length() > Config.MAX_STORAGE_MESSAGE_CHARS
+                        ? body.substring(0, Config.MAX_STORAGE_MESSAGE_CHARS)
+                        : body);
         values.put(TIME_SENT, timeSent);
         values.put(ENCRYPTION, encryption);
         values.put(STATUS, status);
@@ -348,7 +368,9 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
             if (this.trueCounterpart == null) {
                 return null;
             } else {
-                return this.conversation.getAccount().getRoster()
+                return this.conversation
+                        .getAccount()
+                        .getRoster()
                         .getContactFromContactList(this.trueCounterpart);
             }
         }
@@ -375,7 +397,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
 
     public boolean sameMucUser(Message otherMessage) {
         final MucOptions.User thisUser = this.user == null ? null : this.user.get();
-        final MucOptions.User otherUser = otherMessage.user == null ? null : otherMessage.user.get();
+        final MucOptions.User otherUser =
+                otherMessage.user == null ? null : otherMessage.user.get();
         return thisUser != null && thisUser == otherUser;
     }
 
@@ -384,8 +407,9 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public boolean setErrorMessage(String message) {
-        boolean changed = (message != null && !message.equals(errorMessage))
-                || (message == null && errorMessage != null);
+        boolean changed =
+                (message != null && !message.equals(errorMessage))
+                        || (message == null && errorMessage != null);
         this.errorMessage = message;
         return changed;
     }
@@ -533,7 +557,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
                 Iterator<ReadByMarker> iterator = this.readByMarkers.iterator();
                 while (iterator.hasNext()) {
                     ReadByMarker marker = iterator.next();
-                    if (marker.getRealJid() == null && readByMarker.getFullJid().equals(marker.getFullJid())) {
+                    if (marker.getRealJid() == null
+                            && readByMarker.getFullJid().equals(marker.getFullJid())) {
                         iterator.remove();
                     }
                 }
@@ -557,7 +582,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
 
     boolean similar(Message message) {
         if (!isPrivateMessage() && this.serverMsgId != null && message.getServerMsgId() != null) {
-            return this.serverMsgId.equals(message.getServerMsgId()) || Edit.wasPreviouslyEditedServerMsgId(edits, message.getServerMsgId());
+            return this.serverMsgId.equals(message.getServerMsgId())
+                    || Edit.wasPreviouslyEditedServerMsgId(edits, message.getServerMsgId());
         } else if (Edit.wasPreviouslyEditedServerMsgId(edits, message.getServerMsgId())) {
             return true;
         } else if (this.body == null || this.counterpart == null) {
@@ -573,32 +599,37 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
             }
             final boolean matchingCounterpart = this.counterpart.equals(message.getCounterpart());
             if (message.getRemoteMsgId() != null) {
-                final boolean hasUuid = CryptoHelper.UUID_PATTERN.matcher(message.getRemoteMsgId()).matches();
-                if (hasUuid && matchingCounterpart && Edit.wasPreviouslyEditedRemoteMsgId(edits, message.getRemoteMsgId())) {
+                final boolean hasUuid =
+                        CryptoHelper.UUID_PATTERN.matcher(message.getRemoteMsgId()).matches();
+                if (hasUuid
+                        && matchingCounterpart
+                        && Edit.wasPreviouslyEditedRemoteMsgId(edits, message.getRemoteMsgId())) {
                     return true;
                 }
-                return (message.getRemoteMsgId().equals(this.remoteMsgId) || message.getRemoteMsgId().equals(this.uuid))
+                return (message.getRemoteMsgId().equals(this.remoteMsgId)
+                                || message.getRemoteMsgId().equals(this.uuid))
                         && matchingCounterpart
-                        && (body.equals(otherBody) || (message.getEncryption() == Message.ENCRYPTION_PGP && hasUuid));
+                        && (body.equals(otherBody)
+                                || (message.getEncryption() == Message.ENCRYPTION_PGP && hasUuid));
             } else {
                 return this.remoteMsgId == null
                         && matchingCounterpart
                         && body.equals(otherBody)
-                        && Math.abs(this.getTimeSent() - message.getTimeSent()) < Config.MESSAGE_MERGE_WINDOW * 1000;
+                        && Math.abs(this.getTimeSent() - message.getTimeSent())
+                                < Config.MESSAGE_MERGE_WINDOW * 1000;
             }
         }
     }
 
     public Message next() {
-        if (this.conversation instanceof Conversation) {
-            final Conversation conversation = (Conversation) this.conversation;
-            synchronized (conversation.messages) {
+        if (this.conversation instanceof Conversation c) {
+            synchronized (c.messages) {
                 if (this.mNextMessage == null) {
-                    int index = conversation.messages.indexOf(this);
-                    if (index < 0 || index >= conversation.messages.size() - 1) {
+                    int index = c.messages.indexOf(this);
+                    if (index < 0 || index >= c.messages.size() - 1) {
                         this.mNextMessage = null;
                     } else {
-                        this.mNextMessage = conversation.messages.get(index + 1);
+                        this.mNextMessage = c.messages.get(index + 1);
                     }
                 }
                 return this.mNextMessage;
@@ -609,15 +640,14 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public Message prev() {
-        if (this.conversation instanceof Conversation) {
-            final Conversation conversation = (Conversation) this.conversation;
-            synchronized (conversation.messages) {
+        if (this.conversation instanceof Conversation c) {
+            synchronized (c.messages) {
                 if (this.mPreviousMessage == null) {
-                    int index = conversation.messages.indexOf(this);
-                    if (index <= 0 || index > conversation.messages.size()) {
+                    int index = c.messages.indexOf(this);
+                    if (index <= 0 || index > c.messages.size()) {
                         this.mPreviousMessage = null;
                     } else {
-                        this.mPreviousMessage = conversation.messages.get(index - 1);
+                        this.mPreviousMessage = c.messages.get(index - 1);
                     }
                 }
             }
@@ -642,56 +672,6 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         return status != STATUS_RECEIVED && !isCarbon() && type != Message.TYPE_RTP_SESSION;
     }
 
-    public boolean mergeable(final Message message) {
-        return message != null &&
-                (message.getType() == Message.TYPE_TEXT &&
-                        this.getTransferable() == null &&
-                        message.getTransferable() == null &&
-                        message.getEncryption() != Message.ENCRYPTION_PGP &&
-                        message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED &&
-                        this.getType() == message.getType() &&
-                        this.isReactionsEmpty() &&
-                        message.isReactionsEmpty() &&
-                        isStatusMergeable(this.getStatus(), message.getStatus()) &&
-                        isEncryptionMergeable(this.getEncryption(),message.getEncryption()) &&
-                        this.getCounterpart() != null &&
-                        this.getCounterpart().equals(message.getCounterpart()) &&
-                        this.edited() == message.edited() &&
-                        (message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) &&
-                        this.getBody().length() + message.getBody().length() <= Config.MAX_DISPLAY_MESSAGE_CHARS &&
-                        !message.isGeoUri() &&
-                        !this.isGeoUri() &&
-                        !message.isOOb() &&
-                        !this.isOOb() &&
-                        !message.treatAsDownloadable() &&
-                        !this.treatAsDownloadable() &&
-                        !message.hasMeCommand() &&
-                        !this.hasMeCommand() &&
-                        !this.bodyIsOnlyEmojis() &&
-                        !message.bodyIsOnlyEmojis() &&
-                        ((this.axolotlFingerprint == null && message.axolotlFingerprint == null) || this.axolotlFingerprint.equals(message.getFingerprint())) &&
-                        UIHelper.sameDay(message.getTimeSent(), this.getTimeSent()) &&
-                        this.getReadByMarkers().equals(message.getReadByMarkers()) &&
-                        !this.conversation.getJid().asBareJid().equals(Config.BUG_REPORTS)
-                );
-    }
-
-    private static boolean isStatusMergeable(int a, int b) {
-        return a == b || (
-                (a == Message.STATUS_SEND_RECEIVED && b == Message.STATUS_UNSEND)
-                        || (a == Message.STATUS_SEND_RECEIVED && b == Message.STATUS_SEND)
-                        || (a == Message.STATUS_SEND_RECEIVED && b == Message.STATUS_WAITING)
-                        || (a == Message.STATUS_SEND && b == Message.STATUS_UNSEND)
-                        || (a == Message.STATUS_SEND && b == Message.STATUS_WAITING)
-        );
-    }
-
-    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<MucOptions.User> counterparts) {
         this.counterparts = counterparts;
     }
@@ -702,7 +682,9 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
 
     @Override
     public int getAvatarBackgroundColor() {
-        if (type == Message.TYPE_STATUS && getCounterparts() != null && getCounterparts().size() > 1) {
+        if (type == Message.TYPE_STATUS
+                && getCounterparts() != null
+                && getCounterparts().size() > 1) {
             return Color.TRANSPARENT;
         } else {
             return UIHelper.getColorForName(UIHelper.getMessageDisplayName(this));
@@ -730,10 +712,6 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         return this.reactions;
     }
 
-    public boolean isReactionsEmpty() {
-        return this.reactions.isEmpty();
-    }
-
     public Reaction.Aggregated getAggregatedReactions() {
         return Reaction.aggregated(this.reactions);
     }
@@ -742,75 +720,28 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         this.reactions = reactions;
     }
 
-    public static class MergeSeparator {
-    }
-
-    public SpannableStringBuilder getMergedBody() {
-        SpannableStringBuilder body = new SpannableStringBuilder(MessageUtils.filterLtrRtl(this.body).trim());
-        Message current = this;
-        while (current.mergeable(current.next())) {
-            current = current.next();
-            if (current == null) {
-                break;
-            }
-            body.append("\n\n");
-            body.setSpan(new MergeSeparator(), body.length() - 2, body.length(),
-                    SpannableStringBuilder.SPAN_EXCLUSIVE_EXCLUSIVE);
-            body.append(MessageUtils.filterLtrRtl(current.getBody()).trim());
-        }
-        return body;
-    }
-
     public boolean hasMeCommand() {
         return this.body.trim().startsWith(ME_COMMAND);
     }
 
-    public int getMergedStatus() {
-        int status = this.status;
-        Message current = this;
-        while (current.mergeable(current.next())) {
-            current = current.next();
-            if (current == null) {
-                break;
-            }
-            status = current.status;
-        }
-        return status;
-    }
-
-    public long getMergedTimeSent() {
-        long time = this.timeSent;
-        Message current = this;
-        while (current.mergeable(current.next())) {
-            current = current.next();
-            if (current == null) {
-                break;
-            }
-            time = current.timeSent;
-        }
-        return time;
-    }
-
-    public boolean wasMergedIntoPrevious() {
-        Message prev = this.prev();
-        return prev != null && prev.mergeable(this);
-    }
-
     public boolean trusted() {
         Contact contact = this.getContact();
-        return status > STATUS_RECEIVED || (contact != null && (contact.showInContactList() || contact.isSelf()));
+        return status > STATUS_RECEIVED
+                || (contact != null && (contact.showInContactList() || contact.isSelf()));
     }
 
     public boolean fixCounterpart() {
         final Presences presences = conversation.getContact().getPresences();
         if (counterpart != null && presences.has(Strings.nullToEmpty(counterpart.getResource()))) {
             return true;
-        } else if (presences.size() >= 1) {
-            counterpart = PresenceSelector.getNextCounterpart(getContact(), presences.toResourceArray()[0]);
-            return true;
-        } else {
+        } else if (presences.isEmpty()) {
             counterpart = null;
             return false;
+        } else {
+            counterpart =
+                    PresenceSelector.getNextCounterpart(
+                            getContact(), presences.toResourceArray()[0]);
+            return true;
         }
     }
 
@@ -930,7 +861,6 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         return type == TYPE_FILE || type == TYPE_IMAGE || type == TYPE_PRIVATE_FILE;
     }
 
-
     public boolean isTypeText() {
         return type == TYPE_TEXT || type == TYPE_PRIVATE;
     }
@@ -965,7 +895,10 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
 
     public boolean isTrusted() {
         final AxolotlService axolotlService = conversation.getAccount().getAxolotlService();
-        final FingerprintStatus s = axolotlService != null ? axolotlService.getFingerprintTrust(axolotlFingerprint) : null;
+        final FingerprintStatus s =
+                axolotlService != null
+                        ? axolotlService.getFingerprintTrust(axolotlFingerprint)
+                        : null;
         return s != null && s.isTrusted();
     }
 
@@ -980,17 +913,18 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     }
 
     private int getNextEncryption() {
-        if (this.conversation instanceof Conversation) {
-            Conversation conversation = (Conversation) this.conversation;
+        if (this.conversation instanceof Conversation c) {
             for (Message iterator = this.next(); iterator != null; iterator = iterator.next()) {
                 if (iterator.isCarbon() || iterator.getStatus() == STATUS_RECEIVED) {
                     continue;
                 }
                 return iterator.getEncryption();
             }
-            return conversation.getNextEncryption();
+            return c.getNextEncryption();
         } else {
-            throw new AssertionError("This should never be called since isInValidSession should be disabled for stubs");
+            throw new AssertionError(
+                    "This should never be called since isInValidSession should be disabled for"
+                            + " stubs");
         }
     }
 
@@ -998,9 +932,10 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         int pastEncryption = getCleanedEncryption(this.getPreviousEncryption());
         int futureEncryption = getCleanedEncryption(this.getNextEncryption());
 
-        boolean inUnencryptedSession = pastEncryption == ENCRYPTION_NONE
-                || futureEncryption == ENCRYPTION_NONE
-                || pastEncryption != futureEncryption;
+        boolean inUnencryptedSession =
+                pastEncryption == ENCRYPTION_NONE
+                        || futureEncryption == ENCRYPTION_NONE
+                        || pastEncryption != futureEncryption;
 
         return inUnencryptedSession || getCleanedEncryption(this.getEncryption()) == pastEncryption;
     }
@@ -1009,7 +944,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         if (encryption == ENCRYPTION_DECRYPTED || encryption == ENCRYPTION_DECRYPTION_FAILED) {
             return ENCRYPTION_PGP;
         }
-        if (encryption == ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE || encryption == ENCRYPTION_AXOLOTL_FAILED) {
+        if (encryption == ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE
+                || encryption == ENCRYPTION_AXOLOTL_FAILED) {
             return ENCRYPTION_AXOLOTL;
         }
         return encryption;
@@ -1047,7 +983,11 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         return configurePrivateMessage(conversation, message, counterpart, false);
     }
 
-    private static boolean configurePrivateMessage(final Conversation conversation, final Message message, final Jid counterpart, final boolean isFile) {
+    private static boolean configurePrivateMessage(
+            final Conversation conversation,
+            final Message message,
+            final Jid counterpart,
+            final boolean isFile) {
         if (counterpart == null) {
             return false;
         }
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 1d324232514a83f026b47ef50c0ec158eb463871..17a9a3ce9da5059469df6ed01747c2e9edbe037c 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -5918,23 +5918,11 @@ public class XmppConnectionService extends Service {
     }
 
     public void resendFailedMessages(final Message message) {
-        final Collection<Message> messages = new ArrayList<>();
-        Message current = message;
-        while (current.getStatus() == Message.STATUS_SEND_FAILED) {
-            messages.add(current);
-            if (current.mergeable(current.next())) {
-                current = current.next();
-            } else {
-                break;
-            }
-        }
-        for (final Message msg : messages) {
-            msg.setTime(System.currentTimeMillis());
-            markMessage(msg, Message.STATUS_WAITING);
-            this.resendMessage(msg, false);
-        }
-        if (message.getConversation() instanceof Conversation) {
-            ((Conversation) message.getConversation()).sort();
+        message.setTime(System.currentTimeMillis());
+        markMessage(message, Message.STATUS_WAITING);
+        this.resendMessage(message, false);
+        if (message.getConversation() instanceof Conversation c) {
+            c.sort();
         }
         updateConversationUi();
     }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 9149862e6f057f9142ef93b3335db07d8f846732..c3b0bcd9d9253374f98fe671e3e73074fd93fd19 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -31,6 +31,7 @@ import android.os.SystemClock;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
 import android.text.Editable;
+import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.ContextMenu;
@@ -55,18 +56,15 @@ import android.widget.ListView;
 import android.widget.PopupMenu;
 import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
-
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.core.view.inputmethod.InputConnectionCompat;
 import androidx.core.view.inputmethod.InputContentInfoCompat;
 import androidx.databinding.DataBindingUtil;
-
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
-
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.axolotl.AxolotlService;
@@ -128,9 +126,6 @@ import eu.siacs.conversations.xmpp.jingle.JingleFileTransferConnection;
 import eu.siacs.conversations.xmpp.jingle.Media;
 import eu.siacs.conversations.xmpp.jingle.OngoingRtpSession;
 import eu.siacs.conversations.xmpp.jingle.RtpCapability;
-import eu.siacs.conversations.xmpp.jingle.RtpEndUserState;
-
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -329,7 +324,10 @@ public class ConversationFragment extends XmppFragment
                                                             } catch (IllegalStateException e) {
                                                                 Log.d(
                                                                         Config.LOGTAG,
-                                                                        "caught illegal state exception while updating status messages");
+                                                                        "caught illegal state"
+                                                                                + " exception while"
+                                                                                + " updating status"
+                                                                                + " messages");
                                                             }
                                                             messageListAdapter
                                                                     .notifyDataSetChanged();
@@ -692,14 +690,6 @@ public class ConversationFragment extends XmppFragment
         for (int i = 0; i < messages.size(); ++i) {
             if (uuid.equals(messages.get(i).getUuid())) {
                 return i;
-            } else {
-                Message next = messages.get(i);
-                while (next != null && next.wasMergedIntoPrevious()) {
-                    if (uuid.equals(next.getUuid())) {
-                        return i;
-                    }
-                    next = next.next();
-                }
             }
         }
         return -1;
@@ -1045,13 +1035,15 @@ public class ConversationFragment extends XmppFragment
                         } else if (attachment.getType() == Attachment.Type.IMAGE) {
                             Log.d(
                                     Config.LOGTAG,
-                                    "ConversationsActivity.commitAttachments() - attaching image to conversations. CHOOSE_IMAGE");
+                                    "ConversationsActivity.commitAttachments() - attaching image to"
+                                            + " conversations. CHOOSE_IMAGE");
                             attachImageToConversation(
                                     conversation, attachment.getUri(), attachment.getMime());
                         } else {
                             Log.d(
                                     Config.LOGTAG,
-                                    "ConversationsActivity.commitAttachments() - attaching file to conversations. CHOOSE_FILE/RECORD_VOICE/RECORD_VIDEO");
+                                    "ConversationsActivity.commitAttachments() - attaching file to"
+                                        + " conversations. CHOOSE_FILE/RECORD_VOICE/RECORD_VIDEO");
                             attachFileToConversation(
                                     conversation, attachment.getUri(), attachment.getMime());
                         }
@@ -1277,13 +1269,9 @@ public class ConversationFragment extends XmppFragment
         }
     }
 
-    private void populateContextMenu(ContextMenu menu) {
+    private void populateContextMenu(final ContextMenu menu) {
         final Message m = this.selectedMessage;
         final Transferable t = m.getTransferable();
-        Message relevantForCorrection = m;
-        while (relevantForCorrection.mergeable(relevantForCorrection.next())) {
-            relevantForCorrection = relevantForCorrection.next();
-        }
         if (m.getType() != Message.TYPE_STATUS && m.getType() != Message.TYPE_RTP_SESSION) {
 
             if (m.getEncryption() == Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE
@@ -1329,7 +1317,8 @@ public class ConversationFragment extends XmppFragment
                             && m.getErrorMessage() != null
                             && !Message.ERROR_MESSAGE_CANCELLED.equals(m.getErrorMessage());
             final Conversational conversational = m.getConversation();
-            if (m.getStatus() == Message.STATUS_RECEIVED && conversational instanceof Conversation c) {
+            if (m.getStatus() == Message.STATUS_RECEIVED
+                    && conversational instanceof Conversation c) {
                 final XmppConnection connection = c.getAccount().getXmppConnection();
                 if (c.isWithStranger()
                         && m.getServerMsgId() != null
@@ -1357,7 +1346,8 @@ public class ConversationFragment extends XmppFragment
                     && t == null) {
                 copyMessage.setVisible(true);
                 quoteMessage.setVisible(!showError && !MessageUtils.prepareQuote(m).isEmpty());
-                final String scheme = ShareUtil.getLinkScheme(m.getMergedBody());
+                final String scheme =
+                        ShareUtil.getLinkScheme(new SpannableStringBuilder(m.getBody()));
                 if ("xmpp".equals(scheme)) {
                     copyLink.setTitle(R.string.copy_jabber_id);
                     copyLink.setVisible(true);
@@ -1369,9 +1359,9 @@ public class ConversationFragment extends XmppFragment
                 retryDecryption.setVisible(true);
             }
             if (!showError
-                    && relevantForCorrection.getType() == Message.TYPE_TEXT
+                    && m.getType() == Message.TYPE_TEXT
                     && !m.isGeoUri()
-                    && relevantForCorrection.isLastCorrectableMessage()
+                    && m.isLastCorrectableMessage()
                     && m.getConversation() instanceof Conversation) {
                 correctMessage.setVisible(true);
             }
@@ -1672,7 +1662,11 @@ public class ConversationFragment extends XmppFragment
     }
 
     private void triggerRtpSession(final Account account, final Jid with, final String action) {
-        CallIntegrationConnectionService.placeCall(activity.xmppConnectionService, account,with,RtpSessionActivity.actionToMedia(action));
+        CallIntegrationConnectionService.placeCall(
+                activity.xmppConnectionService,
+                account,
+                with,
+                RtpSessionActivity.actionToMedia(action));
     }
 
     private void handleAttachmentSelection(MenuItem item) {
@@ -1946,7 +1940,8 @@ public class ConversationFragment extends XmppFragment
 
     @SuppressLint("InflateParams")
     protected void clearHistoryDialog(final Conversation conversation) {
-        final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity());
+        final MaterialAlertDialogBuilder builder =
+                new MaterialAlertDialogBuilder(requireActivity());
         builder.setTitle(R.string.clear_conversation_history);
         final View dialogView =
                 requireActivity().getLayoutInflater().inflate(R.layout.dialog_clear_history, null);
@@ -1970,7 +1965,8 @@ public class ConversationFragment extends XmppFragment
     }
 
     protected void muteConversationDialog(final Conversation conversation) {
-        final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity());
+        final MaterialAlertDialogBuilder builder =
+                new MaterialAlertDialogBuilder(requireActivity());
         builder.setTitle(R.string.disable_notifications);
         final int[] durations = getResources().getIntArray(R.array.mute_options_durations);
         final CharSequence[] labels = new CharSequence[durations.length];
@@ -2002,7 +1998,9 @@ public class ConversationFragment extends XmppFragment
     private boolean hasPermissions(int requestCode, List<String> permissions) {
         final List<String> missingPermissions = new ArrayList<>();
         for (String permission : permissions) {
-            if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU || Config.ONLY_INTERNAL_STORAGE) && permission.equals(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
+            if ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
+                            || Config.ONLY_INTERNAL_STORAGE)
+                    && permission.equals(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
                 continue;
             }
             if (activity.checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
@@ -2012,9 +2010,7 @@ public class ConversationFragment extends XmppFragment
         if (missingPermissions.size() == 0) {
             return true;
         } else {
-            requestPermissions(
-                    missingPermissions.toArray(new String[0]),
-                    requestCode);
+            requestPermissions(missingPermissions.toArray(new String[0]), requestCode);
             return false;
         }
     }
@@ -2119,9 +2115,6 @@ public class ConversationFragment extends XmppFragment
                     }
                 }
                 if (message != null) {
-                    while (message.next() != null && message.next().wasMergedIntoPrevious()) {
-                        message = message.next();
-                    }
                     return message.getUuid();
                 }
             }
@@ -2140,12 +2133,15 @@ public class ConversationFragment extends XmppFragment
     }
 
     private void addReaction(final Message message) {
-        activity.addReaction(message, reactions -> {
-            if (activity.xmppConnectionService.sendReactions(message, reactions)) {
-                return;
-            }
-            Toast.makeText(activity, R.string.could_not_add_reaction, Toast.LENGTH_LONG).show();
-        });
+        activity.addReaction(
+                message,
+                reactions -> {
+                    if (activity.xmppConnectionService.sendReactions(message, reactions)) {
+                        return;
+                    }
+                    Toast.makeText(activity, R.string.could_not_add_reaction, Toast.LENGTH_LONG)
+                            .show();
+                });
     }
 
     private void reportMessage(final Message message) {
@@ -2153,7 +2149,8 @@ public class ConversationFragment extends XmppFragment
     }
 
     private void showErrorMessage(final Message message) {
-        final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity());
+        final MaterialAlertDialogBuilder builder =
+                new MaterialAlertDialogBuilder(requireActivity());
         builder.setTitle(R.string.error_message);
         final String errorMessage = message.getErrorMessage();
         final String[] errorMessageParts =
@@ -2180,7 +2177,8 @@ public class ConversationFragment extends XmppFragment
     }
 
     private void deleteFile(final Message message) {
-        final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity());
+        final MaterialAlertDialogBuilder builder =
+                new MaterialAlertDialogBuilder(requireActivity());
         builder.setNegativeButton(R.string.cancel, null);
         builder.setTitle(R.string.delete_file_dialog);
         builder.setMessage(R.string.delete_file_dialog_msg);
@@ -2278,10 +2276,7 @@ public class ConversationFragment extends XmppFragment
         updateEditablity();
     }
 
-    private void correctMessage(Message message) {
-        while (message.mergeable(message.next())) {
-            message = message.next();
-        }
+    private void correctMessage(final Message message) {
         this.conversation.setCorrectingMessage(message);
         final Editable editable = binding.textinput.getText();
         this.conversation.setDraftMessage(editable.toString());
@@ -2395,7 +2390,8 @@ public class ConversationFragment extends XmppFragment
             final String uuid = pendingConversationsUuid.pop();
             Log.d(
                     Config.LOGTAG,
-                    "ConversationFragment.onStart() - activity was bound but no conversation loaded. uuid="
+                    "ConversationFragment.onStart() - activity was bound but no conversation"
+                            + " loaded. uuid="
                             + uuid);
             if (uuid != null) {
                 findAndReInitByUuidOrArchive(uuid);
@@ -2710,7 +2706,10 @@ public class ConversationFragment extends XmppFragment
                     R.string.enable,
                     this.mEnableAccountListener);
         } else if (account.getStatus() == Account.State.LOGGED_OUT) {
-            showSnackbar(R.string.this_account_is_logged_out,R.string.log_in,this.mEnableAccountListener);
+            showSnackbar(
+                    R.string.this_account_is_logged_out,
+                    R.string.log_in,
+                    this.mEnableAccountListener);
         } else if (conversation.isBlocked()) {
             showSnackbar(R.string.contact_blocked, R.string.unblock, this.mUnblockClickListener);
         } else if (contact != null
@@ -2772,7 +2771,8 @@ public class ConversationFragment extends XmppFragment
                     showSnackbar(R.string.conference_kicked, R.string.join, joinMuc);
                     break;
                 case TECHNICAL_PROBLEMS:
-                    showSnackbar(R.string.conference_technical_problems, R.string.try_again, joinMuc);
+                    showSnackbar(
+                            R.string.conference_technical_problems, R.string.try_again, joinMuc);
                     break;
                 case UNKNOWN:
                     showSnackbar(R.string.conference_unknown_error, R.string.try_again, joinMuc);
@@ -2942,12 +2942,14 @@ public class ConversationFragment extends XmppFragment
             status = Presence.Status.OFFLINE;
         }
         this.binding.textSendButton.setTag(action);
-        this.binding.textSendButton.setIconResource(SendButtonTool.getSendButtonImageResource(action));
-        this.binding.textSendButton.setIconTint(ColorStateList.valueOf(SendButtonTool.getSendButtonColor(this.binding.textSendButton, status)));
+        this.binding.textSendButton.setIconResource(
+                SendButtonTool.getSendButtonImageResource(action));
+        this.binding.textSendButton.setIconTint(
+                ColorStateList.valueOf(
+                        SendButtonTool.getSendButtonColor(this.binding.textSendButton, status)));
         // TODO send button color
         final Activity activity = getActivity();
-        if (activity != null) {
-        }
+        if (activity != null) {}
     }
 
     protected void updateStatusMessages() {
@@ -3010,7 +3012,7 @@ public class ConversationFragment extends XmppFragment
                         if (!ReadByMarker.contains(marker, addedMarkers)) {
                             addedMarkers.add(
                                     marker); // may be put outside this condition. set should do
-                                             // dedup anyway
+                            // dedup anyway
                             MucOptions.User user = mucOptions.findUser(marker);
                             if (user != null && !users.contains(user)) {
                                 shownMarkers.add(user);
@@ -3269,8 +3271,10 @@ public class ConversationFragment extends XmppFragment
                         });
     }
 
-    public void showNoPGPKeyDialog(final boolean plural, final DialogInterface.OnClickListener listener) {
-        final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity());
+    public void showNoPGPKeyDialog(
+            final boolean plural, final DialogInterface.OnClickListener listener) {
+        final MaterialAlertDialogBuilder builder =
+                new MaterialAlertDialogBuilder(requireActivity());
         if (plural) {
             builder.setTitle(getString(R.string.no_pgp_keys));
             builder.setMessage(getText(R.string.contacts_have_no_pgp_keys));
@@ -3439,7 +3443,13 @@ public class ConversationFragment extends XmppFragment
         try {
             getActivity()
                     .startIntentSenderForResult(
-                            pendingIntent.getIntentSender(), requestCode, null, 0, 0, 0, Compatibility.pgpStartIntentSenderOptions());
+                            pendingIntent.getIntentSender(),
+                            requestCode,
+                            null,
+                            0,
+                            0,
+                            0,
+                            Compatibility.pgpStartIntentSenderOptions());
         } catch (final SendIntentException ignored) {
         }
     }
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 759960dcbbf3eda1902bc76912f6fbff15be66df..e26977c5c291e7f95c1ca0906ba8fcbc6be0c4fe 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -15,18 +15,15 @@ import android.text.style.ForegroundColorSpan;
 import android.text.style.RelativeSizeSpan;
 import android.text.style.StyleSpan;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.ArrayAdapter;
-import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import androidx.annotation.AttrRes;
 import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
@@ -35,10 +32,6 @@ import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.widget.ImageViewCompat;
-import androidx.databinding.DataBindingUtil;
-import androidx.emoji2.emojipicker.EmojiViewItem;
-import androidx.emoji2.emojipicker.RecentEmojiProvider;
-
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.color.MaterialColors;
@@ -47,14 +40,10 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Strings;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-
 import eu.siacs.conversations.AppSettings;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.axolotl.FingerprintStatus;
-import eu.siacs.conversations.databinding.DialogAddReactionBinding;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Conversational;
@@ -89,14 +78,11 @@ import eu.siacs.conversations.utils.TimeFrameUtils;
 import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.mam.MamReference;
-import kotlin.coroutines.Continuation;
-
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
-import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -192,7 +178,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             final Message message,
             final int type,
             final BubbleColor bubbleColor) {
-        final int mergedStatus = message.getMergedStatus();
+        final int mergedStatus = message.getStatus();
         final boolean error;
         if (viewHolder.indicatorReceived != null) {
             viewHolder.indicatorReceived.setVisibility(View.GONE);
@@ -285,7 +271,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         }
 
         final String formattedTime =
-                UIHelper.readableTimeDifferenceFull(getContext(), message.getMergedTimeSent());
+                UIHelper.readableTimeDifferenceFull(getContext(), message.getTimeSent());
         final String bodyLanguage = message.getBodyLanguage();
         final ImmutableList.Builder<String> timeInfoBuilder = new ImmutableList.Builder<>();
         if (message.getStatus() <= Message.STATUS_RECEIVED) {
@@ -328,8 +314,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             case Message.STATUS_WAITING -> R.drawable.ic_more_horiz_24dp;
             case Message.STATUS_UNSEND -> transferable == null ? null : R.drawable.ic_upload_24dp;
             case Message.STATUS_SEND -> R.drawable.ic_done_24dp;
-            case Message.STATUS_SEND_RECEIVED, Message.STATUS_SEND_DISPLAYED -> R.drawable
-                    .ic_done_all_24dp;
+            case Message.STATUS_SEND_RECEIVED, Message.STATUS_SEND_DISPLAYED ->
+                    R.drawable.ic_done_all_24dp;
             case Message.STATUS_SEND_FAILED -> {
                 final String errorMessage = message.getErrorMessage();
                 if (Message.ERROR_MESSAGE_CANCELLED.equals(errorMessage)) {
@@ -486,21 +472,17 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
         if (message.getBody() != null) {
             final String nick = UIHelper.getMessageDisplayName(message);
-            SpannableStringBuilder body = message.getMergedBody();
-            boolean hasMeCommand = message.hasMeCommand();
-            if (hasMeCommand) {
-                body = body.replace(0, Message.ME_COMMAND.length(), nick + " ");
-            }
-            if (body.length() > Config.MAX_DISPLAY_MESSAGE_CHARS) {
-                body = new SpannableStringBuilder(body, 0, Config.MAX_DISPLAY_MESSAGE_CHARS);
-                body.append("\u2026");
+            final boolean hasMeCommand = message.hasMeCommand();
+            final var rawBody = message.getBody();
+            final SpannableStringBuilder body;
+            if (rawBody.length() > Config.MAX_DISPLAY_MESSAGE_CHARS) {
+                body = new SpannableStringBuilder(rawBody, 0, Config.MAX_DISPLAY_MESSAGE_CHARS);
+                body.append("…");
+            } else {
+                body = new SpannableStringBuilder(rawBody);
             }
-            Message.MergeSeparator[] mergeSeparators =
-                    body.getSpans(0, body.length(), Message.MergeSeparator.class);
-            for (Message.MergeSeparator mergeSeparator : mergeSeparators) {
-                int start = body.getSpanStart(mergeSeparator);
-                int end = body.getSpanEnd(mergeSeparator);
-                body.setSpan(new DividerSpan(true), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            if (hasMeCommand) {
+                body.replace(0, Message.ME_COMMAND.length(), String.format("%s ", nick));
             }
             boolean startsWithQuote = handleTextQuotes(viewHolder.messageBody, body, bubbleColor);
             if (!message.isPrivateMessage()) {
@@ -1211,12 +1193,15 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             final View view, final BubbleColor bubbleColor) {
         final @AttrRes int colorAttributeResId =
                 switch (bubbleColor) {
-                    case SURFACE -> Activities.isNightMode(view.getContext())
-                            ? com.google.android.material.R.attr.colorSurfaceContainerHigh
-                            : com.google.android.material.R.attr.colorSurfaceContainerLow;
-                    case SURFACE_HIGH -> Activities.isNightMode(view.getContext())
-                            ? com.google.android.material.R.attr.colorSurfaceContainerHighest
-                            : com.google.android.material.R.attr.colorSurfaceContainerHigh;
+                    case SURFACE ->
+                            Activities.isNightMode(view.getContext())
+                                    ? com.google.android.material.R.attr.colorSurfaceContainerHigh
+                                    : com.google.android.material.R.attr.colorSurfaceContainerLow;
+                    case SURFACE_HIGH ->
+                            Activities.isNightMode(view.getContext())
+                                    ? com.google.android.material.R.attr
+                                            .colorSurfaceContainerHighest
+                                    : com.google.android.material.R.attr.colorSurfaceContainerHigh;
                     case PRIMARY -> com.google.android.material.R.attr.colorPrimaryContainer;
                     case SECONDARY -> com.google.android.material.R.attr.colorSecondaryContainer;
                     case TERTIARY -> com.google.android.material.R.attr.colorTertiaryContainer;
diff --git a/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java b/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java
index 007575307c7b02903e2dc485dd14e585a18c26be..99b63fe2746b8aa9995f22647e7a3f7af2a26230 100644
--- a/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java
+++ b/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java
@@ -34,7 +34,6 @@ import android.content.Intent;
 import android.net.Uri;
 import android.text.SpannableStringBuilder;
 import android.widget.Toast;
-
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.entities.Message;
@@ -46,66 +45,82 @@ import eu.siacs.conversations.xmpp.Jid;
 
 public class ShareUtil {
 
-	public static void share(XmppActivity activity, Message message) {
-		Intent shareIntent = new Intent();
-		shareIntent.setAction(Intent.ACTION_SEND);
-		if (message.isGeoUri()) {
-			shareIntent.putExtra(Intent.EXTRA_TEXT, message.getBody());
-			shareIntent.setType("text/plain");
-		} else if (!message.isFileOrImage()) {
-			shareIntent.putExtra(Intent.EXTRA_TEXT, message.getMergedBody().toString());
-			shareIntent.setType("text/plain");
-			shareIntent.putExtra(ConversationsActivity.EXTRA_AS_QUOTE, message.getStatus() == Message.STATUS_RECEIVED);
-		} else {
-			final DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
-			try {
-				shareIntent.putExtra(Intent.EXTRA_STREAM, FileBackend.getUriForFile(activity, file));
-			} catch (SecurityException e) {
-				Toast.makeText(activity, activity.getString(R.string.no_permission_to_access_x, file.getAbsolutePath()), Toast.LENGTH_SHORT).show();
-				return;
-			}
-			shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-			String mime = message.getMimeType();
-			if (mime == null) {
-				mime = "*/*";
-			}
-			shareIntent.setType(mime);
-		}
-		try {
-			activity.startActivity(Intent.createChooser(shareIntent, activity.getText(R.string.share_with)));
-		} catch (ActivityNotFoundException e) {
-			//This should happen only on faulty androids because normally chooser is always available
-			Toast.makeText(activity, R.string.no_application_found_to_open_file, Toast.LENGTH_SHORT).show();
-		}
-	}
+    public static void share(XmppActivity activity, Message message) {
+        Intent shareIntent = new Intent();
+        shareIntent.setAction(Intent.ACTION_SEND);
+        if (message.isGeoUri()) {
+            shareIntent.putExtra(Intent.EXTRA_TEXT, message.getBody());
+            shareIntent.setType("text/plain");
+        } else if (!message.isFileOrImage()) {
+            shareIntent.putExtra(Intent.EXTRA_TEXT, message.getBody());
+            shareIntent.setType("text/plain");
+            shareIntent.putExtra(
+                    ConversationsActivity.EXTRA_AS_QUOTE,
+                    message.getStatus() == Message.STATUS_RECEIVED);
+        } else {
+            final DownloadableFile file =
+                    activity.xmppConnectionService.getFileBackend().getFile(message);
+            try {
+                shareIntent.putExtra(
+                        Intent.EXTRA_STREAM, FileBackend.getUriForFile(activity, file));
+            } catch (SecurityException e) {
+                Toast.makeText(
+                                activity,
+                                activity.getString(
+                                        R.string.no_permission_to_access_x, file.getAbsolutePath()),
+                                Toast.LENGTH_SHORT)
+                        .show();
+                return;
+            }
+            shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            String mime = message.getMimeType();
+            if (mime == null) {
+                mime = "*/*";
+            }
+            shareIntent.setType(mime);
+        }
+        try {
+            activity.startActivity(
+                    Intent.createChooser(shareIntent, activity.getText(R.string.share_with)));
+        } catch (ActivityNotFoundException e) {
+            // This should happen only on faulty androids because normally chooser is always
+            // available
+            Toast.makeText(activity, R.string.no_application_found_to_open_file, Toast.LENGTH_SHORT)
+                    .show();
+        }
+    }
 
-	public static void copyToClipboard(XmppActivity activity, Message message) {
-		if (activity.copyTextToClipboard(message.getMergedBody().toString(), R.string.message)) {
-			Toast.makeText(activity, R.string.message_copied_to_clipboard, Toast.LENGTH_SHORT).show();
-		}
-	}
+    public static void copyToClipboard(XmppActivity activity, Message message) {
+        if (activity.copyTextToClipboard(message.getBody(), R.string.message)) {
+            Toast.makeText(activity, R.string.message_copied_to_clipboard, Toast.LENGTH_SHORT)
+                    .show();
+        }
+    }
 
-	public static void copyUrlToClipboard(XmppActivity activity, Message message) {
-		final String url;
-		final int resId;
-		if (message.isGeoUri()) {
-			resId = R.string.location;
-			url = message.getBody();
-		} else if (message.hasFileOnRemoteHost()) {
-			resId = R.string.file_url;
-			url = message.getFileParams().url;
-		} else {
-			final Message.FileParams fileParams = message.getFileParams();
-			url = (fileParams != null && fileParams.url != null) ? fileParams.url : message.getBody().trim();
-			resId = R.string.file_url;
-		}
-		if (activity.copyTextToClipboard(url, resId)) {
-			Toast.makeText(activity, R.string.url_copied_to_clipboard, Toast.LENGTH_SHORT).show();
-		}
-	}
+    public static void copyUrlToClipboard(XmppActivity activity, Message message) {
+        final String url;
+        final int resId;
+        if (message.isGeoUri()) {
+            resId = R.string.location;
+            url = message.getBody();
+        } else if (message.hasFileOnRemoteHost()) {
+            resId = R.string.file_url;
+            url = message.getFileParams().url;
+        } else {
+            final Message.FileParams fileParams = message.getFileParams();
+            url =
+                    (fileParams != null && fileParams.url != null)
+                            ? fileParams.url
+                            : message.getBody().trim();
+            resId = R.string.file_url;
+        }
+        if (activity.copyTextToClipboard(url, resId)) {
+            Toast.makeText(activity, R.string.url_copied_to_clipboard, Toast.LENGTH_SHORT).show();
+        }
+    }
 
     public static void copyLinkToClipboard(final XmppActivity activity, final Message message) {
-        final SpannableStringBuilder body = message.getMergedBody();
+        final SpannableStringBuilder body = new SpannableStringBuilder(message.getBody());
         for (final String url : MyLinkify.extractLinks(body)) {
             final Uri uri = Uri.parse(url);
             if ("xmpp".equals(uri.getScheme())) {
diff --git a/src/main/java/eu/siacs/conversations/utils/MessageUtils.java b/src/main/java/eu/siacs/conversations/utils/MessageUtils.java
index 1ac9d2c7dcae0354cb6f8efcf125ec3a54320bd2..3b8b6c0d9d388cc4b067cf6028e21a95b4c4ccf7 100644
--- a/src/main/java/eu/siacs/conversations/utils/MessageUtils.java
+++ b/src/main/java/eu/siacs/conversations/utils/MessageUtils.java
@@ -30,16 +30,14 @@
 package eu.siacs.conversations.utils;
 
 import com.google.common.base.Strings;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.regex.Pattern;
-
 import eu.siacs.conversations.entities.Conversational;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.http.AesGcmURL;
 import eu.siacs.conversations.http.URL;
 import eu.siacs.conversations.ui.util.QuoteHelper;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.regex.Pattern;
 
 public class MessageUtils {
 
@@ -47,7 +45,7 @@ public class MessageUtils {
 
     public static final String EMPTY_STRING = "";
 
-    public static String prepareQuote(Message message) {
+    public static String prepareQuote(final Message message) {
         final StringBuilder builder = new StringBuilder();
         final String body;
         if (message.hasMeCommand()) {
@@ -63,7 +61,7 @@ public class MessageUtils {
             }
             body = nick + " " + message.getBody().substring(Message.ME_COMMAND.length());
         } else {
-            body = message.getMergedBody().toString();
+            body = message.getBody();
         }
         for (String line : body.split("\n")) {
             if (!(line.length() <= 0) && QuoteHelper.isNestedTooDeeply(line)) {
@@ -100,8 +98,12 @@ public class MessageUtils {
         final String protocol = uri.getScheme();
         final boolean encrypted = ref != null && AesGcmURL.IV_KEY.matcher(ref).matches();
         final boolean followedByDataUri = lines.length == 2 && lines[1].startsWith("data:");
-        final boolean validAesGcm = AesGcmURL.PROTOCOL_NAME.equalsIgnoreCase(protocol) && encrypted && (lines.length == 1 || followedByDataUri);
-        final boolean validProtocol = "http".equalsIgnoreCase(protocol) || "https".equalsIgnoreCase(protocol);
+        final boolean validAesGcm =
+                AesGcmURL.PROTOCOL_NAME.equalsIgnoreCase(protocol)
+                        && encrypted
+                        && (lines.length == 1 || followedByDataUri);
+        final boolean validProtocol =
+                "http".equalsIgnoreCase(protocol) || "https".equalsIgnoreCase(protocol);
         final boolean validOob = validProtocol && (oob || encrypted) && lines.length == 1;
         return validAesGcm || validOob;
     }
@@ -111,6 +113,10 @@ public class MessageUtils {
     }
 
     public static boolean unInitiatedButKnownSize(Message message) {
-        return message.getType() == Message.TYPE_TEXT && message.getTransferable() == null && message.isOOb() && message.getFileParams().size != null && message.getFileParams().url != null;
+        return message.getType() == Message.TYPE_TEXT
+                && message.getTransferable() == null
+                && message.isOOb()
+                && message.getFileParams().size != null
+                && message.getFileParams().url != null;
     }
 }
diff --git a/src/main/java/eu/siacs/conversations/utils/StylingHelper.java b/src/main/java/eu/siacs/conversations/utils/StylingHelper.java
index fc669c87d9e017c50e5985753fe8792912ee07f0..5e5bafd3e9d50ca7d4ea85a9045264aa523e117a 100644
--- a/src/main/java/eu/siacs/conversations/utils/StylingHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/StylingHelper.java
@@ -29,7 +29,6 @@
 
 package eu.siacs.conversations.utils;
 
-import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.text.Editable;
@@ -45,138 +44,149 @@ import android.text.style.StyleSpan;
 import android.text.style.TypefaceSpan;
 import android.widget.EditText;
 import android.widget.TextView;
-
 import androidx.annotation.ColorInt;
-import androidx.core.content.ContextCompat;
-
 import com.google.android.material.color.MaterialColors;
-
+import eu.siacs.conversations.ui.text.QuoteSpan;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.ui.text.QuoteSpan;
-
 public class StylingHelper {
 
-	private static final List<? extends Class<? extends ParcelableSpan>> SPAN_CLASSES = Arrays.asList(
-			StyleSpan.class,
-			StrikethroughSpan.class,
-			TypefaceSpan.class,
-			ForegroundColorSpan.class
-	);
-
-	public static void clear(final Editable editable) {
-		final int end = editable.length() - 1;
-		for (Class<? extends ParcelableSpan> clazz : SPAN_CLASSES) {
-			for (ParcelableSpan span : editable.getSpans(0, end, clazz)) {
-				editable.removeSpan(span);
-			}
-		}
-	}
-
-	public static void format(final Editable editable, int start, int end, @ColorInt int textColor) {
-		for (ImStyleParser.Style style : ImStyleParser.parse(editable, start, end)) {
-			final int keywordLength = style.getKeyword().length();
-			editable.setSpan(createSpanForStyle(style), style.getStart() + keywordLength, style.getEnd() - keywordLength + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-			makeKeywordOpaque(editable, style.getStart(), style.getStart() + keywordLength, textColor);
-			makeKeywordOpaque(editable, style.getEnd() - keywordLength + 1, style.getEnd() + 1, textColor);
-		}
-	}
-
-	public static void format(final Editable editable, @ColorInt int textColor) {
-		int end = 0;
-		Message.MergeSeparator[] spans = editable.getSpans(0, editable.length() - 1, Message.MergeSeparator.class);
-		for (Message.MergeSeparator span : spans) {
-			format(editable, end, editable.getSpanStart(span), textColor);
-			end = editable.getSpanEnd(span);
-		}
-		format(editable, end, editable.length() - 1, textColor);
-	}
-
-	public static void highlight(final TextView view, final Editable editable, final List<String> needles) {
-		for (final String needle : needles) {
-			if (!FtsUtils.isKeyword(needle)) {
-				highlight(view, editable, needle);
-			}
-		}
-	}
-
-	public static List<String> filterHighlightedWords(List<String> terms) {
-		List<String> words = new ArrayList<>();
-		for (String term : terms) {
-			if (!FtsUtils.isKeyword(term)) {
-				StringBuilder builder = new StringBuilder();
-				for (int codepoint, i = 0; i < term.length(); i += Character.charCount(codepoint)) {
-					codepoint = term.codePointAt(i);
-					if (Character.isLetterOrDigit(codepoint)) {
-						builder.append(Character.toChars(codepoint));
-					} else if (builder.length() > 0) {
-						words.add(builder.toString());
-						builder.delete(0, builder.length());
-					}
-				}
-				if (builder.length() > 0) {
-					words.add(builder.toString());
-				}
-			}
-		}
-		return words;
-	}
-
-	private static void highlight(final TextView view, final Editable editable, final String needle) {
-		final int length = needle.length();
-		String string = editable.toString();
-		int start = indexOfIgnoreCase(string, needle, 0);
-		while (start != -1) {
-			int end = start + length;
-			editable.setSpan(new BackgroundColorSpan(MaterialColors.getColor(view, com.google.android.material.R.attr.colorPrimaryFixedDim)), start, end, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
-			editable.setSpan(new ForegroundColorSpan(MaterialColors.getColor(view, com.google.android.material.R.attr.colorOnPrimaryFixed)), start, end, SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
-			start = indexOfIgnoreCase(string, needle, start + length);
-		}
-
-	}
-
-	static CharSequence subSequence(CharSequence charSequence, int start, int end) {
-		if (start == 0 && charSequence.length() + 1 == end) {
-			return charSequence;
-		}
-		if (charSequence instanceof Spannable spannable) {
-			Spannable sub = (Spannable) spannable.subSequence(start, end);
-			for (Class<? extends ParcelableSpan> clazz : SPAN_CLASSES) {
-				ParcelableSpan[] spannables = spannable.getSpans(start, end, clazz);
-				for (ParcelableSpan parcelableSpan : spannables) {
-					int beginSpan = spannable.getSpanStart(parcelableSpan);
-					int endSpan = spannable.getSpanEnd(parcelableSpan);
-					if (beginSpan >= start && endSpan <= end) {
-						continue;
-					}
-					sub.setSpan(clone(parcelableSpan), Math.max(beginSpan - start, 0), Math.min(sub.length() - 1, endSpan), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-				}
-			}
-			return sub;
-		} else {
-			return charSequence.subSequence(start, end);
-		}
-	}
-
-	private static ParcelableSpan clone(ParcelableSpan span) {
-		if (span instanceof ForegroundColorSpan) {
-			return new ForegroundColorSpan(((ForegroundColorSpan) span).getForegroundColor());
-		} else if (span instanceof TypefaceSpan) {
-			return new TypefaceSpan(((TypefaceSpan) span).getFamily());
-		} else if (span instanceof StyleSpan) {
-			return new StyleSpan(((StyleSpan) span).getStyle());
-		} else if (span instanceof StrikethroughSpan) {
-			return new StrikethroughSpan();
-		} else {
-			throw new AssertionError("Unknown Span");
-		}
-	}
-
-	private static ParcelableSpan createSpanForStyle(final ImStyleParser.Style style) {
+    private static final List<? extends Class<? extends ParcelableSpan>> SPAN_CLASSES =
+            Arrays.asList(
+                    StyleSpan.class,
+                    StrikethroughSpan.class,
+                    TypefaceSpan.class,
+                    ForegroundColorSpan.class);
+
+    public static void clear(final Editable editable) {
+        final int end = editable.length() - 1;
+        for (Class<? extends ParcelableSpan> clazz : SPAN_CLASSES) {
+            for (ParcelableSpan span : editable.getSpans(0, end, clazz)) {
+                editable.removeSpan(span);
+            }
+        }
+    }
+
+    public static void format(
+            final Editable editable, int start, int end, @ColorInt int textColor) {
+        for (ImStyleParser.Style style : ImStyleParser.parse(editable, start, end)) {
+            final int keywordLength = style.getKeyword().length();
+            editable.setSpan(
+                    createSpanForStyle(style),
+                    style.getStart() + keywordLength,
+                    style.getEnd() - keywordLength + 1,
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+            makeKeywordOpaque(
+                    editable, style.getStart(), style.getStart() + keywordLength, textColor);
+            makeKeywordOpaque(
+                    editable, style.getEnd() - keywordLength + 1, style.getEnd() + 1, textColor);
+        }
+    }
+
+    public static void format(final Editable editable, @ColorInt final int textColor) {
+        format(editable, 0, editable.length() - 1, textColor);
+    }
+
+    public static void highlight(
+            final TextView view, final Editable editable, final List<String> needles) {
+        for (final String needle : needles) {
+            if (!FtsUtils.isKeyword(needle)) {
+                highlight(view, editable, needle);
+            }
+        }
+    }
+
+    public static List<String> filterHighlightedWords(List<String> terms) {
+        List<String> words = new ArrayList<>();
+        for (String term : terms) {
+            if (!FtsUtils.isKeyword(term)) {
+                StringBuilder builder = new StringBuilder();
+                for (int codepoint, i = 0; i < term.length(); i += Character.charCount(codepoint)) {
+                    codepoint = term.codePointAt(i);
+                    if (Character.isLetterOrDigit(codepoint)) {
+                        builder.append(Character.toChars(codepoint));
+                    } else if (builder.length() > 0) {
+                        words.add(builder.toString());
+                        builder.delete(0, builder.length());
+                    }
+                }
+                if (builder.length() > 0) {
+                    words.add(builder.toString());
+                }
+            }
+        }
+        return words;
+    }
+
+    private static void highlight(
+            final TextView view, final Editable editable, final String needle) {
+        final int length = needle.length();
+        String string = editable.toString();
+        int start = indexOfIgnoreCase(string, needle, 0);
+        while (start != -1) {
+            int end = start + length;
+            editable.setSpan(
+                    new BackgroundColorSpan(
+                            MaterialColors.getColor(
+                                    view, com.google.android.material.R.attr.colorPrimaryFixedDim)),
+                    start,
+                    end,
+                    SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+            editable.setSpan(
+                    new ForegroundColorSpan(
+                            MaterialColors.getColor(
+                                    view, com.google.android.material.R.attr.colorOnPrimaryFixed)),
+                    start,
+                    end,
+                    SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
+            start = indexOfIgnoreCase(string, needle, start + length);
+        }
+    }
+
+    static CharSequence subSequence(CharSequence charSequence, int start, int end) {
+        if (start == 0 && charSequence.length() + 1 == end) {
+            return charSequence;
+        }
+        if (charSequence instanceof Spannable spannable) {
+            Spannable sub = (Spannable) spannable.subSequence(start, end);
+            for (Class<? extends ParcelableSpan> clazz : SPAN_CLASSES) {
+                ParcelableSpan[] spannables = spannable.getSpans(start, end, clazz);
+                for (ParcelableSpan parcelableSpan : spannables) {
+                    int beginSpan = spannable.getSpanStart(parcelableSpan);
+                    int endSpan = spannable.getSpanEnd(parcelableSpan);
+                    if (beginSpan >= start && endSpan <= end) {
+                        continue;
+                    }
+                    sub.setSpan(
+                            clone(parcelableSpan),
+                            Math.max(beginSpan - start, 0),
+                            Math.min(sub.length() - 1, endSpan),
+                            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                }
+            }
+            return sub;
+        } else {
+            return charSequence.subSequence(start, end);
+        }
+    }
+
+    private static ParcelableSpan clone(ParcelableSpan span) {
+        if (span instanceof ForegroundColorSpan) {
+            return new ForegroundColorSpan(((ForegroundColorSpan) span).getForegroundColor());
+        } else if (span instanceof TypefaceSpan) {
+            return new TypefaceSpan(((TypefaceSpan) span).getFamily());
+        } else if (span instanceof StyleSpan) {
+            return new StyleSpan(((StyleSpan) span).getStyle());
+        } else if (span instanceof StrikethroughSpan) {
+            return new StrikethroughSpan();
+        } else {
+            throw new AssertionError("Unknown Span");
+        }
+    }
+
+    private static ParcelableSpan createSpanForStyle(final ImStyleParser.Style style) {
         return switch (style.getKeyword()) {
             case "*" -> new StyleSpan(Typeface.BOLD);
             case "_" -> new StyleSpan(Typeface.ITALIC);
@@ -184,62 +194,64 @@ public class StylingHelper {
             case "`", "```" -> new TypefaceSpan("monospace");
             default -> throw new AssertionError("Unknown Style");
         };
-	}
-
-	private static void makeKeywordOpaque(final Editable editable, int start, int end, @ColorInt int fallbackTextColor) {
-		QuoteSpan[] quoteSpans = editable.getSpans(start, end, QuoteSpan.class);
-		@ColorInt int textColor = quoteSpans.length > 0 ? quoteSpans[0].getColor() : fallbackTextColor;
-		@ColorInt int keywordColor = transformColor(textColor);
-		editable.setSpan(new ForegroundColorSpan(keywordColor), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-	}
-
-	private static
-	@ColorInt
-	int transformColor(@ColorInt int c) {
-		return Color.argb(Math.round(Color.alpha(c) * 0.45f), Color.red(c), Color.green(c), Color.blue(c));
-	}
-
-	private static int indexOfIgnoreCase(final String haystack, final String needle, final int start) {
-		if (haystack == null || needle == null) {
-			return -1;
-		}
-		final int endLimit = haystack.length() - needle.length() + 1;
-		if (start > endLimit) {
-			return -1;
-		}
-		if (needle.length() == 0) {
-			return start;
-		}
-		for (int i = start; i < endLimit; i++) {
-			if (haystack.regionMatches(true, i, needle, 0, needle.length())) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	public static class MessageEditorStyler implements TextWatcher {
-
-		private final EditText mEditText;
-
-		public MessageEditorStyler(EditText editText) {
-			this.mEditText = editText;
-		}
-
-		@Override
-		public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
-		}
-
-		@Override
-		public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-
-		}
-
-		@Override
-		public void afterTextChanged(Editable editable) {
-			clear(editable);
-			format(editable, mEditText.getCurrentTextColor());
-		}
-	}
+    }
+
+    private static void makeKeywordOpaque(
+            final Editable editable, int start, int end, @ColorInt int fallbackTextColor) {
+        QuoteSpan[] quoteSpans = editable.getSpans(start, end, QuoteSpan.class);
+        @ColorInt
+        int textColor = quoteSpans.length > 0 ? quoteSpans[0].getColor() : fallbackTextColor;
+        @ColorInt int keywordColor = transformColor(textColor);
+        editable.setSpan(
+                new ForegroundColorSpan(keywordColor),
+                start,
+                end,
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+    }
+
+    private static @ColorInt int transformColor(@ColorInt int c) {
+        return Color.argb(
+                Math.round(Color.alpha(c) * 0.45f), Color.red(c), Color.green(c), Color.blue(c));
+    }
+
+    private static int indexOfIgnoreCase(
+            final String haystack, final String needle, final int start) {
+        if (haystack == null || needle == null) {
+            return -1;
+        }
+        final int endLimit = haystack.length() - needle.length() + 1;
+        if (start > endLimit) {
+            return -1;
+        }
+        if (needle.length() == 0) {
+            return start;
+        }
+        for (int i = start; i < endLimit; i++) {
+            if (haystack.regionMatches(true, i, needle, 0, needle.length())) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    public static class MessageEditorStyler implements TextWatcher {
+
+        private final EditText mEditText;
+
+        public MessageEditorStyler(EditText editText) {
+            this.mEditText = editText;
+        }
+
+        @Override
+        public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
+
+        @Override
+        public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
+
+        @Override
+        public void afterTextChanged(Editable editable) {
+            clear(editable);
+            format(editable, mEditText.getCurrentTextColor());
+        }
+    }
 }

From 4f307c5730d58ffe52d8f3dcdb233885fd7c70a8 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 28 Nov 2024 14:23:41 +0100
Subject: [PATCH 185/357] move bubbles from same sender closer together

---
 .../java/eu/siacs/conversations/Config.java   |  5 +-
 .../siacs/conversations/entities/Message.java |  3 +-
 .../ui/adapter/MessageAdapter.java            | 95 ++++++++++++++++++-
 src/main/res/layout/item_message_received.xml | 10 +-
 src/main/res/layout/item_message_sent.xml     | 10 +-
 src/main/res/values/dimens.xml                |  5 +
 6 files changed, 107 insertions(+), 21 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index cfe1cc60fafda27271c073c70fb88ac437bc2a1f..219c463f4bfac7f6aba98f28e4e65d837e9fa90f 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -2,11 +2,9 @@ package eu.siacs.conversations;
 
 import android.graphics.Bitmap;
 import android.net.Uri;
-
 import eu.siacs.conversations.crypto.XmppDomainVerifier;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.chatstate.ChatState;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -81,7 +79,6 @@ public final class Config {
     public static final int CONNECT_DISCO_TIMEOUT = 20;
     public static final int MINI_GRACE_PERIOD = 750;
 
-
     // media file formats. Homogenous Android or Conversations only deployments can switch to opus
     // and webp
     public static final int AVATAR_SIZE = 192;
@@ -94,7 +91,7 @@ public final class Config {
 
     public static final boolean USE_OPUS_VOICE_MESSAGES = false;
 
-    public static final int MESSAGE_MERGE_WINDOW = 20;
+    public static final int MESSAGE_MERGE_WINDOW = 90_000;
 
     public static final int PAGE_SIZE = 50;
     public static final int MAX_NUM_PAGES = 3;
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index b29c1fac5bc05b60472c94768264d0a77fcc075e..ee61056fa96d1bc1900cad6b2bd1cbb83261c33e 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -615,8 +615,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
                 return this.remoteMsgId == null
                         && matchingCounterpart
                         && body.equals(otherBody)
-                        && Math.abs(this.getTimeSent() - message.getTimeSent())
-                                < Config.MESSAGE_MERGE_WINDOW * 1000;
+                        && Math.abs(this.getTimeSent() - message.getTimeSent()) < 20_000;
             }
         }
     }
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index e26977c5c291e7f95c1ca0906ba8fcbc6be0c4fe..1ad73d920f96a93a0de7fa37edb120fed16a584f 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -29,6 +29,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.widget.ImageViewCompat;
@@ -152,7 +153,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         return 5;
     }
 
-    private int getItemViewType(Message message) {
+    private static int getItemViewType(final Message message) {
         if (message.getType() == Message.TYPE_STATUS) {
             if (DATE_SEPARATOR_BODY.equals(message.getBody())) {
                 return DATE_SEPARATOR;
@@ -169,8 +170,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
     }
 
     @Override
-    public int getItemViewType(int position) {
-        return this.getItemViewType(getItem(position));
+    public int getItemViewType(final int position) {
+        return getItemViewType(getItem(position));
     }
 
     private void displayStatus(
@@ -729,7 +730,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 message.isValidInSession() && (!omemoEncryption || message.isTrusted());
         final Conversational conversation = message.getConversation();
         final Account account = conversation.getAccount();
-        final int type = getItemViewType(position);
+        final int type = getItemViewType(message);
         ViewHolder viewHolder;
         if (view == null) {
             viewHolder = new ViewHolder();
@@ -753,6 +754,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                     view =
                             activity.getLayoutInflater()
                                     .inflate(R.layout.item_message_sent, parent, false);
+                    viewHolder.root = (ConstraintLayout) view;
                     viewHolder.message_box = view.findViewById(R.id.message_box);
                     viewHolder.contact_picture = view.findViewById(R.id.message_photo);
                     viewHolder.download_button = view.findViewById(R.id.download_button);
@@ -769,6 +771,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                     view =
                             activity.getLayoutInflater()
                                     .inflate(R.layout.item_message_received, parent, false);
+                    viewHolder.root = (ConstraintLayout) view;
                     viewHolder.message_box = view.findViewById(R.id.message_box);
                     viewHolder.contact_picture = view.findViewById(R.id.message_photo);
                     viewHolder.download_button = view.findViewById(R.id.download_button);
@@ -901,7 +904,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 } else if (message.getCounterpart() != null
                         || message.getTrueCounterpart() != null
                         || (message.getCounterparts() != null
-                                && message.getCounterparts().size() > 0)) {
+                                && !message.getCounterparts().isEmpty())) {
                     showAvatar = true;
                     AvatarWorkerTask.loadAvatar(
                             message, viewHolder.contact_picture, R.dimen.avatar_on_status_message);
@@ -917,6 +920,12 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             }
             return view;
         } else {
+            // sent and received bubbles
+            final var mergeIntoTop = mergeIntoTop(position, message);
+            final var mergeIntoBottom = mergeIntoBottom(position, message);
+            final var requiresAvatar = type == SENT ? !mergeIntoBottom : !mergeIntoTop;
+            setBubblePadding(viewHolder.root, mergeIntoTop, mergeIntoBottom);
+            setRequiresAvatar(viewHolder, requiresAvatar);
             viewHolder.message_box.setClipToOutline(true);
             AvatarWorkerTask.loadAvatar(message, viewHolder.contact_picture, R.dimen.avatar);
         }
@@ -1075,6 +1084,81 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         return view;
     }
 
+    private void setBubblePadding(
+            final ConstraintLayout root,
+            final boolean mergeIntoTop,
+            final boolean mergeIntoBottom) {
+        final var resources = root.getResources();
+        final var horizontal = resources.getDimensionPixelSize(R.dimen.bubble_horizontal_padding);
+        final int top =
+                resources.getDimensionPixelSize(
+                        mergeIntoTop
+                                ? R.dimen.bubble_vertical_padding_minimum
+                                : R.dimen.bubble_vertical_padding);
+        final int bottom =
+                resources.getDimensionPixelSize(
+                        mergeIntoBottom
+                                ? R.dimen.bubble_vertical_padding_minimum
+                                : R.dimen.bubble_vertical_padding);
+        root.setPadding(horizontal, top, horizontal, bottom);
+    }
+
+    private void setRequiresAvatar(final ViewHolder viewHolder, final boolean requiresAvatar) {
+        final var layoutParams = viewHolder.contact_picture.getLayoutParams();
+        if (requiresAvatar) {
+            final var resources = viewHolder.contact_picture.getResources();
+            final var avatarSize = resources.getDimensionPixelSize(R.dimen.bubble_avatar_size);
+            layoutParams.height = avatarSize;
+            viewHolder.contact_picture.setVisibility(View.VISIBLE);
+            viewHolder.message_box.setMinimumHeight(avatarSize);
+        } else {
+            layoutParams.height = 0;
+            viewHolder.contact_picture.setVisibility(View.INVISIBLE);
+            viewHolder.message_box.setMinimumHeight(0);
+        }
+        viewHolder.contact_picture.setLayoutParams(layoutParams);
+    }
+
+    private boolean mergeIntoTop(final int position, final Message message) {
+        if (position < 0) {
+            return false;
+        }
+        final var top = getItem(position - 1);
+        return merge(top, message);
+    }
+
+    private boolean mergeIntoBottom(final int position, final Message message) {
+        final Message bottom;
+        try {
+            bottom = getItem(position + 1);
+        } catch (final IndexOutOfBoundsException e) {
+            return false;
+        }
+        return merge(message, bottom);
+    }
+
+    private static boolean merge(final Message a, final Message b) {
+        if (getItemViewType(a) != getItemViewType(b)) {
+            return false;
+        }
+        if (a.getConversation().getMode() == Conversation.MODE_MULTI
+                && a.getStatus() == Message.STATUS_RECEIVED) {
+            final var occupantIdA = a.getOccupantId();
+            final var occupantIdB = b.getOccupantId();
+            if (occupantIdA != null && occupantIdB != null) {
+                if (!occupantIdA.equals(occupantIdB)) {
+                    return false;
+                }
+            }
+            final var counterPartA = a.getCounterpart();
+            final var counterPartB = b.getCounterpart();
+            if (counterPartA == null || !counterPartA.equals(counterPartB)) {
+                return false;
+            }
+        }
+        return b.getTimeSent() - a.getTimeSent() <= Config.MESSAGE_MERGE_WINDOW;
+    }
+
     private boolean showDetailedReaction(final Message message, final String emoji) {
         final var c = message.getConversation();
         if (c instanceof Conversation conversation && c.getMode() == Conversational.MODE_MULTI) {
@@ -1300,6 +1384,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
     private static class ViewHolder {
 
+        private ConstraintLayout root;
         public MaterialButton load_more_messages;
         public ImageView edit_indicator;
         public RelativeLayout audioPlayer;
diff --git a/src/main/res/layout/item_message_received.xml b/src/main/res/layout/item_message_received.xml
index 60c665ffe0fc570fb0bf8e7a2bcb3a00f2400440..0df590d2446321be49c9328ed0b61802c6a314e6 100644
--- a/src/main/res/layout/item_message_received.xml
+++ b/src/main/res/layout/item_message_received.xml
@@ -6,13 +6,13 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="8dp"
-        android:paddingVertical="4dp">
+        android:paddingHorizontal="@dimen/bubble_horizontal_padding"
+        android:paddingVertical="@dimen/bubble_vertical_padding">
 
         <com.makeramen.roundedimageview.RoundedImageView
             android:id="@+id/message_photo"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
+            android:layout_width="@dimen/bubble_avatar_size"
+            android:layout_height="@dimen/bubble_avatar_size"
             android:scaleType="fitXY"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/message_box"
@@ -27,7 +27,7 @@
             android:background="@drawable/background_message_bubble"
             android:backgroundTint="?colorTertiaryContainer"
             android:longClickable="true"
-            android:minHeight="48dp"
+            android:minHeight="@dimen/bubble_avatar_size"
             app:layout_constrainedWidth="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
diff --git a/src/main/res/layout/item_message_sent.xml b/src/main/res/layout/item_message_sent.xml
index aac6eb78a5b397fcc9417e57e0ee236ad186d525..8d328df7509cbfe2b91f65dc241300f5fbddf2be 100644
--- a/src/main/res/layout/item_message_sent.xml
+++ b/src/main/res/layout/item_message_sent.xml
@@ -5,13 +5,13 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="8dp"
-        android:paddingVertical="4dp">
+        android:paddingHorizontal="@dimen/bubble_horizontal_padding"
+        android:paddingVertical="@dimen/bubble_vertical_padding">
 
         <com.makeramen.roundedimageview.RoundedImageView
             android:id="@+id/message_photo"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
+            android:layout_width="@dimen/bubble_avatar_size"
+            android:layout_height="@dimen/bubble_avatar_size"
             android:scaleType="fitXY"
             app:layout_constraintBottom_toBottomOf="@id/message_box"
             app:layout_constraintEnd_toEndOf="parent"
@@ -26,7 +26,7 @@
             android:background="@drawable/background_message_bubble"
             android:backgroundTint="?colorSecondaryContainer"
             android:longClickable="true"
-            android:minHeight="48dp"
+            android:minHeight="@dimen/bubble_avatar_size"
             app:layout_constrainedWidth="true"
             app:layout_constraintEnd_toStartOf="@id/message_photo"
             app:layout_constraintHorizontal_bias="1.0"
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 1c812d9d1d8b5d6b004ee665ffdfa665747c7600..d7bc0dcd51241cfa2223159e9de6602d1e2e3b84 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -42,4 +42,9 @@
     <dimen name="local_video_preview_height">128dp</dimen>
     <dimen name="local_video_preview_width">96dp</dimen>
     <dimen name="rtp_session_duration_top_margin">24dp</dimen>
+
+    <dimen name="bubble_horizontal_padding">8dp</dimen>
+    <dimen name="bubble_vertical_padding">4dp</dimen>
+    <dimen name="bubble_vertical_padding_minimum">1dp</dimen>
+    <dimen name="bubble_avatar_size">48dp</dimen>
 </resources>

From 2c37eecfe7d1661c5e3f9ee64ee3723b2ef78505 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 29 Nov 2024 11:41:42 +0100
Subject: [PATCH 186/357] add setting to disable avatars on message bubbles

---
 .../eu/siacs/conversations/AppSettings.java   |  8 ++-
 .../ui/adapter/MessageAdapter.java            | 55 +++++++++++++++++--
 .../InterfaceBubblesSettingsFragment.java     | 19 +++++++
 .../res/drawable/ic_account_circle_24dp.xml   | 12 ++++
 src/main/res/drawable/ic_colors_24dp.xml      | 10 ++++
 src/main/res/layout/item_message_received.xml |  2 +-
 src/main/res/layout/item_message_sent.xml     |  4 +-
 src/main/res/values/defaults.xml              |  1 +
 src/main/res/values/dimens.xml                |  3 +-
 src/main/res/values/strings.xml               |  5 ++
 src/main/res/xml/preferences_interface.xml    | 15 ++---
 .../res/xml/preferences_interface_bubbles.xml | 21 +++++++
 12 files changed, 131 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/eu/siacs/conversations/ui/fragment/settings/InterfaceBubblesSettingsFragment.java
 create mode 100644 src/main/res/drawable/ic_account_circle_24dp.xml
 create mode 100644 src/main/res/drawable/ic_colors_24dp.xml
 create mode 100644 src/main/res/xml/preferences_interface_bubbles.xml

diff --git a/src/main/java/eu/siacs/conversations/AppSettings.java b/src/main/java/eu/siacs/conversations/AppSettings.java
index 4d39315244a607410df11496ec2ae8cab672a23a..2ce12e3278b28982b952d74061550a20ffd7a7c2 100644
--- a/src/main/java/eu/siacs/conversations/AppSettings.java
+++ b/src/main/java/eu/siacs/conversations/AppSettings.java
@@ -3,13 +3,10 @@ package eu.siacs.conversations;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.net.Uri;
-
 import androidx.annotation.BoolRes;
 import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
-
 import com.google.common.base.Strings;
-
 import java.security.SecureRandom;
 
 public class AppSettings {
@@ -45,6 +42,7 @@ public class AppSettings {
     public static final String SEND_CRASH_REPORTS = "send_crash_reports";
     public static final String COLORFUL_CHAT_BUBBLES = "use_green_background";
     public static final String LARGE_FONT = "large_font";
+    public static final String SHOW_AVATARS = "show_avatars";
 
     private static final String ACCEPT_INVITES_FROM_STRANGERS = "accept_invites_from_strangers";
     private static final String INSTALLATION_ID = "im.conversations.android.install_id";
@@ -108,6 +106,10 @@ public class AppSettings {
         return getBooleanPreference(LARGE_FONT, R.bool.large_font);
     }
 
+    public boolean isShowAvatars() {
+        return getBooleanPreference(SHOW_AVATARS, R.bool.show_avatars);
+    }
+
     public boolean isUseTor() {
         return getBooleanPreference(USE_TOR, R.bool.use_tor);
     }
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 1ad73d920f96a93a0de7fa37edb120fed16a584f..709c3186be200a579f2eacf4025faa7fc533c697 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -101,7 +101,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
     private final DisplayMetrics metrics;
     private OnContactPictureClicked mOnContactPictureClickedListener;
     private OnContactPictureLongClicked mOnContactPictureLongClickedListener;
-    private BubbleDesign bubbleDesign = new BubbleDesign(false, false);
+    private BubbleDesign bubbleDesign = new BubbleDesign(false, false, true);
     private final boolean mForceNames;
 
     public MessageAdapter(
@@ -722,6 +722,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         }
     }
 
+    @NonNull
     @Override
     public View getView(final int position, View view, final @NonNull ViewGroup parent) {
         final Message message = getItem(position);
@@ -923,11 +924,21 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             // sent and received bubbles
             final var mergeIntoTop = mergeIntoTop(position, message);
             final var mergeIntoBottom = mergeIntoBottom(position, message);
-            final var requiresAvatar = type == SENT ? !mergeIntoBottom : !mergeIntoTop;
+            final var showAvatar =
+                    bubbleDesign.showAvatars
+                            || (type == RECEIVED
+                                    && message.getConversation().getMode()
+                                            == Conversation.MODE_MULTI);
             setBubblePadding(viewHolder.root, mergeIntoTop, mergeIntoBottom);
-            setRequiresAvatar(viewHolder, requiresAvatar);
+            if (showAvatar) {
+                final var requiresAvatar = type == SENT ? !mergeIntoBottom : !mergeIntoTop;
+                setRequiresAvatar(viewHolder, requiresAvatar);
+                AvatarWorkerTask.loadAvatar(message, viewHolder.contact_picture, R.dimen.avatar);
+            } else {
+                viewHolder.contact_picture.setVisibility(View.GONE);
+            }
+            setAvatarDistance(viewHolder.message_box, type, showAvatar);
             viewHolder.message_box.setClipToOutline(true);
-            AvatarWorkerTask.loadAvatar(message, viewHolder.contact_picture, R.dimen.avatar);
         }
 
         resetClickListener(viewHolder.message_box, viewHolder.messageBody);
@@ -1084,6 +1095,30 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         return view;
     }
 
+    private void setAvatarDistance(
+            final LinearLayout messageBox, final int type, final boolean showAvatar) {
+        final ViewGroup.MarginLayoutParams layoutParams =
+                (ViewGroup.MarginLayoutParams) messageBox.getLayoutParams();
+        if (showAvatar) {
+            final var resources = messageBox.getResources();
+            if (type == RECEIVED) {
+                layoutParams.setMarginStart(
+                        resources.getDimensionPixelSize(R.dimen.bubble_avatar_distance));
+                layoutParams.setMarginEnd(0);
+            } else if (type == SENT) {
+                layoutParams.setMarginStart(0);
+                layoutParams.setMarginEnd(
+                        resources.getDimensionPixelSize(R.dimen.bubble_avatar_distance));
+            } else {
+                throw new AssertionError("Avatar distances are not available on this view type");
+            }
+        } else {
+            layoutParams.setMarginStart(0);
+            layoutParams.setMarginEnd(0);
+        }
+        messageBox.setLayoutParams(layoutParams);
+    }
+
     private void setBubblePadding(
             final ConstraintLayout root,
             final boolean mergeIntoTop,
@@ -1254,7 +1289,10 @@ public class MessageAdapter extends ArrayAdapter<Message> {
     public void updatePreferences() {
         final AppSettings appSettings = new AppSettings(activity);
         this.bubbleDesign =
-                new BubbleDesign(appSettings.isColorfulChatBubbles(), appSettings.isLargeFont());
+                new BubbleDesign(
+                        appSettings.isColorfulChatBubbles(),
+                        appSettings.isLargeFont(),
+                        appSettings.isShowAvatars());
     }
 
     public void setHighlightedTerm(List<String> terms) {
@@ -1375,10 +1413,15 @@ public class MessageAdapter extends ArrayAdapter<Message> {
     private static class BubbleDesign {
         public final boolean colorfulChatBubbles;
         public final boolean largeFont;
+        public final boolean showAvatars;
 
-        private BubbleDesign(final boolean colorfulChatBubbles, final boolean largeFont) {
+        private BubbleDesign(
+                final boolean colorfulChatBubbles,
+                final boolean largeFont,
+                final boolean showAvatars) {
             this.colorfulChatBubbles = colorfulChatBubbles;
             this.largeFont = largeFont;
+            this.showAvatars = showAvatars;
         }
     }
 
diff --git a/src/main/java/eu/siacs/conversations/ui/fragment/settings/InterfaceBubblesSettingsFragment.java b/src/main/java/eu/siacs/conversations/ui/fragment/settings/InterfaceBubblesSettingsFragment.java
new file mode 100644
index 0000000000000000000000000000000000000000..73ff4df0b7f7793db77fb3e7195005457ca0cdac
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/ui/fragment/settings/InterfaceBubblesSettingsFragment.java
@@ -0,0 +1,19 @@
+package eu.siacs.conversations.ui.fragment.settings;
+
+import android.os.Bundle;
+import androidx.annotation.Nullable;
+import eu.siacs.conversations.R;
+
+public class InterfaceBubblesSettingsFragment extends XmppPreferenceFragment {
+
+    @Override
+    public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable String rootKey) {
+        setPreferencesFromResource(R.xml.preferences_interface_bubbles, rootKey);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        requireActivity().setTitle(R.string.pref_title_bubbles);
+    }
+}
diff --git a/src/main/res/drawable/ic_account_circle_24dp.xml b/src/main/res/drawable/ic_account_circle_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..25c7c244b325d55cda6b94c3a48f7019706eca77
--- /dev/null
+++ b/src/main/res/drawable/ic_account_circle_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2zM12,6c1.93,0 3.5,1.57 3.5,3.5S13.93,13 12,13s-3.5,-1.57 -3.5,-3.5S10.07,6 12,6zM12,20c-2.03,0 -4.43,-0.82 -6.14,-2.88C7.55,15.8 9.68,15 12,15s4.45,0.8 6.14,2.12C16.43,19.18 14.03,20 12,20z" />
+
+</vector>
diff --git a/src/main/res/drawable/ic_colors_24dp.xml b/src/main/res/drawable/ic_colors_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..106cd34c100146f327ba89881c2041ad50ac0129
--- /dev/null
+++ b/src/main/res/drawable/ic_colors_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M346,820L100,574Q90,564 85,552Q80,540 80,527Q80,514 85,502Q90,490 100,480L330,251L224,145L286,80L686,480Q696,490 700.5,502Q705,514 705,527Q705,540 700.5,552Q696,564 686,574L440,820Q430,830 418,835Q406,840 393,840Q380,840 368,835Q356,830 346,820ZM393,314L179,528Q179,528 179,528Q179,528 179,528L607,528Q607,528 607,528Q607,528 607,528L393,314ZM792,840Q756,840 731,814.5Q706,789 706,752Q706,725 719.5,701Q733,677 750,654L792,600L836,654Q852,677 866,701Q880,725 880,752Q880,789 854,814.5Q828,840 792,840Z" />
+</vector>
diff --git a/src/main/res/layout/item_message_received.xml b/src/main/res/layout/item_message_received.xml
index 0df590d2446321be49c9328ed0b61802c6a314e6..74951d43dfef90c850ee07f63c8a92c957cb3d0d 100644
--- a/src/main/res/layout/item_message_received.xml
+++ b/src/main/res/layout/item_message_received.xml
@@ -23,7 +23,7 @@
             android:id="@+id/message_box"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
+            android:layout_marginStart="@dimen/bubble_avatar_distance"
             android:background="@drawable/background_message_bubble"
             android:backgroundTint="?colorTertiaryContainer"
             android:longClickable="true"
diff --git a/src/main/res/layout/item_message_sent.xml b/src/main/res/layout/item_message_sent.xml
index 8d328df7509cbfe2b91f65dc241300f5fbddf2be..ccf7a1f47a8913167182f9d50d3c4a3da9fc1319 100644
--- a/src/main/res/layout/item_message_sent.xml
+++ b/src/main/res/layout/item_message_sent.xml
@@ -15,14 +15,14 @@
             android:scaleType="fitXY"
             app:layout_constraintBottom_toBottomOf="@id/message_box"
             app:layout_constraintEnd_toEndOf="parent"
-            app:riv_corner_radius="8dp" />
+            app:riv_corner_radius="8dp"/>
 
 
         <LinearLayout
             android:id="@+id/message_box"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="6dp"
+            android:layout_marginEnd="@dimen/bubble_avatar_distance"
             android:background="@drawable/background_message_bubble"
             android:backgroundTint="?colorSecondaryContainer"
             android:longClickable="true"
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 61900117dd2b48806b53ffcec9e9a026001f28be..5e57731222165a135019ca6131604be0fe760706 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -19,6 +19,7 @@
     <string name="picture_compression">auto</string>
     <bool name="use_green_background">true</bool>
     <bool name="large_font">false</bool>
+    <bool name="show_avatars">true</bool>
     <string name="quick_action">recent</string>
     <bool name="show_dynamic_tags">false</bool>
     <bool name="btbv">true</bool>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index d7bc0dcd51241cfa2223159e9de6602d1e2e3b84..41888854f4388e318e3c8ad0e4ca6cbdd61a6d1a 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -47,4 +47,5 @@
     <dimen name="bubble_vertical_padding">4dp</dimen>
     <dimen name="bubble_vertical_padding_minimum">1dp</dimen>
     <dimen name="bubble_avatar_size">48dp</dimen>
-</resources>
+    <dimen name="bubble_avatar_distance">6dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 6e4ce77ea3fa3076a86a2deb28db0a2184758708..eac59070a1cef8de8a847d29cdd7b9f01a3ddbd2 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1088,4 +1088,9 @@
     <string name="more_reactions">More reactions</string>
     <string name="could_not_modify_call">Could not modify call</string>
     <string name="clients_may_not_support_av">Your contact’s XMPP client might not support audio/video calls.</string>
+    <string name="pref_show_avatars">Show avatars</string>
+    <string name="pref_show_avatars_summary">Display avatars for your messages and in 1:1 chats, in addition to group chats.</string>
+    <string name="pref_chat_bubbles">Chat bubbles</string>
+    <string name="pref_chat_bubbles_summary">Background color, Font size, Avatars</string>
+    <string name="pref_title_bubbles">Chat Bubbles</string>
 </resources>
diff --git a/src/main/res/xml/preferences_interface.xml b/src/main/res/xml/preferences_interface.xml
index 333edb03ab059bfaa311368b721b878d0da4068d..93b951440d8876ec6d6e0fd1f32d53552285f216 100644
--- a/src/main/res/xml/preferences_interface.xml
+++ b/src/main/res/xml/preferences_interface.xml
@@ -15,18 +15,11 @@
             android:key="theme"
             android:title="@string/pref_light_dark_mode"
             app:useSimpleSummaryProvider="true" />
-        <SwitchPreferenceCompat
-            android:defaultValue="@bool/use_green_background"
+        <Preference
             android:icon="@drawable/ic_forum_24dp"
-            android:key="use_green_background"
-            android:summary="@string/pref_use_colorful_bubbles_summary"
-            android:title="@string/pref_use_colorful_bubbles" />
-        <SwitchPreferenceCompat
-            android:defaultValue="@bool/large_font"
-            android:icon="@drawable/ic_format_size_24dp"
-            android:key="large_font"
-            android:summary="@string/pref_large_font_summary"
-            android:title="@string/pref_large_font" />
+            app:fragment="eu.siacs.conversations.ui.fragment.settings.InterfaceBubblesSettingsFragment"
+            app:summary="@string/pref_chat_bubbles_summary"
+            app:title="@string/pref_chat_bubbles" />
         <SwitchPreferenceCompat
             android:defaultValue="@bool/show_dynamic_tags"
             android:icon="@drawable/ic_label_24dp"
diff --git a/src/main/res/xml/preferences_interface_bubbles.xml b/src/main/res/xml/preferences_interface_bubbles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c1a77967126455054f2220383c7c6723272afcd8
--- /dev/null
+++ b/src/main/res/xml/preferences_interface_bubbles.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <SwitchPreferenceCompat
+        android:defaultValue="@bool/use_green_background"
+        android:icon="@drawable/ic_colors_24dp"
+        android:key="use_green_background"
+        android:summary="@string/pref_use_colorful_bubbles_summary"
+        android:title="@string/pref_use_colorful_bubbles" />
+    <SwitchPreferenceCompat
+        android:defaultValue="@bool/show_avatars"
+        android:icon="@drawable/ic_account_circle_24dp"
+        android:key="show_avatars"
+        android:summary="@string/pref_show_avatars_summary"
+        android:title="@string/pref_show_avatars" />
+    <SwitchPreferenceCompat
+        android:defaultValue="@bool/large_font"
+        android:icon="@drawable/ic_format_size_24dp"
+        android:key="large_font"
+        android:summary="@string/pref_large_font_summary"
+        android:title="@string/pref_large_font" />
+</PreferenceScreen>
\ No newline at end of file

From 18c79fab4e957145a6f698e3cbc8bea06ff753bc Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Wed, 27 Nov 2024 12:22:42 +0000
Subject: [PATCH 187/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1045 of 1045 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/uk/
---
 src/main/res/values-uk/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 42dbc1fa0f2dbf81f2cdda6fd18a439b0684b31f..a218e11fe61334df0f0860f6997111ca07591916 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -793,7 +793,7 @@
     <string name="try_again_in_x">Будь ласка, спробуйте ще раз через %s</string>
     <string name="rate_limited">Ви обмежені за рейтингом</string>
     <string name="too_many_attempts">Забагато спроб</string>
-    <string name="the_app_is_out_of_date">Версія Вашого застосунку застаріла.</string>
+    <string name="the_app_is_out_of_date">Ви користуєтеся застарілою версією застосунку.</string>
     <string name="update">Оновити</string>
     <string name="logged_in_with_another_device">Зараз цей номер телефону авторизований на іншому пристрої.</string>
     <string name="enter_your_name_instructions">Будь ласка, вкажіть своє ім\'я, щоб надати можливість людям, які не мають Вашого контакту, дізнатися, хто Ви є.</string>

From 2fc440697bdb06644f478618622f8200ae12f61a Mon Sep 17 00:00:00 2001
From: "lucasmz.dev" <git@lucasmz.dev>
Date: Thu, 28 Nov 2024 04:29:29 +0000
Subject: [PATCH 188/357] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1045 of 1045 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pt_BR/
---
 src/main/res/values-pt-rBR/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 791dbda9fd26a808ddbff53a3ec72c85ed961499..ea7d17b04a82be31a498bcdecb59988372089c96 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -434,7 +434,7 @@
     <string name="no_application_found_to_display_location">Não foi encontrado nenhum aplicativo para exibir a localização</string>
     <string name="location">Localização</string>
     <string name="title_undo_swipe_out_group_chat">Sair da conversa em grupo privada</string>
-    <string name="title_undo_swipe_out_channel">Deixar o canal público</string>
+    <string name="title_undo_swipe_out_channel">Saiu do canal público</string>
     <string name="pref_dont_trust_system_cas_title">Não confiar nas CAs do sistema</string>
     <string name="pref_dont_trust_system_cas_summary">Todos os certificados devem ser aprovados manualmente</string>
     <string name="pref_remove_trusted_certificates_title">Remover certificados</string>
@@ -606,8 +606,8 @@
     <string name="use_camera_icon_to_scan_barcode">Use a câmera para capturar o código de barras de um contato</string>
     <string name="please_wait_for_keys_to_be_fetched">Por favor, aguarde a obtenção das chaves</string>
     <string name="share_as_barcode">Compartilhar como código de barras</string>
-    <string name="share_as_uri">Compartilhar como uma URI XMPP</string>
-    <string name="share_as_http">Compartilhar como um link HTTP</string>
+    <string name="share_as_uri">Compartilhar como URI XMPP</string>
+    <string name="share_as_http">Compartilhar como link HTTP</string>
     <string name="pref_blind_trust_before_verification">Confiar cegamente antes de verificar</string>
     <string name="pref_blind_trust_before_verification_summary">Confiar em novos dispositivos de contatos não verificados, mas solicitar confirmação manual de novos dispositivos para contatos verificados.</string>
     <string name="blindly_trusted_omemo_keys">Chaves OMEMO confiadas cegamente, o que significa que poderiam ser outras pessoas ou alguém poderia tê-las aproveitado.</string>

From 32d77500a5758cfbb438207b4f90710d9992ef79 Mon Sep 17 00:00:00 2001
From: Besnik_b <Besnik_b@users.noreply.translate.codeberg.org>
Date: Thu, 28 Nov 2024 16:08:47 +0000
Subject: [PATCH 189/357] Translated using Weblate (Albanian)

Currently translated at 100.0% (76 of 76 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/sq/
---
 fastlane/metadata/android/sq/changelogs/4212504.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/sq/changelogs/4212504.txt

diff --git a/fastlane/metadata/android/sq/changelogs/4212504.txt b/fastlane/metadata/android/sq/changelogs/4212504.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ef2b5ee2414dca1046538f12d2b5284074c1b7fc
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/4212504.txt
@@ -0,0 +1 @@
+* përmirësim i trajtimit të disa reagimeve me emoxhi

From 2f129a71706ed90df124130f5513735e88d4a36b Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Thu, 28 Nov 2024 13:24:33 +0000
Subject: [PATCH 190/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (76 of 76 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/uk/
---
 fastlane/metadata/android/uk/changelogs/4212504.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/uk/changelogs/4212504.txt

diff --git a/fastlane/metadata/android/uk/changelogs/4212504.txt b/fastlane/metadata/android/uk/changelogs/4212504.txt
new file mode 100644
index 0000000000000000000000000000000000000000..344c67d8be0cf335fc5ecd9240399e92fda0a213
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/4212504.txt
@@ -0,0 +1 @@
+* Покращено обробку деяких реакцій емоджі

From 49ff06f94becffd7acef9b62f2f2f5cf44094c26 Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Fri, 29 Nov 2024 04:41:44 +0000
Subject: [PATCH 191/357] Translated using Weblate (Galician)

Currently translated at 63.1% (48 of 76 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/gl/
---
 fastlane/metadata/android/gl-ES/changelogs/4212504.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/gl-ES/changelogs/4212504.txt

diff --git a/fastlane/metadata/android/gl-ES/changelogs/4212504.txt b/fastlane/metadata/android/gl-ES/changelogs/4212504.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a6a5c9bd3ad667e179093e3ea04c8c9157c796a8
--- /dev/null
+++ b/fastlane/metadata/android/gl-ES/changelogs/4212504.txt
@@ -0,0 +1 @@
+* mellora na xestión da reacción con emojis

From feb773a82906f95a3c5fd3a9e0f14791290b4c19 Mon Sep 17 00:00:00 2001
From: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Date: Fri, 29 Nov 2024 02:19:13 +0000
Subject: [PATCH 192/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (76 of 76 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/zh_Hans/
---
 fastlane/metadata/android/zh-CN/changelogs/4212504.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/zh-CN/changelogs/4212504.txt

diff --git a/fastlane/metadata/android/zh-CN/changelogs/4212504.txt b/fastlane/metadata/android/zh-CN/changelogs/4212504.txt
new file mode 100644
index 0000000000000000000000000000000000000000..84de6ffbc5de6cf5d849ef07e0b1b60199bf000c
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/4212504.txt
@@ -0,0 +1 @@
+* 改进某些表情符号回应的处理

From 9c9b648df73ba3a99b50bb22a53c7c93f77ef60e Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Fri, 29 Nov 2024 11:43:12 +0000
Subject: [PATCH 193/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1050 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/uk/
---
 src/main/res/values-uk/strings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index a218e11fe61334df0f0860f6997111ca07591916..9db40080b404cfeaa31cc9aab50d01a6326274b6 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -1067,7 +1067,7 @@
     <string name="pref_dynamic_colors">Динамічні кольори</string>
     <string name="pref_dynamic_colors_summary">Системні кольори (Material You)</string>
     <string name="pref_use_colorful_bubbles_summary">Різні кольори фону для надісланих та отриманих повідомлень</string>
-    <string name="pref_use_colorful_bubbles">Кольорові бульбашки в розмовах</string>
+    <string name="pref_use_colorful_bubbles">Кольорові бульбашки повідомлень</string>
     <string name="title_activity_new_chat">Нова розмова</string>
     <string name="action_archive_chat">Архівувати розмову</string>
     <string name="archive_this_chat">Після цього видалити розмову</string>
@@ -1143,4 +1143,9 @@
     <string name="add_reaction_title">Додати реакцію</string>
     <string name="could_not_modify_call">Не вдалося змінити виклик</string>
     <string name="clients_may_not_support_av">Можливо, клієнт XMPP Вашого контакту не підтримує аудіо- та відеовиклики.</string>
+    <string name="pref_show_avatars">Показувати аватари</string>
+    <string name="pref_chat_bubbles">Бульбашки повідомлень</string>
+    <string name="pref_chat_bubbles_summary">Колір фону, розмір шрифту, аватари</string>
+    <string name="pref_title_bubbles">Вигляд повідомлень</string>
+    <string name="pref_show_avatars_summary">Крім групових чатів, показувати аватари також у Ваших повідомленнях і приватних чатах.</string>
 </resources>
\ No newline at end of file

From d20e9ead7bdfd458b2853e0cb117fa9d7b173b1d Mon Sep 17 00:00:00 2001
From: licaon-kter <licaon-kter@users.noreply.translate.codeberg.org>
Date: Fri, 29 Nov 2024 11:47:13 +0000
Subject: [PATCH 194/357] Translated using Weblate (Romanian)

Currently translated at 100.0% (1050 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ro/
---
 src/main/res/values-ro-rRO/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 235ce04ac7989932e31c7fddbe7c60c11bbdcb36..1de74fe9845bce3b27da9b255ab3f67ea0aa32bd 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -1114,4 +1114,9 @@
     <string name="more_reactions">Mai multe reacții</string>
     <string name="could_not_modify_call">Nu s-a putut modifica apelul</string>
     <string name="clients_may_not_support_av">Clientul XMPP al contactului dvs. este posibil să nu accepte apeluri audio/video.</string>
+    <string name="pref_chat_bubbles_summary">Culoare de fundal, mărime font, avatare</string>
+    <string name="pref_show_avatars_summary">Afișați avatare pentru mesajele dvs. și în discuțiile 1:1, în plus față de cele de grup.</string>
+    <string name="pref_title_bubbles">Bule de mesaj</string>
+    <string name="pref_chat_bubbles">Bule de mesaj</string>
+    <string name="pref_show_avatars">Arată avatare</string>
 </resources>
\ No newline at end of file

From 339aba11c141073739f30996ced5b229a1cb58a4 Mon Sep 17 00:00:00 2001
From: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Date: Fri, 29 Nov 2024 11:44:29 +0000
Subject: [PATCH 195/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1050 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/zh_Hans/
---
 src/main/res/values-zh-rCN/strings.xml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index c488877df02b684f7015b87de9bc2e83fda5e9e4..2c05c0f851ddc25d4a0592d08f8ddcb045b4a772 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -9,7 +9,7 @@
     <string name="action_add_account">添加账号</string>
     <string name="action_edit_contact">编辑名称</string>
     <string name="action_add_phone_book">添加到通讯录</string>
-    <string name="action_delete_contact">从联系人列表删除</string>
+    <string name="action_delete_contact">删除联系人</string>
     <string name="action_block_contact">屏蔽联系人</string>
     <string name="action_unblock_contact">解除屏蔽联系人</string>
     <string name="action_block_domain">屏蔽域名</string>
@@ -707,7 +707,7 @@
     <string name="disable_now">立即禁用</string>
     <string name="draft">草稿：</string>
     <string name="pref_omemo_setting">OMEMO 加密</string>
-    <string name="pref_omemo_setting_summary_always">OMEMO 将始终用于一对一和私人群聊。</string>
+    <string name="pref_omemo_setting_summary_always">OMEMO 将始终用于一对一聊天和私人群聊。</string>
     <string name="pref_omemo_setting_summary_default_on">新对话将默认使用 OMEMO。</string>
     <string name="pref_omemo_setting_summary_default_off">新对话必须明确开启 OMEMO。</string>
     <string name="create_shortcut">创建快捷方式</string>
@@ -1021,7 +1021,7 @@
     <string name="title_activity_share_with">分享至…</string>
     <string name="pref_use_colorful_bubbles_summary">为已发送和已接收消息使用不同的背景颜色</string>
     <string name="no_certificate_selected">未选择客户端证书！</string>
-    <string name="pref_use_colorful_bubbles">彩色聊天气泡</string>
+    <string name="pref_use_colorful_bubbles">彩色消息气泡</string>
     <string name="pref_dynamic_colors">动态色彩</string>
     <string name="pref_dynamic_colors_summary">系统色彩 (Material You)</string>
     <string name="title_activity_new_chat">新对话</string>
@@ -1075,7 +1075,7 @@
     <string name="pref_fullscreen_notification_summary">当设备锁定时，允许此应用显示占据全屏的来电通知。</string>
     <string name="unsupported_operation">不支持的操作</string>
     <string name="pref_backup_summary">创建一次性备份、计划定期备份</string>
-    <string name="allow_private_messages">允许私信</string>
+    <string name="allow_private_messages">允许频道内私信</string>
     <string name="edit_nick">编辑昵称</string>
     <string name="your_avatar_tap_to_select_new_avatar">您的头像。点击从图库中选择新头像。</string>
     <string name="could_not_disable_video">无法禁用视频。</string>
@@ -1101,4 +1101,9 @@
     <string name="add_reaction_title">添加回应</string>
     <string name="could_not_modify_call">无法修改通话</string>
     <string name="clients_may_not_support_av">您的联系人的 XMPP 客户端可能不支持音频/视频通话。</string>
+    <string name="pref_show_avatars">显示头像</string>
+    <string name="pref_chat_bubbles_summary">背景颜色、字体大小、头像</string>
+    <string name="pref_chat_bubbles">消息气泡</string>
+    <string name="pref_title_bubbles">消息气泡</string>
+    <string name="pref_show_avatars_summary">除了群聊，您的消息还有一对一聊天也会显示头像。</string>
 </resources>
\ No newline at end of file

From a9a8e89fab7eead410f97a1d086699f2c99dd440 Mon Sep 17 00:00:00 2001
From: inputmice <inputmice@users.noreply.translate.codeberg.org>
Date: Fri, 29 Nov 2024 14:17:53 +0000
Subject: [PATCH 196/357] Translated using Weblate (German)

Currently translated at 100.0% (1050 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/de/
---
 src/main/res/values-de/strings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 58c9c554d0b752adb7c5634526d588daf320c82e..991d94be7db4457dee088f8b6b03a402bbb2ad93 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -1012,7 +1012,7 @@
     <string name="remove_bookmark">Willst du das Lesezeichen für %s entfernen?</string>
     <string name="title_activity_share_with">Teilen mit…</string>
     <string name="pref_use_colorful_bubbles_summary">Unterschiedliche Hintergrundfarben für gesendete und empfangene Nachrichten</string>
-    <string name="pref_use_colorful_bubbles">Farbige Chatblasen</string>
+    <string name="pref_use_colorful_bubbles">Farbige Sprechblase</string>
     <string name="pref_dynamic_colors">Dynamische Farben</string>
     <string name="pref_dynamic_colors_summary">Systemfarben (Material You)</string>
     <string name="start_chat">Chat starten</string>
@@ -1095,4 +1095,9 @@
     <string name="more_reactions">Weitere Reaktionen</string>
     <string name="could_not_modify_call">Anruf konnte nicht geändert werden</string>
     <string name="clients_may_not_support_av">Der XMPP-Client deines Kontakts unterstützt möglicherweise keine Audio-/Videoanrufe.</string>
+    <string name="pref_chat_bubbles">Sprechblasen</string>
+    <string name="pref_show_avatars">Profilbilder anzeigen</string>
+    <string name="pref_show_avatars_summary">Profilbilder an Deinen Nachrichten und in 1:1 Chats anzeigen statt nur in Gruppenchats.</string>
+    <string name="pref_chat_bubbles_summary">Hintergrundfarbe, Schriftgröße, Profilbilder</string>
+    <string name="pref_title_bubbles">Sprachblasen</string>
 </resources>
\ No newline at end of file

From 531e3e91da625d1472e252aad946ab138d282b87 Mon Sep 17 00:00:00 2001
From: inputmice <inputmice@users.noreply.translate.codeberg.org>
Date: Fri, 29 Nov 2024 14:20:16 +0000
Subject: [PATCH 197/357] Translated using Weblate (German)

Currently translated at 100.0% (1050 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/de/
---
 src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 991d94be7db4457dee088f8b6b03a402bbb2ad93..bc6c42dcff73b98d1540b395184bb1cc36491baa 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -1012,7 +1012,7 @@
     <string name="remove_bookmark">Willst du das Lesezeichen für %s entfernen?</string>
     <string name="title_activity_share_with">Teilen mit…</string>
     <string name="pref_use_colorful_bubbles_summary">Unterschiedliche Hintergrundfarben für gesendete und empfangene Nachrichten</string>
-    <string name="pref_use_colorful_bubbles">Farbige Sprechblase</string>
+    <string name="pref_use_colorful_bubbles">Farbige Sprechblasen</string>
     <string name="pref_dynamic_colors">Dynamische Farben</string>
     <string name="pref_dynamic_colors_summary">Systemfarben (Material You)</string>
     <string name="start_chat">Chat starten</string>

From 158959b8392028e479cc7ca6ef35fbc64ec5449f Mon Sep 17 00:00:00 2001
From: Stephan-P <Stephan-P@users.noreply.translate.codeberg.org>
Date: Fri, 29 Nov 2024 15:45:22 +0000
Subject: [PATCH 198/357] Translated using Weblate (Dutch)

Currently translated at 100.0% (1050 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/nl/
---
 src/main/res/values-nl/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 14225f14be4b7fc0fcee9a04be5543490c9d54ca..f2412f6aadffee506ddaa0e0f3beb87b52fda422 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -1111,4 +1111,9 @@
     <string name="more_reactions">Meer reacties</string>
     <string name="could_not_modify_call">Kan de aanroep niet wijzigen</string>
     <string name="clients_may_not_support_av">De XMPP-client van je contactpersoon ondersteunt mogelijk geen audio-/videogesprekken.</string>
+    <string name="pref_chat_bubbles">Chat-bubbels</string>
+    <string name="pref_chat_bubbles_summary">Achtergrondkleur, Lettergrootte, Avatars</string>
+    <string name="pref_title_bubbles">Chat-bubbels</string>
+    <string name="pref_show_avatars_summary">Avatars weergeven in jouw berichten en in 1:1-chats, naast groepschats.</string>
+    <string name="pref_show_avatars">Avatars weergeven</string>
 </resources>
\ No newline at end of file

From 9a2bd5d39ff7dab07b321bd506ab429f5cc20e9f Mon Sep 17 00:00:00 2001
From: Besnik_b <Besnik_b@users.noreply.translate.codeberg.org>
Date: Fri, 29 Nov 2024 15:06:47 +0000
Subject: [PATCH 199/357] Translated using Weblate (Albanian)

Currently translated at 99.1% (1041 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sq/
---
 src/main/res/values-sq-rAL/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index 0b136e3eefb80d60e7b10f375776b13868e63349..5dfeae476fd365ad68471c7d43abaee8a067e3ce 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -1106,4 +1106,9 @@
     <string name="more_reactions">Më tepër reagime</string>
     <string name="could_not_modify_call">S’u ndryshua dot thirrja</string>
     <string name="clients_may_not_support_av">Klienti XMPP i kontaktit tuaj mund të mos mbulojë thirrje me audio/video.</string>
+    <string name="pref_show_avatars">Shfaq avatarë</string>
+    <string name="pref_show_avatars_summary">Shfaq avatarë për mesazhet tuaj të rinj dhe fjalosjet 1:1, përtej fjalosjeve grupi.</string>
+    <string name="pref_chat_bubbles">Flluska fjalosjesh</string>
+    <string name="pref_chat_bubbles_summary">Ngjyrë sfondi, Madhësi shkronjash, avatarë</string>
+    <string name="pref_title_bubbles">Flluska Fjalosjesh</string>
 </resources>
\ No newline at end of file

From a2f969d5d72d44bd254d69d201782e28fb6524c3 Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Fri, 29 Nov 2024 19:17:46 +0000
Subject: [PATCH 200/357] Translated using Weblate (Galician)

Currently translated at 99.9% (1049 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/gl/
---
 src/main/res/values-gl/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 5723dac6bd7aaa814a45b11d17da1c1955826e66..f7a0e1afba0b63d9242bdc5dff764b3a05022bbd 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -1095,4 +1095,9 @@
     <string name="add_reaction_title">Engadir reacción</string>
     <string name="could_not_modify_call">Non se puido modificar a chamada</string>
     <string name="clients_may_not_support_av">O cliente do teu contacto XMPP pode que non sexa compatible con chamadas de audio/video.</string>
+    <string name="pref_show_avatars">Mostrar avatares</string>
+    <string name="pref_chat_bubbles">Burbullas da conversa</string>
+    <string name="pref_title_bubbles">Burbullas na conversa</string>
+    <string name="pref_show_avatars_summary">Mostrar avatares para as túas mensaxes en conversas 1:1, ademáis de nas parolas en grupo.</string>
+    <string name="pref_chat_bubbles_summary">Cor de fondo, Tamaño da letra, Avatares</string>
 </resources>
\ No newline at end of file

From 45e719cdd1f5b7397231dd65fb05c07821205be9 Mon Sep 17 00:00:00 2001
From: user11 <user11@users.noreply.translate.codeberg.org>
Date: Fri, 29 Nov 2024 19:31:22 +0000
Subject: [PATCH 201/357] Translated using Weblate (Serbian)

Currently translated at 100.0% (1050 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sr/
---
 src/main/res/values-sr/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 661db4043beb2d512689f048a9e0c52171e5fde3..1af2ee4bfc213cf09490fa3de69dbec7312241e3 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -1129,4 +1129,9 @@
     <string name="more_reactions">Још реакција</string>
     <string name="could_not_modify_call">Није могуће изменити позив</string>
     <string name="clients_may_not_support_av">XMPP клијент вашег контакта можда не подржава аудио/видео позиве.</string>
+    <string name="pref_show_avatars">Прикажи аватаре</string>
+    <string name="pref_show_avatars_summary">Приказуј аватаре за поруке и у препискама 1-на-1, као и у групним препискама.</string>
+    <string name="pref_chat_bubbles">Балончићи у препискама</string>
+    <string name="pref_chat_bubbles_summary">Боја позадине, Величина слова, Аватари</string>
+    <string name="pref_title_bubbles">Балончићи у препискама</string>
 </resources>
\ No newline at end of file

From fe269e0d1a1a57c23d4edbca684367a4acd5d5d5 Mon Sep 17 00:00:00 2001
From: "lucasmz.dev" <git@lucasmz.dev>
Date: Sat, 30 Nov 2024 01:56:31 +0000
Subject: [PATCH 202/357] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1050 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pt_BR/
---
 src/main/res/values-pt-rBR/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index ea7d17b04a82be31a498bcdecb59988372089c96..499458078b1e3ef32741a16d976b3ee8661a5b59 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -1113,4 +1113,9 @@
     <string name="more_reactions">Mais reações</string>
     <string name="could_not_modify_call">Não foi possível modificar a chamada</string>
     <string name="clients_may_not_support_av">O cliente XMPP do seu contato não suporta chamadas de áudio ou vídeo.</string>
+    <string name="pref_show_avatars">Mostrar avatares</string>
+    <string name="pref_show_avatars_summary">Mostrar avatares para suas mensagens e em chats 1:1, em adição à chats em grupo.</string>
+    <string name="pref_chat_bubbles">Bolhas de conversa</string>
+    <string name="pref_chat_bubbles_summary">Cor do fundo, Tamanho da fonte, Avatares</string>
+    <string name="pref_title_bubbles">Bolhas de Conversa</string>
 </resources>
\ No newline at end of file

From 0056f8a528889b554524b110b2290ed35a824a0a Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Fri, 29 Nov 2024 21:48:06 +0000
Subject: [PATCH 203/357] Translated using Weblate (Polish)

Currently translated at 26.3% (20 of 76 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/pl/
---
 fastlane/metadata/android/pl-PL/changelogs/4212504.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4212504.txt

diff --git a/fastlane/metadata/android/pl-PL/changelogs/4212504.txt b/fastlane/metadata/android/pl-PL/changelogs/4212504.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dc07e11f044d9397b071bb304877acfdc4f422e0
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4212504.txt
@@ -0,0 +1 @@
+* Poprawienie obsługi niektórych emoji reakcji

From 0df07a42488ece73adcf0c46ae484df75aa8dedf Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Sat, 30 Nov 2024 16:06:45 +0000
Subject: [PATCH 204/357] Translated using Weblate (German)

Currently translated at 100.0% (1050 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/de/
---
 src/main/res/values-de/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index bc6c42dcff73b98d1540b395184bb1cc36491baa..d170462651e8ffd29c8ad1d1a429c81fdd46fb6b 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -403,7 +403,7 @@
     <string name="mark_as_read">Als gelesen markieren</string>
     <string name="pref_input_options">Eingabe</string>
     <string name="pref_enter_is_send">Eingabetaste sendet Nachricht</string>
-    <string name="pref_enter_is_send_summary">Nutze die Eingabetaste zum Versenden einer Nachricht. Strg+Eingabetaste sendet die Nachricht unabhängig von dieser Einstellung.</string>
+    <string name="pref_enter_is_send_summary">Eingabetaste zum Versenden einer Nachricht nutzen. Strg+Eingabetaste sendet die Nachricht unabhängig von dieser Einstellung.</string>
     <string name="pref_display_enter_key">Eingabetaste anzeigen</string>
     <string name="pref_display_enter_key_summary">Emoji-Taste durch Eingabetaste ersetzen</string>
     <string name="audio">Audio</string>
@@ -441,7 +441,7 @@
         <item quantity="one">%d Zertifikat gelöscht</item>
         <item quantity="other">%d Zertifikate gelöscht</item>
     </plurals>
-    <string name="pref_quick_action_summary">Ersetze \"Senden\"-Schaltfläche durch Schnell-Tasten</string>
+    <string name="pref_quick_action_summary">\"Senden\"-Schaltfläche durch Schnell-Tasten ersetzen</string>
     <string name="pref_quick_action">Schnell-Tasten</string>
     <string name="none">Keine</string>
     <string name="recently_used">Zuletzt verwendet</string>
@@ -1097,7 +1097,7 @@
     <string name="clients_may_not_support_av">Der XMPP-Client deines Kontakts unterstützt möglicherweise keine Audio-/Videoanrufe.</string>
     <string name="pref_chat_bubbles">Sprechblasen</string>
     <string name="pref_show_avatars">Profilbilder anzeigen</string>
-    <string name="pref_show_avatars_summary">Profilbilder an Deinen Nachrichten und in 1:1 Chats anzeigen statt nur in Gruppenchats.</string>
+    <string name="pref_show_avatars_summary">Profilbilder an deinen Nachrichten und in 1:1 Chats statt nur in Gruppenchats anzeigen.</string>
     <string name="pref_chat_bubbles_summary">Hintergrundfarbe, Schriftgröße, Profilbilder</string>
     <string name="pref_title_bubbles">Sprachblasen</string>
 </resources>
\ No newline at end of file

From 437e1f2abe32537e8ecfbe49db51ac86c00a41f0 Mon Sep 17 00:00:00 2001
From: p42ity <p42ity@users.noreply.translate.codeberg.org>
Date: Sat, 30 Nov 2024 13:38:25 +0000
Subject: [PATCH 205/357] Translated using Weblate (German)

Currently translated at 100.0% (1050 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/de/
---
 src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index d170462651e8ffd29c8ad1d1a429c81fdd46fb6b..048678a7b90cc7d68f085442e460da5ade1f79d4 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -1099,5 +1099,5 @@
     <string name="pref_show_avatars">Profilbilder anzeigen</string>
     <string name="pref_show_avatars_summary">Profilbilder an deinen Nachrichten und in 1:1 Chats statt nur in Gruppenchats anzeigen.</string>
     <string name="pref_chat_bubbles_summary">Hintergrundfarbe, Schriftgröße, Profilbilder</string>
-    <string name="pref_title_bubbles">Sprachblasen</string>
+    <string name="pref_title_bubbles">Sprechblasen</string>
 </resources>
\ No newline at end of file

From e4a4cfcaef91c6fd3461941cc6cd5cf98a8641c9 Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Sat, 30 Nov 2024 09:02:50 +0000
Subject: [PATCH 206/357] Translated using Weblate (Polish)

Currently translated at 100.0% (1050 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pl/
---
 src/main/res/values-pl/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 691f9da1f8901477b827d93629fc46a7c3eae213..32dabf6fa6d3c28469bb66f5d4143103dc3a8165 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -1127,4 +1127,9 @@
     <string name="more_reactions">Więcej reakcji</string>
     <string name="could_not_modify_call">Nie można zmodyfikować rozmowy</string>
     <string name="clients_may_not_support_av">Klient XMPP Twojego kontaktu może nie obsługiwać rozmów/wideorozmów.</string>
+    <string name="pref_show_avatars">Pokaż awatary</string>
+    <string name="pref_show_avatars_summary">Pokazuj awatary dla Twoich wiadomości i w rozmowach 1:1, a nie tylko w rozmowach grupowych.</string>
+    <string name="pref_chat_bubbles">Dymki rozmowy</string>
+    <string name="pref_chat_bubbles_summary">Kolor tła, rozmiar czcionki, awatary</string>
+    <string name="pref_title_bubbles">Dymki rozmowy</string>
 </resources>
\ No newline at end of file

From ce8e376abecf5ebd219ca7e9c0f921a41a8d5665 Mon Sep 17 00:00:00 2001
From: 0ko <0ko@users.noreply.translate.codeberg.org>
Date: Sat, 30 Nov 2024 17:56:31 +0000
Subject: [PATCH 207/357] Translated using Weblate (Russian)

Currently translated at 99.8% (1048 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 298b7030202f50e3d4ad07681dd960334805b8ee..d9504e979dd9e91ca2453a86238704b55fa24630 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -1142,4 +1142,7 @@
     <string name="more_reactions">Другие реакции</string>
     <string name="could_not_modify_call">Невозможно изменить звонок</string>
     <string name="clients_may_not_support_av">XMPP-клиент вашего контакта может не поддерживать аудио- и видеозвонки.</string>
+    <string name="pref_chat_bubbles_summary">Цвет фона, размер текста, аватары</string>
+    <string name="pref_show_avatars">Показывать аватары</string>
+    <string name="pref_title_bubbles">Сообщения в пузырях</string>
 </resources>
\ No newline at end of file

From 78a0b762887c77a5f59157f627157183f650fecb Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Sat, 30 Nov 2024 16:04:03 +0000
Subject: [PATCH 208/357] Translated using Weblate (German)

Currently translated at 100.0% (76 of 76 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/de/
---
 fastlane/metadata/android/de-DE/changelogs/4212504.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/de-DE/changelogs/4212504.txt

diff --git a/fastlane/metadata/android/de-DE/changelogs/4212504.txt b/fastlane/metadata/android/de-DE/changelogs/4212504.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c5f074b61dd752ea51ae4bdd344844b3dd4bd7c2
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/4212504.txt
@@ -0,0 +1 @@
+* Handhabung einiger Emoji-Reaktionen verbessert

From b4659bd17dc04789ae48fc57569a9757b9d481ab Mon Sep 17 00:00:00 2001
From: Besnik_b <Besnik_b@users.noreply.translate.codeberg.org>
Date: Sat, 30 Nov 2024 09:53:18 +0000
Subject: [PATCH 209/357] Translated using Weblate (Albanian)

Currently translated at 100.0% (2 of 2 strings)

Translation: Conversations/App Store Metadata (Quicksy)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata-quicksy/sq/
---
 src/quicksy/fastlane/metadata/android/sq/full_description.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/quicksy/fastlane/metadata/android/sq/full_description.txt b/src/quicksy/fastlane/metadata/android/sq/full_description.txt
index 5624b1bd1c917082d4dae641b8e7c1d1b9741459..dd5b5581294d148132a7d8f7522900afa4291012 100644
--- a/src/quicksy/fastlane/metadata/android/sq/full_description.txt
+++ b/src/quicksy/fastlane/metadata/android/sq/full_description.txt
@@ -1,6 +1,6 @@
 Quicksy është një program me fillesë klientin popullor Jabber/XMPP, me zbulim të automatizuar kontaktesh.
 
-Regjistroheni me numrin tuaj të telefonit dhe Quicksy—baszuar në numrat e telefonave në librin tuaj të adresave—do t’ju sugjerojë automatikisht kontakte të mundshëm.
+Regjistroheni me numrin tuaj të telefonit dhe Quicksy—bazuar në numrat e telefonave në librin tuaj të adresave—do t’ju sugjerojë automatikisht kontakte të mundshëm.
 
 Nën kapak, Quicksy është një klient i plotë Jabber, që ju lejon të komunikoni me cilindo përdorues në cilindo shërbyes federimi publik. Në mënyrë të ngjashme, me përdoruesit në Quicksy mund të lidhesh që nga jashtë thjesht duke shtuar +phonenumber@quicksy.im te lista juaj e kontakteve.
 

From 4cf246b0314e5870fc3251d62202024198cdfeae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Sat, 30 Nov 2024 22:42:22 +0000
Subject: [PATCH 210/357] Translated using Weblate (Estonian)

Currently translated at 100.0% (1050 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 64074a3d5772f0b8920484c7a089b26d6f019d79..5e255dcea4a0e0f4116ef5b22869c3871bfc6ae6 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -1115,4 +1115,9 @@
     </plurals>
     <string name="could_not_modify_call">Kõne muutmine ei õnnestunud</string>
     <string name="clients_may_not_support_av">Vestluse teise osapoole XMPP-klient ilmselt ei toeta hääl- ja videokõnesid.</string>
+    <string name="pref_show_avatars_summary">Näita oma sõnumite puhul tunnuspilte otsevestlustes ja vestlusrühmades.</string>
+    <string name="pref_show_avatars">Näita tunnuspilte</string>
+    <string name="pref_chat_bubbles">Jutumullid</string>
+    <string name="pref_chat_bubbles_summary">Taustavärv, kirjatüübi suurus, tunnuspildid</string>
+    <string name="pref_title_bubbles">Jutumullid</string>
 </resources>
\ No newline at end of file

From 8fd3d08a486a2aeef1286177678dc938ab182660 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Sat, 30 Nov 2024 22:45:51 +0000
Subject: [PATCH 211/357] Translated using Weblate (Estonian)

Currently translated at 13.1% (10 of 76 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/et/
---
 fastlane/metadata/android/et/changelogs/4211304.txt | 1 +
 fastlane/metadata/android/et/changelogs/4212404.txt | 2 ++
 fastlane/metadata/android/et/changelogs/4212504.txt | 1 +
 3 files changed, 4 insertions(+)
 create mode 100644 fastlane/metadata/android/et/changelogs/4211304.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4212404.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4212504.txt

diff --git a/fastlane/metadata/android/et/changelogs/4211304.txt b/fastlane/metadata/android/et/changelogs/4211304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..63d91ad689b3366bbc3bedf0c80d32e85fc33e37
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4211304.txt
@@ -0,0 +1 @@
+* vältimaks varunduse peatumist peale kümmet minutit, käivitame ta alati esiplaanil
diff --git a/fastlane/metadata/android/et/changelogs/4212404.txt b/fastlane/metadata/android/et/changelogs/4212404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a5bee3dc73d194b0665cdda34a171063621a1493
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4212404.txt
@@ -0,0 +1,2 @@
+* näitame alati kõne alustamise ikooni
+* erinevad veaparandused
diff --git a/fastlane/metadata/android/et/changelogs/4212504.txt b/fastlane/metadata/android/et/changelogs/4212504.txt
new file mode 100644
index 0000000000000000000000000000000000000000..891ec1b4cf898c2c5e0b862b02c44882a5926f17
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4212504.txt
@@ -0,0 +1 @@
+* parandasime mõnede emoji-põhiste reaktsioonide töötlemist

From cccee3b83083d4264459abff1f65c8e4da8064b7 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Sun, 1 Dec 2024 18:10:33 +0000
Subject: [PATCH 212/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1050 of 1050 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index d9504e979dd9e91ca2453a86238704b55fa24630..de98344c757ed8d783cd8480e862214297ac22a6 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -124,7 +124,7 @@
     <string name="pref_notification_sound_summary">Звук уведомления о новых сообщениях</string>
     <string name="pref_call_ringtone_summary">Мелодия входящего звонка</string>
     <string name="pref_notification_grace_period">Период отсрочки</string>
-    <string name="pref_notification_grace_period_summary">Время, на которое уведомления будут отключены, когда вы пользуетесь аккаунтом на другом устройстве.</string>
+    <string name="pref_notification_grace_period_summary">Время, на которое уведомления будут отключены, когда вы пользуетесь аккаунтом на другом устройстве</string>
     <string name="pref_advanced_options">Дополнительно</string>
     <string name="pref_never_send_crash_summary">Отправляя отчёты об ошибках, вы помогаете разработке</string>
     <string name="pref_confirm_messages">Отчёты о получении</string>
@@ -556,7 +556,7 @@
     <string name="use_own_provider">Использовать своего провайдера</string>
     <string name="pick_your_username">Выберите имя пользователя</string>
     <string name="pref_manually_change_presence">Управлять доступностью вручную</string>
-    <string name="pref_manually_change_presence_summary">Устанавливать свою доступность при редактировании статусного сообщения.</string>
+    <string name="pref_manually_change_presence_summary">Устанавливать свою доступность при редактировании статусного сообщения</string>
     <string name="status_message">Статусное сообщение</string>
     <string name="presence_chat">Свободен для общения</string>
     <string name="presence_online">В сети</string>
@@ -620,7 +620,7 @@
     <string name="share_as_uri">Отправить XMPP URI</string>
     <string name="share_as_http">Отправить HTTP-ссылку</string>
     <string name="pref_blind_trust_before_verification">Слепое доверие до подтверждения</string>
-    <string name="pref_blind_trust_before_verification_summary">Автоматически доверять всем новым устройствам контактов, которые не были подтверждены ранее, но запрашивать ручное подтверждение каждый раз, когда подтверждённый контакт добавляет новое устройство.</string>
+    <string name="pref_blind_trust_before_verification_summary">Автоматически доверять всем новым устройствам контактов, которые не были подтверждены ранее, но запрашивать ручное подтверждение каждый раз, когда подтверждённый контакт добавляет новое устройство</string>
     <string name="blindly_trusted_omemo_keys">Принятие OMEMO-ключей вслепую. Это означает, что собеседник может оказаться недоверенным лицом.</string>
     <string name="not_trusted">Недоверенный</string>
     <string name="invalid_barcode">Некорректный QR-код</string>
@@ -679,7 +679,7 @@
     <string name="transcoding_video">Сжимание видео</string>
     <string name="contact_blocked_past_tense">Контакт заблокирован.</string>
     <string name="pref_notifications_from_strangers">Уведомления от неизвестных контактов</string>
-    <string name="pref_notifications_from_strangers_summary">Уведомлять о сообщениях и звонках от неизвестных контактов.</string>
+    <string name="pref_notifications_from_strangers_summary">Уведомлять о сообщениях и звонках от неизвестных контактов</string>
     <string name="received_message_from_stranger">Получено сообщение от неизвестного контакта</string>
     <string name="block_stranger">Заблокировать неизвестный контакт</string>
     <string name="block_entire_domain">Заблокировать весь домен</string>
@@ -725,9 +725,9 @@
     <string name="disable_now">Отключить сейчас</string>
     <string name="draft">Черновик:</string>
     <string name="pref_omemo_setting">OMEMO-шифрование</string>
-    <string name="pref_omemo_setting_summary_always">OMEMO будет всегда использоваться для одиночных бесед и приватных конференций.</string>
-    <string name="pref_omemo_setting_summary_default_on">OMEMO будет использоваться по умолчанию для новых бесед.</string>
-    <string name="pref_omemo_setting_summary_default_off">OMEMO нужно будет явно включать для новых бесед.</string>
+    <string name="pref_omemo_setting_summary_always">OMEMO будет всегда использоваться для одиночных бесед и приватных конференций</string>
+    <string name="pref_omemo_setting_summary_default_on">OMEMO будет использоваться по умолчанию для новых бесед</string>
+    <string name="pref_omemo_setting_summary_default_off">OMEMO нужно будет явно включать для новых бесед</string>
     <string name="create_shortcut">Создать ярлык</string>
     <string name="default_on">Включено по умолчанию</string>
     <string name="default_off">Выключено по умолчанию</string>
@@ -1011,7 +1011,7 @@
     <string name="could_not_delete_account_from_server">Невозможно удалить аккаунт на сервере</string>
     <string name="delete_from_server">Удалить аккаунт на сервере</string>
     <string name="pref_autojoin">Синхронизировать закладки</string>
-    <string name="pref_autojoin_summary">Устанавливать флаг \"автоприсоединение\" при входе и выходе из MUC, и реагировать на изменения от других клиентов.</string>
+    <string name="pref_autojoin_summary">Устанавливать флаг \"автоприсоединение\" при входе и выходе из MUC, и реагировать на изменения от других клиентов</string>
     <string name="search_group_chats">Поиск по конференциям</string>
     <string name="download_failed_invalid_file">Загрузка не выполнена: файл испорчен</string>
     <string name="rtp_state_content_add_video">Перейти на видеовызов\?</string>
@@ -1019,7 +1019,7 @@
     <string name="incoming_call_duration_timestamp">Входящий вызов (%s) · %s</string>
     <string name="account_registrations_are_not_supported">Регистрации аккаунтов не поддерживаются</string>
     <string name="audio_video_disabled_tor">Звонки отключены при использовании Tor</string>
-    <string name="pref_up_push_account_summary">Аккаунт для получения push-уведомлений.</string>
+    <string name="pref_up_push_account_summary">Аккаунт для получения push-уведомлений</string>
     <string name="no_account_deactivated">Нет (неактивно)</string>
     <string name="verifying_omemo_keys_trusted_source_account">Вы собираетесь проверить ключи OMEMO своего аккаунта. Это безопасно только в том случае, если вы перешли по этой ссылке из надёжного источника, где только вы могли опубликовать эту ссылку.</string>
     <string name="restore_warning_continued">Не пытайтесь восстановить резервные копии, которые не были созданы вами!</string>
@@ -1107,7 +1107,7 @@
     <string name="unsupported_operation">Операция не поддерживается</string>
     <string name="pref_fullscreen_notification">Полноэкранные уведомления</string>
     <string name="pref_backup_recurring">Регулярные резервные копии</string>
-    <string name="pref_fullscreen_notification_summary">Разрешить приложению показывать экраны входящих звонков при заблокированном экране.</string>
+    <string name="pref_fullscreen_notification_summary">Разрешить приложению показывать экраны входящих звонков при заблокированном экране</string>
     <string name="pref_up_long_summary">Conversations, будучи распределителем UnifiedPush, будет использовать стойкое, надёжное и малопотребляющее подключение XMPP для пробуждения других совместимых с UnifiedPush приложений, таких как Tusky, Ltt.rs, FluffyChat и др.</string>
     <string name="detect_mim">Требовать привязку канала</string>
     <string name="detect_mim_summary">Привязка канала может обнаружить некоторые атаки посредником</string>
@@ -1145,4 +1145,6 @@
     <string name="pref_chat_bubbles_summary">Цвет фона, размер текста, аватары</string>
     <string name="pref_show_avatars">Показывать аватары</string>
     <string name="pref_title_bubbles">Сообщения в пузырях</string>
+    <string name="pref_chat_bubbles">Пузырьки сообщений</string>
+    <string name="pref_show_avatars_summary">Показывать аватары в своих сообщениях и приватных чатах в дополнение к конференциям</string>
 </resources>
\ No newline at end of file

From 4cfdc0a58f910c712519887626414b9913f1195d Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Sun, 1 Dec 2024 20:37:18 +0000
Subject: [PATCH 213/357] Translated using Weblate (Russian)

Currently translated at 28.9% (22 of 76 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/ru/
---
 fastlane/metadata/android/ru-RU/changelogs/4212504.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4212504.txt

diff --git a/fastlane/metadata/android/ru-RU/changelogs/4212504.txt b/fastlane/metadata/android/ru-RU/changelogs/4212504.txt
new file mode 100644
index 0000000000000000000000000000000000000000..34a6c925415338666b27b39049b794bede41d658
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4212504.txt
@@ -0,0 +1 @@
+* улучшена обработка некоторых реакций на эмодзи

From 9de3211b4dfecdf76f8413734637e156b71faa8c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 1 Dec 2024 13:30:27 +0100
Subject: [PATCH 214/357] version bump to 2.17.5 + changelog

---
 CHANGELOG.md                                           | 5 +++++
 build.gradle                                           | 4 ++--
 fastlane/metadata/android/en-US/changelogs/4212604.txt | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/4212604.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6333a572de78ca274f48335677383f8fdaff1e8..554360daee85ec3f18df274b9757e53eccd347b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.17.5
+
+* Move message bubbles closer together instead of merging them
+* Add ability to hide avatars in chat views when not stricly necessary (Settings -> Interface -> Chat Bubbles -> Show avatars)
+
 ### Version 2.17.4
 
 * improve handling of some emoji reactions
diff --git a/build.gradle b/build.gradle
index 1dfb565d3cca29aa618c938e943e4689789b336a..c8c048df072f32d07063680ea7e3466b1937e9aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -111,8 +111,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 42125
-        versionName "2.17.4"
+        versionCode 42126
+        versionName "2.17.5"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/4212604.txt b/fastlane/metadata/android/en-US/changelogs/4212604.txt
new file mode 100644
index 0000000000000000000000000000000000000000..84d0effac257f8e9b438a6cd4bb5f82a96e25fd2
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/4212604.txt
@@ -0,0 +1,2 @@
+* Move message bubbles closer together instead of merging them
+* Add ability to hide avatars in chat views when not stricly necessary (Settings -> Interface -> Chat Bubbles -> Show avatars)

From 320a0c2c1ff2425b200fff272e8b11b32bbd3963 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 2 Dec 2024 07:01:58 +0100
Subject: [PATCH 215/357] use data binding in MessageAdapter

---
 .../ui/adapter/MessageAdapter.java            | 953 +++++++++++-------
 1 file changed, 593 insertions(+), 360 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 709c3186be200a579f2eacf4025faa7fc533c697..fa6f83a996838b18124d8e447755eea4fc3311a8 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -15,6 +15,7 @@ import android.text.style.ForegroundColorSpan;
 import android.text.style.RelativeSizeSpan;
 import android.text.style.StyleSpan;
 import android.util.DisplayMetrics;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -33,6 +34,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.widget.ImageViewCompat;
+import androidx.databinding.DataBindingUtil;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.chip.ChipGroup;
 import com.google.android.material.color.MaterialColors;
@@ -45,6 +47,11 @@ import eu.siacs.conversations.AppSettings;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.axolotl.FingerprintStatus;
+import eu.siacs.conversations.databinding.ItemMessageDateBubbleBinding;
+import eu.siacs.conversations.databinding.ItemMessageReceivedBinding;
+import eu.siacs.conversations.databinding.ItemMessageRtpSessionBinding;
+import eu.siacs.conversations.databinding.ItemMessageSentBinding;
+import eu.siacs.conversations.databinding.ItemMessageStatusBinding;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Conversational;
@@ -175,15 +182,12 @@ public class MessageAdapter extends ArrayAdapter<Message> {
     }
 
     private void displayStatus(
-            final ViewHolder viewHolder,
+            final BubbleMessageItemViewHolder viewHolder,
             final Message message,
             final int type,
             final BubbleColor bubbleColor) {
         final int mergedStatus = message.getStatus();
         final boolean error;
-        if (viewHolder.indicatorReceived != null) {
-            viewHolder.indicatorReceived.setVisibility(View.GONE);
-        }
         final Transferable transferable = message.getTransferable();
         final boolean multiReceived =
                 message.getConversation().getMode() == Conversation.MODE_MULTI
@@ -207,32 +211,35 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             fileSize = null;
             error = message.getStatus() == Message.STATUS_SEND_FAILED;
         }
-        if (type == SENT) {
+        if (type == SENT && viewHolder instanceof EndBubbleMessageItemViewHolder endViewHolder) {
             final @DrawableRes Integer receivedIndicator =
                     getMessageStatusAsDrawable(message, mergedStatus);
             if (receivedIndicator == null) {
-                viewHolder.indicatorReceived.setVisibility(View.INVISIBLE);
+                endViewHolder.indicatorReceived().setVisibility(View.INVISIBLE);
             } else {
-                viewHolder.indicatorReceived.setImageResource(receivedIndicator);
+                endViewHolder.indicatorReceived().setImageResource(receivedIndicator);
                 if (mergedStatus == Message.STATUS_SEND_FAILED) {
-                    setImageTintError(viewHolder.indicatorReceived);
+                    setImageTintError(endViewHolder.indicatorReceived());
                 } else {
-                    setImageTint(viewHolder.indicatorReceived, bubbleColor);
+                    setImageTint(endViewHolder.indicatorReceived(), bubbleColor);
                 }
-                viewHolder.indicatorReceived.setVisibility(View.VISIBLE);
+                endViewHolder.indicatorReceived().setVisibility(View.VISIBLE);
             }
         }
         final var additionalStatusInfo = getAdditionalStatusInfo(message, mergedStatus);
 
         if (error && type == SENT) {
-            viewHolder.time.setTextColor(
-                    MaterialColors.getColor(
-                            viewHolder.time, com.google.android.material.R.attr.colorError));
+            viewHolder
+                    .time()
+                    .setTextColor(
+                            MaterialColors.getColor(
+                                    viewHolder.time(),
+                                    com.google.android.material.R.attr.colorError));
         } else {
-            setTextColor(viewHolder.time, bubbleColor);
+            setTextColor(viewHolder.time(), bubbleColor);
         }
         if (message.getEncryption() == Message.ENCRYPTION_NONE) {
-            viewHolder.indicator.setVisibility(View.GONE);
+            viewHolder.indicator().setVisibility(View.GONE);
         } else {
             boolean verified = false;
             if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
@@ -246,29 +253,27 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 }
             }
             if (verified) {
-                viewHolder.indicator.setImageResource(R.drawable.ic_verified_user_24dp);
+                viewHolder.indicator().setImageResource(R.drawable.ic_verified_user_24dp);
             } else {
-                viewHolder.indicator.setImageResource(R.drawable.ic_lock_24dp);
+                viewHolder.indicator().setImageResource(R.drawable.ic_lock_24dp);
             }
             if (error && type == SENT) {
-                setImageTintError(viewHolder.indicator);
+                setImageTintError(viewHolder.indicator());
             } else {
-                setImageTint(viewHolder.indicator, bubbleColor);
+                setImageTint(viewHolder.indicator(), bubbleColor);
             }
-            viewHolder.indicator.setVisibility(View.VISIBLE);
+            viewHolder.indicator().setVisibility(View.VISIBLE);
         }
 
-        if (viewHolder.edit_indicator != null) {
-            if (message.edited()) {
-                viewHolder.edit_indicator.setVisibility(View.VISIBLE);
-                if (error && type == SENT) {
-                    setImageTintError(viewHolder.edit_indicator);
-                } else {
-                    setImageTint(viewHolder.edit_indicator, bubbleColor);
-                }
+        if (message.edited()) {
+            viewHolder.editIndicator().setVisibility(View.VISIBLE);
+            if (error && type == SENT) {
+                setImageTintError(viewHolder.editIndicator());
             } else {
-                viewHolder.edit_indicator.setVisibility(View.GONE);
+                setImageTint(viewHolder.editIndicator(), bubbleColor);
             }
+        } else {
+            viewHolder.editIndicator().setVisibility(View.GONE);
         }
 
         final String formattedTime =
@@ -305,7 +310,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             }
         }
         final var timeInfo = timeInfoBuilder.build();
-        viewHolder.time.setText(Joiner.on(" \u00B7 ").join(timeInfo));
+        viewHolder.time().setText(Joiner.on(" \u00B7 ").join(timeInfo));
     }
 
     public static @DrawableRes Integer getMessageStatusAsDrawable(
@@ -354,29 +359,34 @@ public class MessageAdapter extends ArrayAdapter<Message> {
     }
 
     private void displayInfoMessage(
-            ViewHolder viewHolder, CharSequence text, final BubbleColor bubbleColor) {
-        viewHolder.download_button.setVisibility(View.GONE);
-        viewHolder.audioPlayer.setVisibility(View.GONE);
-        viewHolder.image.setVisibility(View.GONE);
-        viewHolder.messageBody.setVisibility(View.VISIBLE);
-        viewHolder.messageBody.setText(text);
-        viewHolder.messageBody.setTextColor(
-                bubbleToOnSurfaceVariant(viewHolder.messageBody, bubbleColor));
-        viewHolder.messageBody.setTextIsSelectable(false);
+            BubbleMessageItemViewHolder viewHolder,
+            CharSequence text,
+            final BubbleColor bubbleColor) {
+        viewHolder.downloadButton().setVisibility(View.GONE);
+        viewHolder.audioPlayer().setVisibility(View.GONE);
+        viewHolder.image().setVisibility(View.GONE);
+        viewHolder.messageBody().setVisibility(View.VISIBLE);
+        viewHolder.messageBody().setText(text);
+        viewHolder
+                .messageBody()
+                .setTextColor(bubbleToOnSurfaceVariant(viewHolder.messageBody(), bubbleColor));
+        viewHolder.messageBody().setTextIsSelectable(false);
     }
 
     private void displayEmojiMessage(
-            final ViewHolder viewHolder, final String body, final BubbleColor bubbleColor) {
-        viewHolder.download_button.setVisibility(View.GONE);
-        viewHolder.audioPlayer.setVisibility(View.GONE);
-        viewHolder.image.setVisibility(View.GONE);
-        viewHolder.messageBody.setVisibility(View.VISIBLE);
-        setTextColor(viewHolder.messageBody, bubbleColor);
+            final BubbleMessageItemViewHolder viewHolder,
+            final String body,
+            final BubbleColor bubbleColor) {
+        viewHolder.downloadButton().setVisibility(View.GONE);
+        viewHolder.audioPlayer().setVisibility(View.GONE);
+        viewHolder.image().setVisibility(View.GONE);
+        viewHolder.messageBody().setVisibility(View.VISIBLE);
+        setTextColor(viewHolder.messageBody(), bubbleColor);
         final Spannable span = new SpannableString(body);
         float size = Emoticons.isEmoji(body) ? 3.0f : 2.0f;
         span.setSpan(
                 new RelativeSizeSpan(size), 0, body.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        viewHolder.messageBody.setText(span);
+        viewHolder.messageBody().setText(span);
     }
 
     private void applyQuoteSpan(
@@ -462,14 +472,16 @@ public class MessageAdapter extends ArrayAdapter<Message> {
     }
 
     private void displayTextMessage(
-            final ViewHolder viewHolder, final Message message, final BubbleColor bubbleColor) {
-        viewHolder.download_button.setVisibility(View.GONE);
-        viewHolder.image.setVisibility(View.GONE);
-        viewHolder.audioPlayer.setVisibility(View.GONE);
-        viewHolder.messageBody.setVisibility(View.VISIBLE);
-        setTextColor(viewHolder.messageBody, bubbleColor);
-        setTextSize(viewHolder.messageBody, this.bubbleDesign.largeFont);
-        viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
+            final BubbleMessageItemViewHolder viewHolder,
+            final Message message,
+            final BubbleColor bubbleColor) {
+        viewHolder.downloadButton().setVisibility(View.GONE);
+        viewHolder.image().setVisibility(View.GONE);
+        viewHolder.audioPlayer().setVisibility(View.GONE);
+        viewHolder.messageBody().setVisibility(View.VISIBLE);
+        setTextColor(viewHolder.messageBody(), bubbleColor);
+        setTextSize(viewHolder.messageBody(), this.bubbleDesign.largeFont);
+        viewHolder.messageBody().setTypeface(null, Typeface.NORMAL);
 
         if (message.getBody() != null) {
             final String nick = UIHelper.getMessageDisplayName(message);
@@ -485,7 +497,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             if (hasMeCommand) {
                 body.replace(0, Message.ME_COMMAND.length(), String.format("%s ", nick));
             }
-            boolean startsWithQuote = handleTextQuotes(viewHolder.messageBody, body, bubbleColor);
+            boolean startsWithQuote = handleTextQuotes(viewHolder.messageBody(), body, bubbleColor);
             if (!message.isPrivateMessage()) {
                 if (hasMeCommand) {
                     body.setSpan(
@@ -519,7 +531,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 }
                 body.setSpan(
                         new ForegroundColorSpan(
-                                bubbleToOnSurfaceVariant(viewHolder.messageBody, bubbleColor)),
+                                bubbleToOnSurfaceVariant(viewHolder.messageBody(), bubbleColor)),
                         0,
                         privateMarkerIndex,
                         Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -563,83 +575,94 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 }
             }
 
-            StylingHelper.format(body, viewHolder.messageBody.getCurrentTextColor());
+            StylingHelper.format(body, viewHolder.messageBody().getCurrentTextColor());
             MyLinkify.addLinks(body, true);
             if (highlightedTerm != null) {
-                StylingHelper.highlight(viewHolder.messageBody, body, highlightedTerm);
+                StylingHelper.highlight(viewHolder.messageBody(), body, highlightedTerm);
             }
-            viewHolder.messageBody.setAutoLinkMask(0);
-            viewHolder.messageBody.setText(body);
-            viewHolder.messageBody.setMovementMethod(ClickableMovementMethod.getInstance());
+            viewHolder.messageBody().setAutoLinkMask(0);
+            viewHolder.messageBody().setText(body);
+            viewHolder.messageBody().setMovementMethod(ClickableMovementMethod.getInstance());
         } else {
-            viewHolder.messageBody.setText("");
-            viewHolder.messageBody.setTextIsSelectable(false);
+            viewHolder.messageBody().setText("");
+            viewHolder.messageBody().setTextIsSelectable(false);
         }
     }
 
     private void displayDownloadableMessage(
-            ViewHolder viewHolder,
+            final BubbleMessageItemViewHolder viewHolder,
             final Message message,
-            String text,
+            final String text,
             final BubbleColor bubbleColor) {
         toggleWhisperInfo(viewHolder, message, bubbleColor);
-        viewHolder.image.setVisibility(View.GONE);
-        viewHolder.audioPlayer.setVisibility(View.GONE);
-        viewHolder.download_button.setVisibility(View.VISIBLE);
-        viewHolder.download_button.setText(text);
+        viewHolder.image().setVisibility(View.GONE);
+        viewHolder.audioPlayer().setVisibility(View.GONE);
+        viewHolder.downloadButton().setVisibility(View.VISIBLE);
+        viewHolder.downloadButton().setText(text);
         final var attachment = Attachment.of(message);
         final @DrawableRes int imageResource = MediaAdapter.getImageDrawable(attachment);
-        viewHolder.download_button.setIconResource(imageResource);
-        viewHolder.download_button.setOnClickListener(
-                v -> ConversationFragment.downloadFile(activity, message));
+        viewHolder.downloadButton().setIconResource(imageResource);
+        viewHolder
+                .downloadButton()
+                .setOnClickListener(v -> ConversationFragment.downloadFile(activity, message));
     }
 
     private void displayOpenableMessage(
-            ViewHolder viewHolder, final Message message, final BubbleColor bubbleColor) {
+            final BubbleMessageItemViewHolder viewHolder,
+            final Message message,
+            final BubbleColor bubbleColor) {
         toggleWhisperInfo(viewHolder, message, bubbleColor);
-        viewHolder.image.setVisibility(View.GONE);
-        viewHolder.audioPlayer.setVisibility(View.GONE);
-        viewHolder.download_button.setVisibility(View.VISIBLE);
-        viewHolder.download_button.setText(
-                activity.getString(
-                        R.string.open_x_file,
-                        UIHelper.getFileDescriptionString(activity, message)));
+        viewHolder.image().setVisibility(View.GONE);
+        viewHolder.audioPlayer().setVisibility(View.GONE);
+        viewHolder.downloadButton().setVisibility(View.VISIBLE);
+        viewHolder
+                .downloadButton()
+                .setText(
+                        activity.getString(
+                                R.string.open_x_file,
+                                UIHelper.getFileDescriptionString(activity, message)));
         final var attachment = Attachment.of(message);
         final @DrawableRes int imageResource = MediaAdapter.getImageDrawable(attachment);
-        viewHolder.download_button.setIconResource(imageResource);
-        viewHolder.download_button.setOnClickListener(v -> openDownloadable(message));
+        viewHolder.downloadButton().setIconResource(imageResource);
+        viewHolder.downloadButton().setOnClickListener(v -> openDownloadable(message));
     }
 
     private void displayLocationMessage(
-            ViewHolder viewHolder, final Message message, final BubbleColor bubbleColor) {
+            final BubbleMessageItemViewHolder viewHolder,
+            final Message message,
+            final BubbleColor bubbleColor) {
         toggleWhisperInfo(viewHolder, message, bubbleColor);
-        viewHolder.image.setVisibility(View.GONE);
-        viewHolder.audioPlayer.setVisibility(View.GONE);
-        viewHolder.download_button.setVisibility(View.VISIBLE);
-        viewHolder.download_button.setText(R.string.show_location);
+        viewHolder.image().setVisibility(View.GONE);
+        viewHolder.audioPlayer().setVisibility(View.GONE);
+        viewHolder.downloadButton().setVisibility(View.VISIBLE);
+        viewHolder.downloadButton().setText(R.string.show_location);
         final var attachment = Attachment.of(message);
         final @DrawableRes int imageResource = MediaAdapter.getImageDrawable(attachment);
-        viewHolder.download_button.setIconResource(imageResource);
-        viewHolder.download_button.setOnClickListener(v -> showLocation(message));
+        viewHolder.downloadButton().setIconResource(imageResource);
+        viewHolder.downloadButton().setOnClickListener(v -> showLocation(message));
     }
 
     private void displayAudioMessage(
-            ViewHolder viewHolder, Message message, final BubbleColor bubbleColor) {
+            final BubbleMessageItemViewHolder viewHolder,
+            Message message,
+            final BubbleColor bubbleColor) {
         toggleWhisperInfo(viewHolder, message, bubbleColor);
-        viewHolder.image.setVisibility(View.GONE);
-        viewHolder.download_button.setVisibility(View.GONE);
-        final RelativeLayout audioPlayer = viewHolder.audioPlayer;
+        viewHolder.image().setVisibility(View.GONE);
+        viewHolder.downloadButton().setVisibility(View.GONE);
+        final RelativeLayout audioPlayer = viewHolder.audioPlayer();
         audioPlayer.setVisibility(View.VISIBLE);
         AudioPlayer.ViewHolder.get(audioPlayer).setBubbleColor(bubbleColor);
         this.audioPlayer.init(audioPlayer, message);
     }
 
     private void displayMediaPreviewMessage(
-            ViewHolder viewHolder, final Message message, final BubbleColor bubbleColor) {
+            final BubbleMessageItemViewHolder viewHolder,
+            final Message message,
+            final BubbleColor bubbleColor) {
         toggleWhisperInfo(viewHolder, message, bubbleColor);
-        viewHolder.download_button.setVisibility(View.GONE);
-        viewHolder.audioPlayer.setVisibility(View.GONE);
-        viewHolder.image.setVisibility(View.VISIBLE);
+        viewHolder.downloadButton().setVisibility(View.GONE);
+        viewHolder.audioPlayer().setVisibility(View.GONE);
+        viewHolder.image().setVisibility(View.VISIBLE);
         final FileParams params = message.getFileParams();
         final float target = activity.getResources().getDimension(R.dimen.image_preview_width);
         final int scaledW;
@@ -659,13 +682,15 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         }
         final LinearLayout.LayoutParams layoutParams =
                 new LinearLayout.LayoutParams(scaledW, scaledH);
-        viewHolder.image.setLayoutParams(layoutParams);
-        activity.loadBitmap(message, viewHolder.image);
-        viewHolder.image.setOnClickListener(v -> openDownloadable(message));
+        viewHolder.image().setLayoutParams(layoutParams);
+        activity.loadBitmap(message, viewHolder.image());
+        viewHolder.image().setOnClickListener(v -> openDownloadable(message));
     }
 
     private void toggleWhisperInfo(
-            ViewHolder viewHolder, final Message message, final BubbleColor bubbleColor) {
+            final BubbleMessageItemViewHolder viewHolder,
+            final Message message,
+            final BubbleColor bubbleColor) {
         if (message.isPrivateMessage()) {
             final String privateMarker;
             if (message.getStatus() <= Message.STATUS_RECEIVED) {
@@ -680,7 +705,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             final SpannableString body = new SpannableString(privateMarker);
             body.setSpan(
                     new ForegroundColorSpan(
-                            bubbleToOnSurfaceVariant(viewHolder.messageBody, bubbleColor)),
+                            bubbleToOnSurfaceVariant(viewHolder.messageBody(), bubbleColor)),
                     0,
                     privateMarker.length(),
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
@@ -689,14 +714,14 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                     0,
                     privateMarker.length(),
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-            viewHolder.messageBody.setText(body);
-            viewHolder.messageBody.setVisibility(View.VISIBLE);
+            viewHolder.messageBody().setText(body);
+            viewHolder.messageBody().setVisibility(View.VISIBLE);
         } else {
-            viewHolder.messageBody.setVisibility(View.GONE);
+            viewHolder.messageBody().setVisibility(View.GONE);
         }
     }
 
-    private void loadMoreMessages(Conversation conversation) {
+    private void loadMoreMessages(final Conversation conversation) {
         conversation.setLastClearHistory(0, null);
         activity.xmppConnectionService.updateConversation(conversation);
         conversation.setHasMessagesLeftOnServer(true);
@@ -722,88 +747,96 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         }
     }
 
+    private MessageItemViewHolder getViewHolder(
+            final View view, final @NonNull ViewGroup parent, final int type) {
+        if (view != null && view.getTag() instanceof MessageItemViewHolder messageItemViewHolder) {
+            return messageItemViewHolder;
+        } else {
+            final MessageItemViewHolder viewHolder =
+                    switch (type) {
+                        case RTP_SESSION ->
+                                new RtpSessionMessageItemViewHolder(
+                                        DataBindingUtil.inflate(
+                                                LayoutInflater.from(parent.getContext()),
+                                                R.layout.item_message_rtp_session,
+                                                parent,
+                                                false));
+                        case DATE_SEPARATOR ->
+                                new DateSeperatorMessageItemViewHolder(
+                                        DataBindingUtil.inflate(
+                                                LayoutInflater.from(parent.getContext()),
+                                                R.layout.item_message_date_bubble,
+                                                parent,
+                                                false));
+                        case STATUS ->
+                                new StatusMessageItemViewHolder(
+                                        DataBindingUtil.inflate(
+                                                LayoutInflater.from(parent.getContext()),
+                                                R.layout.item_message_status,
+                                                parent,
+                                                false));
+                        case SENT ->
+                                new EndBubbleMessageItemViewHolder(
+                                        DataBindingUtil.inflate(
+                                                LayoutInflater.from(parent.getContext()),
+                                                R.layout.item_message_sent,
+                                                parent,
+                                                false));
+                        case RECEIVED ->
+                                new StartBubbleMessageItemViewHolder(
+                                        DataBindingUtil.inflate(
+                                                LayoutInflater.from(parent.getContext()),
+                                                R.layout.item_message_received,
+                                                parent,
+                                                false));
+                        default -> throw new AssertionError("Unable to create ViewHolder for type");
+                    };
+            viewHolder.itemView.setTag(viewHolder);
+            return viewHolder;
+        }
+    }
+
     @NonNull
     @Override
     public View getView(final int position, View view, final @NonNull ViewGroup parent) {
         final Message message = getItem(position);
+        final int type = getItemViewType(message);
+        final MessageItemViewHolder viewHolder = getViewHolder(view, parent, type);
+
+        if (type == DATE_SEPARATOR
+                && viewHolder instanceof DateSeperatorMessageItemViewHolder messageItemViewHolder) {
+            return render(message, messageItemViewHolder);
+        }
+
+        if (type == RTP_SESSION
+                && viewHolder instanceof RtpSessionMessageItemViewHolder messageItemViewHolder) {
+            return render(message, messageItemViewHolder);
+        }
+
+        if (type == STATUS
+                && viewHolder instanceof StatusMessageItemViewHolder messageItemViewHolder) {
+            return render(message, messageItemViewHolder);
+        }
+
+        if ((type == SENT || type == RECEIVED)
+                && viewHolder instanceof BubbleMessageItemViewHolder messageItemViewHolder) {
+            // TODO: type is represented by the class of viewHolder. we can get rid of that
+            return render(position, message, type, messageItemViewHolder);
+        }
+
+        throw new AssertionError();
+    }
+
+    private View render(
+            final int position,
+            final Message message,
+            final int type,
+            final BubbleMessageItemViewHolder viewHolder) {
         final boolean omemoEncryption = message.getEncryption() == Message.ENCRYPTION_AXOLOTL;
         final boolean isInValidSession =
                 message.isValidInSession() && (!omemoEncryption || message.isTrusted());
         final Conversational conversation = message.getConversation();
         final Account account = conversation.getAccount();
-        final int type = getItemViewType(message);
-        ViewHolder viewHolder;
-        if (view == null) {
-            viewHolder = new ViewHolder();
-            switch (type) {
-                case DATE_SEPARATOR:
-                    view =
-                            activity.getLayoutInflater()
-                                    .inflate(R.layout.item_message_date_bubble, parent, false);
-                    viewHolder.status_message = view.findViewById(R.id.message_body);
-                    viewHolder.message_box = view.findViewById(R.id.message_box);
-                    break;
-                case RTP_SESSION:
-                    view =
-                            activity.getLayoutInflater()
-                                    .inflate(R.layout.item_message_rtp_session, parent, false);
-                    viewHolder.status_message = view.findViewById(R.id.message_body);
-                    viewHolder.message_box = view.findViewById(R.id.message_box);
-                    viewHolder.indicatorReceived = view.findViewById(R.id.indicator_received);
-                    break;
-                case SENT:
-                    view =
-                            activity.getLayoutInflater()
-                                    .inflate(R.layout.item_message_sent, parent, false);
-                    viewHolder.root = (ConstraintLayout) view;
-                    viewHolder.message_box = view.findViewById(R.id.message_box);
-                    viewHolder.contact_picture = view.findViewById(R.id.message_photo);
-                    viewHolder.download_button = view.findViewById(R.id.download_button);
-                    viewHolder.indicator = view.findViewById(R.id.security_indicator);
-                    viewHolder.edit_indicator = view.findViewById(R.id.edit_indicator);
-                    viewHolder.image = view.findViewById(R.id.message_image);
-                    viewHolder.messageBody = view.findViewById(R.id.message_body);
-                    viewHolder.time = view.findViewById(R.id.message_time);
-                    viewHolder.indicatorReceived = view.findViewById(R.id.indicator_received);
-                    viewHolder.audioPlayer = view.findViewById(R.id.audio_player);
-                    viewHolder.reactions = view.findViewById(R.id.reactions);
-                    break;
-                case RECEIVED:
-                    view =
-                            activity.getLayoutInflater()
-                                    .inflate(R.layout.item_message_received, parent, false);
-                    viewHolder.root = (ConstraintLayout) view;
-                    viewHolder.message_box = view.findViewById(R.id.message_box);
-                    viewHolder.contact_picture = view.findViewById(R.id.message_photo);
-                    viewHolder.download_button = view.findViewById(R.id.download_button);
-                    viewHolder.indicator = view.findViewById(R.id.security_indicator);
-                    viewHolder.edit_indicator = view.findViewById(R.id.edit_indicator);
-                    viewHolder.image = view.findViewById(R.id.message_image);
-                    viewHolder.messageBody = view.findViewById(R.id.message_body);
-                    viewHolder.time = view.findViewById(R.id.message_time);
-                    viewHolder.indicatorReceived = view.findViewById(R.id.indicator_received);
-                    viewHolder.encryption = view.findViewById(R.id.message_encryption);
-                    viewHolder.audioPlayer = view.findViewById(R.id.audio_player);
-                    viewHolder.reactions = view.findViewById(R.id.reactions);
-                    break;
-                case STATUS:
-                    view =
-                            activity.getLayoutInflater()
-                                    .inflate(R.layout.item_message_status, parent, false);
-                    viewHolder.contact_picture = view.findViewById(R.id.message_photo);
-                    viewHolder.status_message = view.findViewById(R.id.status_message);
-                    viewHolder.load_more_messages = view.findViewById(R.id.load_more_messages);
-                    break;
-                default:
-                    throw new AssertionError("Unknown view type");
-            }
-            view.setTag(viewHolder);
-        } else {
-            viewHolder = (ViewHolder) view.getTag();
-            if (viewHolder == null) {
-                return view;
-            }
-        }
 
         final boolean colorfulBackground = this.bubbleDesign.colorfulChatBubbles;
         final BubbleColor bubbleColor;
@@ -817,149 +850,46 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             bubbleColor = colorfulBackground ? BubbleColor.TERTIARY : BubbleColor.SURFACE_HIGH;
         }
 
-        if (type == DATE_SEPARATOR) {
-            if (UIHelper.today(message.getTimeSent())) {
-                viewHolder.status_message.setText(R.string.today);
-            } else if (UIHelper.yesterday(message.getTimeSent())) {
-                viewHolder.status_message.setText(R.string.yesterday);
-            } else {
-                viewHolder.status_message.setText(
-                        DateUtils.formatDateTime(
-                                activity,
-                                message.getTimeSent(),
-                                DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_YEAR));
-            }
-            if (colorfulBackground) {
-                setBackgroundTint(viewHolder.message_box, BubbleColor.PRIMARY);
-                setTextColor(viewHolder.status_message, BubbleColor.PRIMARY);
-            } else {
-                setBackgroundTint(viewHolder.message_box, BubbleColor.SURFACE_HIGH);
-                setTextColor(viewHolder.status_message, BubbleColor.SURFACE_HIGH);
-            }
-            return view;
-        } else if (type == RTP_SESSION) {
-            final boolean received = message.getStatus() <= Message.STATUS_RECEIVED;
-            final RtpSessionStatus rtpSessionStatus = RtpSessionStatus.of(message.getBody());
-            final long duration = rtpSessionStatus.duration;
-            if (received) {
-                if (duration > 0) {
-                    viewHolder.status_message.setText(
-                            activity.getString(
-                                    R.string.incoming_call_duration_timestamp,
-                                    TimeFrameUtils.resolve(activity, duration),
-                                    UIHelper.readableTimeDifferenceFull(
-                                            activity, message.getTimeSent())));
-                } else if (rtpSessionStatus.successful) {
-                    viewHolder.status_message.setText(R.string.incoming_call);
-                } else {
-                    viewHolder.status_message.setText(
-                            activity.getString(
-                                    R.string.missed_call_timestamp,
-                                    UIHelper.readableTimeDifferenceFull(
-                                            activity, message.getTimeSent())));
-                }
-            } else {
-                if (duration > 0) {
-                    viewHolder.status_message.setText(
-                            activity.getString(
-                                    R.string.outgoing_call_duration_timestamp,
-                                    TimeFrameUtils.resolve(activity, duration),
-                                    UIHelper.readableTimeDifferenceFull(
-                                            activity, message.getTimeSent())));
-                } else {
-                    viewHolder.status_message.setText(
-                            activity.getString(
-                                    R.string.outgoing_call_timestamp,
-                                    UIHelper.readableTimeDifferenceFull(
-                                            activity, message.getTimeSent())));
-                }
-            }
-            if (colorfulBackground) {
-                setBackgroundTint(viewHolder.message_box, BubbleColor.SECONDARY);
-                setTextColor(viewHolder.status_message, BubbleColor.SECONDARY);
-                setImageTint(viewHolder.indicatorReceived, BubbleColor.SECONDARY);
-            } else {
-                setBackgroundTint(viewHolder.message_box, BubbleColor.SURFACE_HIGH);
-                setTextColor(viewHolder.status_message, BubbleColor.SURFACE_HIGH);
-                setImageTint(viewHolder.indicatorReceived, BubbleColor.SURFACE_HIGH);
-            }
-            viewHolder.indicatorReceived.setImageResource(
-                    RtpSessionStatus.getDrawable(received, rtpSessionStatus.successful));
-            return view;
-        } else if (type == STATUS) {
-            if ("LOAD_MORE".equals(message.getBody())) {
-                viewHolder.status_message.setVisibility(View.GONE);
-                viewHolder.contact_picture.setVisibility(View.GONE);
-                viewHolder.load_more_messages.setVisibility(View.VISIBLE);
-                viewHolder.load_more_messages.setOnClickListener(
-                        v -> loadMoreMessages((Conversation) message.getConversation()));
-            } else {
-                viewHolder.status_message.setVisibility(View.VISIBLE);
-                viewHolder.load_more_messages.setVisibility(View.GONE);
-                viewHolder.status_message.setText(message.getBody());
-                boolean showAvatar;
-                if (conversation.getMode() == Conversation.MODE_SINGLE) {
-                    showAvatar = true;
-                    AvatarWorkerTask.loadAvatar(
-                            message, viewHolder.contact_picture, R.dimen.avatar_on_status_message);
-                } else if (message.getCounterpart() != null
-                        || message.getTrueCounterpart() != null
-                        || (message.getCounterparts() != null
-                                && !message.getCounterparts().isEmpty())) {
-                    showAvatar = true;
-                    AvatarWorkerTask.loadAvatar(
-                            message, viewHolder.contact_picture, R.dimen.avatar_on_status_message);
-                } else {
-                    showAvatar = false;
-                }
-                if (showAvatar) {
-                    viewHolder.contact_picture.setAlpha(0.5f);
-                    viewHolder.contact_picture.setVisibility(View.VISIBLE);
-                } else {
-                    viewHolder.contact_picture.setVisibility(View.GONE);
-                }
-            }
-            return view;
+        final var mergeIntoTop = mergeIntoTop(position, message);
+        final var mergeIntoBottom = mergeIntoBottom(position, message);
+        final var showAvatar =
+                bubbleDesign.showAvatars
+                        || (type == RECEIVED
+                                && message.getConversation().getMode() == Conversation.MODE_MULTI);
+        setBubblePadding(viewHolder.root(), mergeIntoTop, mergeIntoBottom);
+        if (showAvatar) {
+            final var requiresAvatar = type == SENT ? !mergeIntoBottom : !mergeIntoTop;
+            setRequiresAvatar(viewHolder, requiresAvatar);
+            AvatarWorkerTask.loadAvatar(message, viewHolder.contactPicture(), R.dimen.avatar);
         } else {
-            // sent and received bubbles
-            final var mergeIntoTop = mergeIntoTop(position, message);
-            final var mergeIntoBottom = mergeIntoBottom(position, message);
-            final var showAvatar =
-                    bubbleDesign.showAvatars
-                            || (type == RECEIVED
-                                    && message.getConversation().getMode()
-                                            == Conversation.MODE_MULTI);
-            setBubblePadding(viewHolder.root, mergeIntoTop, mergeIntoBottom);
-            if (showAvatar) {
-                final var requiresAvatar = type == SENT ? !mergeIntoBottom : !mergeIntoTop;
-                setRequiresAvatar(viewHolder, requiresAvatar);
-                AvatarWorkerTask.loadAvatar(message, viewHolder.contact_picture, R.dimen.avatar);
-            } else {
-                viewHolder.contact_picture.setVisibility(View.GONE);
-            }
-            setAvatarDistance(viewHolder.message_box, type, showAvatar);
-            viewHolder.message_box.setClipToOutline(true);
+            viewHolder.contactPicture().setVisibility(View.GONE);
         }
-
-        resetClickListener(viewHolder.message_box, viewHolder.messageBody);
-
-        viewHolder.contact_picture.setOnClickListener(
-                v -> {
-                    if (MessageAdapter.this.mOnContactPictureClickedListener != null) {
-                        MessageAdapter.this.mOnContactPictureClickedListener
-                                .onContactPictureClicked(message);
-                    }
-                });
-        viewHolder.contact_picture.setOnLongClickListener(
-                v -> {
-                    if (MessageAdapter.this.mOnContactPictureLongClickedListener != null) {
-                        MessageAdapter.this.mOnContactPictureLongClickedListener
-                                .onContactPictureLongClicked(v, message);
-                        return true;
-                    } else {
-                        return false;
-                    }
-                });
+        setAvatarDistance(viewHolder.messageBox(), type, showAvatar);
+        viewHolder.messageBox().setClipToOutline(true);
+
+        resetClickListener(viewHolder.messageBox(), viewHolder.messageBody());
+
+        viewHolder
+                .contactPicture()
+                .setOnClickListener(
+                        v -> {
+                            if (MessageAdapter.this.mOnContactPictureClickedListener != null) {
+                                MessageAdapter.this.mOnContactPictureClickedListener
+                                        .onContactPictureClicked(message);
+                            }
+                        });
+        viewHolder
+                .contactPicture()
+                .setOnLongClickListener(
+                        v -> {
+                            if (MessageAdapter.this.mOnContactPictureLongClickedListener != null) {
+                                MessageAdapter.this.mOnContactPictureLongClickedListener
+                                        .onContactPictureLongClicked(v, message);
+                                return true;
+                            } else {
+                                return false;
+                            }
+                        });
 
         final Transferable transferable = message.getTransferable();
         final boolean unInitiatedButKnownSize = MessageUtils.unInitiatedButKnownSize(message);
@@ -1017,8 +947,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             } else {
                 displayInfoMessage(
                         viewHolder, activity.getString(R.string.install_openkeychain), bubbleColor);
-                viewHolder.message_box.setOnClickListener(this::promptOpenKeychainInstall);
-                viewHolder.messageBody.setOnClickListener(this::promptOpenKeychainInstall);
+                viewHolder.messageBox().setOnClickListener(this::promptOpenKeychainInstall);
+                viewHolder.messageBody().setOnClickListener(this::promptOpenKeychainInstall);
             }
         } else if (message.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) {
             displayInfoMessage(
@@ -1061,38 +991,153 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             }
         }
 
-        setBackgroundTint(viewHolder.message_box, bubbleColor);
-        setTextColor(viewHolder.messageBody, bubbleColor);
+        setBackgroundTint(viewHolder.messageBox(), bubbleColor);
+        setTextColor(viewHolder.messageBody(), bubbleColor);
 
-        if (type == RECEIVED) {
-            setTextColor(viewHolder.encryption, bubbleColor);
+        if (type == RECEIVED
+                && viewHolder instanceof StartBubbleMessageItemViewHolder startViewHolder) {
+            setTextColor(startViewHolder.encryption(), bubbleColor);
             if (isInValidSession) {
-                viewHolder.encryption.setVisibility(View.GONE);
+                startViewHolder.encryption().setVisibility(View.GONE);
             } else {
-                viewHolder.encryption.setVisibility(View.VISIBLE);
+                startViewHolder.encryption().setVisibility(View.VISIBLE);
                 if (omemoEncryption && !message.isTrusted()) {
-                    viewHolder.encryption.setText(R.string.not_trusted);
+                    startViewHolder.encryption().setText(R.string.not_trusted);
                 } else {
-                    viewHolder.encryption.setText(
-                            CryptoHelper.encryptionTypeToText(message.getEncryption()));
+                    startViewHolder
+                            .encryption()
+                            .setText(CryptoHelper.encryptionTypeToText(message.getEncryption()));
                 }
             }
             BindingAdapters.setReactionsOnReceived(
-                    viewHolder.reactions,
+                    viewHolder.reactions(),
                     message.getAggregatedReactions(),
                     reactions -> sendReactions(message, reactions),
                     emoji -> showDetailedReaction(message, emoji),
                     () -> addReaction(message));
         } else if (type == SENT) {
             BindingAdapters.setReactionsOnSent(
-                    viewHolder.reactions,
+                    viewHolder.reactions(),
                     message.getAggregatedReactions(),
                     reactions -> sendReactions(message, reactions),
                     emoji -> showDetailedReaction(message, emoji));
         }
 
         displayStatus(viewHolder, message, type, bubbleColor);
-        return view;
+        return viewHolder.root();
+    }
+
+    private View render(
+            final Message message, final DateSeperatorMessageItemViewHolder viewHolder) {
+        final boolean colorfulBackground = this.bubbleDesign.colorfulChatBubbles;
+        if (UIHelper.today(message.getTimeSent())) {
+            viewHolder.binding.messageBody.setText(R.string.today);
+        } else if (UIHelper.yesterday(message.getTimeSent())) {
+            viewHolder.binding.messageBody.setText(R.string.yesterday);
+        } else {
+            viewHolder.binding.messageBody.setText(
+                    DateUtils.formatDateTime(
+                            activity,
+                            message.getTimeSent(),
+                            DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_YEAR));
+        }
+        if (colorfulBackground) {
+            setBackgroundTint(viewHolder.binding.messageBox, BubbleColor.PRIMARY);
+            setTextColor(viewHolder.binding.messageBody, BubbleColor.PRIMARY);
+        } else {
+            setBackgroundTint(viewHolder.binding.messageBox, BubbleColor.SURFACE_HIGH);
+            setTextColor(viewHolder.binding.messageBody, BubbleColor.SURFACE_HIGH);
+        }
+        return viewHolder.binding.getRoot();
+    }
+
+    private View render(final Message message, final RtpSessionMessageItemViewHolder viewHolder) {
+        final boolean colorfulBackground = this.bubbleDesign.colorfulChatBubbles;
+        final boolean received = message.getStatus() <= Message.STATUS_RECEIVED;
+        final RtpSessionStatus rtpSessionStatus = RtpSessionStatus.of(message.getBody());
+        final long duration = rtpSessionStatus.duration;
+        if (received) {
+            if (duration > 0) {
+                viewHolder.binding.messageBody.setText(
+                        activity.getString(
+                                R.string.incoming_call_duration_timestamp,
+                                TimeFrameUtils.resolve(activity, duration),
+                                UIHelper.readableTimeDifferenceFull(
+                                        activity, message.getTimeSent())));
+            } else if (rtpSessionStatus.successful) {
+                viewHolder.binding.messageBody.setText(R.string.incoming_call);
+            } else {
+                viewHolder.binding.messageBody.setText(
+                        activity.getString(
+                                R.string.missed_call_timestamp,
+                                UIHelper.readableTimeDifferenceFull(
+                                        activity, message.getTimeSent())));
+            }
+        } else {
+            if (duration > 0) {
+                viewHolder.binding.messageBody.setText(
+                        activity.getString(
+                                R.string.outgoing_call_duration_timestamp,
+                                TimeFrameUtils.resolve(activity, duration),
+                                UIHelper.readableTimeDifferenceFull(
+                                        activity, message.getTimeSent())));
+            } else {
+                viewHolder.binding.messageBody.setText(
+                        activity.getString(
+                                R.string.outgoing_call_timestamp,
+                                UIHelper.readableTimeDifferenceFull(
+                                        activity, message.getTimeSent())));
+            }
+        }
+        if (colorfulBackground) {
+            setBackgroundTint(viewHolder.binding.messageBox, BubbleColor.SECONDARY);
+            setTextColor(viewHolder.binding.messageBody, BubbleColor.SECONDARY);
+            setImageTint(viewHolder.binding.indicatorReceived, BubbleColor.SECONDARY);
+        } else {
+            setBackgroundTint(viewHolder.binding.messageBox, BubbleColor.SURFACE_HIGH);
+            setTextColor(viewHolder.binding.messageBody, BubbleColor.SURFACE_HIGH);
+            setImageTint(viewHolder.binding.indicatorReceived, BubbleColor.SURFACE_HIGH);
+        }
+        viewHolder.binding.indicatorReceived.setImageResource(
+                RtpSessionStatus.getDrawable(received, rtpSessionStatus.successful));
+        return viewHolder.binding.getRoot();
+    }
+
+    private View render(final Message message, final StatusMessageItemViewHolder viewHolder) {
+        final var conversation = message.getConversation();
+        if ("LOAD_MORE".equals(message.getBody())) {
+            viewHolder.binding.statusMessage.setVisibility(View.GONE);
+            viewHolder.binding.messagePhoto.setVisibility(View.GONE);
+            viewHolder.binding.loadMoreMessages.setVisibility(View.VISIBLE);
+            viewHolder.binding.loadMoreMessages.setOnClickListener(
+                    v -> loadMoreMessages((Conversation) message.getConversation()));
+        } else {
+            viewHolder.binding.statusMessage.setVisibility(View.VISIBLE);
+            viewHolder.binding.loadMoreMessages.setVisibility(View.GONE);
+            viewHolder.binding.statusMessage.setText(message.getBody());
+            boolean showAvatar;
+            if (conversation.getMode() == Conversation.MODE_SINGLE) {
+                showAvatar = true;
+                AvatarWorkerTask.loadAvatar(
+                        message, viewHolder.binding.messagePhoto, R.dimen.avatar_on_status_message);
+            } else if (message.getCounterpart() != null
+                    || message.getTrueCounterpart() != null
+                    || (message.getCounterparts() != null
+                            && !message.getCounterparts().isEmpty())) {
+                showAvatar = true;
+                AvatarWorkerTask.loadAvatar(
+                        message, viewHolder.binding.messagePhoto, R.dimen.avatar_on_status_message);
+            } else {
+                showAvatar = false;
+            }
+            if (showAvatar) {
+                viewHolder.binding.messagePhoto.setAlpha(0.5f);
+                viewHolder.binding.messagePhoto.setVisibility(View.VISIBLE);
+            } else {
+                viewHolder.binding.messagePhoto.setVisibility(View.GONE);
+            }
+        }
+        return viewHolder.binding.getRoot();
     }
 
     private void setAvatarDistance(
@@ -1138,20 +1183,21 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         root.setPadding(horizontal, top, horizontal, bottom);
     }
 
-    private void setRequiresAvatar(final ViewHolder viewHolder, final boolean requiresAvatar) {
-        final var layoutParams = viewHolder.contact_picture.getLayoutParams();
+    private void setRequiresAvatar(
+            final BubbleMessageItemViewHolder viewHolder, final boolean requiresAvatar) {
+        final var layoutParams = viewHolder.contactPicture().getLayoutParams();
         if (requiresAvatar) {
-            final var resources = viewHolder.contact_picture.getResources();
+            final var resources = viewHolder.contactPicture().getResources();
             final var avatarSize = resources.getDimensionPixelSize(R.dimen.bubble_avatar_size);
             layoutParams.height = avatarSize;
-            viewHolder.contact_picture.setVisibility(View.VISIBLE);
-            viewHolder.message_box.setMinimumHeight(avatarSize);
+            viewHolder.contactPicture().setVisibility(View.VISIBLE);
+            viewHolder.messageBox().setMinimumHeight(avatarSize);
         } else {
             layoutParams.height = 0;
-            viewHolder.contact_picture.setVisibility(View.INVISIBLE);
-            viewHolder.message_box.setMinimumHeight(0);
+            viewHolder.contactPicture().setVisibility(View.INVISIBLE);
+            viewHolder.messageBox().setMinimumHeight(0);
         }
-        viewHolder.contact_picture.setLayoutParams(layoutParams);
+        viewHolder.contactPicture().setLayoutParams(layoutParams);
     }
 
     private boolean mergeIntoTop(final int position, final Message message) {
@@ -1307,7 +1353,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         void onContactPictureLongClicked(View v, Message message);
     }
 
-    private static void setBackgroundTint(final View view, final BubbleColor bubbleColor) {
+    private static void setBackgroundTint(final LinearLayout view, final BubbleColor bubbleColor) {
         view.setBackgroundTintList(bubbleToColorStateList(view, bubbleColor));
     }
 
@@ -1425,22 +1471,209 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         }
     }
 
-    private static class ViewHolder {
-
-        private ConstraintLayout root;
-        public MaterialButton load_more_messages;
-        public ImageView edit_indicator;
-        public RelativeLayout audioPlayer;
-        protected LinearLayout message_box;
-        protected MaterialButton download_button;
-        protected ImageView image;
-        protected ImageView indicator;
-        protected ImageView indicatorReceived;
-        protected TextView time;
-        protected TextView messageBody;
-        protected ImageView contact_picture;
-        protected TextView status_message;
-        protected TextView encryption;
-        protected ChipGroup reactions;
+    private abstract static class MessageItemViewHolder /*extends RecyclerView.ViewHolder*/ {
+
+        private View itemView;
+
+        private MessageItemViewHolder(@NonNull View itemView) {
+            this.itemView = itemView;
+        }
+    }
+
+    private abstract static class BubbleMessageItemViewHolder extends MessageItemViewHolder {
+
+        private BubbleMessageItemViewHolder(@NonNull View itemView) {
+            super(itemView);
+        }
+
+        public abstract ConstraintLayout root();
+
+        protected abstract ImageView editIndicator();
+
+        protected abstract RelativeLayout audioPlayer();
+
+        protected abstract LinearLayout messageBox();
+
+        protected abstract MaterialButton downloadButton();
+
+        protected abstract ImageView image();
+
+        // TODO rename into indicatorSecurity()
+        protected abstract ImageView indicator();
+
+        protected abstract TextView time();
+
+        protected abstract TextView messageBody();
+
+        protected abstract ImageView contactPicture();
+
+        protected abstract ChipGroup reactions();
+    }
+
+    private static class StartBubbleMessageItemViewHolder extends BubbleMessageItemViewHolder {
+
+        private final ItemMessageReceivedBinding binding;
+
+        public StartBubbleMessageItemViewHolder(@NonNull ItemMessageReceivedBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+
+        @Override
+        public ConstraintLayout root() {
+            return (ConstraintLayout) this.binding.getRoot();
+        }
+
+        @Override
+        protected ImageView editIndicator() {
+            return this.binding.editIndicator;
+        }
+
+        @Override
+        protected RelativeLayout audioPlayer() {
+            return this.binding.messageContent.audioPlayer;
+        }
+
+        @Override
+        protected LinearLayout messageBox() {
+            return this.binding.messageBox;
+        }
+
+        @Override
+        protected MaterialButton downloadButton() {
+            return this.binding.messageContent.downloadButton;
+        }
+
+        @Override
+        protected ImageView image() {
+            return this.binding.messageContent.messageImage;
+        }
+
+        protected ImageView indicator() {
+            return this.binding.securityIndicator;
+        }
+
+        @Override
+        protected TextView time() {
+            return this.binding.messageTime;
+        }
+
+        @Override
+        protected TextView messageBody() {
+            return this.binding.messageContent.messageBody;
+        }
+
+        protected TextView encryption() {
+            return this.binding.messageEncryption;
+        }
+
+        @Override
+        protected ImageView contactPicture() {
+            return this.binding.messagePhoto;
+        }
+
+        @Override
+        protected ChipGroup reactions() {
+            return this.binding.reactions;
+        }
+    }
+
+    private static class EndBubbleMessageItemViewHolder extends BubbleMessageItemViewHolder {
+
+        private final ItemMessageSentBinding binding;
+
+        private EndBubbleMessageItemViewHolder(@NonNull ItemMessageSentBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+
+        @Override
+        public ConstraintLayout root() {
+            return (ConstraintLayout) this.binding.getRoot();
+        }
+
+        @Override
+        protected ImageView editIndicator() {
+            return this.binding.editIndicator;
+        }
+
+        @Override
+        protected RelativeLayout audioPlayer() {
+            return this.binding.messageContent.audioPlayer;
+        }
+
+        @Override
+        protected LinearLayout messageBox() {
+            return this.binding.messageBox;
+        }
+
+        @Override
+        protected MaterialButton downloadButton() {
+            return this.binding.messageContent.downloadButton;
+        }
+
+        @Override
+        protected ImageView image() {
+            return this.binding.messageContent.messageImage;
+        }
+
+        @Override
+        protected ImageView indicator() {
+            return this.binding.securityIndicator;
+        }
+
+        protected ImageView indicatorReceived() {
+            return this.binding.indicatorReceived;
+        }
+
+        @Override
+        protected TextView time() {
+            return this.binding.messageTime;
+        }
+
+        @Override
+        protected TextView messageBody() {
+            return this.binding.messageContent.messageBody;
+        }
+
+        @Override
+        protected ImageView contactPicture() {
+            return this.binding.messagePhoto;
+        }
+
+        @Override
+        protected ChipGroup reactions() {
+            return this.binding.reactions;
+        }
+    }
+
+    private static class DateSeperatorMessageItemViewHolder extends MessageItemViewHolder {
+
+        private final ItemMessageDateBubbleBinding binding;
+
+        private DateSeperatorMessageItemViewHolder(@NonNull ItemMessageDateBubbleBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+    }
+
+    private static class RtpSessionMessageItemViewHolder extends MessageItemViewHolder {
+
+        private final ItemMessageRtpSessionBinding binding;
+
+        private RtpSessionMessageItemViewHolder(@NonNull ItemMessageRtpSessionBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
+    }
+
+    private static class StatusMessageItemViewHolder extends MessageItemViewHolder {
+
+        private final ItemMessageStatusBinding binding;
+
+        private StatusMessageItemViewHolder(@NonNull ItemMessageStatusBinding binding) {
+            super(binding.getRoot());
+            this.binding = binding;
+        }
     }
 }

From 86ef2baacabb6a65db733ecc3e3387317521abe4 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 4 Dec 2024 09:27:36 +0100
Subject: [PATCH 216/357] add setting for call integration

---
 CHANGELOG.md                                      |  2 +-
 .../java/eu/siacs/conversations/AppSettings.java  |  5 +++++
 .../conversations/services/CallIntegration.java   | 15 ++++++++-------
 .../settings/NotificationsSettingsFragment.java   |  9 +++++----
 src/main/res/drawable/ic_mobile_friendly_24dp.xml | 10 ++++++++++
 src/main/res/values/defaults.xml                  |  1 +
 src/main/res/values/strings.xml                   |  2 ++
 src/main/res/xml/preferences_notifications.xml    |  8 ++++++--
 8 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 src/main/res/drawable/ic_mobile_friendly_24dp.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 554360daee85ec3f18df274b9757e53eccd347b8..8d1737a627e954721dd014a064d2853628125720 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ### Version 2.17.5
 
 * Move message bubbles closer together instead of merging them
-* Add ability to hide avatars in chat views when not stricly necessary (Settings -> Interface -> Chat Bubbles -> Show avatars)
+* Add ability to hide avatars in chat view when not strictly necessary (Settings -> Interface -> Chat Bubbles -> Show avatars)
 
 ### Version 2.17.4
 
diff --git a/src/main/java/eu/siacs/conversations/AppSettings.java b/src/main/java/eu/siacs/conversations/AppSettings.java
index 2ce12e3278b28982b952d74061550a20ffd7a7c2..c1d021af86345d8d1aa480fc5e593d97440de0f5 100644
--- a/src/main/java/eu/siacs/conversations/AppSettings.java
+++ b/src/main/java/eu/siacs/conversations/AppSettings.java
@@ -43,6 +43,7 @@ public class AppSettings {
     public static final String COLORFUL_CHAT_BUBBLES = "use_green_background";
     public static final String LARGE_FONT = "large_font";
     public static final String SHOW_AVATARS = "show_avatars";
+    public static final String CALL_INTEGRATION = "call_integration";
 
     private static final String ACCEPT_INVITES_FROM_STRANGERS = "accept_invites_from_strangers";
     private static final String INSTALLATION_ID = "im.conversations.android.install_id";
@@ -110,6 +111,10 @@ public class AppSettings {
         return getBooleanPreference(SHOW_AVATARS, R.bool.show_avatars);
     }
 
+    public boolean isCallIntegration() {
+        return getBooleanPreference(CALL_INTEGRATION, R.bool.call_integration);
+    }
+
     public boolean isUseTor() {
         return getBooleanPreference(USE_TOR, R.bool.use_tor);
     }
diff --git a/src/main/java/eu/siacs/conversations/services/CallIntegration.java b/src/main/java/eu/siacs/conversations/services/CallIntegration.java
index ae9e14c0cb78e105603676c84024d323da463146..ad19af3638d1b19373a0719c29571f68fd028052 100644
--- a/src/main/java/eu/siacs/conversations/services/CallIntegration.java
+++ b/src/main/java/eu/siacs/conversations/services/CallIntegration.java
@@ -12,22 +12,19 @@ import android.telecom.CallEndpoint;
 import android.telecom.Connection;
 import android.telecom.DisconnectCause;
 import android.util.Log;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
-
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-
+import eu.siacs.conversations.AppSettings;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.ui.util.MainThreadExecutor;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.jingle.JingleConnectionManager;
 import eu.siacs.conversations.xmpp.jingle.Media;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -46,7 +43,7 @@ public class CallIntegration extends Connection {
      * SecurityException
      */
     private static final List<String> BROKEN_DEVICE_MODELS =
-            Arrays.asList("gtaxlwifi", "a5y17lte", "YT-X705F");
+            Arrays.asList("gtaxlwifi", "a5y17lte", "YT-X705F", "HWAGS2");
 
     /**
      * all Realme devices at least up to and including Android 11 are broken
@@ -525,13 +522,17 @@ public class CallIntegration extends Connection {
         return selfManaged(context);
     }
 
-    public static boolean selfManaged(final Context context) {
+    public static boolean selfManagedAvailable(final Context context) {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
                 && Build.VERSION.SDK_INT < 35
                 && hasSystemFeature(context)
                 && isDeviceModelSupported();
     }
 
+    public static boolean selfManaged(final Context context) {
+        return selfManagedAvailable(context) && new AppSettings(context).isCallIntegration();
+    }
+
     public static boolean hasSystemFeature(final Context context) {
         final var packageManager = context.getPackageManager();
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
@@ -559,7 +560,7 @@ public class CallIntegration extends Connection {
         }
         // SailfishOS's AppSupport do not support Call Integration
         if (Build.MODEL.endsWith("(AppSupport)")) {
-			return false;
+            return false;
         }
         return true;
     }
diff --git a/src/main/java/eu/siacs/conversations/ui/fragment/settings/NotificationsSettingsFragment.java b/src/main/java/eu/siacs/conversations/ui/fragment/settings/NotificationsSettingsFragment.java
index e0d2ced3c6e3b3cc5193d2ecc7b0720217ddfee9..624152a7e5c91dc316989609845b985059abdb28 100644
--- a/src/main/java/eu/siacs/conversations/ui/fragment/settings/NotificationsSettingsFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/fragment/settings/NotificationsSettingsFragment.java
@@ -10,17 +10,15 @@ import android.os.Bundle;
 import android.provider.Settings;
 import android.util.Log;
 import android.widget.Toast;
-
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.Preference;
-
 import com.google.common.base.Optional;
-
 import eu.siacs.conversations.AppSettings;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
+import eu.siacs.conversations.services.CallIntegration;
 import eu.siacs.conversations.services.NotificationService;
 import eu.siacs.conversations.ui.activity.result.PickRingtone;
 import eu.siacs.conversations.utils.Compatibility;
@@ -66,13 +64,15 @@ public class NotificationsSettingsFragment extends XmppPreferenceFragment {
         final var notificationVibrate = findPreference(AppSettings.NOTIFICATION_VIBRATE);
         final var notificationLed = findPreference(AppSettings.NOTIFICATION_LED);
         final var foregroundService = findPreference(AppSettings.KEEP_FOREGROUND_SERVICE);
+        final var callIntegration = findPreference(AppSettings.CALL_INTEGRATION);
         if (messageNotificationSettings == null
                 || fullscreenNotification == null
                 || notificationRingtone == null
                 || notificationHeadsUp == null
                 || notificationVibrate == null
                 || notificationLed == null
-                || foregroundService == null) {
+                || foregroundService == null
+                || callIntegration == null) {
             throw new IllegalStateException("The preference resource file is missing preferences");
         }
         if (Compatibility.runsTwentySix()) {
@@ -91,6 +91,7 @@ public class NotificationsSettingsFragment extends XmppPreferenceFragment {
                         .canUseFullScreenIntent()) {
             fullscreenNotification.setVisible(false);
         }
+        callIntegration.setVisible(CallIntegration.selfManagedAvailable(requireContext()));
     }
 
     @Override
diff --git a/src/main/res/drawable/ic_mobile_friendly_24dp.xml b/src/main/res/drawable/ic_mobile_friendly_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3c1b49c7d28586a66d7538a0eb5fb95882a2404f
--- /dev/null
+++ b/src/main/res/drawable/ic_mobile_friendly_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M240,920Q207,920 183.5,896.5Q160,873 160,840L160,120Q160,87 183.5,63.5Q207,40 240,40L640,40Q673,40 696.5,63.5Q720,87 720,120L720,280L640,280L640,240L240,240L240,720L640,720L640,680L720,680L720,840Q720,873 696.5,896.5Q673,920 640,920L240,920ZM240,800L240,840Q240,840 240,840Q240,840 240,840L640,840Q640,840 640,840Q640,840 640,840L640,800L240,800ZM598,640L428,470L484,414L598,528L824,302L880,358L598,640ZM240,160L640,160L640,120Q640,120 640,120Q640,120 640,120L240,120Q240,120 240,120Q240,120 240,120L240,160ZM240,160L240,120Q240,120 240,120Q240,120 240,120L240,120Q240,120 240,120Q240,120 240,120L240,160ZM240,800L240,800L240,840Q240,840 240,840Q240,840 240,840L240,840Q240,840 240,840Q240,840 240,840L240,800Z" />
+</vector>
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index 5e57731222165a135019ca6131604be0fe760706..ca09b233ea90e935e613a3693afbc86096a31c05 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -48,4 +48,5 @@
     <string name="default_push_server">up.conversations.im</string>
     <string name="default_push_account">none</string>
     <bool name="require_channel_binding">false</bool>
+    <bool name="call_integration">true</bool>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index eac59070a1cef8de8a847d29cdd7b9f01a3ddbd2..f9d50a7aab1b1ba8014de726135f9ff979d568ae 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1093,4 +1093,6 @@
     <string name="pref_chat_bubbles">Chat bubbles</string>
     <string name="pref_chat_bubbles_summary">Background color, Font size, Avatars</string>
     <string name="pref_title_bubbles">Chat Bubbles</string>
+    <string name="pref_call_integration">Call integration</string>
+    <string name="pref_call_integration_summary">Calls from this app interact with regular phone calls, such as ending one call when another starts.</string>
 </resources>
diff --git a/src/main/res/xml/preferences_notifications.xml b/src/main/res/xml/preferences_notifications.xml
index da505b65f4c87a4738fa7831f3c118ae56bcaa5b..c02633c210646d5f1aed70c4d796ee9403ef5eba 100644
--- a/src/main/res/xml/preferences_notifications.xml
+++ b/src/main/res/xml/preferences_notifications.xml
@@ -38,8 +38,6 @@
         android:key="led"
         android:summary="@string/pref_led_summary"
         android:title="@string/pref_led" />
-
-
     <Preference
         android:icon="@drawable/ic_phone_24dp"
         android:key="call_ringtone"
@@ -51,6 +49,12 @@
         android:key="fullscreen_notification"
         android:summary="@string/pref_fullscreen_notification_summary"
         android:title="@string/pref_fullscreen_notification" />
+    <SwitchPreferenceCompat
+        android:defaultValue="@bool/call_integration"
+        android:icon="@drawable/ic_mobile_friendly_24dp"
+        android:key="call_integration"
+        android:summary="@string/pref_call_integration_summary"
+        android:title="@string/pref_call_integration" />
     <ListPreference
         android:defaultValue="@integer/grace_period"
         android:entries="@array/grace_periods"

From 0bc26f5efca7e72bbf381ad699696080a4689da1 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 6 Dec 2024 08:36:30 +0100
Subject: [PATCH 217/357] use all networks if active network has no DNS

---
 .../de/gultsch/minidns/AndroidDNSClient.java  | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/main/java/de/gultsch/minidns/AndroidDNSClient.java b/src/main/java/de/gultsch/minidns/AndroidDNSClient.java
index f1789f63a320eb8300903a82258f47ab1c26793d..b3fde929adefd65d6207e44ca5ba2edc3b2840da 100644
--- a/src/main/java/de/gultsch/minidns/AndroidDNSClient.java
+++ b/src/main/java/de/gultsch/minidns/AndroidDNSClient.java
@@ -6,31 +6,24 @@ import android.net.LinkProperties;
 import android.net.Network;
 import android.os.Build;
 import android.util.Log;
-
+import androidx.annotation.NonNull;
 import androidx.collection.LruCache;
-
 import com.google.common.base.Objects;
 import com.google.common.base.Strings;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
-
-import org.minidns.AbstractDnsClient;
-import org.minidns.dnsmessage.DnsMessage;
-import org.minidns.dnsqueryresult.DirectCachedDnsQueryResult;
-import org.minidns.dnsqueryresult.DnsQueryResult;
-import org.minidns.dnsqueryresult.StandardDnsQueryResult;
-import org.minidns.dnsqueryresult.SynthesizedCachedDnsQueryResult;
-import org.minidns.record.Data;
-
-import org.minidns.record.Record;
-
 import eu.siacs.conversations.Config;
-
 import java.io.IOException;
 import java.net.InetAddress;
 import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
+import org.minidns.AbstractDnsClient;
+import org.minidns.dnsmessage.DnsMessage;
+import org.minidns.dnsqueryresult.DnsQueryResult;
+import org.minidns.dnsqueryresult.StandardDnsQueryResult;
+import org.minidns.record.Data;
+import org.minidns.record.Record;
 
 public class AndroidDNSClient extends AbstractDnsClient {
 
@@ -95,7 +88,8 @@ public class AndroidDNSClient extends AbstractDnsClient {
                     continue;
             }
             cacheQuery(cacheKey, response);
-            return new StandardDnsQueryResult(dnsServer.inetAddress, dnsServer.port,result.queryMethod,question,response);
+            return new StandardDnsQueryResult(
+                    dnsServer.inetAddress, dnsServer.port, result.queryMethod, question, response);
         }
         return null;
     }
@@ -109,9 +103,29 @@ public class AndroidDNSClient extends AbstractDnsClient {
     }
 
     private List<DNSServer> getDNSServers() {
+        final ConnectivityManager connectivityManager =
+                context.getSystemService(ConnectivityManager.class);
+        if (connectivityManager == null) {
+            Log.w(Config.LOGTAG, "no DNS servers found. ConnectivityManager was null");
+            return Collections.emptyList();
+        }
+        final Network activeNetwork = connectivityManager.getActiveNetwork();
+        final List<DNSServer> activeDnsServers =
+                activeNetwork == null
+                        ? Collections.emptyList()
+                        : getDNSServers(connectivityManager, new Network[] {activeNetwork});
+        if (activeDnsServers.isEmpty()) {
+            Log.d(Config.LOGTAG, "no DNS servers on active networks. looking at all networks");
+            return getDNSServers(connectivityManager, connectivityManager.getAllNetworks());
+        } else {
+            return activeDnsServers;
+        }
+    }
+
+    private List<DNSServer> getDNSServers(
+            @NonNull final ConnectivityManager connectivityManager,
+            @NonNull final Network[] networks) {
         final ImmutableList.Builder<DNSServer> dnsServerBuilder = new ImmutableList.Builder<>();
-        final ConnectivityManager connectivityManager = context.getSystemService(ConnectivityManager.class);
-        final Network[] networks = getActiveNetworks(connectivityManager);
         for (final Network network : networks) {
             final LinkProperties linkProperties = connectivityManager.getLinkProperties(network);
             if (linkProperties == null) {
@@ -134,17 +148,6 @@ public class AndroidDNSClient extends AbstractDnsClient {
         return dnsServerBuilder.build();
     }
 
-    private Network[] getActiveNetworks(final ConnectivityManager connectivityManager) {
-        if (connectivityManager == null) {
-            return new Network[0];
-        }
-        final Network activeNetwork = connectivityManager.getActiveNetwork();
-        if (activeNetwork != null) {
-                return new Network[] {activeNetwork};
-        }
-        return connectivityManager.getAllNetworks();
-    }
-
     private DnsMessage queryCache(final QuestionServerTuple key) {
         final DnsMessage cachedResponse;
         synchronized (QUERY_CACHE) {

From 4427219b2bcb94dc2c16b2a5e70c72c1fd199e62 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 6 Dec 2024 09:15:11 +0100
Subject: [PATCH 218/357] show info messages in italic

---
 .../eu/siacs/conversations/ui/adapter/MessageAdapter.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index fa6f83a996838b18124d8e447755eea4fc3311a8..e6437367a0c9ed2fa33420d56f51ccaf19eb5ecd 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -365,6 +365,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         viewHolder.downloadButton().setVisibility(View.GONE);
         viewHolder.audioPlayer().setVisibility(View.GONE);
         viewHolder.image().setVisibility(View.GONE);
+        viewHolder.messageBody().setTypeface(null, Typeface.ITALIC);
         viewHolder.messageBody().setVisibility(View.VISIBLE);
         viewHolder.messageBody().setText(text);
         viewHolder
@@ -380,6 +381,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         viewHolder.downloadButton().setVisibility(View.GONE);
         viewHolder.audioPlayer().setVisibility(View.GONE);
         viewHolder.image().setVisibility(View.GONE);
+        viewHolder.messageBody().setTypeface(null, Typeface.NORMAL);
         viewHolder.messageBody().setVisibility(View.VISIBLE);
         setTextColor(viewHolder.messageBody(), bubbleColor);
         final Spannable span = new SpannableString(body);
@@ -478,6 +480,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         viewHolder.downloadButton().setVisibility(View.GONE);
         viewHolder.image().setVisibility(View.GONE);
         viewHolder.audioPlayer().setVisibility(View.GONE);
+        viewHolder.messageBody().setTypeface(null, Typeface.NORMAL);
         viewHolder.messageBody().setVisibility(View.VISIBLE);
         setTextColor(viewHolder.messageBody(), bubbleColor);
         setTextSize(viewHolder.messageBody(), this.bubbleDesign.largeFont);
@@ -715,6 +718,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                     privateMarker.length(),
                     Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             viewHolder.messageBody().setText(body);
+            viewHolder.messageBody().setTypeface(null, Typeface.NORMAL);
             viewHolder.messageBody().setVisibility(View.VISIBLE);
         } else {
             viewHolder.messageBody().setVisibility(View.GONE);

From 07ac6275750d1cca1822f6622a11eeb308b177cf Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 6 Dec 2024 14:42:13 +0100
Subject: [PATCH 219/357] add setting to left-align messages

---
 .../eu/siacs/conversations/AppSettings.java   |   5 +
 .../ui/adapter/MessageAdapter.java            | 212 ++++++++++--------
 .../drawable/ic_format_align_left_24dp.xml    |  13 ++
 src/main/res/layout/fragment_conversation.xml |   2 +-
 ..._message_sent.xml => item_message_end.xml} |   0
 ...ge_received.xml => item_message_start.xml} |  39 ++--
 src/main/res/values/defaults.xml              |   1 +
 src/main/res/values/strings.xml               |   2 +
 .../res/xml/preferences_interface_bubbles.xml |   5 +
 9 files changed, 166 insertions(+), 113 deletions(-)
 create mode 100644 src/main/res/drawable/ic_format_align_left_24dp.xml
 rename src/main/res/layout/{item_message_sent.xml => item_message_end.xml} (100%)
 rename src/main/res/layout/{item_message_received.xml => item_message_start.xml} (88%)

diff --git a/src/main/java/eu/siacs/conversations/AppSettings.java b/src/main/java/eu/siacs/conversations/AppSettings.java
index c1d021af86345d8d1aa480fc5e593d97440de0f5..4287d694f69fc51fe3ba976fcc32e39ad0aecdf2 100644
--- a/src/main/java/eu/siacs/conversations/AppSettings.java
+++ b/src/main/java/eu/siacs/conversations/AppSettings.java
@@ -44,6 +44,7 @@ public class AppSettings {
     public static final String LARGE_FONT = "large_font";
     public static final String SHOW_AVATARS = "show_avatars";
     public static final String CALL_INTEGRATION = "call_integration";
+    public static final String ALIGN_START = "align_start";
 
     private static final String ACCEPT_INVITES_FROM_STRANGERS = "accept_invites_from_strangers";
     private static final String INSTALLATION_ID = "im.conversations.android.install_id";
@@ -115,6 +116,10 @@ public class AppSettings {
         return getBooleanPreference(CALL_INTEGRATION, R.bool.call_integration);
     }
 
+    public boolean isAlignStart() {
+        return getBooleanPreference(ALIGN_START, R.bool.align_start);
+    }
+
     public boolean isUseTor() {
         return getBooleanPreference(USE_TOR, R.bool.use_tor);
     }
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index e6437367a0c9ed2fa33420d56f51ccaf19eb5ecd..7eb8ea05ca7f4074585c260639197925bf0a5707 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -48,9 +48,9 @@ import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.axolotl.FingerprintStatus;
 import eu.siacs.conversations.databinding.ItemMessageDateBubbleBinding;
-import eu.siacs.conversations.databinding.ItemMessageReceivedBinding;
+import eu.siacs.conversations.databinding.ItemMessageEndBinding;
 import eu.siacs.conversations.databinding.ItemMessageRtpSessionBinding;
-import eu.siacs.conversations.databinding.ItemMessageSentBinding;
+import eu.siacs.conversations.databinding.ItemMessageStartBinding;
 import eu.siacs.conversations.databinding.ItemMessageStatusBinding;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
@@ -97,8 +97,8 @@ import java.util.regex.Pattern;
 public class MessageAdapter extends ArrayAdapter<Message> {
 
     public static final String DATE_SEPARATOR_BODY = "DATE_SEPARATOR";
-    private static final int SENT = 0;
-    private static final int RECEIVED = 1;
+    private static final int END = 0;
+    private static final int START = 1;
     private static final int STATUS = 2;
     private static final int DATE_SEPARATOR = 3;
     private static final int RTP_SESSION = 4;
@@ -108,7 +108,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
     private final DisplayMetrics metrics;
     private OnContactPictureClicked mOnContactPictureClickedListener;
     private OnContactPictureLongClicked mOnContactPictureLongClickedListener;
-    private BubbleDesign bubbleDesign = new BubbleDesign(false, false, true);
+    private BubbleDesign bubbleDesign = new BubbleDesign(false, false, false, true);
     private final boolean mForceNames;
 
     public MessageAdapter(
@@ -160,7 +160,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         return 5;
     }
 
-    private static int getItemViewType(final Message message) {
+    private static int getItemViewType(final Message message, final boolean alignStart) {
         if (message.getType() == Message.TYPE_STATUS) {
             if (DATE_SEPARATOR_BODY.equals(message.getBody())) {
                 return DATE_SEPARATOR;
@@ -169,29 +169,29 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             }
         } else if (message.getType() == Message.TYPE_RTP_SESSION) {
             return RTP_SESSION;
-        } else if (message.getStatus() <= Message.STATUS_RECEIVED) {
-            return RECEIVED;
+        } else if (message.getStatus() <= Message.STATUS_RECEIVED || alignStart) {
+            return START;
         } else {
-            return SENT;
+            return END;
         }
     }
 
     @Override
     public int getItemViewType(final int position) {
-        return getItemViewType(getItem(position));
+        return getItemViewType(getItem(position), bubbleDesign.alignStart);
     }
 
     private void displayStatus(
             final BubbleMessageItemViewHolder viewHolder,
             final Message message,
-            final int type,
             final BubbleColor bubbleColor) {
-        final int mergedStatus = message.getStatus();
+        final int status = message.getStatus();
         final boolean error;
         final Transferable transferable = message.getTransferable();
-        final boolean multiReceived =
+        final boolean sent = status != Message.STATUS_RECEIVED;
+        final boolean showUserNickname =
                 message.getConversation().getMode() == Conversation.MODE_MULTI
-                        && mergedStatus <= Message.STATUS_RECEIVED;
+                        && viewHolder instanceof StartBubbleMessageItemViewHolder;
         final String fileSize;
         if (message.isFileOrImage()
                 || transferable != null
@@ -211,24 +211,27 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             fileSize = null;
             error = message.getStatus() == Message.STATUS_SEND_FAILED;
         }
-        if (type == SENT && viewHolder instanceof EndBubbleMessageItemViewHolder endViewHolder) {
+
+        if (sent) {
             final @DrawableRes Integer receivedIndicator =
-                    getMessageStatusAsDrawable(message, mergedStatus);
+                    getMessageStatusAsDrawable(message, status);
             if (receivedIndicator == null) {
-                endViewHolder.indicatorReceived().setVisibility(View.INVISIBLE);
+                viewHolder.indicatorReceived().setVisibility(View.INVISIBLE);
             } else {
-                endViewHolder.indicatorReceived().setImageResource(receivedIndicator);
-                if (mergedStatus == Message.STATUS_SEND_FAILED) {
-                    setImageTintError(endViewHolder.indicatorReceived());
+                viewHolder.indicatorReceived().setImageResource(receivedIndicator);
+                if (status == Message.STATUS_SEND_FAILED) {
+                    setImageTintError(viewHolder.indicatorReceived());
                 } else {
-                    setImageTint(endViewHolder.indicatorReceived(), bubbleColor);
+                    setImageTint(viewHolder.indicatorReceived(), bubbleColor);
                 }
-                endViewHolder.indicatorReceived().setVisibility(View.VISIBLE);
+                viewHolder.indicatorReceived().setVisibility(View.VISIBLE);
             }
+        } else {
+            viewHolder.indicatorReceived().setVisibility(View.GONE);
         }
-        final var additionalStatusInfo = getAdditionalStatusInfo(message, mergedStatus);
+        final var additionalStatusInfo = getAdditionalStatusInfo(message, status);
 
-        if (error && type == SENT) {
+        if (error && sent) {
             viewHolder
                     .time()
                     .setTextColor(
@@ -239,78 +242,69 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             setTextColor(viewHolder.time(), bubbleColor);
         }
         if (message.getEncryption() == Message.ENCRYPTION_NONE) {
-            viewHolder.indicator().setVisibility(View.GONE);
+            viewHolder.indicatorSecurity().setVisibility(View.GONE);
         } else {
             boolean verified = false;
             if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
-                final FingerprintStatus status =
+                final FingerprintStatus fingerprintStatus =
                         message.getConversation()
                                 .getAccount()
                                 .getAxolotlService()
                                 .getFingerprintTrust(message.getFingerprint());
-                if (status != null && status.isVerified()) {
+                if (fingerprintStatus != null && fingerprintStatus.isVerified()) {
                     verified = true;
                 }
             }
             if (verified) {
-                viewHolder.indicator().setImageResource(R.drawable.ic_verified_user_24dp);
+                viewHolder.indicatorSecurity().setImageResource(R.drawable.ic_verified_user_24dp);
             } else {
-                viewHolder.indicator().setImageResource(R.drawable.ic_lock_24dp);
+                viewHolder.indicatorSecurity().setImageResource(R.drawable.ic_lock_24dp);
             }
-            if (error && type == SENT) {
-                setImageTintError(viewHolder.indicator());
+            if (error && sent) {
+                setImageTintError(viewHolder.indicatorSecurity());
             } else {
-                setImageTint(viewHolder.indicator(), bubbleColor);
+                setImageTint(viewHolder.indicatorSecurity(), bubbleColor);
             }
-            viewHolder.indicator().setVisibility(View.VISIBLE);
+            viewHolder.indicatorSecurity().setVisibility(View.VISIBLE);
         }
 
         if (message.edited()) {
-            viewHolder.editIndicator().setVisibility(View.VISIBLE);
-            if (error && type == SENT) {
-                setImageTintError(viewHolder.editIndicator());
+            viewHolder.indicatorEdit().setVisibility(View.VISIBLE);
+            if (error && sent) {
+                setImageTintError(viewHolder.indicatorEdit());
             } else {
-                setImageTint(viewHolder.editIndicator(), bubbleColor);
+                setImageTint(viewHolder.indicatorEdit(), bubbleColor);
             }
         } else {
-            viewHolder.editIndicator().setVisibility(View.GONE);
+            viewHolder.indicatorEdit().setVisibility(View.GONE);
         }
 
         final String formattedTime =
                 UIHelper.readableTimeDifferenceFull(getContext(), message.getTimeSent());
         final String bodyLanguage = message.getBodyLanguage();
         final ImmutableList.Builder<String> timeInfoBuilder = new ImmutableList.Builder<>();
-        if (message.getStatus() <= Message.STATUS_RECEIVED) {
-            timeInfoBuilder.add(formattedTime);
-            if (fileSize != null) {
-                timeInfoBuilder.add(fileSize);
-            }
-            if (mForceNames || multiReceived) {
-                final String displayName = UIHelper.getMessageDisplayName(message);
-                if (displayName != null) {
-                    timeInfoBuilder.add(displayName);
-                }
-            }
-            if (bodyLanguage != null) {
-                timeInfoBuilder.add(bodyLanguage.toUpperCase(Locale.US));
+
+        if (mForceNames || showUserNickname) {
+            final String displayName = UIHelper.getMessageDisplayName(message);
+            if (displayName != null) {
+                timeInfoBuilder.add(displayName);
             }
+        }
+        if (fileSize != null) {
+            timeInfoBuilder.add(fileSize);
+        }
+        if (bodyLanguage != null) {
+            timeInfoBuilder.add(bodyLanguage.toUpperCase(Locale.US));
+        }
+        // for space reasons we display only 'additional status info' (send progress or concrete
+        // failure reason) or the time
+        if (additionalStatusInfo != null) {
+            timeInfoBuilder.add(additionalStatusInfo);
         } else {
-            if (bodyLanguage != null) {
-                timeInfoBuilder.add(bodyLanguage.toUpperCase(Locale.US));
-            }
-            if (fileSize != null) {
-                timeInfoBuilder.add(fileSize);
-            }
-            // for space reasons we display only 'additional status info' (send progress or concrete
-            // failure reason) or the time
-            if (additionalStatusInfo != null) {
-                timeInfoBuilder.add(additionalStatusInfo);
-            } else {
-                timeInfoBuilder.add(formattedTime);
-            }
+            timeInfoBuilder.add(formattedTime);
         }
         final var timeInfo = timeInfoBuilder.build();
-        viewHolder.time().setText(Joiner.on(" \u00B7 ").join(timeInfo));
+        viewHolder.time().setText(Joiner.on(" · ").join(timeInfo));
     }
 
     public static @DrawableRes Integer getMessageStatusAsDrawable(
@@ -779,18 +773,18 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                                                 R.layout.item_message_status,
                                                 parent,
                                                 false));
-                        case SENT ->
+                        case END ->
                                 new EndBubbleMessageItemViewHolder(
                                         DataBindingUtil.inflate(
                                                 LayoutInflater.from(parent.getContext()),
-                                                R.layout.item_message_sent,
+                                                R.layout.item_message_end,
                                                 parent,
                                                 false));
-                        case RECEIVED ->
+                        case START ->
                                 new StartBubbleMessageItemViewHolder(
                                         DataBindingUtil.inflate(
                                                 LayoutInflater.from(parent.getContext()),
-                                                R.layout.item_message_received,
+                                                R.layout.item_message_start,
                                                 parent,
                                                 false));
                         default -> throw new AssertionError("Unable to create ViewHolder for type");
@@ -802,9 +796,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
     @NonNull
     @Override
-    public View getView(final int position, View view, final @NonNull ViewGroup parent) {
+    public View getView(final int position, final View view, final @NonNull ViewGroup parent) {
         final Message message = getItem(position);
-        final int type = getItemViewType(message);
+        final int type = getItemViewType(message, bubbleDesign.alignStart);
         final MessageItemViewHolder viewHolder = getViewHolder(view, parent, type);
 
         if (type == DATE_SEPARATOR
@@ -822,10 +816,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             return render(message, messageItemViewHolder);
         }
 
-        if ((type == SENT || type == RECEIVED)
+        if ((type == END || type == START)
                 && viewHolder instanceof BubbleMessageItemViewHolder messageItemViewHolder) {
-            // TODO: type is represented by the class of viewHolder. we can get rid of that
-            return render(position, message, type, messageItemViewHolder);
+            return render(position, message, messageItemViewHolder);
         }
 
         throw new AssertionError();
@@ -834,7 +827,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
     private View render(
             final int position,
             final Message message,
-            final int type,
             final BubbleMessageItemViewHolder viewHolder) {
         final boolean omemoEncryption = message.getEncryption() == Message.ENCRYPTION_AXOLOTL;
         final boolean isInValidSession =
@@ -843,8 +835,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         final Account account = conversation.getAccount();
 
         final boolean colorfulBackground = this.bubbleDesign.colorfulChatBubbles;
+        final boolean received = message.getStatus() == Message.STATUS_RECEIVED;
         final BubbleColor bubbleColor;
-        if (type == RECEIVED) {
+        if (received) {
             if (isInValidSession) {
                 bubbleColor = colorfulBackground ? BubbleColor.SECONDARY : BubbleColor.SURFACE;
             } else {
@@ -858,17 +851,20 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         final var mergeIntoBottom = mergeIntoBottom(position, message);
         final var showAvatar =
                 bubbleDesign.showAvatars
-                        || (type == RECEIVED
+                        || (viewHolder instanceof StartBubbleMessageItemViewHolder
                                 && message.getConversation().getMode() == Conversation.MODE_MULTI);
         setBubblePadding(viewHolder.root(), mergeIntoTop, mergeIntoBottom);
         if (showAvatar) {
-            final var requiresAvatar = type == SENT ? !mergeIntoBottom : !mergeIntoTop;
+            final var requiresAvatar =
+                    viewHolder instanceof StartBubbleMessageItemViewHolder
+                            ? !mergeIntoTop
+                            : !mergeIntoBottom;
             setRequiresAvatar(viewHolder, requiresAvatar);
             AvatarWorkerTask.loadAvatar(message, viewHolder.contactPicture(), R.dimen.avatar);
         } else {
             viewHolder.contactPicture().setVisibility(View.GONE);
         }
-        setAvatarDistance(viewHolder.messageBox(), type, showAvatar);
+        setAvatarDistance(viewHolder.messageBox(), viewHolder.getClass(), showAvatar);
         viewHolder.messageBox().setClipToOutline(true);
 
         resetClickListener(viewHolder.messageBox(), viewHolder.messageBody());
@@ -998,8 +994,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         setBackgroundTint(viewHolder.messageBox(), bubbleColor);
         setTextColor(viewHolder.messageBody(), bubbleColor);
 
-        if (type == RECEIVED
-                && viewHolder instanceof StartBubbleMessageItemViewHolder startViewHolder) {
+        if (received && viewHolder instanceof StartBubbleMessageItemViewHolder startViewHolder) {
             setTextColor(startViewHolder.encryption(), bubbleColor);
             if (isInValidSession) {
                 startViewHolder.encryption().setVisibility(View.GONE);
@@ -1019,7 +1014,10 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                     reactions -> sendReactions(message, reactions),
                     emoji -> showDetailedReaction(message, emoji),
                     () -> addReaction(message));
-        } else if (type == SENT) {
+        } else {
+            if (viewHolder instanceof StartBubbleMessageItemViewHolder startViewHolder) {
+                startViewHolder.encryption().setVisibility(View.GONE);
+            }
             BindingAdapters.setReactionsOnSent(
                     viewHolder.reactions(),
                     message.getAggregatedReactions(),
@@ -1027,7 +1025,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                     emoji -> showDetailedReaction(message, emoji));
         }
 
-        displayStatus(viewHolder, message, type, bubbleColor);
+        displayStatus(viewHolder, message, bubbleColor);
         return viewHolder.root();
     }
 
@@ -1145,16 +1143,18 @@ public class MessageAdapter extends ArrayAdapter<Message> {
     }
 
     private void setAvatarDistance(
-            final LinearLayout messageBox, final int type, final boolean showAvatar) {
+            final LinearLayout messageBox,
+            final Class<? extends BubbleMessageItemViewHolder> clazz,
+            final boolean showAvatar) {
         final ViewGroup.MarginLayoutParams layoutParams =
                 (ViewGroup.MarginLayoutParams) messageBox.getLayoutParams();
         if (showAvatar) {
             final var resources = messageBox.getResources();
-            if (type == RECEIVED) {
+            if (clazz == StartBubbleMessageItemViewHolder.class) {
                 layoutParams.setMarginStart(
                         resources.getDimensionPixelSize(R.dimen.bubble_avatar_distance));
                 layoutParams.setMarginEnd(0);
-            } else if (type == SENT) {
+            } else if (clazz == EndBubbleMessageItemViewHolder.class) {
                 layoutParams.setMarginStart(0);
                 layoutParams.setMarginEnd(
                         resources.getDimensionPixelSize(R.dimen.bubble_avatar_distance));
@@ -1223,7 +1223,12 @@ public class MessageAdapter extends ArrayAdapter<Message> {
     }
 
     private static boolean merge(final Message a, final Message b) {
-        if (getItemViewType(a) != getItemViewType(b)) {
+        if (getItemViewType(a, false) != getItemViewType(b, false)) {
+            return false;
+        }
+        final var receivedA = a.getStatus() == Message.STATUS_RECEIVED;
+        final var receivedB = b.getStatus() == Message.STATUS_RECEIVED;
+        if (receivedA != receivedB) {
             return false;
         }
         if (a.getConversation().getMode() == Conversation.MODE_MULTI
@@ -1341,6 +1346,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         this.bubbleDesign =
                 new BubbleDesign(
                         appSettings.isColorfulChatBubbles(),
+                        appSettings.isAlignStart(),
                         appSettings.isLargeFont(),
                         appSettings.isShowAvatars());
     }
@@ -1462,14 +1468,17 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
     private static class BubbleDesign {
         public final boolean colorfulChatBubbles;
+        public final boolean alignStart;
         public final boolean largeFont;
         public final boolean showAvatars;
 
         private BubbleDesign(
                 final boolean colorfulChatBubbles,
+                final boolean alignStart,
                 final boolean largeFont,
                 final boolean showAvatars) {
             this.colorfulChatBubbles = colorfulChatBubbles;
+            this.alignStart = alignStart;
             this.largeFont = largeFont;
             this.showAvatars = showAvatars;
         }
@@ -1492,7 +1501,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
         public abstract ConstraintLayout root();
 
-        protected abstract ImageView editIndicator();
+        protected abstract ImageView indicatorEdit();
 
         protected abstract RelativeLayout audioPlayer();
 
@@ -1502,8 +1511,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
         protected abstract ImageView image();
 
-        // TODO rename into indicatorSecurity()
-        protected abstract ImageView indicator();
+        protected abstract ImageView indicatorSecurity();
+
+        protected abstract ImageView indicatorReceived();
 
         protected abstract TextView time();
 
@@ -1516,9 +1526,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
     private static class StartBubbleMessageItemViewHolder extends BubbleMessageItemViewHolder {
 
-        private final ItemMessageReceivedBinding binding;
+        private final ItemMessageStartBinding binding;
 
-        public StartBubbleMessageItemViewHolder(@NonNull ItemMessageReceivedBinding binding) {
+        public StartBubbleMessageItemViewHolder(@NonNull ItemMessageStartBinding binding) {
             super(binding.getRoot());
             this.binding = binding;
         }
@@ -1529,7 +1539,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         }
 
         @Override
-        protected ImageView editIndicator() {
+        protected ImageView indicatorEdit() {
             return this.binding.editIndicator;
         }
 
@@ -1553,10 +1563,15 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             return this.binding.messageContent.messageImage;
         }
 
-        protected ImageView indicator() {
+        protected ImageView indicatorSecurity() {
             return this.binding.securityIndicator;
         }
 
+        @Override
+        protected ImageView indicatorReceived() {
+            return this.binding.indicatorReceived;
+        }
+
         @Override
         protected TextView time() {
             return this.binding.messageTime;
@@ -1584,9 +1599,9 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
     private static class EndBubbleMessageItemViewHolder extends BubbleMessageItemViewHolder {
 
-        private final ItemMessageSentBinding binding;
+        private final ItemMessageEndBinding binding;
 
-        private EndBubbleMessageItemViewHolder(@NonNull ItemMessageSentBinding binding) {
+        private EndBubbleMessageItemViewHolder(@NonNull ItemMessageEndBinding binding) {
             super(binding.getRoot());
             this.binding = binding;
         }
@@ -1597,7 +1612,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         }
 
         @Override
-        protected ImageView editIndicator() {
+        protected ImageView indicatorEdit() {
             return this.binding.editIndicator;
         }
 
@@ -1622,10 +1637,11 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         }
 
         @Override
-        protected ImageView indicator() {
+        protected ImageView indicatorSecurity() {
             return this.binding.securityIndicator;
         }
 
+        @Override
         protected ImageView indicatorReceived() {
             return this.binding.indicatorReceived;
         }
diff --git a/src/main/res/drawable/ic_format_align_left_24dp.xml b/src/main/res/drawable/ic_format_align_left_24dp.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5cab3ad2c0ed7d13544039d5e55036ddadd50402
--- /dev/null
+++ b/src/main/res/drawable/ic_format_align_left_24dp.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15,15L3,15v2h12v-2zM15,7L3,7v2h12L15,7zM3,13h18v-2L3,11v2zM3,21h18v-2L3,19v2zM3,3v2h18L21,3L3,3z" />
+
+</vector>
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index cfb280eb5b1b2784700a1e2ad58e08401fcd34ca..efdd10e07407280cbe512e326108205bf843183a 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -18,7 +18,7 @@
             android:listSelector="@android:color/transparent"
             android:stackFromBottom="true"
             android:transcriptMode="normal"
-            tools:listitem="@layout/item_message_sent" />
+            tools:listitem="@layout/item_message_end" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/scroll_to_bottom_button"
diff --git a/src/main/res/layout/item_message_sent.xml b/src/main/res/layout/item_message_end.xml
similarity index 100%
rename from src/main/res/layout/item_message_sent.xml
rename to src/main/res/layout/item_message_end.xml
diff --git a/src/main/res/layout/item_message_received.xml b/src/main/res/layout/item_message_start.xml
similarity index 88%
rename from src/main/res/layout/item_message_received.xml
rename to src/main/res/layout/item_message_start.xml
index 74951d43dfef90c850ee07f63c8a92c957cb3d0d..fed53496d31687f3b736794d7cecbf51d00f952e 100644
--- a/src/main/res/layout/item_message_received.xml
+++ b/src/main/res/layout/item_message_start.xml
@@ -53,47 +53,58 @@
                     android:orientation="horizontal">
 
                     <TextView
-                        android:id="@+id/message_encryption"
+                        android:id="@+id/message_time"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginEnd="4sp"
+                        android:accessibilityTraversalAfter="@id/message_photo"
+                        android:accessibilityTraversalBefore="@id/message_content"
                         android:gravity="center_vertical"
                         android:textAppearance="?textAppearanceBodySmall"
                         android:textColor="?colorOnTertiaryContainer"
-                        tools:text="@string/not_trusted" />
+                        tools:text="10:42" />
 
                     <ImageView
                         android:id="@+id/security_indicator"
                         android:layout_width="12sp"
                         android:layout_height="12sp"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginEnd="4sp"
+                        android:layout_marginStart="4sp"
                         android:gravity="center_vertical"
                         android:src="@drawable/ic_lock_24dp"
                         app:tint="?colorOnTertiaryContainer" />
 
+                    <TextView
+                        android:id="@+id/message_encryption"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="4sp"
+                        android:gravity="center_vertical"
+                        android:textAppearance="?textAppearanceBodySmall"
+                        android:textColor="?colorOnTertiaryContainer"
+                        android:textStyle="bold"
+                        tools:text="@string/not_trusted" />
+
                     <ImageView
                         android:id="@+id/edit_indicator"
                         android:layout_width="12sp"
                         android:layout_height="12sp"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginEnd="4sp"
+                        android:layout_marginStart="4sp"
                         android:gravity="center_vertical"
                         android:src="@drawable/ic_edit_24dp"
                         app:tint="?colorOnTertiaryContainer" />
 
-                    <TextView
-                        android:id="@+id/message_time"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
+                    <ImageView
+                        android:id="@+id/indicator_received"
+                        android:layout_width="16sp"
+                        android:layout_height="16sp"
                         android:layout_gravity="center_vertical"
-                        android:accessibilityTraversalAfter="@id/message_photo"
-                        android:accessibilityTraversalBefore="@id/message_content"
+                        android:layout_marginStart="4sp"
                         android:gravity="center_vertical"
-                        android:textAppearance="?textAppearanceBodySmall"
-                        android:textColor="?colorOnTertiaryContainer"
-                        tools:text="10:42" />
+                        android:src="@drawable/ic_done_24dp"
+                        app:tint="?colorOnTertiaryContainer" />
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index ca09b233ea90e935e613a3693afbc86096a31c05..eb01b23a3d1c02cdb2eae30b495dc8e09e15e749 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -49,4 +49,5 @@
     <string name="default_push_account">none</string>
     <bool name="require_channel_binding">false</bool>
     <bool name="call_integration">true</bool>
+    <bool name="align_start">false</bool>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f9d50a7aab1b1ba8014de726135f9ff979d568ae..fde70c71b2b38622e5a594693a14da759a18300e 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1095,4 +1095,6 @@
     <string name="pref_title_bubbles">Chat Bubbles</string>
     <string name="pref_call_integration">Call integration</string>
     <string name="pref_call_integration_summary">Calls from this app interact with regular phone calls, such as ending one call when another starts.</string>
+    <string name="pref_align_start">Left-aligned messages</string>
+    <string name="pref_align_start_summary">Display all messages, including sent ones, on the left side for a uniform chat layout.</string>
 </resources>
diff --git a/src/main/res/xml/preferences_interface_bubbles.xml b/src/main/res/xml/preferences_interface_bubbles.xml
index c1a77967126455054f2220383c7c6723272afcd8..7c12b1b6ff29c8db6c26e3f38aa7ade3871be7b7 100644
--- a/src/main/res/xml/preferences_interface_bubbles.xml
+++ b/src/main/res/xml/preferences_interface_bubbles.xml
@@ -6,6 +6,11 @@
         android:key="use_green_background"
         android:summary="@string/pref_use_colorful_bubbles_summary"
         android:title="@string/pref_use_colorful_bubbles" />
+    <SwitchPreferenceCompat
+        android:icon="@drawable/ic_format_align_left_24dp"
+        android:key="align_start"
+        android:summary="@string/pref_align_start_summary"
+        android:title="@string/pref_align_start" />
     <SwitchPreferenceCompat
         android:defaultValue="@bool/show_avatars"
         android:icon="@drawable/ic_account_circle_24dp"

From 669764de8f3d3ad8208eebd8b327b696e767cb29 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 7 Dec 2024 12:16:45 +0100
Subject: [PATCH 220/357] type safe parsing of stream error

---
 .../conversations/xmpp/XmppConnection.java    | 65 +++++++++----------
 .../xmpp/model/streams/StreamError.java       | 12 ++++
 2 files changed, 43 insertions(+), 34 deletions(-)
 create mode 100644 src/main/java/im/conversations/android/xmpp/model/streams/StreamError.java

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 8cf9a59bcdf0dd4d6704f22dd85386db293fdf3d..1da0963a31ccb4d29c445ca15f23156365ade5ac 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -12,16 +12,13 @@ import android.util.Base64;
 import android.util.Log;
 import android.util.Pair;
 import android.util.SparseArray;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
-
 import eu.siacs.conversations.AppSettings;
 import eu.siacs.conversations.BuildConfig;
 import eu.siacs.conversations.Config;
@@ -63,7 +60,6 @@ import eu.siacs.conversations.xml.XmlReader;
 import eu.siacs.conversations.xmpp.bind.Bind2;
 import eu.siacs.conversations.xmpp.forms.Data;
 import eu.siacs.conversations.xmpp.jingle.OnJinglePacketReceived;
-
 import im.conversations.android.xmpp.model.AuthenticationFailure;
 import im.conversations.android.xmpp.model.AuthenticationRequest;
 import im.conversations.android.xmpp.model.AuthenticationStreamFeature;
@@ -96,14 +92,10 @@ import im.conversations.android.xmpp.model.sm.StreamManagement;
 import im.conversations.android.xmpp.model.stanza.Iq;
 import im.conversations.android.xmpp.model.stanza.Presence;
 import im.conversations.android.xmpp.model.stanza.Stanza;
+import im.conversations.android.xmpp.model.streams.StreamError;
 import im.conversations.android.xmpp.model.tls.Proceed;
 import im.conversations.android.xmpp.model.tls.StartTls;
 import im.conversations.android.xmpp.processor.BindProcessor;
-
-import okhttp3.HttpUrl;
-
-import org.xmlpull.v1.XmlPullParserException;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -135,7 +127,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
-
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLPeerUnverifiedException;
@@ -143,6 +134,8 @@ import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.X509KeyManager;
 import javax.net.ssl.X509TrustManager;
+import okhttp3.HttpUrl;
+import org.xmlpull.v1.XmlPullParserException;
 
 public class XmppConnection implements Runnable {
 
@@ -604,24 +597,28 @@ public class XmppConnection implements Runnable {
         this.mStreamCountDownLatch = streamCountDownLatch;
         Tag nextTag = tagReader.readTag();
         while (nextTag != null && !nextTag.isEnd("stream")) {
-            if (nextTag.isStart("error")) {
-                processStreamError(nextTag);
+            if (nextTag.isStart("error", Namespace.STREAMS)) {
+                processStreamError(tagReader.readElement(nextTag, StreamError.class));
             } else if (nextTag.isStart("features", Namespace.STREAMS)) {
                 processStreamFeatures(nextTag);
             } else if (nextTag.isStart("proceed", Namespace.TLS)) {
                 switchOverToTls(nextTag);
             } else if (nextTag.isStart("failure", Namespace.TLS)) {
                 throw new StateChangingException(Account.State.TLS_ERROR);
+            } else if (!isSecure()) {
+                throw new StateChangingException(Account.State.INCOMPATIBLE_SERVER);
             } else if (account.isOptionSet(Account.OPTION_REGISTER)
                     && nextTag.isStart("iq", Namespace.JABBER_CLIENT)) {
                 processIq(nextTag);
-            } else if (!isSecure() || this.loginInfo == null) {
+            } else if (this.loginInfo == null) {
                 throw new StateChangingException(Account.State.INCOMPATIBLE_SERVER);
-            } else if (nextTag.isStart("success")) {
-                final Element success = tagReader.readElement(nextTag);
-                if (processSuccess(success)) {
-                    break;
-                }
+            } else if (nextTag.isStart("success", Namespace.SASL)) {
+                processSuccess(tagReader.readElement(nextTag, Success.class));
+                break;
+            } else if (nextTag.isStart("success", Namespace.SASL_2)) {
+                processSuccess(
+                        tagReader.readElement(
+                                nextTag, im.conversations.android.xmpp.model.sasl2.Success.class));
             } else if (nextTag.isStart("failure", Namespace.SASL)) {
                 final var failure = tagReader.readElement(nextTag, Failure.class);
                 processFailure(failure);
@@ -761,7 +758,7 @@ public class XmppConnection implements Runnable {
         tagWriter.writeElement(response);
     }
 
-    private boolean processSuccess(final Element element)
+    private void processSuccess(final StreamElement element)
             throws IOException, XmlPullParserException {
         final LoginInfo currentLoginInfo = this.loginInfo;
         final SaslMechanism currentSaslMechanism = LoginInfo.mechanism(currentLoginInfo);
@@ -910,12 +907,10 @@ public class XmppConnection implements Runnable {
             final Tag tag = tagReader.readTag();
             if (tag != null && tag.isStart("stream", Namespace.STREAMS)) {
                 processStream();
-                return true;
+                return;
             } else {
                 throw new StateChangingException(Account.State.STREAM_OPENING_ERROR);
             }
-        } else {
-            return false;
         }
     }
 
@@ -1023,7 +1018,8 @@ public class XmppConnection implements Runnable {
             Log.d(
                     Config.LOGTAG,
                     account.getJid().asBareJid()
-                            + ": fast authentication failed. falling back to regular authentication");
+                            + ": fast authentication failed. falling back to regular"
+                            + " authentication");
             authenticate();
         } else {
             throw new StateChangingException(Account.State.UNAUTHORIZED);
@@ -1592,7 +1588,8 @@ public class XmppConnection implements Runnable {
                     Log.d(
                             Config.LOGTAG,
                             account.getJid().asBareJid()
-                                    + ": interrupted while waiting for DB restore during SASL2 bind");
+                                    + ": interrupted while waiting for DB restore during SASL2"
+                                    + " bind");
                     return;
                 }
             }
@@ -2343,14 +2340,11 @@ public class XmppConnection implements Runnable {
                 });
     }
 
-    private void processStreamError(final Tag currentTag) throws IOException {
-        final Element streamError = tagReader.readElement(currentTag);
-        if (streamError == null) {
-            return;
-        }
-        if (streamError.hasChild("conflict")) {
-            final var loginInfo = this.loginInfo;
-            if (loginInfo != null && loginInfo.saslVersion == SaslMechanism.Version.SASL_2) {
+    private void processStreamError(final StreamError streamError) throws IOException {
+        final var loginInfo = this.loginInfo;
+        final var isSecureLoggedIn = isSecure() && LoginInfo.isSuccess(loginInfo);
+        if (isSecureLoggedIn && streamError.hasChild("conflict")) {
+            if (loginInfo.saslVersion == SaslMechanism.Version.SASL_2) {
                 this.appSettings.resetInstallationId();
             }
             account.setResource(createNewResource());
@@ -2367,7 +2361,9 @@ public class XmppConnection implements Runnable {
             this.lastConnect = SystemClock.elapsedRealtime();
             final String text = streamError.findChildContent("text");
             Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": policy violation. " + text);
-            failPendingMessages(text);
+            if (isSecureLoggedIn) {
+                failPendingMessages(text);
+            }
             throw new StateChangingException(Account.State.POLICY_VIOLATION);
         } else if (streamError.hasChild("see-other-host")) {
             final String seeOtherHost = streamError.findChildContent("see-other-host");
@@ -3085,7 +3081,8 @@ public class XmppConnection implements Runnable {
                                 Log.d(
                                         Config.LOGTAG,
                                         account.getJid().asBareJid()
-                                                + ": http upload is not available for files with size "
+                                                + ": http upload is not available for files with"
+                                                + " size "
                                                 + filesize
                                                 + " (max is "
                                                 + maxsize
diff --git a/src/main/java/im/conversations/android/xmpp/model/streams/StreamError.java b/src/main/java/im/conversations/android/xmpp/model/streams/StreamError.java
new file mode 100644
index 0000000000000000000000000000000000000000..d1b1b6ca054c8a6406a4468392874eaf55af8b01
--- /dev/null
+++ b/src/main/java/im/conversations/android/xmpp/model/streams/StreamError.java
@@ -0,0 +1,12 @@
+package im.conversations.android.xmpp.model.streams;
+
+import im.conversations.android.annotation.XmlElement;
+import im.conversations.android.xmpp.model.StreamElement;
+
+@XmlElement(name = "error")
+public class StreamError extends StreamElement {
+
+    public StreamError() {
+        super(StreamError.class);
+    }
+}

From 118933764d53d4f1f48827d949417367a586072a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 8 Dec 2024 10:56:11 +0100
Subject: [PATCH 221/357] make see-other-host and resume location work over Tor

---
 .../java/eu/siacs/conversations/utils/IP.java | 43 ++++++++----
 .../siacs/conversations/utils/Resolver.java   | 36 +++++-----
 .../utils/SocksSocketFactory.java             | 69 +++++++++++++------
 .../conversations/xmpp/XmppConnection.java    | 58 +++++++++++-----
 4 files changed, 132 insertions(+), 74 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/utils/IP.java b/src/main/java/eu/siacs/conversations/utils/IP.java
index 948f7537ad8f6af1dc90d71691b21b964548f938..8b07c98f66eadfa8e259e6458303d4314c177ad5 100644
--- a/src/main/java/eu/siacs/conversations/utils/IP.java
+++ b/src/main/java/eu/siacs/conversations/utils/IP.java
@@ -1,20 +1,30 @@
 package eu.siacs.conversations.utils;
 
 import com.google.common.net.InetAddresses;
-
+import java.net.InetAddress;
 import java.util.regex.Pattern;
 
 public class IP {
 
-    private static final Pattern PATTERN_IPV4 = Pattern.compile("\\A(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
-    private static final Pattern PATTERN_IPV6_HEX4DECCOMPRESSED = Pattern.compile("\\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?) ::((?:[0-9A-Fa-f]{1,4}:)*)(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
-    private static final Pattern PATTERN_IPV6_6HEX4DEC = Pattern.compile("\\A((?:[0-9A-Fa-f]{1,4}:){6,6})(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
-    private static final Pattern PATTERN_IPV6_HEXCOMPRESSED = Pattern.compile("\\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)\\z");
-    private static final Pattern PATTERN_IPV6 = Pattern.compile("\\A(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}\\z");
-
-    public static boolean matches(String server) {
-        return server != null && (
-                PATTERN_IPV4.matcher(server).matches()
+    private static final Pattern PATTERN_IPV4 =
+            Pattern.compile(
+                    "\\A(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
+    private static final Pattern PATTERN_IPV6_HEX4DECCOMPRESSED =
+            Pattern.compile(
+                    "\\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)"
+                        + " ::((?:[0-9A-Fa-f]{1,4}:)*)(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
+    private static final Pattern PATTERN_IPV6_6HEX4DEC =
+            Pattern.compile(
+                    "\\A((?:[0-9A-Fa-f]{1,4}:){6,6})(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
+    private static final Pattern PATTERN_IPV6_HEXCOMPRESSED =
+            Pattern.compile(
+                    "\\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)\\z");
+    private static final Pattern PATTERN_IPV6 =
+            Pattern.compile("\\A(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}\\z");
+
+    public static boolean matches(final String server) {
+        return server != null
+                && (PATTERN_IPV4.matcher(server).matches()
                         || PATTERN_IPV6.matcher(server).matches()
                         || PATTERN_IPV6_6HEX4DEC.matcher(server).matches()
                         || PATTERN_IPV6_HEX4DECCOMPRESSED.matcher(server).matches()
@@ -22,8 +32,14 @@ public class IP {
     }
 
     public static String wrapIPv6(final String host) {
-        if (matches(host)) {
-            return String.format("[%s]", host);
+        if (InetAddresses.isInetAddress(host)) {
+            final InetAddress inetAddress;
+            try {
+                inetAddress = InetAddresses.forString(host);
+            } catch (final IllegalArgumentException e) {
+                return host;
+            }
+            return InetAddresses.toUriString(inetAddress);
         } else {
             return host;
         }
@@ -31,12 +47,11 @@ public class IP {
 
     public static String unwrapIPv6(final String host) {
         if (host.length() > 2 && host.charAt(0) == '[' && host.charAt(host.length() - 1) == ']') {
-            final String ip = host.substring(1,host.length() -1);
+            final String ip = host.substring(1, host.length() - 1);
             if (InetAddresses.isInetAddress(ip)) {
                 return ip;
             }
         }
         return host;
     }
-
 }
diff --git a/src/main/java/eu/siacs/conversations/utils/Resolver.java b/src/main/java/eu/siacs/conversations/utils/Resolver.java
index 224a5758f9fd8f9ab6177e1de908e6b8bbe21b29..a283d8496db75ffeb36b5debc4d7775e20635207 100644
--- a/src/main/java/eu/siacs/conversations/utils/Resolver.java
+++ b/src/main/java/eu/siacs/conversations/utils/Resolver.java
@@ -3,9 +3,7 @@ package eu.siacs.conversations.utils;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.util.Log;
-
 import androidx.annotation.NonNull;
-
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.base.Strings;
@@ -18,26 +16,11 @@ import com.google.common.primitives.Ints;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
-
 import de.gultsch.minidns.AndroidDNSClient;
 import de.gultsch.minidns.ResolverResult;
-
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.Conversations;
 import eu.siacs.conversations.xmpp.Jid;
-
-import org.minidns.dnsmessage.Question;
-import org.minidns.dnsname.DnsName;
-import org.minidns.dnsname.InvalidDnsNameException;
-import org.minidns.dnsqueryresult.DnsQueryResult;
-import org.minidns.record.A;
-import org.minidns.record.AAAA;
-import org.minidns.record.CNAME;
-import org.minidns.record.Data;
-import org.minidns.record.InternetAddressRR;
-import org.minidns.record.Record;
-import org.minidns.record.SRV;
-
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -49,6 +32,17 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import org.minidns.dnsmessage.Question;
+import org.minidns.dnsname.DnsName;
+import org.minidns.dnsname.InvalidDnsNameException;
+import org.minidns.dnsqueryresult.DnsQueryResult;
+import org.minidns.record.A;
+import org.minidns.record.AAAA;
+import org.minidns.record.CNAME;
+import org.minidns.record.Data;
+import org.minidns.record.InternetAddressRR;
+import org.minidns.record.Record;
+import org.minidns.record.SRV;
 
 public class Resolver {
 
@@ -156,8 +150,8 @@ public class Resolver {
         if (IP.matches(domain)) {
             final InetAddress inetAddress;
             try {
-                inetAddress = InetAddress.getByName(domain);
-            } catch (final UnknownHostException e) {
+                inetAddress = InetAddresses.forString(domain);
+            } catch (final IllegalArgumentException e) {
                 return Collections.emptyList();
             }
             return Result.createWithDefaultPorts(null, inetAddress);
@@ -442,6 +436,10 @@ public class Resolver {
                     .toString();
         }
 
+        public String asDestination() {
+            return ip != null ? InetAddresses.toAddrString(ip) : hostname.toString();
+        }
+
         public ContentValues toContentValues() {
             final ContentValues contentValues = new ContentValues();
             contentValues.put(IP, ip == null ? null : ip.getAddress());
diff --git a/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java b/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java
index 2b9d42d7ad1c53215604d752ef24953555344555..81ad58e98be22f36329565c74abfc66fba37051b 100644
--- a/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java
+++ b/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java
@@ -1,37 +1,56 @@
 package eu.siacs.conversations.utils;
 
 import com.google.common.io.ByteStreams;
-
+import com.google.common.net.InetAddresses;
+import eu.siacs.conversations.Config;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.nio.ByteBuffer;
 
-import eu.siacs.conversations.Config;
-
 public class SocksSocketFactory {
 
-    private static final byte[] LOCALHOST = new byte[]{127, 0, 0, 1};
+    private static final byte[] LOCALHOST = new byte[] {127, 0, 0, 1};
 
-    public static void createSocksConnection(final Socket socket, final String destination, final int port) throws IOException {
-        //TODO use different Socks Addr Type if destination is IP or IPv6
+    public static void createSocksConnection(
+            final Socket socket, final String destination, final int port) throws IOException {
         final InputStream proxyIs = socket.getInputStream();
         final OutputStream proxyOs = socket.getOutputStream();
-        proxyOs.write(new byte[]{0x05, 0x01, 0x00});
+        proxyOs.write(new byte[] {0x05, 0x01, 0x00});
         proxyOs.flush();
         final byte[] handshake = new byte[2];
         ByteStreams.readFully(proxyIs, handshake);
         if (handshake[0] != 0x05 || handshake[1] != 0x00) {
             throw new SocksConnectionException("Socks 5 handshake failed");
         }
-        final byte[] dest = destination.getBytes();
-        final ByteBuffer request = ByteBuffer.allocate(7 + dest.length);
-        request.put(new byte[]{0x05, 0x01, 0x00, 0x03});
-        request.put((byte) dest.length);
-        request.put(dest);
+        final byte type;
+        final ByteBuffer request;
+        if (InetAddresses.isInetAddress(destination)) {
+            final var ip = InetAddresses.forString(destination);
+            final var dest = ip.getAddress();
+            request = ByteBuffer.allocate(6 + dest.length);
+            if (ip instanceof Inet4Address) {
+                type = 0x01;
+            } else if (ip instanceof Inet6Address) {
+                type = 0x04;
+            } else {
+                throw new IOException("IP address is of unknown subtype");
+            }
+            request.put(new byte[] {0x05, 0x01, 0x00, type});
+            request.put(dest);
+        } else {
+            final byte[] dest = destination.getBytes();
+            type = 0x03;
+            request = ByteBuffer.allocate(7 + dest.length);
+            request.put(new byte[] {0x05, 0x01, 0x00, type});
+            request.put((byte) dest.length);
+            request.put(dest);
+        }
         request.putShort((short) port);
         proxyOs.write(request.array());
         proxyOs.flush();
@@ -42,13 +61,16 @@ public class SocksSocketFactory {
             throw new IOException(String.format("Unknown Socks version %02X ", ver));
         }
         final byte status = response[1];
-        final byte bndAddrType = response[3];
-        final byte[] bndDestination = readDestination(bndAddrType, proxyIs);
+        final byte bndAddressType = response[3];
+        final byte[] bndDestination = readDestination(bndAddressType, proxyIs);
         final byte[] bndPort = new byte[2];
-        if (bndAddrType == 0x03) {
+        if (bndAddressType == 0x03) {
             final String receivedDestination = new String(bndDestination);
             if (!receivedDestination.equalsIgnoreCase(destination)) {
-                throw new IOException(String.format("Destination mismatch. Received %s Expected %s", receivedDestination, destination));
+                throw new IOException(
+                        String.format(
+                                "Destination mismatch. Received %s Expected %s",
+                                receivedDestination, destination));
             }
         }
         ByteStreams.readFully(proxyIs, bndPort);
@@ -63,7 +85,8 @@ public class SocksSocketFactory {
         }
     }
 
-    private static byte[] readDestination(final byte type, final InputStream inputStream) throws IOException {
+    private static byte[] readDestination(final byte type, final InputStream inputStream)
+            throws IOException {
         final byte[] bndDestination;
         if (type == 0x01) {
             bndDestination = new byte[4];
@@ -88,7 +111,8 @@ public class SocksSocketFactory {
         return false;
     }
 
-    private static Socket createSocket(InetSocketAddress address, String destination, int port) throws IOException {
+    private static Socket createSocket(InetSocketAddress address, String destination, int port)
+            throws IOException {
         Socket socket = new Socket();
         try {
             socket.connect(address, Config.CONNECT_TIMEOUT * 1000);
@@ -100,7 +124,10 @@ public class SocksSocketFactory {
     }
 
     public static Socket createSocketOverTor(String destination, int port) throws IOException {
-        return createSocket(new InetSocketAddress(InetAddress.getByAddress(LOCALHOST), 9050), destination, port);
+        return createSocket(
+                new InetSocketAddress(InetAddress.getByAddress(LOCALHOST), 9050),
+                destination,
+                port);
     }
 
     private static class SocksConnectionException extends IOException {
@@ -109,9 +136,7 @@ public class SocksSocketFactory {
         }
     }
 
-    public static class SocksProxyNotFoundException extends IOException {
-
-    }
+    public static class SocksProxyNotFoundException extends IOException {}
 
     public static class HostNotFoundException extends SocksConnectionException {
         HostNotFoundException(String message) {
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 1da0963a31ccb4d29c445ca15f23156365ade5ac..3bba58c49b2c9c258c5dce3dd20aea3370f15208 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -19,6 +19,7 @@ import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
 import eu.siacs.conversations.AppSettings;
 import eu.siacs.conversations.BuildConfig;
 import eu.siacs.conversations.Config;
@@ -290,9 +291,9 @@ public class XmppConnection implements Runnable {
         this.quickStartInProgress = false;
         this.isBound = false;
         this.attempt++;
-        this.verifiedHostname =
-                null; // will be set if user entered hostname is being used or hostname was verified
-        // with dnssec
+        this.currentResolverResult = null;
+        // will be set if user entered hostname is being used or hostname was verified with dnssec
+        this.verifiedHostname = null;
         try {
             Socket localSocket;
             shouldAuthenticate = !account.isOptionSet(Account.OPTION_REGISTER);
@@ -300,33 +301,53 @@ public class XmppConnection implements Runnable {
             final boolean useTor = mXmppConnectionService.useTorToConnect() || account.isOnion();
             final boolean extended = mXmppConnectionService.showExtendedConnectionOptions();
             if (useTor) {
-                String destination;
-                if (account.getHostname().isEmpty() || account.isOnion()) {
-                    destination = account.getServer();
+                final var seeOtherHost = this.seeOtherHostResolverResult;
+                final Resolver.Result resume = streamId == null ? null : streamId.location;
+                final Resolver.Result viaTor;
+                if (account.isOnion()) {
+                    // for .onion JIDs we always connect to the onion address no matter what
+                    viaTor =
+                            Iterables.getOnlyElement(
+                                    Resolver.fromHardCoded(
+                                            account.getServer(), Resolver.XMPP_PORT_STARTTLS));
+                } else if (resume != null) {
+                    viaTor = resume;
+                } else if (seeOtherHost != null) {
+                    viaTor = seeOtherHost;
+                } else if (account.getHostname().isEmpty()) {
+                    viaTor =
+                            Iterables.getOnlyElement(
+                                    Resolver.fromHardCoded(
+                                            account.getServer(), Resolver.XMPP_PORT_STARTTLS));
                 } else {
-                    destination = account.getHostname();
-                    this.verifiedHostname = destination;
+                    viaTor =
+                            Iterables.getOnlyElement(
+                                    Resolver.fromHardCoded(
+                                            account.getHostname(), account.getPort()));
+                    this.verifiedHostname = account.getHostname();
                 }
 
-                final int port = account.getPort();
-                final boolean directTls = Resolver.useDirectTls(port);
-
                 Log.d(
                         Config.LOGTAG,
                         account.getJid().asBareJid()
                                 + ": connect to "
-                                + destination
+                                + viaTor.asDestination()
                                 + " via Tor. directTls="
-                                + directTls);
-                localSocket = SocksSocketFactory.createSocketOverTor(destination, port);
+                                + viaTor.isDirectTls());
+                localSocket =
+                        SocksSocketFactory.createSocketOverTor(
+                                viaTor.asDestination(), viaTor.getPort());
 
-                if (directTls) {
+                if (viaTor.isDirectTls()) {
                     localSocket = upgradeSocketToTls(localSocket);
                     features.encryptionEnabled = true;
                 }
 
                 try {
-                    startXmpp(localSocket);
+                    if (startXmpp(localSocket)) {
+                        this.currentResolverResult = viaTor;
+                        this.seeOtherHostResolverResult = null;
+                    }
                 } catch (final InterruptedException e) {
                     Log.d(
                             Config.LOGTAG,
@@ -442,9 +463,8 @@ public class XmppConnection implements Runnable {
 
                         localSocket.setSoTimeout(Config.SOCKET_TIMEOUT * 1000);
                         if (startXmpp(localSocket)) {
-                            localSocket.setSoTimeout(
-                                    0); // reset to 0; once the connection is established we don’t
-                            // want this
+                            // reset to 0; once the connection is established we don't want this
+                            localSocket.setSoTimeout(0);
                             if (!hardcoded && !result.equals(storedBackupResult)) {
                                 mXmppConnectionService.databaseBackend.saveResolverResult(
                                         domain, result);

From b6a1e44cc467cb8556cbadeb13be2b74788d403b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 9 Dec 2024 11:20:13 +0100
Subject: [PATCH 222/357] add todos

---
 src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 3bba58c49b2c9c258c5dce3dd20aea3370f15208..fdff71cb4e9b9e2c3f78c0e5cdcda24548cbf68f 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -300,6 +300,7 @@ public class XmppConnection implements Runnable {
             this.changeStatus(Account.State.CONNECTING);
             final boolean useTor = mXmppConnectionService.useTorToConnect() || account.isOnion();
             final boolean extended = mXmppConnectionService.showExtendedConnectionOptions();
+            // TODO collapse Tor usage into normal connection code path
             if (useTor) {
                 final var seeOtherHost = this.seeOtherHostResolverResult;
                 final Resolver.Result resume = streamId == null ? null : streamId.location;
@@ -457,6 +458,7 @@ public class XmppConnection implements Runnable {
                         localSocket = new Socket();
                         localSocket.connect(addr, Config.SOCKET_TIMEOUT * 1000);
 
+                        // TODO use result.isDirect() as condition and set encryptionEnabled after
                         if (features.encryptionEnabled) {
                             localSocket = upgradeSocketToTls(localSocket);
                         }

From 37f51949fda2f04cd64eab76a1cc91343695f52e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 9 Dec 2024 17:54:29 +0100
Subject: [PATCH 223/357] use sorted map in annotation processor

---
 .../processor/XmlElementProcessor.java         | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/libs/annotation-processor/src/main/java/im/conversations/android/annotation/processor/XmlElementProcessor.java b/libs/annotation-processor/src/main/java/im/conversations/android/annotation/processor/XmlElementProcessor.java
index c42cc5340537f328541761290dcb04eebae5d819..b93849d57d3ca8a0800f6affa153f727e6ae5cd4 100644
--- a/libs/annotation-processor/src/main/java/im/conversations/android/annotation/processor/XmlElementProcessor.java
+++ b/libs/annotation-processor/src/main/java/im/conversations/android/annotation/processor/XmlElementProcessor.java
@@ -4,17 +4,17 @@ import com.google.auto.service.AutoService;
 import com.google.common.base.CaseFormat;
 import com.google.common.base.Objects;
 import com.google.common.base.Strings;
+import com.google.common.collect.ComparisonChain;
 import com.google.common.collect.ImmutableMap;
-
+import com.google.common.collect.ImmutableSortedMap;
 import im.conversations.android.annotation.XmlElement;
 import im.conversations.android.annotation.XmlPackage;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
+import javax.annotation.Nonnull;
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Processor;
 import javax.annotation.processing.RoundEnvironment;
@@ -38,7 +38,7 @@ public class XmlElementProcessor extends AbstractProcessor {
     public boolean process(Set<? extends TypeElement> set, RoundEnvironment roundEnvironment) {
         final Set<? extends Element> elements =
                 roundEnvironment.getElementsAnnotatedWith(XmlElement.class);
-        final ImmutableMap.Builder<Id, String> builder = ImmutableMap.builder();
+        final ImmutableSortedMap.Builder<Id, String> builder = ImmutableSortedMap.naturalOrder();
         for (final Element element : elements) {
             if (element instanceof final TypeElement typeElement) {
                 final Id id = of(typeElement);
@@ -160,7 +160,7 @@ public class XmlElementProcessor extends AbstractProcessor {
         return false;
     }
 
-    public static class Id {
+    public static class Id implements Comparable<Id> {
         public final String name;
         public final String namespace;
 
@@ -181,5 +181,13 @@ public class XmlElementProcessor extends AbstractProcessor {
         public int hashCode() {
             return Objects.hashCode(name, namespace);
         }
+
+        @Override
+        public int compareTo(@Nonnull Id id) {
+            return ComparisonChain.start()
+                    .compare(namespace, id.namespace)
+                    .compare(name, id.name)
+                    .result();
+        }
     }
 }

From 7be8a0e24410b86835e6746b157a054336ffc223 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 14 Dec 2024 16:34:35 +0100
Subject: [PATCH 224/357] take pep config node max into account for bookmarks2

---
 src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index fdff71cb4e9b9e2c3f78c0e5cdcda24548cbf68f..5762736cb591fc5d725f3d619db321b7d975d7a9 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -3149,6 +3149,7 @@ public class XmppConnection implements Runnable {
 
         public boolean bookmarks2() {
             return pepPublishOptions()
+                    && pepConfigNodeMax()
                     && hasDiscoFeature(account.getJid().asBareJid(), Namespace.BOOKMARKS2_COMPAT);
         }
 

From 6e362fb0bdcfb09121db375507cac7d73a0b671c Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 14 Dec 2024 16:35:34 +0100
Subject: [PATCH 225/357] version bump to 2.17.6 + changelog

---
 CHANGELOG.md                                           | 4 ++++
 build.gradle                                           | 4 ++--
 fastlane/metadata/android/en-US/changelogs/4212704.txt | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/4212704.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d1737a627e954721dd014a064d2853628125720..b935547858289e53ae1b1e217b9b448dd768f590 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 2.17.6
+
+* Add ability to show message bubbles left-aligned
+
 ### Version 2.17.5
 
 * Move message bubbles closer together instead of merging them
diff --git a/build.gradle b/build.gradle
index c8c048df072f32d07063680ea7e3466b1937e9aa..1f95a139f8661c06a627c15f890fb0638ea45445 100644
--- a/build.gradle
+++ b/build.gradle
@@ -111,8 +111,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 42126
-        versionName "2.17.5"
+        versionCode 42127
+        versionName "2.17.6"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/4212704.txt b/fastlane/metadata/android/en-US/changelogs/4212704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1c21c350b62e1b0d25f2fedd1ca66ee6a92a82aa
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/4212704.txt
@@ -0,0 +1 @@
+* Add ability to show message bubbles left-aligned

From a8d1db47f07f04faa6c365546a5f7453000d061a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 16 Dec 2024 20:32:25 +0100
Subject: [PATCH 226/357] homogenize ChooserTargetService and Shortcuts

---
 build.gradle                                  |    6 +-
 src/main/AndroidManifest.xml                  |   14 +-
 .../persistance/DatabaseBackend.java          | 1877 ++++++++++++-----
 .../services/ContactChooserTargetService.java |  117 -
 .../services/NotificationService.java         |   41 +-
 .../services/ShortcutService.java             |  154 +-
 .../services/XmppConnectionService.java       |  179 +-
 .../ui/ConversationsActivity.java             |  174 +-
 .../conversations/ui/ShareWithActivity.java   |   54 +-
 src/main/res/xml/shortcuts.xml                |    7 +
 10 files changed, 1746 insertions(+), 877 deletions(-)
 delete mode 100644 src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java
 create mode 100644 src/main/res/xml/shortcuts.xml

diff --git a/build.gradle b/build.gradle
index 1f95a139f8661c06a627c15f890fb0638ea45445..1839ee0bae642d83e5c6b25859706e5427c4c989 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,13 +42,13 @@ spotless {
 
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.2'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.3'
 
     implementation project(':libs:annotation')
     annotationProcessor project(':libs:annotation-processor')
 
 
-    implementation 'androidx.viewpager:viewpager:1.0.0'
+    implementation 'androidx.viewpager:viewpager:1.1.0'
 
     playstoreImplementation('com.google.firebase:firebase-messaging:24.1.0') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
@@ -59,6 +59,8 @@ dependencies {
     quicksyPlaystoreImplementation 'com.google.android.gms:play-services-auth-api-phone:18.1.0'
     implementation 'com.github.open-keychain.open-keychain:openpgp-api:v5.7.1'
     implementation("com.github.CanHub:Android-Image-Cropper:2.0.0")
+    implementation "androidx.sharetarget:sharetarget:1.2.0"
+
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.exifinterface:exifinterface:1.3.7'
     implementation 'androidx.cardview:cardview:1.0.0'
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index b621147724ca0088d4bf5aad295d37e79b867d75..ddc93f285f4393df4950420a44525b281cf870cd 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -124,14 +124,6 @@
             android:name=".services.ImportBackupService"
             android:exported="false"
             android:foregroundServiceType="dataSync" />
-        <service
-            android:name=".services.ContactChooserTargetService"
-            android:exported="true"
-            android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
-            <intent-filter>
-                <action android:name="android.service.chooser.ChooserTargetService" />
-            </intent-filter>
-        </service>
 
         <service
             android:name=".services.CallIntegrationConnectionService"
@@ -194,6 +186,9 @@
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
         </activity>
         <activity
             android:name=".ui.ConversationsActivity"
@@ -330,10 +325,9 @@
                 <data android:mimeType="*/*" />
             </intent-filter>
 
-            <!-- the value here needs to be the full class name; independent of the configured applicationId -->
             <meta-data
                 android:name="android.service.chooser.chooser_target_service"
-                android:value="eu.siacs.conversations.services.ContactChooserTargetService" />
+                android:value="androidx.sharetarget.ChooserTargetServiceCompat" />
         </activity>
         <activity
             android:name=".ui.TrustKeysActivity"
diff --git a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
index ddfbae34262d06abb49aabcb4191372f14063b80..9e3fd1e406d15ccabc3739510321329898ba5247 100644
--- a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
@@ -10,35 +10,7 @@ import android.os.Environment;
 import android.os.SystemClock;
 import android.util.Base64;
 import android.util.Log;
-
 import com.google.common.base.Stopwatch;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.whispersystems.libsignal.IdentityKey;
-import org.whispersystems.libsignal.IdentityKeyPair;
-import org.whispersystems.libsignal.InvalidKeyException;
-import org.whispersystems.libsignal.SignalProtocolAddress;
-import org.whispersystems.libsignal.state.PreKeyRecord;
-import org.whispersystems.libsignal.state.SessionRecord;
-import org.whispersystems.libsignal.state.SignedPreKeyRecord;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
-
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.crypto.axolotl.AxolotlService;
 import eu.siacs.conversations.crypto.axolotl.FingerprintStatus;
@@ -60,6 +32,30 @@ import eu.siacs.conversations.utils.Resolver;
 import eu.siacs.conversations.xmpp.InvalidJid;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.mam.MamReference;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CopyOnWriteArrayList;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.whispersystems.libsignal.IdentityKey;
+import org.whispersystems.libsignal.IdentityKeyPair;
+import org.whispersystems.libsignal.InvalidKeyException;
+import org.whispersystems.libsignal.SignalProtocolAddress;
+import org.whispersystems.libsignal.state.PreKeyRecord;
+import org.whispersystems.libsignal.state.SessionRecord;
+import org.whispersystems.libsignal.state.SignedPreKeyRecord;
 
 public class DatabaseBackend extends SQLiteOpenHelper {
 
@@ -68,123 +64,273 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 
     private static boolean requiresMessageIndexRebuild = false;
     private static DatabaseBackend instance = null;
-    private static final String CREATE_CONTATCS_STATEMENT = "create table "
-            + Contact.TABLENAME + "(" + Contact.ACCOUNT + " TEXT, "
-            + Contact.SERVERNAME + " TEXT, " + Contact.SYSTEMNAME + " TEXT,"
-            + Contact.PRESENCE_NAME + " TEXT,"
-            + Contact.JID + " TEXT," + Contact.KEYS + " TEXT,"
-            + Contact.PHOTOURI + " TEXT," + Contact.OPTIONS + " NUMBER,"
-            + Contact.SYSTEMACCOUNT + " NUMBER, " + Contact.AVATAR + " TEXT, "
-            + Contact.LAST_PRESENCE + " TEXT, " + Contact.LAST_TIME + " NUMBER, "
-            + Contact.RTP_CAPABILITY + " TEXT,"
-            + Contact.GROUPS + " TEXT, FOREIGN KEY(" + Contact.ACCOUNT + ") REFERENCES "
-            + Account.TABLENAME + "(" + Account.UUID
-            + ") ON DELETE CASCADE, UNIQUE(" + Contact.ACCOUNT + ", "
-            + Contact.JID + ") ON CONFLICT REPLACE);";
-
-    private static final String CREATE_DISCOVERY_RESULTS_STATEMENT = "create table "
-            + ServiceDiscoveryResult.TABLENAME + "("
-            + ServiceDiscoveryResult.HASH + " TEXT, "
-            + ServiceDiscoveryResult.VER + " TEXT, "
-            + ServiceDiscoveryResult.RESULT + " TEXT, "
-            + "UNIQUE(" + ServiceDiscoveryResult.HASH + ", "
-            + ServiceDiscoveryResult.VER + ") ON CONFLICT REPLACE);";
-
-    private static final String CREATE_PRESENCE_TEMPLATES_STATEMENT = "CREATE TABLE "
-            + PresenceTemplate.TABELNAME + "("
-            + PresenceTemplate.UUID + " TEXT, "
-            + PresenceTemplate.LAST_USED + " NUMBER,"
-            + PresenceTemplate.MESSAGE + " TEXT,"
-            + PresenceTemplate.STATUS + " TEXT,"
-            + "UNIQUE(" + PresenceTemplate.MESSAGE + "," + PresenceTemplate.STATUS + ") ON CONFLICT REPLACE);";
-
-    private static final String CREATE_PREKEYS_STATEMENT = "CREATE TABLE "
-            + SQLiteAxolotlStore.PREKEY_TABLENAME + "("
-            + SQLiteAxolotlStore.ACCOUNT + " TEXT,  "
-            + SQLiteAxolotlStore.ID + " INTEGER, "
-            + SQLiteAxolotlStore.KEY + " TEXT, FOREIGN KEY("
-            + SQLiteAxolotlStore.ACCOUNT
-            + ") REFERENCES " + Account.TABLENAME + "(" + Account.UUID + ") ON DELETE CASCADE, "
-            + "UNIQUE( " + SQLiteAxolotlStore.ACCOUNT + ", "
-            + SQLiteAxolotlStore.ID
-            + ") ON CONFLICT REPLACE"
-            + ");";
-
-    private static final String CREATE_SIGNED_PREKEYS_STATEMENT = "CREATE TABLE "
-            + SQLiteAxolotlStore.SIGNED_PREKEY_TABLENAME + "("
-            + SQLiteAxolotlStore.ACCOUNT + " TEXT,  "
-            + SQLiteAxolotlStore.ID + " INTEGER, "
-            + SQLiteAxolotlStore.KEY + " TEXT, FOREIGN KEY("
-            + SQLiteAxolotlStore.ACCOUNT
-            + ") REFERENCES " + Account.TABLENAME + "(" + Account.UUID + ") ON DELETE CASCADE, "
-            + "UNIQUE( " + SQLiteAxolotlStore.ACCOUNT + ", "
-            + SQLiteAxolotlStore.ID
-            + ") ON CONFLICT REPLACE" +
-            ");";
-
-    private static final String CREATE_SESSIONS_STATEMENT = "CREATE TABLE "
-            + SQLiteAxolotlStore.SESSION_TABLENAME + "("
-            + SQLiteAxolotlStore.ACCOUNT + " TEXT,  "
-            + SQLiteAxolotlStore.NAME + " TEXT, "
-            + SQLiteAxolotlStore.DEVICE_ID + " INTEGER, "
-            + SQLiteAxolotlStore.KEY + " TEXT, FOREIGN KEY("
-            + SQLiteAxolotlStore.ACCOUNT
-            + ") REFERENCES " + Account.TABLENAME + "(" + Account.UUID + ") ON DELETE CASCADE, "
-            + "UNIQUE( " + SQLiteAxolotlStore.ACCOUNT + ", "
-            + SQLiteAxolotlStore.NAME + ", "
-            + SQLiteAxolotlStore.DEVICE_ID
-            + ") ON CONFLICT REPLACE"
-            + ");";
-
-    private static final String CREATE_IDENTITIES_STATEMENT = "CREATE TABLE "
-            + SQLiteAxolotlStore.IDENTITIES_TABLENAME + "("
-            + SQLiteAxolotlStore.ACCOUNT + " TEXT,  "
-            + SQLiteAxolotlStore.NAME + " TEXT, "
-            + SQLiteAxolotlStore.OWN + " INTEGER, "
-            + SQLiteAxolotlStore.FINGERPRINT + " TEXT, "
-            + SQLiteAxolotlStore.CERTIFICATE + " BLOB, "
-            + SQLiteAxolotlStore.TRUST + " TEXT, "
-            + SQLiteAxolotlStore.ACTIVE + " NUMBER, "
-            + SQLiteAxolotlStore.LAST_ACTIVATION + " NUMBER,"
-            + SQLiteAxolotlStore.KEY + " TEXT, FOREIGN KEY("
-            + SQLiteAxolotlStore.ACCOUNT
-            + ") REFERENCES " + Account.TABLENAME + "(" + Account.UUID + ") ON DELETE CASCADE, "
-            + "UNIQUE( " + SQLiteAxolotlStore.ACCOUNT + ", "
-            + SQLiteAxolotlStore.NAME + ", "
-            + SQLiteAxolotlStore.FINGERPRINT
-            + ") ON CONFLICT IGNORE"
-            + ");";
+    private static final String CREATE_CONTATCS_STATEMENT =
+            "create table "
+                    + Contact.TABLENAME
+                    + "("
+                    + Contact.ACCOUNT
+                    + " TEXT, "
+                    + Contact.SERVERNAME
+                    + " TEXT, "
+                    + Contact.SYSTEMNAME
+                    + " TEXT,"
+                    + Contact.PRESENCE_NAME
+                    + " TEXT,"
+                    + Contact.JID
+                    + " TEXT,"
+                    + Contact.KEYS
+                    + " TEXT,"
+                    + Contact.PHOTOURI
+                    + " TEXT,"
+                    + Contact.OPTIONS
+                    + " NUMBER,"
+                    + Contact.SYSTEMACCOUNT
+                    + " NUMBER, "
+                    + Contact.AVATAR
+                    + " TEXT, "
+                    + Contact.LAST_PRESENCE
+                    + " TEXT, "
+                    + Contact.LAST_TIME
+                    + " NUMBER, "
+                    + Contact.RTP_CAPABILITY
+                    + " TEXT,"
+                    + Contact.GROUPS
+                    + " TEXT, FOREIGN KEY("
+                    + Contact.ACCOUNT
+                    + ") REFERENCES "
+                    + Account.TABLENAME
+                    + "("
+                    + Account.UUID
+                    + ") ON DELETE CASCADE, UNIQUE("
+                    + Contact.ACCOUNT
+                    + ", "
+                    + Contact.JID
+                    + ") ON CONFLICT REPLACE);";
+
+    private static final String CREATE_DISCOVERY_RESULTS_STATEMENT =
+            "create table "
+                    + ServiceDiscoveryResult.TABLENAME
+                    + "("
+                    + ServiceDiscoveryResult.HASH
+                    + " TEXT, "
+                    + ServiceDiscoveryResult.VER
+                    + " TEXT, "
+                    + ServiceDiscoveryResult.RESULT
+                    + " TEXT, "
+                    + "UNIQUE("
+                    + ServiceDiscoveryResult.HASH
+                    + ", "
+                    + ServiceDiscoveryResult.VER
+                    + ") ON CONFLICT REPLACE);";
+
+    private static final String CREATE_PRESENCE_TEMPLATES_STATEMENT =
+            "CREATE TABLE "
+                    + PresenceTemplate.TABELNAME
+                    + "("
+                    + PresenceTemplate.UUID
+                    + " TEXT, "
+                    + PresenceTemplate.LAST_USED
+                    + " NUMBER,"
+                    + PresenceTemplate.MESSAGE
+                    + " TEXT,"
+                    + PresenceTemplate.STATUS
+                    + " TEXT,"
+                    + "UNIQUE("
+                    + PresenceTemplate.MESSAGE
+                    + ","
+                    + PresenceTemplate.STATUS
+                    + ") ON CONFLICT REPLACE);";
+
+    private static final String CREATE_PREKEYS_STATEMENT =
+            "CREATE TABLE "
+                    + SQLiteAxolotlStore.PREKEY_TABLENAME
+                    + "("
+                    + SQLiteAxolotlStore.ACCOUNT
+                    + " TEXT,  "
+                    + SQLiteAxolotlStore.ID
+                    + " INTEGER, "
+                    + SQLiteAxolotlStore.KEY
+                    + " TEXT, FOREIGN KEY("
+                    + SQLiteAxolotlStore.ACCOUNT
+                    + ") REFERENCES "
+                    + Account.TABLENAME
+                    + "("
+                    + Account.UUID
+                    + ") ON DELETE CASCADE, "
+                    + "UNIQUE( "
+                    + SQLiteAxolotlStore.ACCOUNT
+                    + ", "
+                    + SQLiteAxolotlStore.ID
+                    + ") ON CONFLICT REPLACE"
+                    + ");";
+
+    private static final String CREATE_SIGNED_PREKEYS_STATEMENT =
+            "CREATE TABLE "
+                    + SQLiteAxolotlStore.SIGNED_PREKEY_TABLENAME
+                    + "("
+                    + SQLiteAxolotlStore.ACCOUNT
+                    + " TEXT,  "
+                    + SQLiteAxolotlStore.ID
+                    + " INTEGER, "
+                    + SQLiteAxolotlStore.KEY
+                    + " TEXT, FOREIGN KEY("
+                    + SQLiteAxolotlStore.ACCOUNT
+                    + ") REFERENCES "
+                    + Account.TABLENAME
+                    + "("
+                    + Account.UUID
+                    + ") ON DELETE CASCADE, "
+                    + "UNIQUE( "
+                    + SQLiteAxolotlStore.ACCOUNT
+                    + ", "
+                    + SQLiteAxolotlStore.ID
+                    + ") ON CONFLICT REPLACE"
+                    + ");";
+
+    private static final String CREATE_SESSIONS_STATEMENT =
+            "CREATE TABLE "
+                    + SQLiteAxolotlStore.SESSION_TABLENAME
+                    + "("
+                    + SQLiteAxolotlStore.ACCOUNT
+                    + " TEXT,  "
+                    + SQLiteAxolotlStore.NAME
+                    + " TEXT, "
+                    + SQLiteAxolotlStore.DEVICE_ID
+                    + " INTEGER, "
+                    + SQLiteAxolotlStore.KEY
+                    + " TEXT, FOREIGN KEY("
+                    + SQLiteAxolotlStore.ACCOUNT
+                    + ") REFERENCES "
+                    + Account.TABLENAME
+                    + "("
+                    + Account.UUID
+                    + ") ON DELETE CASCADE, "
+                    + "UNIQUE( "
+                    + SQLiteAxolotlStore.ACCOUNT
+                    + ", "
+                    + SQLiteAxolotlStore.NAME
+                    + ", "
+                    + SQLiteAxolotlStore.DEVICE_ID
+                    + ") ON CONFLICT REPLACE"
+                    + ");";
+
+    private static final String CREATE_IDENTITIES_STATEMENT =
+            "CREATE TABLE "
+                    + SQLiteAxolotlStore.IDENTITIES_TABLENAME
+                    + "("
+                    + SQLiteAxolotlStore.ACCOUNT
+                    + " TEXT,  "
+                    + SQLiteAxolotlStore.NAME
+                    + " TEXT, "
+                    + SQLiteAxolotlStore.OWN
+                    + " INTEGER, "
+                    + SQLiteAxolotlStore.FINGERPRINT
+                    + " TEXT, "
+                    + SQLiteAxolotlStore.CERTIFICATE
+                    + " BLOB, "
+                    + SQLiteAxolotlStore.TRUST
+                    + " TEXT, "
+                    + SQLiteAxolotlStore.ACTIVE
+                    + " NUMBER, "
+                    + SQLiteAxolotlStore.LAST_ACTIVATION
+                    + " NUMBER,"
+                    + SQLiteAxolotlStore.KEY
+                    + " TEXT, FOREIGN KEY("
+                    + SQLiteAxolotlStore.ACCOUNT
+                    + ") REFERENCES "
+                    + Account.TABLENAME
+                    + "("
+                    + Account.UUID
+                    + ") ON DELETE CASCADE, "
+                    + "UNIQUE( "
+                    + SQLiteAxolotlStore.ACCOUNT
+                    + ", "
+                    + SQLiteAxolotlStore.NAME
+                    + ", "
+                    + SQLiteAxolotlStore.FINGERPRINT
+                    + ") ON CONFLICT IGNORE"
+                    + ");";
 
     private static final String RESOLVER_RESULTS_TABLENAME = "resolver_results";
 
-    private static final String CREATE_RESOLVER_RESULTS_TABLE = "create table " + RESOLVER_RESULTS_TABLENAME + "("
-            + Resolver.Result.DOMAIN + " TEXT,"
-            + Resolver.Result.HOSTNAME + " TEXT,"
-            + Resolver.Result.IP + " BLOB,"
-            + Resolver.Result.PRIORITY + " NUMBER,"
-            + Resolver.Result.DIRECT_TLS + " NUMBER,"
-            + Resolver.Result.AUTHENTICATED + " NUMBER,"
-            + Resolver.Result.PORT + " NUMBER,"
-            + "UNIQUE(" + Resolver.Result.DOMAIN + ") ON CONFLICT REPLACE"
-            + ");";
-
-    private static final String CREATE_MESSAGE_TIME_INDEX = "CREATE INDEX message_time_index ON " + Message.TABLENAME + "(" + Message.TIME_SENT + ")";
-    private static final String CREATE_MESSAGE_CONVERSATION_INDEX = "CREATE INDEX message_conversation_index ON " + Message.TABLENAME + "(" + Message.CONVERSATION + ")";
-    private static final String CREATE_MESSAGE_DELETED_INDEX = "CREATE INDEX message_deleted_index ON " + Message.TABLENAME + "(" + Message.DELETED + ")";
-    private static final String CREATE_MESSAGE_RELATIVE_FILE_PATH_INDEX = "CREATE INDEX message_file_path_index ON " + Message.TABLENAME + "(" + Message.RELATIVE_FILE_PATH + ")";
-    private static final String CREATE_MESSAGE_TYPE_INDEX = "CREATE INDEX message_type_index ON " + Message.TABLENAME + "(" + Message.TYPE + ")";
-
-    private static final String CREATE_MESSAGE_INDEX_TABLE = "CREATE VIRTUAL TABLE messages_index USING fts4 (uuid,body,notindexed=\"uuid\",content=\"" + Message.TABLENAME + "\",tokenize='unicode61')";
-    private static final String CREATE_MESSAGE_INSERT_TRIGGER = "CREATE TRIGGER after_message_insert AFTER INSERT ON " + Message.TABLENAME + " BEGIN INSERT INTO messages_index(rowid,uuid,body) VALUES(NEW.rowid,NEW.uuid,NEW.body); END;";
-    private static final String CREATE_MESSAGE_UPDATE_TRIGGER = "CREATE TRIGGER after_message_update UPDATE OF uuid,body ON " + Message.TABLENAME + " BEGIN UPDATE messages_index SET body=NEW.body,uuid=NEW.uuid WHERE rowid=OLD.rowid; END;";
-    private static final String CREATE_MESSAGE_DELETE_TRIGGER = "CREATE TRIGGER after_message_delete AFTER DELETE ON " + Message.TABLENAME + " BEGIN DELETE FROM messages_index WHERE rowid=OLD.rowid; END;";
-    private static final String COPY_PREEXISTING_ENTRIES = "INSERT INTO messages_index(messages_index) VALUES('rebuild');";
+    private static final String CREATE_RESOLVER_RESULTS_TABLE =
+            "create table "
+                    + RESOLVER_RESULTS_TABLENAME
+                    + "("
+                    + Resolver.Result.DOMAIN
+                    + " TEXT,"
+                    + Resolver.Result.HOSTNAME
+                    + " TEXT,"
+                    + Resolver.Result.IP
+                    + " BLOB,"
+                    + Resolver.Result.PRIORITY
+                    + " NUMBER,"
+                    + Resolver.Result.DIRECT_TLS
+                    + " NUMBER,"
+                    + Resolver.Result.AUTHENTICATED
+                    + " NUMBER,"
+                    + Resolver.Result.PORT
+                    + " NUMBER,"
+                    + "UNIQUE("
+                    + Resolver.Result.DOMAIN
+                    + ") ON CONFLICT REPLACE"
+                    + ");";
+
+    private static final String CREATE_MESSAGE_TIME_INDEX =
+            "CREATE INDEX message_time_index ON "
+                    + Message.TABLENAME
+                    + "("
+                    + Message.TIME_SENT
+                    + ")";
+    private static final String CREATE_MESSAGE_CONVERSATION_INDEX =
+            "CREATE INDEX message_conversation_index ON "
+                    + Message.TABLENAME
+                    + "("
+                    + Message.CONVERSATION
+                    + ")";
+    private static final String CREATE_MESSAGE_DELETED_INDEX =
+            "CREATE INDEX message_deleted_index ON "
+                    + Message.TABLENAME
+                    + "("
+                    + Message.DELETED
+                    + ")";
+    private static final String CREATE_MESSAGE_RELATIVE_FILE_PATH_INDEX =
+            "CREATE INDEX message_file_path_index ON "
+                    + Message.TABLENAME
+                    + "("
+                    + Message.RELATIVE_FILE_PATH
+                    + ")";
+    private static final String CREATE_MESSAGE_TYPE_INDEX =
+            "CREATE INDEX message_type_index ON " + Message.TABLENAME + "(" + Message.TYPE + ")";
+
+    private static final String CREATE_MESSAGE_INDEX_TABLE =
+            "CREATE VIRTUAL TABLE messages_index USING fts4"
+                    + " (uuid,body,notindexed=\"uuid\",content=\""
+                    + Message.TABLENAME
+                    + "\",tokenize='unicode61')";
+    private static final String CREATE_MESSAGE_INSERT_TRIGGER =
+            "CREATE TRIGGER after_message_insert AFTER INSERT ON "
+                    + Message.TABLENAME
+                    + " BEGIN INSERT INTO messages_index(rowid,uuid,body)"
+                    + " VALUES(NEW.rowid,NEW.uuid,NEW.body); END;";
+    private static final String CREATE_MESSAGE_UPDATE_TRIGGER =
+            "CREATE TRIGGER after_message_update UPDATE OF uuid,body ON "
+                    + Message.TABLENAME
+                    + " BEGIN UPDATE messages_index SET body=NEW.body,uuid=NEW.uuid WHERE"
+                    + " rowid=OLD.rowid; END;";
+    private static final String CREATE_MESSAGE_DELETE_TRIGGER =
+            "CREATE TRIGGER after_message_delete AFTER DELETE ON "
+                    + Message.TABLENAME
+                    + " BEGIN DELETE FROM messages_index WHERE rowid=OLD.rowid; END;";
+    private static final String COPY_PREEXISTING_ENTRIES =
+            "INSERT INTO messages_index(messages_index) VALUES('rebuild');";
 
     private DatabaseBackend(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
     }
 
-    private static ContentValues createFingerprintStatusContentValues(FingerprintStatus.Trust trust, boolean active) {
+    private static ContentValues createFingerprintStatusContentValues(
+            FingerprintStatus.Trust trust, boolean active) {
         ContentValues values = new ContentValues();
         values.put(SQLiteAxolotlStore.TRUST, trust.toString());
         values.put(SQLiteAxolotlStore.ACTIVE, active ? 1 : 0);
@@ -199,7 +345,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         final SQLiteDatabase db = getWritableDatabase();
         final Stopwatch stopwatch = Stopwatch.createStarted();
         db.execSQL(COPY_PREEXISTING_ENTRIES);
-        Log.d(Config.LOGTAG,"rebuilt message index in "+ stopwatch.stop().toString());
+        Log.d(Config.LOGTAG, "rebuilt message index in " + stopwatch.stop().toString());
     }
 
     public static synchronized DatabaseBackend getInstance(Context context) {
@@ -217,57 +363,132 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 
     @Override
     public void onCreate(SQLiteDatabase db) {
-        db.execSQL("create table " + Account.TABLENAME + "(" + Account.UUID + " TEXT PRIMARY KEY,"
-                + Account.USERNAME + " TEXT,"
-                + Account.SERVER + " TEXT,"
-                + Account.PASSWORD + " TEXT,"
-                + Account.DISPLAY_NAME + " TEXT, "
-                + Account.STATUS + " TEXT,"
-                + Account.STATUS_MESSAGE + " TEXT,"
-                + Account.ROSTERVERSION + " TEXT,"
-                + Account.OPTIONS + " NUMBER, "
-                + Account.AVATAR + " TEXT, "
-                + Account.KEYS + " TEXT, "
-                + Account.HOSTNAME + " TEXT, "
-                + Account.RESOURCE + " TEXT,"
-                + Account.PINNED_MECHANISM + " TEXT,"
-                + Account.PINNED_CHANNEL_BINDING + " TEXT,"
-                + Account.FAST_MECHANISM + " TEXT,"
-                + Account.FAST_TOKEN + " TEXT,"
-                + Account.PORT + " NUMBER DEFAULT 5222)");
-        db.execSQL("create table " + Conversation.TABLENAME + " ("
-                + Conversation.UUID + " TEXT PRIMARY KEY, " + Conversation.NAME
-                + " TEXT, " + Conversation.CONTACT + " TEXT, "
-                + Conversation.ACCOUNT + " TEXT, " + Conversation.CONTACTJID
-                + " TEXT, " + Conversation.CREATED + " NUMBER, "
-                + Conversation.STATUS + " NUMBER, " + Conversation.MODE
-                + " NUMBER, " + Conversation.ATTRIBUTES + " TEXT, FOREIGN KEY("
-                + Conversation.ACCOUNT + ") REFERENCES " + Account.TABLENAME
-                + "(" + Account.UUID + ") ON DELETE CASCADE);");
-        db.execSQL("create table " + Message.TABLENAME + "( " + Message.UUID
-                + " TEXT PRIMARY KEY, " + Message.CONVERSATION + " TEXT, "
-                + Message.TIME_SENT + " NUMBER, " + Message.COUNTERPART
-                + " TEXT, " + Message.TRUE_COUNTERPART + " TEXT,"
-                + Message.BODY + " TEXT, " + Message.ENCRYPTION + " NUMBER, "
-                + Message.STATUS + " NUMBER," + Message.TYPE + " NUMBER, "
-                + Message.RELATIVE_FILE_PATH + " TEXT, "
-                + Message.SERVER_MSG_ID + " TEXT, "
-                + Message.FINGERPRINT + " TEXT, "
-                + Message.CARBON + " INTEGER, "
-                + Message.EDITED + " TEXT, "
-                + Message.READ + " NUMBER DEFAULT 1, "
-                + Message.OOB + " INTEGER, "
-                + Message.ERROR_MESSAGE + " TEXT,"
-                + Message.READ_BY_MARKERS + " TEXT,"
-                + Message.MARKABLE + " NUMBER DEFAULT 0,"
-                + Message.DELETED + " NUMBER DEFAULT 0,"
-                + Message.BODY_LANGUAGE + " TEXT,"
-                + Message.OCCUPANT_ID + " TEXT,"
-                + Message.REACTIONS + " TEXT,"
-                + Message.REMOTE_MSG_ID + " TEXT, FOREIGN KEY("
-                + Message.CONVERSATION + ") REFERENCES "
-                + Conversation.TABLENAME + "(" + Conversation.UUID
-                + ") ON DELETE CASCADE);");
+        db.execSQL(
+                "create table "
+                        + Account.TABLENAME
+                        + "("
+                        + Account.UUID
+                        + " TEXT PRIMARY KEY,"
+                        + Account.USERNAME
+                        + " TEXT,"
+                        + Account.SERVER
+                        + " TEXT,"
+                        + Account.PASSWORD
+                        + " TEXT,"
+                        + Account.DISPLAY_NAME
+                        + " TEXT, "
+                        + Account.STATUS
+                        + " TEXT,"
+                        + Account.STATUS_MESSAGE
+                        + " TEXT,"
+                        + Account.ROSTERVERSION
+                        + " TEXT,"
+                        + Account.OPTIONS
+                        + " NUMBER, "
+                        + Account.AVATAR
+                        + " TEXT, "
+                        + Account.KEYS
+                        + " TEXT, "
+                        + Account.HOSTNAME
+                        + " TEXT, "
+                        + Account.RESOURCE
+                        + " TEXT,"
+                        + Account.PINNED_MECHANISM
+                        + " TEXT,"
+                        + Account.PINNED_CHANNEL_BINDING
+                        + " TEXT,"
+                        + Account.FAST_MECHANISM
+                        + " TEXT,"
+                        + Account.FAST_TOKEN
+                        + " TEXT,"
+                        + Account.PORT
+                        + " NUMBER DEFAULT 5222)");
+        db.execSQL(
+                "create table "
+                        + Conversation.TABLENAME
+                        + " ("
+                        + Conversation.UUID
+                        + " TEXT PRIMARY KEY, "
+                        + Conversation.NAME
+                        + " TEXT, "
+                        + Conversation.CONTACT
+                        + " TEXT, "
+                        + Conversation.ACCOUNT
+                        + " TEXT, "
+                        + Conversation.CONTACTJID
+                        + " TEXT, "
+                        + Conversation.CREATED
+                        + " NUMBER, "
+                        + Conversation.STATUS
+                        + " NUMBER, "
+                        + Conversation.MODE
+                        + " NUMBER, "
+                        + Conversation.ATTRIBUTES
+                        + " TEXT, FOREIGN KEY("
+                        + Conversation.ACCOUNT
+                        + ") REFERENCES "
+                        + Account.TABLENAME
+                        + "("
+                        + Account.UUID
+                        + ") ON DELETE CASCADE);");
+        db.execSQL(
+                "create table "
+                        + Message.TABLENAME
+                        + "( "
+                        + Message.UUID
+                        + " TEXT PRIMARY KEY, "
+                        + Message.CONVERSATION
+                        + " TEXT, "
+                        + Message.TIME_SENT
+                        + " NUMBER, "
+                        + Message.COUNTERPART
+                        + " TEXT, "
+                        + Message.TRUE_COUNTERPART
+                        + " TEXT,"
+                        + Message.BODY
+                        + " TEXT, "
+                        + Message.ENCRYPTION
+                        + " NUMBER, "
+                        + Message.STATUS
+                        + " NUMBER,"
+                        + Message.TYPE
+                        + " NUMBER, "
+                        + Message.RELATIVE_FILE_PATH
+                        + " TEXT, "
+                        + Message.SERVER_MSG_ID
+                        + " TEXT, "
+                        + Message.FINGERPRINT
+                        + " TEXT, "
+                        + Message.CARBON
+                        + " INTEGER, "
+                        + Message.EDITED
+                        + " TEXT, "
+                        + Message.READ
+                        + " NUMBER DEFAULT 1, "
+                        + Message.OOB
+                        + " INTEGER, "
+                        + Message.ERROR_MESSAGE
+                        + " TEXT,"
+                        + Message.READ_BY_MARKERS
+                        + " TEXT,"
+                        + Message.MARKABLE
+                        + " NUMBER DEFAULT 0,"
+                        + Message.DELETED
+                        + " NUMBER DEFAULT 0,"
+                        + Message.BODY_LANGUAGE
+                        + " TEXT,"
+                        + Message.OCCUPANT_ID
+                        + " TEXT,"
+                        + Message.REACTIONS
+                        + " TEXT,"
+                        + Message.REMOTE_MSG_ID
+                        + " TEXT, FOREIGN KEY("
+                        + Message.CONVERSATION
+                        + ") REFERENCES "
+                        + Conversation.TABLENAME
+                        + "("
+                        + Conversation.UUID
+                        + ") ON DELETE CASCADE);");
         db.execSQL(CREATE_MESSAGE_TIME_INDEX);
         db.execSQL(CREATE_MESSAGE_CONVERSATION_INDEX);
         db.execSQL(CREATE_MESSAGE_DELETED_INDEX);
@@ -290,54 +511,87 @@ public class DatabaseBackend extends SQLiteOpenHelper {
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
         if (oldVersion < 2 && newVersion >= 2) {
-            db.execSQL("update " + Account.TABLENAME + " set "
-                    + Account.OPTIONS + " = " + Account.OPTIONS + " | 8");
+            db.execSQL(
+                    "update "
+                            + Account.TABLENAME
+                            + " set "
+                            + Account.OPTIONS
+                            + " = "
+                            + Account.OPTIONS
+                            + " | 8");
         }
         if (oldVersion < 3 && newVersion >= 3) {
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
-                    + Message.TYPE + " NUMBER");
+            db.execSQL(
+                    "ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.TYPE + " NUMBER");
         }
         if (oldVersion < 5 && newVersion >= 5) {
             db.execSQL("DROP TABLE " + Contact.TABLENAME);
             db.execSQL(CREATE_CONTATCS_STATEMENT);
-            db.execSQL("UPDATE " + Account.TABLENAME + " SET "
-                    + Account.ROSTERVERSION + " = NULL");
+            db.execSQL("UPDATE " + Account.TABLENAME + " SET " + Account.ROSTERVERSION + " = NULL");
         }
         if (oldVersion < 6 && newVersion >= 6) {
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
-                    + Message.TRUE_COUNTERPART + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Message.TABLENAME
+                            + " ADD COLUMN "
+                            + Message.TRUE_COUNTERPART
+                            + " TEXT");
         }
         if (oldVersion < 7 && newVersion >= 7) {
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
-                    + Message.REMOTE_MSG_ID + " TEXT");
-            db.execSQL("ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN "
-                    + Contact.AVATAR + " TEXT");
-            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN "
-                    + Account.AVATAR + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Message.TABLENAME
+                            + " ADD COLUMN "
+                            + Message.REMOTE_MSG_ID
+                            + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN " + Contact.AVATAR + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.AVATAR + " TEXT");
         }
         if (oldVersion < 8 && newVersion >= 8) {
-            db.execSQL("ALTER TABLE " + Conversation.TABLENAME + " ADD COLUMN "
-                    + Conversation.ATTRIBUTES + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Conversation.TABLENAME
+                            + " ADD COLUMN "
+                            + Conversation.ATTRIBUTES
+                            + " TEXT");
         }
         if (oldVersion < 9 && newVersion >= 9) {
-            db.execSQL("ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN "
-                    + Contact.LAST_TIME + " NUMBER");
-            db.execSQL("ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN "
-                    + Contact.LAST_PRESENCE + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Contact.TABLENAME
+                            + " ADD COLUMN "
+                            + Contact.LAST_TIME
+                            + " NUMBER");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Contact.TABLENAME
+                            + " ADD COLUMN "
+                            + Contact.LAST_PRESENCE
+                            + " TEXT");
         }
         if (oldVersion < 10 && newVersion >= 10) {
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
-                    + Message.RELATIVE_FILE_PATH + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Message.TABLENAME
+                            + " ADD COLUMN "
+                            + Message.RELATIVE_FILE_PATH
+                            + " TEXT");
         }
         if (oldVersion < 11 && newVersion >= 11) {
-            db.execSQL("ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN "
-                    + Contact.GROUPS + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN " + Contact.GROUPS + " TEXT");
             db.execSQL("delete from " + Contact.TABLENAME);
             db.execSQL("update " + Account.TABLENAME + " set " + Account.ROSTERVERSION + " = NULL");
         }
         if (oldVersion < 12 && newVersion >= 12) {
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
-                    + Message.SERVER_MSG_ID + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Message.TABLENAME
+                            + " ADD COLUMN "
+                            + Message.SERVER_MSG_ID
+                            + " TEXT");
         }
         if (oldVersion < 13 && newVersion >= 13) {
             db.execSQL("delete from " + Contact.TABLENAME);
@@ -348,26 +602,60 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         }
         if (oldVersion < 15 && newVersion >= 15) {
             recreateAxolotlDb(db);
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
-                    + Message.FINGERPRINT + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Message.TABLENAME
+                            + " ADD COLUMN "
+                            + Message.FINGERPRINT
+                            + " TEXT");
         }
         if (oldVersion < 16 && newVersion >= 16) {
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
-                    + Message.CARBON + " INTEGER");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Message.TABLENAME
+                            + " ADD COLUMN "
+                            + Message.CARBON
+                            + " INTEGER");
         }
         if (oldVersion < 19 && newVersion >= 19) {
-            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.DISPLAY_NAME + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Account.TABLENAME
+                            + " ADD COLUMN "
+                            + Account.DISPLAY_NAME
+                            + " TEXT");
         }
         if (oldVersion < 20 && newVersion >= 20) {
-            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.HOSTNAME + " TEXT");
-            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.PORT + " NUMBER DEFAULT 5222");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Account.TABLENAME
+                            + " ADD COLUMN "
+                            + Account.HOSTNAME
+                            + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Account.TABLENAME
+                            + " ADD COLUMN "
+                            + Account.PORT
+                            + " NUMBER DEFAULT 5222");
         }
         if (oldVersion < 26 && newVersion >= 26) {
-            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.STATUS + " TEXT");
-            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.STATUS_MESSAGE + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.STATUS + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Account.TABLENAME
+                            + " ADD COLUMN "
+                            + Account.STATUS_MESSAGE
+                            + " TEXT");
         }
         if (oldVersion < 40 && newVersion >= 40) {
-            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.RESOURCE + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Account.TABLENAME
+                            + " ADD COLUMN "
+                            + Account.RESOURCE
+                            + " TEXT");
         }
         /* Any migrations that alter the Account table need to happen BEFORE this migration, as it
          * depends on account de-serialization.
@@ -375,45 +663,67 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         if (oldVersion < 17 && newVersion >= 17 && newVersion < 31) {
             List<Account> accounts = getAccounts(db);
             for (Account account : accounts) {
-                String ownDeviceIdString = account.getKey(SQLiteAxolotlStore.JSONKEY_REGISTRATION_ID);
+                String ownDeviceIdString =
+                        account.getKey(SQLiteAxolotlStore.JSONKEY_REGISTRATION_ID);
                 if (ownDeviceIdString == null) {
                     continue;
                 }
                 int ownDeviceId = Integer.valueOf(ownDeviceIdString);
-                SignalProtocolAddress ownAddress = new SignalProtocolAddress(account.getJid().asBareJid().toString(), ownDeviceId);
+                SignalProtocolAddress ownAddress =
+                        new SignalProtocolAddress(
+                                account.getJid().asBareJid().toString(), ownDeviceId);
                 deleteSession(db, account, ownAddress);
                 IdentityKeyPair identityKeyPair = loadOwnIdentityKeyPair(db, account);
                 if (identityKeyPair != null) {
                     String[] selectionArgs = {
-                            account.getUuid(),
-                            CryptoHelper.bytesToHex(identityKeyPair.getPublicKey().serialize())
+                        account.getUuid(),
+                        CryptoHelper.bytesToHex(identityKeyPair.getPublicKey().serialize())
                     };
                     ContentValues values = new ContentValues();
                     values.put(SQLiteAxolotlStore.TRUSTED, 2);
-                    db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, values,
-                            SQLiteAxolotlStore.ACCOUNT + " = ? AND "
-                                    + SQLiteAxolotlStore.FINGERPRINT + " = ? ",
+                    db.update(
+                            SQLiteAxolotlStore.IDENTITIES_TABLENAME,
+                            values,
+                            SQLiteAxolotlStore.ACCOUNT
+                                    + " = ? AND "
+                                    + SQLiteAxolotlStore.FINGERPRINT
+                                    + " = ? ",
                             selectionArgs);
                 } else {
-                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": could not load own identity key pair");
+                    Log.d(
+                            Config.LOGTAG,
+                            account.getJid().asBareJid()
+                                    + ": could not load own identity key pair");
                 }
             }
         }
         if (oldVersion < 18 && newVersion >= 18) {
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.READ + " NUMBER DEFAULT 1");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Message.TABLENAME
+                            + " ADD COLUMN "
+                            + Message.READ
+                            + " NUMBER DEFAULT 1");
         }
 
         if (oldVersion < 21 && newVersion >= 21) {
             List<Account> accounts = getAccounts(db);
             for (Account account : accounts) {
                 account.unsetPgpSignature();
-                db.update(Account.TABLENAME, account.getContentValues(), Account.UUID
-                        + "=?", new String[]{account.getUuid()});
+                db.update(
+                        Account.TABLENAME,
+                        account.getContentValues(),
+                        Account.UUID + "=?",
+                        new String[] {account.getUuid()});
             }
         }
 
         if (oldVersion >= 15 && oldVersion < 22 && newVersion >= 22) {
-            db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.CERTIFICATE);
+            db.execSQL(
+                    "ALTER TABLE "
+                            + SQLiteAxolotlStore.IDENTITIES_TABLENAME
+                            + " ADD COLUMN "
+                            + SQLiteAxolotlStore.CERTIFICATE);
         }
 
         if (oldVersion < 23 && newVersion >= 23) {
@@ -421,11 +731,13 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         }
 
         if (oldVersion < 24 && newVersion >= 24) {
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.EDITED + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.EDITED + " TEXT");
         }
 
         if (oldVersion < 25 && newVersion >= 25) {
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.OOB + " INTEGER");
+            db.execSQL(
+                    "ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.OOB + " INTEGER");
         }
 
         if (oldVersion < 26 && newVersion >= 26) {
@@ -441,51 +753,116 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         }
 
         if (oldVersion < 29 && newVersion >= 29) {
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.ERROR_MESSAGE + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Message.TABLENAME
+                            + " ADD COLUMN "
+                            + Message.ERROR_MESSAGE
+                            + " TEXT");
         }
         if (oldVersion >= 15 && oldVersion < 31 && newVersion >= 31) {
-            db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.TRUST + " TEXT");
-            db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.ACTIVE + " NUMBER");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + SQLiteAxolotlStore.IDENTITIES_TABLENAME
+                            + " ADD COLUMN "
+                            + SQLiteAxolotlStore.TRUST
+                            + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + SQLiteAxolotlStore.IDENTITIES_TABLENAME
+                            + " ADD COLUMN "
+                            + SQLiteAxolotlStore.ACTIVE
+                            + " NUMBER");
             HashMap<Integer, ContentValues> migration = new HashMap<>();
-            migration.put(0, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, true));
-            migration.put(1, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, true));
-            migration.put(2, createFingerprintStatusContentValues(FingerprintStatus.Trust.UNTRUSTED, true));
-            migration.put(3, createFingerprintStatusContentValues(FingerprintStatus.Trust.COMPROMISED, false));
-            migration.put(4, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, false));
-            migration.put(5, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, false));
-            migration.put(6, createFingerprintStatusContentValues(FingerprintStatus.Trust.UNTRUSTED, false));
-            migration.put(7, createFingerprintStatusContentValues(FingerprintStatus.Trust.VERIFIED_X509, true));
-            migration.put(8, createFingerprintStatusContentValues(FingerprintStatus.Trust.VERIFIED_X509, false));
+            migration.put(
+                    0, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, true));
+            migration.put(
+                    1, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, true));
+            migration.put(
+                    2,
+                    createFingerprintStatusContentValues(FingerprintStatus.Trust.UNTRUSTED, true));
+            migration.put(
+                    3,
+                    createFingerprintStatusContentValues(
+                            FingerprintStatus.Trust.COMPROMISED, false));
+            migration.put(
+                    4,
+                    createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, false));
+            migration.put(
+                    5,
+                    createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, false));
+            migration.put(
+                    6,
+                    createFingerprintStatusContentValues(FingerprintStatus.Trust.UNTRUSTED, false));
+            migration.put(
+                    7,
+                    createFingerprintStatusContentValues(
+                            FingerprintStatus.Trust.VERIFIED_X509, true));
+            migration.put(
+                    8,
+                    createFingerprintStatusContentValues(
+                            FingerprintStatus.Trust.VERIFIED_X509, false));
             for (Map.Entry<Integer, ContentValues> entry : migration.entrySet()) {
                 String whereClause = SQLiteAxolotlStore.TRUSTED + "=?";
                 String[] where = {String.valueOf(entry.getKey())};
-                db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, entry.getValue(), whereClause, where);
+                db.update(
+                        SQLiteAxolotlStore.IDENTITIES_TABLENAME,
+                        entry.getValue(),
+                        whereClause,
+                        where);
             }
-
         }
         if (oldVersion >= 15 && oldVersion < 32 && newVersion >= 32) {
-            db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.LAST_ACTIVATION + " NUMBER");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + SQLiteAxolotlStore.IDENTITIES_TABLENAME
+                            + " ADD COLUMN "
+                            + SQLiteAxolotlStore.LAST_ACTIVATION
+                            + " NUMBER");
             ContentValues defaults = new ContentValues();
             defaults.put(SQLiteAxolotlStore.LAST_ACTIVATION, System.currentTimeMillis());
             db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, defaults, null, null);
         }
         if (oldVersion >= 15 && oldVersion < 33 && newVersion >= 33) {
             String whereClause = SQLiteAxolotlStore.OWN + "=1";
-            db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, createFingerprintStatusContentValues(FingerprintStatus.Trust.VERIFIED, true), whereClause, null);
+            db.update(
+                    SQLiteAxolotlStore.IDENTITIES_TABLENAME,
+                    createFingerprintStatusContentValues(FingerprintStatus.Trust.VERIFIED, true),
+                    whereClause,
+                    null);
         }
 
         if (oldVersion < 34 && newVersion >= 34) {
             db.execSQL(CREATE_MESSAGE_TIME_INDEX);
 
-            final File oldPicturesDirectory = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES) + "/Conversations/");
-            final File oldFilesDirectory = new File(Environment.getExternalStorageDirectory() + "/Conversations/");
-            final File newFilesDirectory = new File(Environment.getExternalStorageDirectory() + "/Conversations/Media/Conversations Files/");
-            final File newVideosDirectory = new File(Environment.getExternalStorageDirectory() + "/Conversations/Media/Conversations Videos/");
+            final File oldPicturesDirectory =
+                    new File(
+                            Environment.getExternalStoragePublicDirectory(
+                                            Environment.DIRECTORY_PICTURES)
+                                    + "/Conversations/");
+            final File oldFilesDirectory =
+                    new File(Environment.getExternalStorageDirectory() + "/Conversations/");
+            final File newFilesDirectory =
+                    new File(
+                            Environment.getExternalStorageDirectory()
+                                    + "/Conversations/Media/Conversations Files/");
+            final File newVideosDirectory =
+                    new File(
+                            Environment.getExternalStorageDirectory()
+                                    + "/Conversations/Media/Conversations Videos/");
             if (oldPicturesDirectory.exists() && oldPicturesDirectory.isDirectory()) {
-                final File newPicturesDirectory = new File(Environment.getExternalStorageDirectory() + "/Conversations/Media/Conversations Images/");
+                final File newPicturesDirectory =
+                        new File(
+                                Environment.getExternalStorageDirectory()
+                                        + "/Conversations/Media/Conversations Images/");
                 newPicturesDirectory.getParentFile().mkdirs();
                 if (oldPicturesDirectory.renameTo(newPicturesDirectory)) {
-                    Log.d(Config.LOGTAG, "moved " + oldPicturesDirectory.getAbsolutePath() + " to " + newPicturesDirectory.getAbsolutePath());
+                    Log.d(
+                            Config.LOGTAG,
+                            "moved "
+                                    + oldPicturesDirectory.getAbsolutePath()
+                                    + " to "
+                                    + newPicturesDirectory.getAbsolutePath());
                 }
             }
             if (oldFilesDirectory.exists() && oldFilesDirectory.isDirectory()) {
@@ -498,17 +875,26 @@ public class DatabaseBackend extends SQLiteOpenHelper {
                 for (File file : files) {
                     if (file.getName().equals(".nomedia")) {
                         if (file.delete()) {
-                            Log.d(Config.LOGTAG, "deleted nomedia file in " + oldFilesDirectory.getAbsolutePath());
+                            Log.d(
+                                    Config.LOGTAG,
+                                    "deleted nomedia file in "
+                                            + oldFilesDirectory.getAbsolutePath());
                         }
                     } else if (file.isFile()) {
                         final String name = file.getName();
                         boolean isVideo = false;
                         int start = name.lastIndexOf('.') + 1;
                         if (start < name.length()) {
-                            String mime = MimeUtils.guessMimeTypeFromExtension(name.substring(start));
+                            String mime =
+                                    MimeUtils.guessMimeTypeFromExtension(name.substring(start));
                             isVideo = mime != null && mime.startsWith("video/");
                         }
-                        File dst = new File((isVideo ? newVideosDirectory : newFilesDirectory).getAbsolutePath() + "/" + file.getName());
+                        File dst =
+                                new File(
+                                        (isVideo ? newVideosDirectory : newFilesDirectory)
+                                                        .getAbsolutePath()
+                                                + "/"
+                                                + file.getName());
                         if (file.renameTo(dst)) {
                             Log.d(Config.LOGTAG, "moved " + file + " to " + dst);
                         }
@@ -524,17 +910,30 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             for (Account account : accounts) {
                 account.setOption(Account.OPTION_REQUIRES_ACCESS_MODE_CHANGE, true);
                 account.setOption(Account.OPTION_LOGGED_IN_SUCCESSFULLY, false);
-                db.update(Account.TABLENAME, account.getContentValues(), Account.UUID
-                        + "=?", new String[]{account.getUuid()});
+                db.update(
+                        Account.TABLENAME,
+                        account.getContentValues(),
+                        Account.UUID + "=?",
+                        new String[] {account.getUuid()});
             }
         }
 
         if (oldVersion < 37 && newVersion >= 37) {
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.READ_BY_MARKERS + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Message.TABLENAME
+                            + " ADD COLUMN "
+                            + Message.READ_BY_MARKERS
+                            + " TEXT");
         }
 
         if (oldVersion < 38 && newVersion >= 38) {
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.MARKABLE + " NUMBER DEFAULT 0");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Message.TABLENAME
+                            + " ADD COLUMN "
+                            + Message.MARKABLE
+                            + " NUMBER DEFAULT 0");
         }
 
         if (oldVersion < 39 && newVersion >= 39) {
@@ -545,13 +944,21 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             List<Account> accounts = getAccounts(db);
             for (Account account : accounts) {
                 account.setOption(Account.OPTION_MAGIC_CREATE, true);
-                db.update(Account.TABLENAME, account.getContentValues(), Account.UUID
-                        + "=?", new String[]{account.getUuid()});
+                db.update(
+                        Account.TABLENAME,
+                        account.getContentValues(),
+                        Account.UUID + "=?",
+                        new String[] {account.getUuid()});
             }
         }
 
         if (oldVersion < 44 && newVersion >= 44) {
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.DELETED + " NUMBER DEFAULT 0");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Message.TABLENAME
+                            + " ADD COLUMN "
+                            + Message.DELETED
+                            + " NUMBER DEFAULT 0");
             db.execSQL(CREATE_MESSAGE_DELETED_INDEX);
             db.execSQL(CREATE_MESSAGE_RELATIVE_FILE_PATH_INDEX);
             db.execSQL(CREATE_MESSAGE_TYPE_INDEX);
@@ -570,10 +977,20 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             Log.d(Config.LOGTAG, "deleted old edit information in " + diff + "ms");
         }
         if (oldVersion < 47 && newVersion >= 47) {
-            db.execSQL("ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN " + Contact.PRESENCE_NAME + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Contact.TABLENAME
+                            + " ADD COLUMN "
+                            + Contact.PRESENCE_NAME
+                            + " TEXT");
         }
         if (oldVersion < 48 && newVersion >= 48) {
-            db.execSQL("ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN " + Contact.RTP_CAPABILITY + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Contact.TABLENAME
+                            + " ADD COLUMN "
+                            + Contact.RTP_CAPABILITY
+                            + " TEXT");
         }
         if (oldVersion < 49 && newVersion >= 49) {
             db.beginTransaction();
@@ -596,16 +1013,46 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             requiresMessageIndexRebuild = true;
         }
         if (oldVersion < 50 && newVersion >= 50) {
-            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.PINNED_MECHANISM + " TEXT");
-            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.PINNED_CHANNEL_BINDING + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Account.TABLENAME
+                            + " ADD COLUMN "
+                            + Account.PINNED_MECHANISM
+                            + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Account.TABLENAME
+                            + " ADD COLUMN "
+                            + Account.PINNED_CHANNEL_BINDING
+                            + " TEXT");
         }
         if (oldVersion < 51 && newVersion >= 51) {
-            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.FAST_MECHANISM + " TEXT");
-            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.FAST_TOKEN + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Account.TABLENAME
+                            + " ADD COLUMN "
+                            + Account.FAST_MECHANISM
+                            + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Account.TABLENAME
+                            + " ADD COLUMN "
+                            + Account.FAST_TOKEN
+                            + " TEXT");
         }
         if (oldVersion < 52 && newVersion >= 52) {
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.OCCUPANT_ID + " TEXT");
-            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.REACTIONS + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Message.TABLENAME
+                            + " ADD COLUMN "
+                            + Message.OCCUPANT_ID
+                            + " TEXT");
+            db.execSQL(
+                    "ALTER TABLE "
+                            + Message.TABLENAME
+                            + " ADD COLUMN "
+                            + Message.REACTIONS
+                            + " TEXT");
         }
     }
 
@@ -617,21 +1064,33 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         while (cursor.moveToNext()) {
             String newJid;
             try {
-                newJid = Jid.of(cursor.getString(cursor.getColumnIndex(Conversation.CONTACTJID))).toString();
+                newJid =
+                        Jid.of(cursor.getString(cursor.getColumnIndex(Conversation.CONTACTJID)))
+                                .toString();
             } catch (IllegalArgumentException ignored) {
-                Log.e(Config.LOGTAG, "Failed to migrate Conversation CONTACTJID "
-                        + cursor.getString(cursor.getColumnIndex(Conversation.CONTACTJID))
-                        + ": " + ignored + ". Skipping...");
+                Log.e(
+                        Config.LOGTAG,
+                        "Failed to migrate Conversation CONTACTJID "
+                                + cursor.getString(cursor.getColumnIndex(Conversation.CONTACTJID))
+                                + ": "
+                                + ignored
+                                + ". Skipping...");
                 continue;
             }
 
             final String[] updateArgs = {
-                    newJid,
-                    cursor.getString(cursor.getColumnIndex(Conversation.UUID)),
+                newJid, cursor.getString(cursor.getColumnIndex(Conversation.UUID)),
             };
-            db.execSQL("update " + Conversation.TABLENAME
-                    + " set " + Conversation.CONTACTJID + " = ? "
-                    + " where " + Conversation.UUID + " = ?", updateArgs);
+            db.execSQL(
+                    "update "
+                            + Conversation.TABLENAME
+                            + " set "
+                            + Conversation.CONTACTJID
+                            + " = ? "
+                            + " where "
+                            + Conversation.UUID
+                            + " = ?",
+                    updateArgs);
         }
         cursor.close();
 
@@ -642,21 +1101,33 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             try {
                 newJid = Jid.of(cursor.getString(cursor.getColumnIndex(Contact.JID))).toString();
             } catch (final IllegalArgumentException e) {
-                Log.e(Config.LOGTAG, "Failed to migrate Contact JID "
-                        + cursor.getString(cursor.getColumnIndex(Contact.JID))
-                        + ":  Skipping...", e);
+                Log.e(
+                        Config.LOGTAG,
+                        "Failed to migrate Contact JID "
+                                + cursor.getString(cursor.getColumnIndex(Contact.JID))
+                                + ":  Skipping...",
+                        e);
                 continue;
             }
 
             final String[] updateArgs = {
-                    newJid,
-                    cursor.getString(cursor.getColumnIndex(Contact.ACCOUNT)),
-                    cursor.getString(cursor.getColumnIndex(Contact.JID)),
+                newJid,
+                cursor.getString(cursor.getColumnIndex(Contact.ACCOUNT)),
+                cursor.getString(cursor.getColumnIndex(Contact.JID)),
             };
-            db.execSQL("update " + Contact.TABLENAME
-                    + " set " + Contact.JID + " = ? "
-                    + " where " + Contact.ACCOUNT + " = ? "
-                    + " AND " + Contact.JID + " = ?", updateArgs);
+            db.execSQL(
+                    "update "
+                            + Contact.TABLENAME
+                            + " set "
+                            + Contact.JID
+                            + " = ? "
+                            + " where "
+                            + Contact.ACCOUNT
+                            + " = ? "
+                            + " AND "
+                            + Contact.JID
+                            + " = ?",
+                    updateArgs);
         }
         cursor.close();
 
@@ -665,25 +1136,37 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         while (cursor.moveToNext()) {
             String newServer;
             try {
-                newServer = Jid.of(
-                        cursor.getString(cursor.getColumnIndex(Account.USERNAME)),
-                        cursor.getString(cursor.getColumnIndex(Account.SERVER)),
-                        null
-                ).getDomain().toEscapedString();
+                newServer =
+                        Jid.of(
+                                        cursor.getString(cursor.getColumnIndex(Account.USERNAME)),
+                                        cursor.getString(cursor.getColumnIndex(Account.SERVER)),
+                                        null)
+                                .getDomain()
+                                .toEscapedString();
             } catch (IllegalArgumentException ignored) {
-                Log.e(Config.LOGTAG, "Failed to migrate Account SERVER "
-                        + cursor.getString(cursor.getColumnIndex(Account.SERVER))
-                        + ": " + ignored + ". Skipping...");
+                Log.e(
+                        Config.LOGTAG,
+                        "Failed to migrate Account SERVER "
+                                + cursor.getString(cursor.getColumnIndex(Account.SERVER))
+                                + ": "
+                                + ignored
+                                + ". Skipping...");
                 continue;
             }
 
             String[] updateArgs = {
-                    newServer,
-                    cursor.getString(cursor.getColumnIndex(Account.UUID)),
+                newServer, cursor.getString(cursor.getColumnIndex(Account.UUID)),
             };
-            db.execSQL("update " + Account.TABLENAME
-                    + " set " + Account.SERVER + " = ? "
-                    + " where " + Account.UUID + " = ?", updateArgs);
+            db.execSQL(
+                    "update "
+                            + Account.TABLENAME
+                            + " set "
+                            + Account.SERVER
+                            + " = ? "
+                            + " where "
+                            + Account.UUID
+                            + " = ?",
+                    updateArgs);
         }
         cursor.close();
     }
@@ -711,9 +1194,15 @@ public class DatabaseBackend extends SQLiteOpenHelper {
     public ServiceDiscoveryResult findDiscoveryResult(final String hash, final String ver) {
         SQLiteDatabase db = this.getReadableDatabase();
         String[] selectionArgs = {hash, ver};
-        Cursor cursor = db.query(ServiceDiscoveryResult.TABLENAME, null,
-                ServiceDiscoveryResult.HASH + "=? AND " + ServiceDiscoveryResult.VER + "=?",
-                selectionArgs, null, null, null);
+        Cursor cursor =
+                db.query(
+                        ServiceDiscoveryResult.TABLENAME,
+                        null,
+                        ServiceDiscoveryResult.HASH + "=? AND " + ServiceDiscoveryResult.VER + "=?",
+                        selectionArgs,
+                        null,
+                        null,
+                        null);
         if (cursor.getCount() == 0) {
             cursor.close();
             return null;
@@ -723,7 +1212,9 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         ServiceDiscoveryResult result = null;
         try {
             result = new ServiceDiscoveryResult(cursor);
-        } catch (JSONException e) { /* result is still null */ }
+        } catch (JSONException e) {
+            /* result is still null */
+        }
 
         cursor.close();
         return result;
@@ -740,7 +1231,8 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         SQLiteDatabase db = this.getReadableDatabase();
         String where = Resolver.Result.DOMAIN + "=?";
         String[] whereArgs = {domain};
-        final Cursor cursor = db.query(RESOLVER_RESULTS_TABLENAME, null, where, whereArgs, null, null, null);
+        final Cursor cursor =
+                db.query(RESOLVER_RESULTS_TABLENAME, null, where, whereArgs, null, null, null);
         Resolver.Result result = null;
         if (cursor != null) {
             try {
@@ -748,7 +1240,9 @@ public class DatabaseBackend extends SQLiteOpenHelper {
                     result = Resolver.Result.fromCursor(cursor);
                 }
             } catch (Exception e) {
-                Log.d(Config.LOGTAG, "unable to find cached resolver result in database " + e.getMessage());
+                Log.d(
+                        Config.LOGTAG,
+                        "unable to find cached resolver result in database " + e.getMessage());
                 return null;
             } finally {
                 cursor.close();
@@ -762,14 +1256,32 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         String whereToDelete = PresenceTemplate.MESSAGE + "=?";
         String[] whereToDeleteArgs = {template.getStatusMessage()};
         db.delete(PresenceTemplate.TABELNAME, whereToDelete, whereToDeleteArgs);
-        db.delete(PresenceTemplate.TABELNAME, PresenceTemplate.UUID + " not in (select " + PresenceTemplate.UUID + " from " + PresenceTemplate.TABELNAME + " order by " + PresenceTemplate.LAST_USED + " desc limit 9)", null);
+        db.delete(
+                PresenceTemplate.TABELNAME,
+                PresenceTemplate.UUID
+                        + " not in (select "
+                        + PresenceTemplate.UUID
+                        + " from "
+                        + PresenceTemplate.TABELNAME
+                        + " order by "
+                        + PresenceTemplate.LAST_USED
+                        + " desc limit 9)",
+                null);
         db.insert(PresenceTemplate.TABELNAME, null, template.getContentValues());
     }
 
     public List<PresenceTemplate> getPresenceTemplates() {
         ArrayList<PresenceTemplate> templates = new ArrayList<>();
         SQLiteDatabase db = this.getReadableDatabase();
-        Cursor cursor = db.query(PresenceTemplate.TABELNAME, null, null, null, null, null, PresenceTemplate.LAST_USED + " desc");
+        Cursor cursor =
+                db.query(
+                        PresenceTemplate.TABELNAME,
+                        null,
+                        null,
+                        null,
+                        null,
+                        null,
+                        PresenceTemplate.LAST_USED + " desc");
         while (cursor.moveToNext()) {
             templates.add(PresenceTemplate.fromCursor(cursor));
         }
@@ -781,9 +1293,18 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         CopyOnWriteArrayList<Conversation> list = new CopyOnWriteArrayList<>();
         SQLiteDatabase db = this.getReadableDatabase();
         String[] selectionArgs = {Integer.toString(status)};
-        Cursor cursor = db.rawQuery("select * from " + Conversation.TABLENAME
-                + " where " + Conversation.STATUS + " = ? and " + Conversation.CONTACTJID + " is not null order by "
-                + Conversation.CREATED + " desc", selectionArgs);
+        Cursor cursor =
+                db.rawQuery(
+                        "select * from "
+                                + Conversation.TABLENAME
+                                + " where "
+                                + Conversation.STATUS
+                                + " = ? and "
+                                + Conversation.CONTACTJID
+                                + " is not null order by "
+                                + Conversation.CREATED
+                                + " desc",
+                        selectionArgs);
         while (cursor.moveToNext()) {
             final Conversation conversation = Conversation.fromCursor(cursor);
             if (conversation.getJid() instanceof InvalidJid) {
@@ -805,16 +1326,28 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         Cursor cursor;
         if (timestamp == -1) {
             String[] selectionArgs = {conversation.getUuid()};
-            cursor = db.query(Message.TABLENAME, null, Message.CONVERSATION
-                    + "=?", selectionArgs, null, null, Message.TIME_SENT
-                    + " DESC", String.valueOf(limit));
+            cursor =
+                    db.query(
+                            Message.TABLENAME,
+                            null,
+                            Message.CONVERSATION + "=?",
+                            selectionArgs,
+                            null,
+                            null,
+                            Message.TIME_SENT + " DESC",
+                            String.valueOf(limit));
         } else {
-            String[] selectionArgs = {conversation.getUuid(),
-                    Long.toString(timestamp)};
-            cursor = db.query(Message.TABLENAME, null, Message.CONVERSATION
-                            + "=? and " + Message.TIME_SENT + "<?", selectionArgs,
-                    null, null, Message.TIME_SENT + " DESC",
-                    String.valueOf(limit));
+            String[] selectionArgs = {conversation.getUuid(), Long.toString(timestamp)};
+            cursor =
+                    db.query(
+                            Message.TABLENAME,
+                            null,
+                            Message.CONVERSATION + "=? and " + Message.TIME_SENT + "<?",
+                            selectionArgs,
+                            null,
+                            null,
+                            Message.TIME_SENT + " DESC",
+                            String.valueOf(limit));
         }
         CursorUtils.upgradeCursorWindowSize(cursor);
         while (cursor.moveToNext()) {
@@ -832,11 +1365,54 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         final SQLiteDatabase db = this.getReadableDatabase();
         final StringBuilder SQL = new StringBuilder();
         final String[] selectionArgs;
-        SQL.append("SELECT " + Message.TABLENAME + ".*," + Conversation.TABLENAME + "." + Conversation.CONTACTJID + "," + Conversation.TABLENAME + "." + Conversation.ACCOUNT + "," + Conversation.TABLENAME + "." + Conversation.MODE + " FROM " + Message.TABLENAME + " JOIN " + Conversation.TABLENAME + " ON " + Message.TABLENAME + "." + Message.CONVERSATION + "=" + Conversation.TABLENAME + "." + Conversation.UUID + " JOIN messages_index ON messages_index.rowid=messages.rowid WHERE " + Message.ENCRYPTION + " NOT IN(" + Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE + "," + Message.ENCRYPTION_PGP + "," + Message.ENCRYPTION_DECRYPTION_FAILED + "," + Message.ENCRYPTION_AXOLOTL_FAILED + ") AND " + Message.TYPE + " IN(" + Message.TYPE_TEXT + "," + Message.TYPE_PRIVATE + ") AND messages_index.body MATCH ?");
+        SQL.append(
+                "SELECT "
+                        + Message.TABLENAME
+                        + ".*,"
+                        + Conversation.TABLENAME
+                        + "."
+                        + Conversation.CONTACTJID
+                        + ","
+                        + Conversation.TABLENAME
+                        + "."
+                        + Conversation.ACCOUNT
+                        + ","
+                        + Conversation.TABLENAME
+                        + "."
+                        + Conversation.MODE
+                        + " FROM "
+                        + Message.TABLENAME
+                        + " JOIN "
+                        + Conversation.TABLENAME
+                        + " ON "
+                        + Message.TABLENAME
+                        + "."
+                        + Message.CONVERSATION
+                        + "="
+                        + Conversation.TABLENAME
+                        + "."
+                        + Conversation.UUID
+                        + " JOIN messages_index ON messages_index.rowid=messages.rowid WHERE "
+                        + Message.ENCRYPTION
+                        + " NOT IN("
+                        + Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE
+                        + ","
+                        + Message.ENCRYPTION_PGP
+                        + ","
+                        + Message.ENCRYPTION_DECRYPTION_FAILED
+                        + ","
+                        + Message.ENCRYPTION_AXOLOTL_FAILED
+                        + ") AND "
+                        + Message.TYPE
+                        + " IN("
+                        + Message.TYPE_TEXT
+                        + ","
+                        + Message.TYPE_PRIVATE
+                        + ") AND messages_index.body MATCH ?");
         if (uuid == null) {
-            selectionArgs = new String[]{FtsUtils.toMatchString(term)};
+            selectionArgs = new String[] {FtsUtils.toMatchString(term)};
         } else {
-            selectionArgs = new String[]{FtsUtils.toMatchString(term), uuid};
+            selectionArgs = new String[] {FtsUtils.toMatchString(term), uuid};
             SQL.append(" AND " + Conversation.TABLENAME + '.' + Conversation.UUID + "=?");
         }
         SQL.append(" ORDER BY " + Message.TIME_SENT + " DESC limit " + Config.MAX_SEARCH_RESULTS);
@@ -851,18 +1427,34 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         if (internal) {
             final String name = file.getName();
             if (name.endsWith(".pgp")) {
-                selection = "(" + Message.RELATIVE_FILE_PATH + " IN(?,?) OR (" + Message.RELATIVE_FILE_PATH + "=? and encryption in(1,4))) and type in (1,2,5)";
-                selectionArgs = new String[]{file.getAbsolutePath(), name, name.substring(0, name.length() - 4)};
+                selection =
+                        "("
+                                + Message.RELATIVE_FILE_PATH
+                                + " IN(?,?) OR ("
+                                + Message.RELATIVE_FILE_PATH
+                                + "=? and encryption in(1,4))) and type in (1,2,5)";
+                selectionArgs =
+                        new String[] {
+                            file.getAbsolutePath(), name, name.substring(0, name.length() - 4)
+                        };
             } else {
                 selection = Message.RELATIVE_FILE_PATH + " IN(?,?) and type in (1,2,5)";
-                selectionArgs = new String[]{file.getAbsolutePath(), name};
+                selectionArgs = new String[] {file.getAbsolutePath(), name};
             }
         } else {
             selection = Message.RELATIVE_FILE_PATH + "=? and type in (1,2,5)";
-            selectionArgs = new String[]{file.getAbsolutePath()};
+            selectionArgs = new String[] {file.getAbsolutePath()};
         }
         final List<String> uuids = new ArrayList<>();
-        Cursor cursor = db.query(Message.TABLENAME, new String[]{Message.UUID}, selection, selectionArgs, null, null, null);
+        Cursor cursor =
+                db.query(
+                        Message.TABLENAME,
+                        new String[] {Message.UUID},
+                        selection,
+                        selectionArgs,
+                        null,
+                        null,
+                        null);
         while (cursor != null && cursor.moveToNext()) {
             uuids.add(cursor.getString(0));
         }
@@ -880,7 +1472,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         contentValues.put(Message.DELETED, 1);
         db.beginTransaction();
         for (String uuid : uuids) {
-            db.update(Message.TABLENAME, contentValues, where, new String[]{uuid});
+            db.update(Message.TABLENAME, contentValues, where, new String[] {uuid});
         }
         db.setTransactionSuccessful();
         db.endTransaction();
@@ -893,7 +1485,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         for (FilePathInfo info : files) {
             final ContentValues contentValues = new ContentValues();
             contentValues.put(Message.DELETED, info.deleted ? 1 : 0);
-            db.update(Message.TABLENAME, contentValues, where, new String[]{info.uuid.toString()});
+            db.update(Message.TABLENAME, contentValues, where, new String[] {info.uuid.toString()});
         }
         db.setTransactionSuccessful();
         db.endTransaction();
@@ -901,10 +1493,20 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 
     public List<FilePathInfo> getFilePathInfo() {
         final SQLiteDatabase db = this.getReadableDatabase();
-        final Cursor cursor = db.query(Message.TABLENAME, new String[]{Message.UUID, Message.RELATIVE_FILE_PATH, Message.DELETED}, "type in (1,2,5) and " + Message.RELATIVE_FILE_PATH + " is not null", null, null, null, null);
+        final Cursor cursor =
+                db.query(
+                        Message.TABLENAME,
+                        new String[] {Message.UUID, Message.RELATIVE_FILE_PATH, Message.DELETED},
+                        "type in (1,2,5) and " + Message.RELATIVE_FILE_PATH + " is not null",
+                        null,
+                        null,
+                        null,
+                        null);
         final List<FilePathInfo> list = new ArrayList<>();
         while (cursor != null && cursor.moveToNext()) {
-            list.add(new FilePathInfo(cursor.getString(0), cursor.getString(1), cursor.getInt(2) > 0));
+            list.add(
+                    new FilePathInfo(
+                            cursor.getString(0), cursor.getString(1), cursor.getInt(2) > 0));
         }
         if (cursor != null) {
             cursor.close();
@@ -914,7 +1516,13 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 
     public List<FilePath> getRelativeFilePaths(String account, Jid jid, int limit) {
         SQLiteDatabase db = this.getReadableDatabase();
-        final String SQL = "select uuid,relativeFilePath from messages where type in (1,2,5) and deleted=0 and " + Message.RELATIVE_FILE_PATH + " is not null and conversationUuid=(select uuid from conversations where accountUuid=? and (contactJid=? or contactJid like ?)) order by timeSent desc";
+        final String SQL =
+                "select uuid,relativeFilePath from messages where type in (1,2,5) and deleted=0 and"
+                        + " "
+                        + Message.RELATIVE_FILE_PATH
+                        + " is not null and conversationUuid=(select uuid from conversations where"
+                        + " accountUuid=? and (contactJid=? or contactJid like ?)) order by"
+                        + " timeSent desc";
         final String[] args = {account, jid.toString(), jid.toString() + "/%"};
         Cursor cursor = db.rawQuery(SQL + (limit > 0 ? " limit " + limit : ""), args);
         List<FilePath> filesPaths = new ArrayList<>();
@@ -949,7 +1557,8 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             final Conversation conversation, final String messageId) {
         final var db = this.getReadableDatabase();
         final String sql =
-                "select * from messages where conversationUuid=? and (uuid=? OR remoteMsgId=?) LIMIT 1";
+                "select * from messages where conversationUuid=? and (uuid=? OR remoteMsgId=?)"
+                        + " LIMIT 1";
         final String[] args = {conversation.getUuid(), messageId, messageId};
         final Cursor cursor = db.rawQuery(sql, args);
         if (cursor == null) {
@@ -990,15 +1599,51 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         }
     }
 
+    public Conversation findConversation(final String uuid) {
+        final var db = this.getReadableDatabase();
+        final String[] selectionArgs = {uuid};
+        try (final Cursor cursor =
+                db.query(
+                        Conversation.TABLENAME,
+                        null,
+                        Conversation.UUID + "=?",
+                        selectionArgs,
+                        null,
+                        null,
+                        null)) {
+            if (cursor.getCount() == 0) {
+                return null;
+            }
+            cursor.moveToFirst();
+            final Conversation conversation = Conversation.fromCursor(cursor);
+            if (conversation.getJid() instanceof InvalidJid) {
+                return null;
+            }
+            return conversation;
+        }
+    }
+
     public Conversation findConversation(final Account account, final Jid contactJid) {
-        SQLiteDatabase db = this.getReadableDatabase();
-        String[] selectionArgs = {account.getUuid(),
-                contactJid.asBareJid().toString() + "/%",
-                contactJid.asBareJid().toString()
+        final SQLiteDatabase db = this.getReadableDatabase();
+        final String[] selectionArgs = {
+            account.getUuid(),
+            contactJid.asBareJid().toString() + "/%",
+            contactJid.asBareJid().toString()
         };
-        try(final Cursor cursor = db.query(Conversation.TABLENAME, null,
-                Conversation.ACCOUNT + "=? AND (" + Conversation.CONTACTJID
-                        + " like ? OR " + Conversation.CONTACTJID + "=?)", selectionArgs, null, null, null)) {
+        try (final Cursor cursor =
+                db.query(
+                        Conversation.TABLENAME,
+                        null,
+                        Conversation.ACCOUNT
+                                + "=? AND ("
+                                + Conversation.CONTACTJID
+                                + " like ? OR "
+                                + Conversation.CONTACTJID
+                                + "=?)",
+                        selectionArgs,
+                        null,
+                        null,
+                        null)) {
             if (cursor.getCount() == 0) {
                 return null;
             }
@@ -1007,6 +1652,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             if (conversation.getJid() instanceof InvalidJid) {
                 return null;
             }
+            conversation.setAccount(account);
             return conversation;
         }
     }
@@ -1014,8 +1660,11 @@ public class DatabaseBackend extends SQLiteOpenHelper {
     public void updateConversation(final Conversation conversation) {
         final SQLiteDatabase db = this.getWritableDatabase();
         final String[] args = {conversation.getUuid()};
-        db.update(Conversation.TABLENAME, conversation.getContentValues(),
-                Conversation.UUID + "=?", args);
+        db.update(
+                Conversation.TABLENAME,
+                conversation.getContentValues(),
+                Conversation.UUID + "=?",
+                args);
     }
 
     public List<Account> getAccounts() {
@@ -1026,9 +1675,10 @@ public class DatabaseBackend extends SQLiteOpenHelper {
     public List<Jid> getAccountJids(final boolean enabledOnly) {
         final SQLiteDatabase db = this.getReadableDatabase();
         final List<Jid> jids = new ArrayList<>();
-        final String[] columns = new String[]{Account.USERNAME, Account.SERVER};
+        final String[] columns = new String[] {Account.USERNAME, Account.SERVER};
         final String where = enabledOnly ? "not options & (1 <<1)" : null;
-        try (final Cursor cursor = db.query(Account.TABLENAME, columns, where, null, null, null, null)) {
+        try (final Cursor cursor =
+                db.query(Account.TABLENAME, columns, where, null, null, null, null)) {
             while (cursor != null && cursor.moveToNext()) {
                 jids.add(Jid.of(cursor.getString(0), cursor.getString(1), null));
             }
@@ -1101,7 +1751,9 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         final SQLiteDatabase db = this.getWritableDatabase();
         db.beginTransaction();
         for (Contact contact : roster.getContacts()) {
-            if (contact.getOption(Contact.Options.IN_ROSTER) || contact.hasAvatarOrPresenceName() || contact.getOption(Contact.Options.SYNCED_VIA_OTHER)) {
+            if (contact.getOption(Contact.Options.IN_ROSTER)
+                    || contact.hasAvatarOrPresenceName()
+                    || contact.getOption(Contact.Options.SYNCED_VIA_OTHER)) {
                 db.insert(Contact.TABLENAME, null, contact.getContentValues());
             } else {
                 String where = Contact.ACCOUNT + "=? AND " + Contact.JID + "=?";
@@ -1114,7 +1766,9 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         account.setRosterVersion(roster.getVersion());
         updateAccount(account);
         long duration = SystemClock.elapsedRealtime() - start;
-        Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": persisted roster in " + duration + "ms");
+        Log.d(
+                Config.LOGTAG,
+                account.getJid().asBareJid() + ": persisted roster in " + duration + "ms");
     }
 
     public void deleteMessagesInConversation(Conversation conversation) {
@@ -1125,7 +1779,15 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         int num = db.delete(Message.TABLENAME, Message.CONVERSATION + "=?", args);
         db.setTransactionSuccessful();
         db.endTransaction();
-        Log.d(Config.LOGTAG, "deleted " + num + " messages for " + conversation.getJid().asBareJid() + " in " + (SystemClock.elapsedRealtime() - start) + "ms");
+        Log.d(
+                Config.LOGTAG,
+                "deleted "
+                        + num
+                        + " messages for "
+                        + conversation.getJid().asBareJid()
+                        + " in "
+                        + (SystemClock.elapsedRealtime() - start)
+                        + "ms");
     }
 
     public void expireOldMessages(long timestamp) {
@@ -1141,7 +1803,13 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         Cursor cursor = null;
         try {
             SQLiteDatabase db = this.getReadableDatabase();
-            String sql = "select messages.timeSent,messages.serverMsgId from accounts join conversations on accounts.uuid=conversations.accountUuid join messages on conversations.uuid=messages.conversationUuid where accounts.uuid=? and (messages.status=0 or messages.carbon=1 or messages.serverMsgId not null) and (conversations.mode=0 or (messages.serverMsgId not null and messages.type=4)) order by messages.timesent desc limit 1";
+            String sql =
+                    "select messages.timeSent,messages.serverMsgId from accounts join conversations"
+                        + " on accounts.uuid=conversations.accountUuid join messages on"
+                        + " conversations.uuid=messages.conversationUuid where accounts.uuid=? and"
+                        + " (messages.status=0 or messages.carbon=1 or messages.serverMsgId not"
+                        + " null) and (conversations.mode=0 or (messages.serverMsgId not null and"
+                        + " messages.type=4)) order by messages.timesent desc limit 1";
             String[] args = {account.getUuid()};
             cursor = db.rawQuery(sql, args);
             if (cursor.getCount() == 0) {
@@ -1160,7 +1828,11 @@ public class DatabaseBackend extends SQLiteOpenHelper {
     }
 
     public long getLastTimeFingerprintUsed(Account account, String fingerprint) {
-        String SQL = "select messages.timeSent from accounts join conversations on accounts.uuid=conversations.accountUuid join messages on conversations.uuid=messages.conversationUuid where accounts.uuid=? and messages.axolotl_fingerprint=? order by messages.timesent desc limit 1";
+        String SQL =
+                "select messages.timeSent from accounts join conversations on"
+                        + " accounts.uuid=conversations.accountUuid join messages on"
+                        + " conversations.uuid=messages.conversationUuid where accounts.uuid=? and"
+                        + " messages.axolotl_fingerprint=? order by messages.timesent desc limit 1";
         String[] args = {account.getUuid(), fingerprint};
         Cursor cursor = getReadableDatabase().rawQuery(SQL, args);
         long time;
@@ -1178,14 +1850,19 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         String[] columns = {Conversation.ATTRIBUTES};
         String selection = Conversation.ACCOUNT + "=?";
         String[] args = {account.getUuid()};
-        Cursor cursor = db.query(Conversation.TABLENAME, columns, selection, args, null, null, null);
+        Cursor cursor =
+                db.query(Conversation.TABLENAME, columns, selection, args, null, null, null);
         MamReference maxClearDate = new MamReference(0);
         while (cursor.moveToNext()) {
             try {
                 final JSONObject o = new JSONObject(cursor.getString(0));
-                maxClearDate = MamReference.max(maxClearDate, MamReference.fromAttribute(o.getString(Conversation.ATTRIBUTE_LAST_CLEAR_HISTORY)));
+                maxClearDate =
+                        MamReference.max(
+                                maxClearDate,
+                                MamReference.fromAttribute(
+                                        o.getString(Conversation.ATTRIBUTE_LAST_CLEAR_HISTORY)));
             } catch (Exception e) {
-                //ignored
+                // ignored
             }
         }
         cursor.close();
@@ -1194,16 +1871,22 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 
     private Cursor getCursorForSession(Account account, SignalProtocolAddress contact) {
         final SQLiteDatabase db = this.getReadableDatabase();
-        String[] selectionArgs = {account.getUuid(),
-                contact.getName(),
-                Integer.toString(contact.getDeviceId())};
-        return db.query(SQLiteAxolotlStore.SESSION_TABLENAME,
+        String[] selectionArgs = {
+            account.getUuid(), contact.getName(), Integer.toString(contact.getDeviceId())
+        };
+        return db.query(
+                SQLiteAxolotlStore.SESSION_TABLENAME,
                 null,
-                SQLiteAxolotlStore.ACCOUNT + " = ? AND "
-                        + SQLiteAxolotlStore.NAME + " = ? AND "
-                        + SQLiteAxolotlStore.DEVICE_ID + " = ? ",
+                SQLiteAxolotlStore.ACCOUNT
+                        + " = ? AND "
+                        + SQLiteAxolotlStore.NAME
+                        + " = ? AND "
+                        + SQLiteAxolotlStore.DEVICE_ID
+                        + " = ? ",
                 selectionArgs,
-                null, null, null);
+                null,
+                null,
+                null);
     }
 
     public SessionRecord loadSession(Account account, SignalProtocolAddress contact) {
@@ -1212,7 +1895,12 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         if (cursor.getCount() != 0) {
             cursor.moveToFirst();
             try {
-                session = new SessionRecord(Base64.decode(cursor.getString(cursor.getColumnIndex(SQLiteAxolotlStore.KEY)), Base64.DEFAULT));
+                session =
+                        new SessionRecord(
+                                Base64.decode(
+                                        cursor.getString(
+                                                cursor.getColumnIndex(SQLiteAxolotlStore.KEY)),
+                                        Base64.DEFAULT));
             } catch (IOException e) {
                 cursor.close();
                 throw new AssertionError(e);
@@ -1227,21 +1915,23 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         return getSubDeviceSessions(db, account, contact);
     }
 
-    private List<Integer> getSubDeviceSessions(SQLiteDatabase db, Account account, SignalProtocolAddress contact) {
+    private List<Integer> getSubDeviceSessions(
+            SQLiteDatabase db, Account account, SignalProtocolAddress contact) {
         List<Integer> devices = new ArrayList<>();
         String[] columns = {SQLiteAxolotlStore.DEVICE_ID};
-        String[] selectionArgs = {account.getUuid(),
-                contact.getName()};
-        Cursor cursor = db.query(SQLiteAxolotlStore.SESSION_TABLENAME,
-                columns,
-                SQLiteAxolotlStore.ACCOUNT + " = ? AND "
-                        + SQLiteAxolotlStore.NAME + " = ?",
-                selectionArgs,
-                null, null, null);
+        String[] selectionArgs = {account.getUuid(), contact.getName()};
+        Cursor cursor =
+                db.query(
+                        SQLiteAxolotlStore.SESSION_TABLENAME,
+                        columns,
+                        SQLiteAxolotlStore.ACCOUNT + " = ? AND " + SQLiteAxolotlStore.NAME + " = ?",
+                        selectionArgs,
+                        null,
+                        null,
+                        null);
 
         while (cursor.moveToNext()) {
-            devices.add(cursor.getInt(
-                    cursor.getColumnIndex(SQLiteAxolotlStore.DEVICE_ID)));
+            devices.add(cursor.getInt(cursor.getColumnIndex(SQLiteAxolotlStore.DEVICE_ID)));
         }
 
         cursor.close();
@@ -1252,12 +1942,16 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         List<String> addresses = new ArrayList<>();
         String[] colums = {"DISTINCT " + SQLiteAxolotlStore.NAME};
         String[] selectionArgs = {account.getUuid()};
-        Cursor cursor = getReadableDatabase().query(SQLiteAxolotlStore.SESSION_TABLENAME,
-                colums,
-                SQLiteAxolotlStore.ACCOUNT + " = ?",
-                selectionArgs,
-                null, null, null
-        );
+        Cursor cursor =
+                getReadableDatabase()
+                        .query(
+                                SQLiteAxolotlStore.SESSION_TABLENAME,
+                                colums,
+                                SQLiteAxolotlStore.ACCOUNT + " = ?",
+                                selectionArgs,
+                                null,
+                                null,
+                                null);
         while (cursor.moveToNext()) {
             addresses.add(cursor.getString(0));
         }
@@ -1272,12 +1966,14 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         return count != 0;
     }
 
-    public void storeSession(Account account, SignalProtocolAddress contact, SessionRecord session) {
+    public void storeSession(
+            Account account, SignalProtocolAddress contact, SessionRecord session) {
         SQLiteDatabase db = this.getWritableDatabase();
         ContentValues values = new ContentValues();
         values.put(SQLiteAxolotlStore.NAME, contact.getName());
         values.put(SQLiteAxolotlStore.DEVICE_ID, contact.getDeviceId());
-        values.put(SQLiteAxolotlStore.KEY, Base64.encodeToString(session.serialize(), Base64.DEFAULT));
+        values.put(
+                SQLiteAxolotlStore.KEY, Base64.encodeToString(session.serialize(), Base64.DEFAULT));
         values.put(SQLiteAxolotlStore.ACCOUNT, account.getUuid());
         db.insert(SQLiteAxolotlStore.SESSION_TABLENAME, null, values);
     }
@@ -1288,22 +1984,26 @@ public class DatabaseBackend extends SQLiteOpenHelper {
     }
 
     private void deleteSession(SQLiteDatabase db, Account account, SignalProtocolAddress contact) {
-        String[] args = {account.getUuid(),
-                contact.getName(),
-                Integer.toString(contact.getDeviceId())};
-        db.delete(SQLiteAxolotlStore.SESSION_TABLENAME,
-                SQLiteAxolotlStore.ACCOUNT + " = ? AND "
-                        + SQLiteAxolotlStore.NAME + " = ? AND "
-                        + SQLiteAxolotlStore.DEVICE_ID + " = ? ",
+        String[] args = {
+            account.getUuid(), contact.getName(), Integer.toString(contact.getDeviceId())
+        };
+        db.delete(
+                SQLiteAxolotlStore.SESSION_TABLENAME,
+                SQLiteAxolotlStore.ACCOUNT
+                        + " = ? AND "
+                        + SQLiteAxolotlStore.NAME
+                        + " = ? AND "
+                        + SQLiteAxolotlStore.DEVICE_ID
+                        + " = ? ",
                 args);
     }
 
     public void deleteAllSessions(Account account, SignalProtocolAddress contact) {
         SQLiteDatabase db = this.getWritableDatabase();
         String[] args = {account.getUuid(), contact.getName()};
-        db.delete(SQLiteAxolotlStore.SESSION_TABLENAME,
-                SQLiteAxolotlStore.ACCOUNT + "=? AND "
-                        + SQLiteAxolotlStore.NAME + " = ?",
+        db.delete(
+                SQLiteAxolotlStore.SESSION_TABLENAME,
+                SQLiteAxolotlStore.ACCOUNT + "=? AND " + SQLiteAxolotlStore.NAME + " = ?",
                 args);
     }
 
@@ -1311,12 +2011,15 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         SQLiteDatabase db = this.getReadableDatabase();
         String[] columns = {SQLiteAxolotlStore.KEY};
         String[] selectionArgs = {account.getUuid(), Integer.toString(preKeyId)};
-        Cursor cursor = db.query(SQLiteAxolotlStore.PREKEY_TABLENAME,
-                columns,
-                SQLiteAxolotlStore.ACCOUNT + "=? AND "
-                        + SQLiteAxolotlStore.ID + "=?",
-                selectionArgs,
-                null, null, null);
+        Cursor cursor =
+                db.query(
+                        SQLiteAxolotlStore.PREKEY_TABLENAME,
+                        columns,
+                        SQLiteAxolotlStore.ACCOUNT + "=? AND " + SQLiteAxolotlStore.ID + "=?",
+                        selectionArgs,
+                        null,
+                        null,
+                        null);
 
         return cursor;
     }
@@ -1327,7 +2030,12 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         if (cursor.getCount() != 0) {
             cursor.moveToFirst();
             try {
-                record = new PreKeyRecord(Base64.decode(cursor.getString(cursor.getColumnIndex(SQLiteAxolotlStore.KEY)), Base64.DEFAULT));
+                record =
+                        new PreKeyRecord(
+                                Base64.decode(
+                                        cursor.getString(
+                                                cursor.getColumnIndex(SQLiteAxolotlStore.KEY)),
+                                        Base64.DEFAULT));
             } catch (IOException e) {
                 throw new AssertionError(e);
             }
@@ -1347,7 +2055,8 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         SQLiteDatabase db = this.getWritableDatabase();
         ContentValues values = new ContentValues();
         values.put(SQLiteAxolotlStore.ID, record.getId());
-        values.put(SQLiteAxolotlStore.KEY, Base64.encodeToString(record.serialize(), Base64.DEFAULT));
+        values.put(
+                SQLiteAxolotlStore.KEY, Base64.encodeToString(record.serialize(), Base64.DEFAULT));
         values.put(SQLiteAxolotlStore.ACCOUNT, account.getUuid());
         db.insert(SQLiteAxolotlStore.PREKEY_TABLENAME, null, values);
     }
@@ -1355,9 +2064,9 @@ public class DatabaseBackend extends SQLiteOpenHelper {
     public int deletePreKey(Account account, int preKeyId) {
         SQLiteDatabase db = this.getWritableDatabase();
         String[] args = {account.getUuid(), Integer.toString(preKeyId)};
-        return db.delete(SQLiteAxolotlStore.PREKEY_TABLENAME,
-                SQLiteAxolotlStore.ACCOUNT + "=? AND "
-                        + SQLiteAxolotlStore.ID + "=?",
+        return db.delete(
+                SQLiteAxolotlStore.PREKEY_TABLENAME,
+                SQLiteAxolotlStore.ACCOUNT + "=? AND " + SQLiteAxolotlStore.ID + "=?",
                 args);
     }
 
@@ -1365,11 +2074,15 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         SQLiteDatabase db = this.getReadableDatabase();
         String[] columns = {SQLiteAxolotlStore.KEY};
         String[] selectionArgs = {account.getUuid(), Integer.toString(signedPreKeyId)};
-        Cursor cursor = db.query(SQLiteAxolotlStore.SIGNED_PREKEY_TABLENAME,
-                columns,
-                SQLiteAxolotlStore.ACCOUNT + "=? AND " + SQLiteAxolotlStore.ID + "=?",
-                selectionArgs,
-                null, null, null);
+        Cursor cursor =
+                db.query(
+                        SQLiteAxolotlStore.SIGNED_PREKEY_TABLENAME,
+                        columns,
+                        SQLiteAxolotlStore.ACCOUNT + "=? AND " + SQLiteAxolotlStore.ID + "=?",
+                        selectionArgs,
+                        null,
+                        null,
+                        null);
 
         return cursor;
     }
@@ -1380,7 +2093,12 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         if (cursor.getCount() != 0) {
             cursor.moveToFirst();
             try {
-                record = new SignedPreKeyRecord(Base64.decode(cursor.getString(cursor.getColumnIndex(SQLiteAxolotlStore.KEY)), Base64.DEFAULT));
+                record =
+                        new SignedPreKeyRecord(
+                                Base64.decode(
+                                        cursor.getString(
+                                                cursor.getColumnIndex(SQLiteAxolotlStore.KEY)),
+                                        Base64.DEFAULT));
             } catch (IOException e) {
                 throw new AssertionError(e);
             }
@@ -1394,15 +2112,24 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         SQLiteDatabase db = this.getReadableDatabase();
         String[] columns = {SQLiteAxolotlStore.KEY};
         String[] selectionArgs = {account.getUuid()};
-        Cursor cursor = db.query(SQLiteAxolotlStore.SIGNED_PREKEY_TABLENAME,
-                columns,
-                SQLiteAxolotlStore.ACCOUNT + "=?",
-                selectionArgs,
-                null, null, null);
+        Cursor cursor =
+                db.query(
+                        SQLiteAxolotlStore.SIGNED_PREKEY_TABLENAME,
+                        columns,
+                        SQLiteAxolotlStore.ACCOUNT + "=?",
+                        selectionArgs,
+                        null,
+                        null,
+                        null);
 
         while (cursor.moveToNext()) {
             try {
-                prekeys.add(new SignedPreKeyRecord(Base64.decode(cursor.getString(cursor.getColumnIndex(SQLiteAxolotlStore.KEY)), Base64.DEFAULT)));
+                prekeys.add(
+                        new SignedPreKeyRecord(
+                                Base64.decode(
+                                        cursor.getString(
+                                                cursor.getColumnIndex(SQLiteAxolotlStore.KEY)),
+                                        Base64.DEFAULT)));
             } catch (IOException ignored) {
             }
         }
@@ -1414,11 +2141,15 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         String[] columns = {"count(" + SQLiteAxolotlStore.KEY + ")"};
         String[] selectionArgs = {account.getUuid()};
         SQLiteDatabase db = this.getReadableDatabase();
-        Cursor cursor = db.query(SQLiteAxolotlStore.SIGNED_PREKEY_TABLENAME,
-                columns,
-                SQLiteAxolotlStore.ACCOUNT + "=?",
-                selectionArgs,
-                null, null, null);
+        Cursor cursor =
+                db.query(
+                        SQLiteAxolotlStore.SIGNED_PREKEY_TABLENAME,
+                        columns,
+                        SQLiteAxolotlStore.ACCOUNT + "=?",
+                        selectionArgs,
+                        null,
+                        null,
+                        null);
         final int count;
         if (cursor.moveToFirst()) {
             count = cursor.getInt(0);
@@ -1440,7 +2171,8 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         SQLiteDatabase db = this.getWritableDatabase();
         ContentValues values = new ContentValues();
         values.put(SQLiteAxolotlStore.ID, record.getId());
-        values.put(SQLiteAxolotlStore.KEY, Base64.encodeToString(record.serialize(), Base64.DEFAULT));
+        values.put(
+                SQLiteAxolotlStore.KEY, Base64.encodeToString(record.serialize(), Base64.DEFAULT));
         values.put(SQLiteAxolotlStore.ACCOUNT, account.getUuid());
         db.insert(SQLiteAxolotlStore.SIGNED_PREKEY_TABLENAME, null, values);
     }
@@ -1448,9 +2180,9 @@ public class DatabaseBackend extends SQLiteOpenHelper {
     public void deleteSignedPreKey(Account account, int signedPreKeyId) {
         SQLiteDatabase db = this.getWritableDatabase();
         String[] args = {account.getUuid(), Integer.toString(signedPreKeyId)};
-        db.delete(SQLiteAxolotlStore.SIGNED_PREKEY_TABLENAME,
-                SQLiteAxolotlStore.ACCOUNT + "=? AND "
-                        + SQLiteAxolotlStore.ID + "=?",
+        db.delete(
+                SQLiteAxolotlStore.SIGNED_PREKEY_TABLENAME,
+                SQLiteAxolotlStore.ACCOUNT + "=? AND " + SQLiteAxolotlStore.ID + "=?",
                 args);
     }
 
@@ -1459,7 +2191,8 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         return getIdentityKeyCursor(db, account, name, own);
     }
 
-    private Cursor getIdentityKeyCursor(SQLiteDatabase db, Account account, String name, boolean own) {
+    private Cursor getIdentityKeyCursor(
+            SQLiteDatabase db, Account account, String name, boolean own) {
         return getIdentityKeyCursor(db, account, name, own, null);
     }
 
@@ -1472,11 +2205,14 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         return getIdentityKeyCursor(db, account, null, null, fingerprint);
     }
 
-    private Cursor getIdentityKeyCursor(SQLiteDatabase db, Account account, String name, Boolean own, String fingerprint) {
-        String[] columns = {SQLiteAxolotlStore.TRUST,
-                SQLiteAxolotlStore.ACTIVE,
-                SQLiteAxolotlStore.LAST_ACTIVATION,
-                SQLiteAxolotlStore.KEY};
+    private Cursor getIdentityKeyCursor(
+            SQLiteDatabase db, Account account, String name, Boolean own, String fingerprint) {
+        String[] columns = {
+            SQLiteAxolotlStore.TRUST,
+            SQLiteAxolotlStore.ACTIVE,
+            SQLiteAxolotlStore.LAST_ACTIVATION,
+            SQLiteAxolotlStore.KEY
+        };
         ArrayList<String> selectionArgs = new ArrayList<>(4);
         selectionArgs.add(account.getUuid());
         String selectionString = SQLiteAxolotlStore.ACCOUNT + " = ?";
@@ -1492,11 +2228,15 @@ public class DatabaseBackend extends SQLiteOpenHelper {
             selectionArgs.add(own ? "1" : "0");
             selectionString += " AND " + SQLiteAxolotlStore.OWN + " = ?";
         }
-        Cursor cursor = db.query(SQLiteAxolotlStore.IDENTITIES_TABLENAME,
-                columns,
-                selectionString,
-                selectionArgs.toArray(new String[selectionArgs.size()]),
-                null, null, null);
+        Cursor cursor =
+                db.query(
+                        SQLiteAxolotlStore.IDENTITIES_TABLENAME,
+                        columns,
+                        selectionString,
+                        selectionArgs.toArray(new String[selectionArgs.size()]),
+                        null,
+                        null,
+                        null);
 
         return cursor;
     }
@@ -1513,9 +2253,20 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         if (cursor.getCount() != 0) {
             cursor.moveToFirst();
             try {
-                identityKeyPair = new IdentityKeyPair(Base64.decode(cursor.getString(cursor.getColumnIndex(SQLiteAxolotlStore.KEY)), Base64.DEFAULT));
+                identityKeyPair =
+                        new IdentityKeyPair(
+                                Base64.decode(
+                                        cursor.getString(
+                                                cursor.getColumnIndex(SQLiteAxolotlStore.KEY)),
+                                        Base64.DEFAULT));
             } catch (InvalidKeyException e) {
-                Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Encountered invalid IdentityKey in database for account" + account.getJid().asBareJid() + ", address: " + name);
+                Log.d(
+                        Config.LOGTAG,
+                        AxolotlService.getLogprefix(account)
+                                + "Encountered invalid IdentityKey in database for account"
+                                + account.getJid().asBareJid()
+                                + ", address: "
+                                + name);
             }
         }
         cursor.close();
@@ -1527,7 +2278,8 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         return loadIdentityKeys(account, name, null);
     }
 
-    public Set<IdentityKey> loadIdentityKeys(Account account, String name, FingerprintStatus status) {
+    public Set<IdentityKey> loadIdentityKeys(
+            Account account, String name, FingerprintStatus status) {
         Set<IdentityKey> identityKeys = new HashSet<>();
         Cursor cursor = getIdentityKeyCursor(account, name, false);
 
@@ -1540,10 +2292,22 @@ public class DatabaseBackend extends SQLiteOpenHelper {
                 if (key != null) {
                     identityKeys.add(new IdentityKey(Base64.decode(key, Base64.DEFAULT), 0));
                 } else {
-                    Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Missing key (possibly preverified) in database for account" + account.getJid().asBareJid() + ", address: " + name);
+                    Log.d(
+                            Config.LOGTAG,
+                            AxolotlService.getLogprefix(account)
+                                    + "Missing key (possibly preverified) in database for account"
+                                    + account.getJid().asBareJid()
+                                    + ", address: "
+                                    + name);
                 }
             } catch (InvalidKeyException e) {
-                Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account) + "Encountered invalid IdentityKey in database for account" + account.getJid().asBareJid() + ", address: " + name);
+                Log.d(
+                        Config.LOGTAG,
+                        AxolotlService.getLogprefix(account)
+                                + "Encountered invalid IdentityKey in database for account"
+                                + account.getJid().asBareJid()
+                                + ", address: "
+                                + name);
             }
         }
         cursor.close();
@@ -1554,22 +2318,40 @@ public class DatabaseBackend extends SQLiteOpenHelper {
     public long numTrustedKeys(Account account, String name) {
         SQLiteDatabase db = getReadableDatabase();
         String[] args = {
-                account.getUuid(),
-                name,
-                FingerprintStatus.Trust.TRUSTED.toString(),
-                FingerprintStatus.Trust.VERIFIED.toString(),
-                FingerprintStatus.Trust.VERIFIED_X509.toString()
+            account.getUuid(),
+            name,
+            FingerprintStatus.Trust.TRUSTED.toString(),
+            FingerprintStatus.Trust.VERIFIED.toString(),
+            FingerprintStatus.Trust.VERIFIED_X509.toString()
         };
-        return DatabaseUtils.queryNumEntries(db, SQLiteAxolotlStore.IDENTITIES_TABLENAME,
-                SQLiteAxolotlStore.ACCOUNT + " = ?"
-                        + " AND " + SQLiteAxolotlStore.NAME + " = ?"
-                        + " AND (" + SQLiteAxolotlStore.TRUST + " = ? OR " + SQLiteAxolotlStore.TRUST + " = ? OR " + SQLiteAxolotlStore.TRUST + " = ?)"
-                        + " AND " + SQLiteAxolotlStore.ACTIVE + " > 0",
-                args
-        );
+        return DatabaseUtils.queryNumEntries(
+                db,
+                SQLiteAxolotlStore.IDENTITIES_TABLENAME,
+                SQLiteAxolotlStore.ACCOUNT
+                        + " = ?"
+                        + " AND "
+                        + SQLiteAxolotlStore.NAME
+                        + " = ?"
+                        + " AND ("
+                        + SQLiteAxolotlStore.TRUST
+                        + " = ? OR "
+                        + SQLiteAxolotlStore.TRUST
+                        + " = ? OR "
+                        + SQLiteAxolotlStore.TRUST
+                        + " = ?)"
+                        + " AND "
+                        + SQLiteAxolotlStore.ACTIVE
+                        + " > 0",
+                args);
     }
 
-    private void storeIdentityKey(Account account, String name, boolean own, String fingerprint, String base64Serialized, FingerprintStatus status) {
+    private void storeIdentityKey(
+            Account account,
+            String name,
+            boolean own,
+            String fingerprint,
+            String base64Serialized,
+            FingerprintStatus status) {
         SQLiteDatabase db = this.getWritableDatabase();
         ContentValues values = new ContentValues();
         values.put(SQLiteAxolotlStore.ACCOUNT, account.getUuid());
@@ -1578,7 +2360,13 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         values.put(SQLiteAxolotlStore.FINGERPRINT, fingerprint);
         values.put(SQLiteAxolotlStore.KEY, base64Serialized);
         values.putAll(status.toContentValues());
-        String where = SQLiteAxolotlStore.ACCOUNT + "=? AND " + SQLiteAxolotlStore.NAME + "=? AND " + SQLiteAxolotlStore.FINGERPRINT + " =?";
+        String where =
+                SQLiteAxolotlStore.ACCOUNT
+                        + "=? AND "
+                        + SQLiteAxolotlStore.NAME
+                        + "=? AND "
+                        + SQLiteAxolotlStore.FINGERPRINT
+                        + " =?";
         String[] whereArgs = {account.getUuid(), name, fingerprint};
         int rows = db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, values, where, whereArgs);
         if (rows == 0) {
@@ -1586,7 +2374,8 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         }
     }
 
-    public void storePreVerification(Account account, String name, String fingerprint, FingerprintStatus status) {
+    public void storePreVerification(
+            Account account, String name, String fingerprint, FingerprintStatus status) {
         SQLiteDatabase db = this.getWritableDatabase();
         ContentValues values = new ContentValues();
         values.put(SQLiteAxolotlStore.ACCOUNT, account.getUuid());
@@ -1610,36 +2399,43 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         return status;
     }
 
-    public boolean setIdentityKeyTrust(Account account, String fingerprint, FingerprintStatus fingerprintStatus) {
+    public boolean setIdentityKeyTrust(
+            Account account, String fingerprint, FingerprintStatus fingerprintStatus) {
         SQLiteDatabase db = this.getWritableDatabase();
         return setIdentityKeyTrust(db, account, fingerprint, fingerprintStatus);
     }
 
-    private boolean setIdentityKeyTrust(SQLiteDatabase db, Account account, String fingerprint, FingerprintStatus status) {
-        String[] selectionArgs = {
-                account.getUuid(),
-                fingerprint
-        };
-        int rows = db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, status.toContentValues(),
-                SQLiteAxolotlStore.ACCOUNT + " = ? AND "
-                        + SQLiteAxolotlStore.FINGERPRINT + " = ? ",
-                selectionArgs);
+    private boolean setIdentityKeyTrust(
+            SQLiteDatabase db, Account account, String fingerprint, FingerprintStatus status) {
+        String[] selectionArgs = {account.getUuid(), fingerprint};
+        int rows =
+                db.update(
+                        SQLiteAxolotlStore.IDENTITIES_TABLENAME,
+                        status.toContentValues(),
+                        SQLiteAxolotlStore.ACCOUNT
+                                + " = ? AND "
+                                + SQLiteAxolotlStore.FINGERPRINT
+                                + " = ? ",
+                        selectionArgs);
         return rows == 1;
     }
 
-    public boolean setIdentityKeyCertificate(Account account, String fingerprint, X509Certificate x509Certificate) {
+    public boolean setIdentityKeyCertificate(
+            Account account, String fingerprint, X509Certificate x509Certificate) {
         SQLiteDatabase db = this.getWritableDatabase();
-        String[] selectionArgs = {
-                account.getUuid(),
-                fingerprint
-        };
+        String[] selectionArgs = {account.getUuid(), fingerprint};
         try {
             ContentValues values = new ContentValues();
             values.put(SQLiteAxolotlStore.CERTIFICATE, x509Certificate.getEncoded());
-            return db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, values,
-                    SQLiteAxolotlStore.ACCOUNT + " = ? AND "
-                            + SQLiteAxolotlStore.FINGERPRINT + " = ? ",
-                    selectionArgs) == 1;
+            return db.update(
+                            SQLiteAxolotlStore.IDENTITIES_TABLENAME,
+                            values,
+                            SQLiteAxolotlStore.ACCOUNT
+                                    + " = ? AND "
+                                    + SQLiteAxolotlStore.FINGERPRINT
+                                    + " = ? ",
+                            selectionArgs)
+                    == 1;
         } catch (CertificateEncodingException e) {
             Log.d(Config.LOGTAG, "could not encode certificate");
             return false;
@@ -1648,25 +2444,34 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 
     public X509Certificate getIdentityKeyCertifcate(Account account, String fingerprint) {
         SQLiteDatabase db = this.getReadableDatabase();
-        String[] selectionArgs = {
-                account.getUuid(),
-                fingerprint
-        };
+        String[] selectionArgs = {account.getUuid(), fingerprint};
         String[] colums = {SQLiteAxolotlStore.CERTIFICATE};
-        String selection = SQLiteAxolotlStore.ACCOUNT + " = ? AND " + SQLiteAxolotlStore.FINGERPRINT + " = ? ";
-        Cursor cursor = db.query(SQLiteAxolotlStore.IDENTITIES_TABLENAME, colums, selection, selectionArgs, null, null, null);
+        String selection =
+                SQLiteAxolotlStore.ACCOUNT + " = ? AND " + SQLiteAxolotlStore.FINGERPRINT + " = ? ";
+        Cursor cursor =
+                db.query(
+                        SQLiteAxolotlStore.IDENTITIES_TABLENAME,
+                        colums,
+                        selection,
+                        selectionArgs,
+                        null,
+                        null,
+                        null);
         if (cursor.getCount() < 1) {
             return null;
         } else {
             cursor.moveToFirst();
-            byte[] certificate = cursor.getBlob(cursor.getColumnIndex(SQLiteAxolotlStore.CERTIFICATE));
+            byte[] certificate =
+                    cursor.getBlob(cursor.getColumnIndex(SQLiteAxolotlStore.CERTIFICATE));
             cursor.close();
             if (certificate == null || certificate.length == 0) {
                 return null;
             }
             try {
                 CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
-                return (X509Certificate) certificateFactory.generateCertificate(new ByteArrayInputStream(certificate));
+                return (X509Certificate)
+                        certificateFactory.generateCertificate(
+                                new ByteArrayInputStream(certificate));
             } catch (CertificateException e) {
                 Log.d(Config.LOGTAG, "certificate exception " + e.getMessage());
                 return null;
@@ -1674,17 +2479,31 @@ public class DatabaseBackend extends SQLiteOpenHelper {
         }
     }
 
-    public void storeIdentityKey(Account account, String name, IdentityKey identityKey, FingerprintStatus status) {
-        storeIdentityKey(account, name, false, CryptoHelper.bytesToHex(identityKey.getPublicKey().serialize()), Base64.encodeToString(identityKey.serialize(), Base64.DEFAULT), status);
+    public void storeIdentityKey(
+            Account account, String name, IdentityKey identityKey, FingerprintStatus status) {
+        storeIdentityKey(
+                account,
+                name,
+                false,
+                CryptoHelper.bytesToHex(identityKey.getPublicKey().serialize()),
+                Base64.encodeToString(identityKey.serialize(), Base64.DEFAULT),
+                status);
     }
 
     public void storeOwnIdentityKeyPair(Account account, IdentityKeyPair identityKeyPair) {
-        storeIdentityKey(account, account.getJid().asBareJid().toString(), true, CryptoHelper.bytesToHex(identityKeyPair.getPublicKey().serialize()), Base64.encodeToString(identityKeyPair.serialize(), Base64.DEFAULT), FingerprintStatus.createActiveVerified(false));
+        storeIdentityKey(
+                account,
+                account.getJid().asBareJid().toString(),
+                true,
+                CryptoHelper.bytesToHex(identityKeyPair.getPublicKey().serialize()),
+                Base64.encodeToString(identityKeyPair.serialize(), Base64.DEFAULT),
+                FingerprintStatus.createActiveVerified(false));
     }
 
-
     private void recreateAxolotlDb(SQLiteDatabase db) {
-        Log.d(Config.LOGTAG, AxolotlService.LOGPREFIX + " : " + ">>> (RE)CREATING AXOLOTL DATABASE <<<");
+        Log.d(
+                Config.LOGTAG,
+                AxolotlService.LOGPREFIX + " : " + ">>> (RE)CREATING AXOLOTL DATABASE <<<");
         db.execSQL("DROP TABLE IF EXISTS " + SQLiteAxolotlStore.SESSION_TABLENAME);
         db.execSQL(CREATE_SESSIONS_STATEMENT);
         db.execSQL("DROP TABLE IF EXISTS " + SQLiteAxolotlStore.PREKEY_TABLENAME);
@@ -1697,36 +2516,70 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 
     public void wipeAxolotlDb(Account account) {
         String accountName = account.getUuid();
-        Log.d(Config.LOGTAG, AxolotlService.getLogprefix(account) + ">>> WIPING AXOLOTL DATABASE FOR ACCOUNT " + accountName + " <<<");
+        Log.d(
+                Config.LOGTAG,
+                AxolotlService.getLogprefix(account)
+                        + ">>> WIPING AXOLOTL DATABASE FOR ACCOUNT "
+                        + accountName
+                        + " <<<");
         SQLiteDatabase db = this.getWritableDatabase();
-        String[] deleteArgs = {
-                accountName
-        };
-        db.delete(SQLiteAxolotlStore.SESSION_TABLENAME,
+        String[] deleteArgs = {accountName};
+        db.delete(
+                SQLiteAxolotlStore.SESSION_TABLENAME,
                 SQLiteAxolotlStore.ACCOUNT + " = ?",
                 deleteArgs);
-        db.delete(SQLiteAxolotlStore.PREKEY_TABLENAME,
+        db.delete(
+                SQLiteAxolotlStore.PREKEY_TABLENAME,
                 SQLiteAxolotlStore.ACCOUNT + " = ?",
                 deleteArgs);
-        db.delete(SQLiteAxolotlStore.SIGNED_PREKEY_TABLENAME,
+        db.delete(
+                SQLiteAxolotlStore.SIGNED_PREKEY_TABLENAME,
                 SQLiteAxolotlStore.ACCOUNT + " = ?",
                 deleteArgs);
-        db.delete(SQLiteAxolotlStore.IDENTITIES_TABLENAME,
+        db.delete(
+                SQLiteAxolotlStore.IDENTITIES_TABLENAME,
                 SQLiteAxolotlStore.ACCOUNT + " = ?",
                 deleteArgs);
     }
 
-    public List<ShortcutService.FrequentContact> getFrequentContacts(int days) {
-        SQLiteDatabase db = this.getReadableDatabase();
-        final String SQL = "select " + Conversation.TABLENAME + "." + Conversation.ACCOUNT + "," + Conversation.TABLENAME + "." + Conversation.CONTACTJID + " from " + Conversation.TABLENAME + " join " + Message.TABLENAME + " on conversations.uuid=messages.conversationUuid where messages.status!=0 and carbon==0  and conversations.mode=0 and messages.timeSent>=? group by conversations.uuid order by count(body) desc limit 4;";
-        String[] whereArgs = new String[]{String.valueOf(System.currentTimeMillis() - (Config.MILLISECONDS_IN_DAY * days))};
+    public List<ShortcutService.FrequentContact> getFrequentContacts(final int days) {
+        final var db = this.getReadableDatabase();
+        final String SQL =
+                "select "
+                        + Conversation.TABLENAME
+                        + "."
+                        + Conversation.UUID
+                        + ","
+                        + Conversation.TABLENAME
+                        + "."
+                        + Conversation.ACCOUNT
+                        + ","
+                        + Conversation.TABLENAME
+                        + "."
+                        + Conversation.CONTACTJID
+                        + " from "
+                        + Conversation.TABLENAME
+                        + " join "
+                        + Message.TABLENAME
+                        + " on conversations.uuid=messages.conversationUuid where"
+                        + " messages.status!=0 and carbon==0  and conversations.mode=0 and"
+                        + " messages.timeSent>=? group by conversations.uuid order by count(body)"
+                        + " desc limit 4;";
+        String[] whereArgs =
+                new String[] {
+                    String.valueOf(System.currentTimeMillis() - (Config.MILLISECONDS_IN_DAY * days))
+                };
         Cursor cursor = db.rawQuery(SQL, whereArgs);
         ArrayList<ShortcutService.FrequentContact> contacts = new ArrayList<>();
         while (cursor.moveToNext()) {
             try {
-                contacts.add(new ShortcutService.FrequentContact(cursor.getString(0), Jid.of(cursor.getString(1))));
-            } catch (Exception e) {
-                Log.d(Config.LOGTAG, e.getMessage());
+                contacts.add(
+                        new ShortcutService.FrequentContact(
+                                cursor.getString(0),
+                                cursor.getString(1),
+                                Jid.of(cursor.getString(2))));
+            } catch (final Exception e) {
+                Log.e(Config.LOGTAG, "could not create frequent contact", e);
             }
         }
         cursor.close();
diff --git a/src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java b/src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java
deleted file mode 100644
index 63a9afc3fa8558f1096d47f9a4f1689e4b1cf11e..0000000000000000000000000000000000000000
--- a/src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package eu.siacs.conversations.services;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.ServiceConnection;
-import android.graphics.drawable.Icon;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.service.chooser.ChooserTarget;
-import android.service.chooser.ChooserTargetService;
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.receiver.SystemEventReceiver;
-import eu.siacs.conversations.ui.ConversationsActivity;
-import eu.siacs.conversations.utils.Compatibility;
-
-@SuppressLint("Deprecated")
-@TargetApi(Build.VERSION_CODES.M)
-public class ContactChooserTargetService extends ChooserTargetService implements ServiceConnection {
-
-    private final Object lock = new Object();
-    private static final int MAX_TARGETS = 5;
-    private XmppConnectionService mXmppConnectionService;
-
-    private static boolean textOnly(IntentFilter filter) {
-        for (int i = 0; i < filter.countDataTypes(); ++i) {
-            if (!"text/plain".equals(filter.getDataType(i))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    @Override
-    public List<ChooserTarget> onGetChooserTargets(
-            final ComponentName targetActivityName, final IntentFilter matchedFilter) {
-        if (!SystemEventReceiver.hasEnabledAccounts(this)) {
-            return Collections.emptyList();
-        }
-        final Intent intent = new Intent(this, XmppConnectionService.class);
-        intent.setAction("contact_chooser");
-        Compatibility.startService(this, intent);
-        bindService(intent, this, Context.BIND_AUTO_CREATE);
-        try {
-            waitForService();
-            if (!mXmppConnectionService.areMessagesInitialized()) {
-                return Collections.emptyList();
-            }
-            final ArrayList<Conversation> conversations = new ArrayList<>();
-            mXmppConnectionService.populateWithOrderedConversations(
-                    conversations, textOnly(matchedFilter));
-            final ComponentName componentName =
-                    new ComponentName(this, ConversationsActivity.class);
-            final int pixel = AvatarService.getSystemUiAvatarSize(this);
-            final ArrayList<ChooserTarget> chooserTargets = new ArrayList<>();
-            for (final Conversation conversation : conversations) {
-                if (conversation.sentMessagesCount() == 0) {
-                    continue;
-                }
-                final String name = conversation.getName().toString();
-                final Icon icon =
-                        Icon.createWithBitmap(
-                                mXmppConnectionService.getAvatarService().get(conversation, pixel));
-                final float score = 1 - (1.0f / MAX_TARGETS) * chooserTargets.size();
-                final Bundle extras = new Bundle();
-                extras.putString(ConversationsActivity.EXTRA_CONVERSATION, conversation.getUuid());
-                chooserTargets.add(new ChooserTarget(name, icon, score, componentName, extras));
-                if (chooserTargets.size() >= MAX_TARGETS) {
-                    return chooserTargets;
-                }
-            }
-            return chooserTargets;
-        } catch (final InterruptedException e) {
-            Log.d(
-                    Config.LOGTAG,
-                    "Thread got interrupted before binding to XmppConnectionService",
-                    e);
-        } finally {
-            unbindService(this);
-        }
-        return Collections.emptyList();
-    }
-
-    @Override
-    public void onServiceConnected(final ComponentName name, final IBinder service) {
-        XmppConnectionService.XmppConnectionBinder binder =
-                (XmppConnectionService.XmppConnectionBinder) service;
-        mXmppConnectionService = binder.getService();
-        synchronized (this.lock) {
-            lock.notifyAll();
-        }
-    }
-
-    @Override
-    public void onServiceDisconnected(ComponentName name) {
-        mXmppConnectionService = null;
-    }
-
-    private void waitForService() throws InterruptedException {
-        if (mXmppConnectionService == null) {
-            synchronized (this.lock) {
-                lock.wait();
-            }
-        }
-    }
-}
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index 409a05d573282b2b7a677fabb6f3c8b523101090..4fd89f8a776cf6345fb96e652612ae25e9214f17 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -28,7 +28,6 @@ import android.text.SpannableString;
 import android.text.style.StyleSpan;
 import android.util.DisplayMetrics;
 import android.util.Log;
-
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
 import androidx.core.app.ActivityCompat;
@@ -41,7 +40,6 @@ import androidx.core.app.RemoteInput;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.core.graphics.drawable.IconCompat;
-
 import com.google.common.base.Joiner;
 import com.google.common.base.Optional;
 import com.google.common.base.Splitter;
@@ -49,7 +47,6 @@ import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.google.common.primitives.Ints;
-
 import eu.siacs.conversations.AppSettings;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
@@ -70,7 +67,6 @@ import eu.siacs.conversations.utils.UIHelper;
 import eu.siacs.conversations.xmpp.XmppConnection;
 import eu.siacs.conversations.xmpp.jingle.AbstractJingleConnection;
 import eu.siacs.conversations.xmpp.jingle.Media;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -505,7 +501,8 @@ public class NotificationService {
             Log.d(
                     Config.LOGTAG,
                     message.getConversation().getAccount().getJid().asBareJid()
-                            + ": suppressing failed delivery notification because conversation is open");
+                            + ": suppressing failed delivery notification because conversation is"
+                            + " open");
             return;
         }
         final PendingIntent pendingIntent = createContentIntent(conversation);
@@ -631,10 +628,11 @@ public class NotificationService {
                         .build());
         modifyIncomingCall(builder);
         final Notification notification = builder.build();
-        notification.audioAttributes = new AudioAttributes.Builder()
-                .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
-                .build();
+        notification.audioAttributes =
+                new AudioAttributes.Builder()
+                        .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                        .setUsage(AudioAttributes.USAGE_NOTIFICATION_RINGTONE)
+                        .build();
         notification.flags = notification.flags | Notification.FLAG_INSISTENT;
         notify(INCOMING_CALL_NOTIFICATION_ID, notification);
     }
@@ -708,7 +706,8 @@ public class NotificationService {
         if (jingleRtpConnection == null) {
             return false;
         }
-        final var notificationManager = mXmppConnectionService.getSystemService(NotificationManager.class);
+        final var notificationManager =
+                mXmppConnectionService.getSystemService(NotificationManager.class);
         if (Iterables.any(
                 Arrays.asList(notificationManager.getActiveNotifications()),
                 n -> n.getId() == INCOMING_CALL_NOTIFICATION_ID)) {
@@ -820,7 +819,8 @@ public class NotificationService {
                         Log.d(
                                 Config.LOGTAG,
                                 conversational.getAccount().getJid().asBareJid()
-                                        + ": dismissed missed call because call was picked up on other device");
+                                        + ": dismissed missed call because call was picked up on"
+                                        + " other device");
                         iterator.remove();
                     }
                 }
@@ -1345,12 +1345,15 @@ public class NotificationService {
             if (systemAccount != null) {
                 notificationBuilder.addPerson(systemAccount.toString());
             }
-            info = mXmppConnectionService.getShortcutService().getShortcutInfoCompat(contact);
+            info =
+                    mXmppConnectionService
+                            .getShortcutService()
+                            .getShortcutInfo(contact, conversation.getUuid());
         } else {
             info =
                     mXmppConnectionService
                             .getShortcutService()
-                            .getShortcutInfoCompat(conversation.getMucOptions());
+                            .getShortcutInfo(conversation.getMucOptions());
         }
         notificationBuilder.setWhen(conversation.getLatestMessage().getTimeSent());
         notificationBuilder.setSmallIcon(R.drawable.ic_app_icon_notification);
@@ -1384,16 +1387,16 @@ public class NotificationService {
             }
             final BigPictureStyle bigPictureStyle = new NotificationCompat.BigPictureStyle();
             bigPictureStyle.bigPicture(bitmap);
-            if (tmp.size() > 0) {
-                CharSequence text = getMergedBodies(tmp);
-                bigPictureStyle.setSummaryText(text);
-                builder.setContentText(text);
-                builder.setTicker(text);
-            } else {
+            if (tmp.isEmpty()) {
                 final String description =
                         UIHelper.getFileDescriptionString(mXmppConnectionService, message);
                 builder.setContentText(description);
                 builder.setTicker(description);
+            } else {
+                final CharSequence text = getMergedBodies(tmp);
+                bigPictureStyle.setSummaryText(text);
+                builder.setContentText(text);
+                builder.setTicker(text);
             }
             builder.setStyle(bigPictureStyle);
         } catch (final IOException e) {
diff --git a/src/main/java/eu/siacs/conversations/services/ShortcutService.java b/src/main/java/eu/siacs/conversations/services/ShortcutService.java
index c6ae77b63e1d13fabf1f8cdc751fe35f0d6e6ded..ef208d690fb174aee109ff1072f2b0c16f4cdd77 100644
--- a/src/main/java/eu/siacs/conversations/services/ShortcutService.java
+++ b/src/main/java/eu/siacs/conversations/services/ShortcutService.java
@@ -2,37 +2,38 @@ package eu.siacs.conversations.services;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
-import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
 import android.graphics.Bitmap;
-import android.graphics.drawable.Icon;
 import android.net.Uri;
 import android.os.Build;
+import android.os.PersistableBundle;
 import android.util.Log;
-
 import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
 import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
 import androidx.core.graphics.drawable.IconCompat;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.MucOptions;
+import eu.siacs.conversations.ui.ConversationsActivity;
 import eu.siacs.conversations.ui.StartConversationActivity;
 import eu.siacs.conversations.utils.ReplacingSerialSingleThreadExecutor;
 import eu.siacs.conversations.xmpp.Jid;
+import java.util.Collection;
+import java.util.List;
 
 public class ShortcutService {
 
     private final XmppConnectionService xmppConnectionService;
-    private final ReplacingSerialSingleThreadExecutor replacingSerialSingleThreadExecutor = new ReplacingSerialSingleThreadExecutor(ShortcutService.class.getSimpleName());
+    private final ReplacingSerialSingleThreadExecutor replacingSerialSingleThreadExecutor =
+            new ReplacingSerialSingleThreadExecutor(ShortcutService.class.getSimpleName());
 
-    public ShortcutService(XmppConnectionService xmppConnectionService) {
+    public ShortcutService(final XmppConnectionService xmppConnectionService) {
         this.xmppConnectionService = xmppConnectionService;
     }
 
@@ -42,12 +43,7 @@ public class ShortcutService {
 
     public void refresh(final boolean forceUpdate) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            final Runnable r = new Runnable() {
-                @Override
-                public void run() {
-                    refreshImpl(forceUpdate);
-                }
-            };
+            final Runnable r = () -> refreshImpl(forceUpdate);
             replacingSerialSingleThreadExecutor.execute(r);
         }
     }
@@ -55,87 +51,88 @@ public class ShortcutService {
     @TargetApi(25)
     public void report(Contact contact) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            ShortcutManager shortcutManager = xmppConnectionService.getSystemService(ShortcutManager.class);
+            ShortcutManager shortcutManager =
+                    xmppConnectionService.getSystemService(ShortcutManager.class);
             shortcutManager.reportShortcutUsed(getShortcutId(contact));
         }
     }
 
     @TargetApi(25)
-    private void refreshImpl(boolean forceUpdate) {
-        List<FrequentContact> frequentContacts = xmppConnectionService.databaseBackend.getFrequentContacts(30);
-        HashMap<String,Account> accounts = new HashMap<>();
-        for(Account account : xmppConnectionService.getAccounts()) {
-            accounts.put(account.getUuid(),account);
-        }
-        List<Contact> contacts = new ArrayList<>();
-        for(FrequentContact frequentContact : frequentContacts) {
-            Account account = accounts.get(frequentContact.account);
+    private void refreshImpl(final boolean forceUpdate) {
+        final var frequentContacts = xmppConnectionService.databaseBackend.getFrequentContacts(30);
+        final var accounts =
+                ImmutableMap.copyOf(
+                        Maps.uniqueIndex(xmppConnectionService.getAccounts(), Account::getUuid));
+        final var contactBuilder = new ImmutableMap.Builder<FrequentContact, Contact>();
+        for (final var frequentContact : frequentContacts) {
+            final Account account = accounts.get(frequentContact.account);
             if (account != null) {
-                contacts.add(account.getRoster().getContact(frequentContact.contact));
+                final var contact = account.getRoster().getContact(frequentContact.contact);
+                contactBuilder.put(frequentContact, contact);
             }
         }
-        ShortcutManager shortcutManager = xmppConnectionService.getSystemService(ShortcutManager.class);
-        boolean needsUpdate = forceUpdate || contactsChanged(contacts,shortcutManager.getDynamicShortcuts());
+        final var contacts = contactBuilder.build();
+        final var current = ShortcutManagerCompat.getDynamicShortcuts(xmppConnectionService);
+        boolean needsUpdate = forceUpdate || contactsChanged(contacts.values(), current);
         if (!needsUpdate) {
-            Log.d(Config.LOGTAG,"skipping shortcut update");
+            Log.d(Config.LOGTAG, "skipping shortcut update");
             return;
         }
-        List<ShortcutInfo> newDynamicShortCuts = new ArrayList<>();
-        for (Contact contact : contacts) {
-            ShortcutInfo shortcut = getShortcutInfo(contact);
-            newDynamicShortCuts.add(shortcut);
+        final var newDynamicShortcuts = new ImmutableList.Builder<ShortcutInfoCompat>();
+        for (final var entry : contacts.entrySet()) {
+            final var contact = entry.getValue();
+            final var conversation = entry.getKey().conversation;
+            final var shortcut = getShortcutInfo(contact, conversation);
+            newDynamicShortcuts.add(shortcut);
         }
-        if (shortcutManager.setDynamicShortcuts(newDynamicShortCuts)) {
-            Log.d(Config.LOGTAG,"updated dynamic shortcuts");
+        if (ShortcutManagerCompat.setDynamicShortcuts(
+                xmppConnectionService, newDynamicShortcuts.build())) {
+            Log.d(Config.LOGTAG, "updated dynamic shortcuts");
         } else {
             Log.d(Config.LOGTAG, "unable to update dynamic shortcuts");
         }
     }
 
-    public ShortcutInfoCompat getShortcutInfoCompat(final Contact contact) {
+    public ShortcutInfoCompat getShortcutInfo(final Contact contact, final String conversation) {
         final ShortcutInfoCompat.Builder builder =
                 new ShortcutInfoCompat.Builder(xmppConnectionService, getShortcutId(contact))
                         .setShortLabel(contact.getDisplayName())
                         .setIntent(getShortcutIntent(contact))
                         .setIsConversation();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            builder.setIcon(
-                    IconCompat.createFromIcon(
-                            xmppConnectionService,
-                            Icon.createWithBitmap(
-                                    xmppConnectionService
-                                            .getAvatarService()
-                                            .getRoundedShortcut(contact))));
+        builder.setIcon(
+                IconCompat.createWithBitmap(
+                        xmppConnectionService.getAvatarService().getRoundedShortcut(contact)));
+        if (conversation != null) {
+            setConversation(builder, conversation);
         }
         return builder.build();
     }
 
-    public ShortcutInfoCompat getShortcutInfoCompat(final MucOptions mucOptions) {
+    public ShortcutInfoCompat getShortcutInfo(final MucOptions mucOptions) {
         final ShortcutInfoCompat.Builder builder =
                 new ShortcutInfoCompat.Builder(xmppConnectionService, getShortcutId(mucOptions))
                         .setShortLabel(mucOptions.getConversation().getName())
                         .setIntent(getShortcutIntent(mucOptions))
                         .setIsConversation();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            builder.setIcon(
-                    IconCompat.createFromIcon(
-                            xmppConnectionService,
-                            Icon.createWithBitmap(
-                                    xmppConnectionService
-                                            .getAvatarService()
-                                            .getRoundedShortcut(mucOptions))));
-        }
+        builder.setIcon(
+                IconCompat.createWithBitmap(
+                        xmppConnectionService.getAvatarService().getRoundedShortcut(mucOptions)));
+        setConversation(builder, mucOptions.getConversation().getUuid());
         return builder.build();
     }
 
-    @TargetApi(Build.VERSION_CODES.N_MR1)
-    private ShortcutInfo getShortcutInfo(final Contact contact) {
-        return getShortcutInfoCompat(contact).toShortcutInfo();
+    private static void setConversation(
+            final ShortcutInfoCompat.Builder builder, @NonNull final String conversation) {
+        builder.setCategories(ImmutableSet.of("eu.siacs.conversations.category.SHARE_TARGET"));
+        final var extras = new PersistableBundle();
+        extras.putString(ConversationsActivity.EXTRA_CONVERSATION, conversation);
+        builder.setExtras(extras);
     }
 
-    private static boolean contactsChanged(List<Contact> needles, List<ShortcutInfo> haystack) {
-        for(Contact needle : needles) {
-            if(!contactExists(needle,haystack)) {
+    private static boolean contactsChanged(
+            final Collection<Contact> needles, final List<ShortcutInfoCompat> haystack) {
+        for (final Contact needle : needles) {
+            if (!contactExists(needle, haystack)) {
                 return true;
             }
         }
@@ -143,17 +140,22 @@ public class ShortcutService {
     }
 
     @TargetApi(25)
-    private static boolean contactExists(Contact needle, List<ShortcutInfo> haystack) {
-        for(ShortcutInfo shortcutInfo : haystack) {
-            if (getShortcutId(needle).equals(shortcutInfo.getId()) && needle.getDisplayName().equals(shortcutInfo.getShortLabel())) {
+    private static boolean contactExists(
+            final Contact needle, final List<ShortcutInfoCompat> haystack) {
+        for (final ShortcutInfoCompat shortcutInfo : haystack) {
+            final var label = shortcutInfo.getShortLabel();
+            if (getShortcutId(needle).equals(shortcutInfo.getId())
+                    && needle.getDisplayName().equals(label.toString())) {
                 return true;
             }
         }
         return false;
     }
 
-    private static String getShortcutId(Contact contact) {
-        return contact.getAccount().getJid().asBareJid().toEscapedString()+"#"+contact.getJid().asBareJid().toEscapedString();
+    private static String getShortcutId(final Contact contact) {
+        return contact.getAccount().getJid().asBareJid().toEscapedString()
+                + "#"
+                + contact.getJid().asBareJid().toEscapedString();
     }
 
     private static String getShortcutId(final MucOptions mucOptions) {
@@ -194,12 +196,15 @@ public class ShortcutService {
     }
 
     @NonNull
-    public Intent createShortcut(Contact contact, boolean legacy) {
+    public Intent createShortcut(final Contact contact, final boolean legacy) {
         Intent intent;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !legacy) {
-            ShortcutInfo shortcut = getShortcutInfo(contact);
-            ShortcutManager shortcutManager = xmppConnectionService.getSystemService(ShortcutManager.class);
-            intent = shortcutManager.createShortcutResultIntent(shortcut);
+            final var conversation = xmppConnectionService.find(contact);
+            final var uuid = conversation == null ? null : conversation.getUuid();
+            final var shortcut = getShortcutInfo(contact, uuid);
+            intent =
+                    ShortcutManagerCompat.createShortcutResultIntent(
+                            xmppConnectionService, shortcut);
         } else {
             intent = createShortcutResultIntent(contact);
         }
@@ -207,7 +212,7 @@ public class ShortcutService {
     }
 
     @NonNull
-    private Intent createShortcutResultIntent(Contact contact) {
+    private Intent createShortcutResultIntent(final Contact contact) {
         AvatarService avatarService = xmppConnectionService.getAvatarService();
         Bitmap icon = avatarService.getRoundedShortcutWithIcon(contact);
         Intent intent = new Intent();
@@ -218,13 +223,14 @@ public class ShortcutService {
     }
 
     public static class FrequentContact {
+        private final String conversation;
         private final String account;
         private final Jid contact;
 
-        public FrequentContact(String account, Jid contact) {
+        public FrequentContact(final String conversation, final String account, final Jid contact) {
+            this.conversation = conversation;
             this.account = account;
             this.contact = contact;
         }
     }
-
 }
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 17a9a3ce9da5059469df6ed01747c2e9edbe037c..a5511bd23c0c9189fb44dd9f3883fa9a49366aff 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -55,8 +55,10 @@ import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 import com.google.common.base.Strings;
 import com.google.common.collect.Collections2;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Maps;
 import eu.siacs.conversations.AppSettings;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
@@ -147,7 +149,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
@@ -253,12 +254,13 @@ public class XmppConnectionService extends Service {
     private final MessageGenerator mMessageGenerator = new MessageGenerator(this);
     public OnContactStatusChanged onContactStatusChanged =
             (contact, online) -> {
-                Conversation conversation = find(getConversations(), contact);
-                if (conversation != null) {
-                    if (online) {
-                        if (contact.getPresences().size() == 1) {
-                            sendUnsentMessages(conversation);
-                        }
+                final var conversation = find(contact);
+                if (conversation == null) {
+                    return;
+                }
+                if (online) {
+                    if (contact.getPresences().size() == 1) {
+                        sendUnsentMessages(conversation);
                     }
                 }
             };
@@ -998,16 +1000,17 @@ public class XmppConnectionService extends Service {
         }
         if (pingNow) {
             for (final Account account : pingCandidates) {
+                final var connection = account.getXmppConnection();
                 final boolean lowTimeout = isInLowPingTimeoutMode(account);
-                account.getXmppConnection().sendPing();
+                final var delta =
+                        (SystemClock.elapsedRealtime() - connection.getLastPacketReceived())
+                                / 1000L;
+                connection.sendPing();
                 Log.d(
                         Config.LOGTAG,
-                        account.getJid().asBareJid()
-                                + " send ping (action="
-                                + action
-                                + ",lowTimeout="
-                                + lowTimeout
-                                + ")");
+                        String.format(
+                                "%s: send ping (action=%s,lowTimeout=%s,interval=%s)",
+                                account.getJid().asBareJid(), action, lowTimeout, delta));
                 scheduleWakeUpCall(
                         lowTimeout ? Config.LOW_PING_TIMEOUT : Config.PING_TIMEOUT,
                         account.getUuid().hashCode());
@@ -1485,7 +1488,7 @@ public class XmppConnectionService extends Service {
                 ContextCompat.RECEIVER_EXPORTED);
         mForceDuringOnCreate.set(false);
         toggleForegroundService();
-        internalPingExecutor.scheduleAtFixedRate(
+        internalPingExecutor.scheduleWithFixedDelay(
                 this::manageAccountConnectionStatesInternal, 10, 10, TimeUnit.SECONDS);
         final SharedPreferences sharedPreferences =
                 androidx.preference.PreferenceManager.getDefaultSharedPreferences(this);
@@ -2428,10 +2431,8 @@ public class XmppConnectionService extends Service {
 
     private void restoreFromDatabase() {
         synchronized (this.conversations) {
-            final Map<String, Account> accountLookupTable = new Hashtable<>();
-            for (Account account : this.accounts) {
-                accountLookupTable.put(account.getUuid(), account);
-            }
+            final Map<String, Account> accountLookupTable =
+                    ImmutableMap.copyOf(Maps.uniqueIndex(this.accounts, Account::getUuid));
             Log.d(Config.LOGTAG, "restoring conversations...");
             final long startTimeConversationsRestore = SystemClock.elapsedRealtime();
             this.conversations.addAll(
@@ -2735,8 +2736,8 @@ public class XmppConnectionService extends Service {
         return results;
     }
 
-    public Conversation find(final Iterable<Conversation> haystack, final Contact contact) {
-        for (final Conversation conversation : haystack) {
+    public Conversation find(final Contact contact) {
+        for (final Conversation conversation : this.conversations) {
             if (conversation.getContact() == contact) {
                 return conversation;
             }
@@ -2798,27 +2799,19 @@ public class XmppConnectionService extends Service {
             final MessageArchiveService.Query query,
             final boolean async) {
         synchronized (this.conversations) {
-            Conversation conversation = find(account, jid);
-            if (conversation != null) {
-                return conversation;
+            final var cached = find(account, jid);
+            if (cached != null) {
+                return cached;
             }
-            conversation = databaseBackend.findConversation(account, jid);
+            final var existing = databaseBackend.findConversation(account, jid);
+            final Conversation conversation;
             final boolean loadMessagesFromDb;
-            if (conversation != null) {
-                conversation.setStatus(Conversation.STATUS_AVAILABLE);
-                conversation.setAccount(account);
-                if (muc) {
-                    conversation.setMode(Conversation.MODE_MULTI);
-                    conversation.setContactJid(jid);
-                } else {
-                    conversation.setMode(Conversation.MODE_SINGLE);
-                    conversation.setContactJid(jid.asBareJid());
-                }
-                databaseBackend.updateConversation(conversation);
-                loadMessagesFromDb = conversation.messagesLoaded.compareAndSet(true, false);
+            if (existing != null) {
+                conversation = existing;
+                loadMessagesFromDb = restoreFromArchive(conversation, jid, muc);
             } else {
                 String conversationName;
-                Contact contact = account.getRoster().getContact(jid);
+                final Contact contact = account.getRoster().getContact(jid);
                 if (contact != null) {
                     conversationName = contact.getDisplayName();
                 } else {
@@ -2839,35 +2832,13 @@ public class XmppConnectionService extends Service {
                 this.databaseBackend.createConversation(conversation);
                 loadMessagesFromDb = false;
             }
-            final Conversation c = conversation;
-            final Runnable runnable =
-                    () -> {
-                        if (loadMessagesFromDb) {
-                            c.addAll(0, databaseBackend.getMessages(c, Config.PAGE_SIZE));
-                            updateConversationUi();
-                            c.messagesLoaded.set(true);
-                        }
-                        if (account.getXmppConnection() != null
-                                && !c.getContact().isBlocked()
-                                && account.getXmppConnection().getFeatures().mam()
-                                && !muc) {
-                            if (query == null) {
-                                mMessageArchiveService.query(c);
-                            } else {
-                                if (query.getConversation() == null) {
-                                    mMessageArchiveService.query(
-                                            c, query.getStart(), query.isCatchup());
-                                }
-                            }
-                        }
-                        if (joinAfterCreate) {
-                            joinMuc(c);
-                        }
-                    };
             if (async) {
-                mDatabaseReaderExecutor.execute(runnable);
+                mDatabaseReaderExecutor.execute(
+                        () ->
+                                postProcessConversation(
+                                        conversation, loadMessagesFromDb, joinAfterCreate, query));
             } else {
-                runnable.run();
+                postProcessConversation(conversation, loadMessagesFromDb, joinAfterCreate, query);
             }
             this.conversations.add(conversation);
             updateConversationUi();
@@ -2875,6 +2846,84 @@ public class XmppConnectionService extends Service {
         }
     }
 
+    public Conversation findConversationByUuidReliable(final String uuid) {
+        final var cached = findConversationByUuid(uuid);
+        if (cached != null) {
+            return cached;
+        }
+        final var existing = databaseBackend.findConversation(uuid);
+        if (existing == null) {
+            return null;
+        }
+        Log.d(
+                Config.LOGTAG,
+                existing.getJid().asBareJid()
+                        + ": restoring conversation with "
+                        + existing.getJid()
+                        + " from DB");
+        final Map<String, Account> accounts =
+                ImmutableMap.copyOf(Maps.uniqueIndex(this.accounts, Account::getUuid));
+        existing.setAccount(accounts.get(existing.getAccountUuid()));
+        final var loadMessagesFromDb = restoreFromArchive(existing);
+        mDatabaseReaderExecutor.execute(
+                () ->
+                        postProcessConversation(
+                                existing,
+                                loadMessagesFromDb,
+                                existing.getMode() == Conversational.MODE_MULTI,
+                                null));
+        this.conversations.add(existing);
+        updateConversationUi();
+        return existing;
+    }
+
+    private boolean restoreFromArchive(
+            final Conversation conversation, final Jid jid, final boolean muc) {
+        if (muc) {
+            conversation.setMode(Conversation.MODE_MULTI);
+            conversation.setContactJid(jid);
+        } else {
+            conversation.setMode(Conversation.MODE_SINGLE);
+            conversation.setContactJid(jid.asBareJid());
+        }
+        return restoreFromArchive(conversation);
+    }
+
+    private boolean restoreFromArchive(final Conversation conversation) {
+        conversation.setStatus(Conversation.STATUS_AVAILABLE);
+        databaseBackend.updateConversation(conversation);
+        return conversation.messagesLoaded.compareAndSet(true, false);
+    }
+
+    private void postProcessConversation(
+            final Conversation c,
+            final boolean loadMessagesFromDb,
+            final boolean joinAfterCreate,
+            final MessageArchiveService.Query query) {
+        final var singleMode = c.getMode() == Conversational.MODE_SINGLE;
+        final var account = c.getAccount();
+        if (loadMessagesFromDb) {
+            c.addAll(0, databaseBackend.getMessages(c, Config.PAGE_SIZE));
+            updateConversationUi();
+            c.messagesLoaded.set(true);
+        }
+        if (account.getXmppConnection() != null
+                && !c.getContact().isBlocked()
+                && account.getXmppConnection().getFeatures().mam()
+                && singleMode) {
+            if (query == null) {
+                mMessageArchiveService.query(c);
+            } else {
+                if (query.getConversation() == null) {
+                    mMessageArchiveService.query(c, query.getStart(), query.isCatchup());
+                }
+            }
+        }
+        if (joinAfterCreate) {
+            joinMuc(c);
+        }
+    }
+
     public void archiveConversation(Conversation conversation) {
         archiveConversation(conversation, true);
     }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
index 2c7d71d79c91cbe0dd7dc700977fc8abfcf4b0a0..f90f99b8b317c22f023f42d1223585787fb0c7d2 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
@@ -29,7 +29,6 @@
 
 package eu.siacs.conversations.ui;
 
-
 import static eu.siacs.conversations.ui.ConversationFragment.REQUEST_DECRYPT_PGP;
 
 import android.Manifest;
@@ -51,22 +50,13 @@ import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
-
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.app.ActivityCompat;
 import androidx.databinding.DataBindingUtil;
-
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-import org.openintents.openpgp.util.OpenPgpApi;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.OmemoSetting;
@@ -90,8 +80,22 @@ import eu.siacs.conversations.utils.SignupUtils;
 import eu.siacs.conversations.utils.XmppUri;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.openintents.openpgp.util.OpenPgpApi;
 
-public class ConversationsActivity extends XmppActivity implements OnConversationSelected, OnConversationArchived, OnConversationsListItemUpdated, OnConversationRead, XmppConnectionService.OnAccountUpdate, XmppConnectionService.OnConversationUpdate, XmppConnectionService.OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnAffiliationChanged {
+public class ConversationsActivity extends XmppActivity
+        implements OnConversationSelected,
+                OnConversationArchived,
+                OnConversationsListItemUpdated,
+                OnConversationRead,
+                XmppConnectionService.OnAccountUpdate,
+                XmppConnectionService.OnConversationUpdate,
+                XmppConnectionService.OnRosterUpdate,
+                OnUpdateBlocklist,
+                XmppConnectionService.OnShowErrorToast,
+                XmppConnectionService.OnAffiliationChanged {
 
     public static final String ACTION_VIEW_CONVERSATION = "eu.siacs.conversations.action.VIEW";
     public static final String EXTRA_CONVERSATION = "conversationUuid";
@@ -104,19 +108,18 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
     public static final String POST_ACTION_RECORD_VOICE = "record_voice";
     public static final String EXTRA_TYPE = "type";
 
-    private static final List<String> VIEW_AND_SHARE_ACTIONS = Arrays.asList(
-            ACTION_VIEW_CONVERSATION,
-            Intent.ACTION_SEND,
-            Intent.ACTION_SEND_MULTIPLE
-    );
+    private static final List<String> VIEW_AND_SHARE_ACTIONS =
+            Arrays.asList(
+                    ACTION_VIEW_CONVERSATION, Intent.ACTION_SEND, Intent.ACTION_SEND_MULTIPLE);
 
     public static final int REQUEST_OPEN_MESSAGE = 0x9876;
     public static final int REQUEST_PLAY_PAUSE = 0x5432;
 
-
-    //secondary fragment (when holding the conversation, must be initialized before refreshing the overview fragment
-    private static final @IdRes
-    int[] FRAGMENT_ID_NOTIFICATION_ORDER = {R.id.secondary_fragment, R.id.main_fragment};
+    // secondary fragment (when holding the conversation, must be initialized before refreshing the
+    // overview fragment
+    private static final @IdRes int[] FRAGMENT_ID_NOTIFICATION_ORDER = {
+        R.id.secondary_fragment, R.id.main_fragment
+    };
     private final PendingItem<Intent> pendingViewIntent = new PendingItem<>();
     private final PendingItem<ActivityResult> postponedActivityResult = new PendingItem<>();
     private ActivityConversationsBinding binding;
@@ -125,7 +128,9 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
 
     private static boolean isViewOrShareIntent(Intent i) {
         Log.d(Config.LOGTAG, "action: " + (i == null ? null : i.getAction()));
-        return i != null && VIEW_AND_SHARE_ACTIONS.contains(i.getAction()) && i.hasExtra(EXTRA_CONVERSATION);
+        return i != null
+                && VIEW_AND_SHARE_ACTIONS.contains(i.getAction())
+                && i.hasExtra(EXTRA_CONVERSATION);
     }
 
     private static Intent createLauncherIntent(Context context) {
@@ -169,7 +174,8 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         }
 
         invalidateActionBarTitle();
-        if (binding.secondaryFragment != null && ConversationFragment.getConversation(this) == null) {
+        if (binding.secondaryFragment != null
+                && ConversationFragment.getConversation(this) == null) {
             Conversation conversation = ConversationsOverviewFragment.getSuggestion(this);
             if (conversation != null) {
                 openConversation(conversation, null);
@@ -182,7 +188,8 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         return performRedirectIfNecessary(null, noAnimation);
     }
 
-    private boolean performRedirectIfNecessary(final Conversation ignore, final boolean noAnimation) {
+    private boolean performRedirectIfNecessary(
+            final Conversation ignore, final boolean noAnimation) {
         if (xmppConnectionService == null) {
             return false;
         }
@@ -192,12 +199,13 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
             if (noAnimation) {
                 intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
             }
-            runOnUiThread(() -> {
-                startActivity(intent);
-                if (noAnimation) {
-                    overridePendingTransition(0, 0);
-                }
-            });
+            runOnUiThread(
+                    () -> {
+                        startActivity(intent);
+                        if (noAnimation) {
+                            overridePendingTransition(0, 0);
+                        }
+                    });
         }
         return mRedirectInProcess.get();
     }
@@ -219,7 +227,8 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
     }
 
     private String getBatteryOptimizationPreferenceKey() {
-        @SuppressLint("HardwareIds") String device = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
+        @SuppressLint("HardwareIds")
+        String device = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
         return "show_battery_optimization" + (device == null ? "" : device);
     }
 
@@ -228,20 +237,31 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
     }
 
     private boolean openBatteryOptimizationDialogIfNeeded() {
-        if (isOptimizingBattery() && getPreferences().getBoolean(getBatteryOptimizationPreferenceKey(), true)) {
+        if (isOptimizingBattery()
+                && getPreferences().getBoolean(getBatteryOptimizationPreferenceKey(), true)) {
             final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
             builder.setTitle(R.string.battery_optimizations_enabled);
-            builder.setMessage(getString(R.string.battery_optimizations_enabled_dialog, getString(R.string.app_name)));
-            builder.setPositiveButton(R.string.next, (dialog, which) -> {
-                final Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-                final Uri uri = Uri.parse("package:" + getPackageName());
-                intent.setData(uri);
-                try {
-                    startActivityForResult(intent, REQUEST_BATTERY_OP);
-                } catch (final ActivityNotFoundException e) {
-                    Toast.makeText(this, R.string.device_does_not_support_battery_op, Toast.LENGTH_SHORT).show();
-                }
-            });
+            builder.setMessage(
+                    getString(
+                            R.string.battery_optimizations_enabled_dialog,
+                            getString(R.string.app_name)));
+            builder.setPositiveButton(
+                    R.string.next,
+                    (dialog, which) -> {
+                        final Intent intent =
+                                new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+                        final Uri uri = Uri.parse("package:" + getPackageName());
+                        intent.setData(uri);
+                        try {
+                            startActivityForResult(intent, REQUEST_BATTERY_OP);
+                        } catch (final ActivityNotFoundException e) {
+                            Toast.makeText(
+                                            this,
+                                            R.string.device_does_not_support_battery_op,
+                                            Toast.LENGTH_SHORT)
+                                    .show();
+                        }
+                    });
             builder.setOnDismissListener(dialog -> setNeverAskForBatteryOptimizationsAgain());
             final AlertDialog dialog = builder.create();
             dialog.setCanceledOnTouchOutside(false);
@@ -252,8 +272,12 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
     }
 
     private void requestNotificationPermissionIfNeeded() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && ActivityCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-            requestPermissions(new String[]{Manifest.permission.POST_NOTIFICATIONS}, REQUEST_POST_NOTIFICATION);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
+                && ActivityCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
+                        != PackageManager.PERMISSION_GRANTED) {
+            requestPermissions(
+                    new String[] {Manifest.permission.POST_NOTIFICATIONS},
+                    REQUEST_POST_NOTIFICATION);
         }
     }
 
@@ -271,9 +295,10 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         }
     }
 
-    private boolean processViewIntent(Intent intent) {
+    private boolean processViewIntent(final Intent intent) {
         final String uuid = intent.getStringExtra(EXTRA_CONVERSATION);
-        final Conversation conversation = uuid != null ? xmppConnectionService.findConversationByUuid(uuid) : null;
+        final Conversation conversation =
+                uuid != null ? xmppConnectionService.findConversationByUuidReliable(uuid) : null;
         if (conversation == null) {
             Log.d(Config.LOGTAG, "unable to view conversation with uuid:" + uuid);
             return false;
@@ -283,7 +308,8 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    public void onRequestPermissionsResult(
+            int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         UriHandlerActivity.onRequestPermissionResult(this, requestCode, grantResults);
         if (grantResults.length > 0) {
@@ -397,8 +423,9 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         if (qrCodeScanMenuItem != null) {
             if (isCameraFeatureAvailable()) {
                 Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
-                boolean visible = getResources().getBoolean(R.bool.show_qr_code_scan)
-                        && fragment instanceof ConversationsOverviewFragment;
+                boolean visible =
+                        getResources().getBoolean(R.bool.show_qr_code_scan)
+                                && fragment instanceof ConversationsOverviewFragment;
                 qrCodeScanMenuItem.setVisible(visible);
             } else {
                 qrCodeScanMenuItem.setVisible(false);
@@ -411,7 +438,9 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
     public void onConversationSelected(Conversation conversation) {
         clearPendingViewIntent();
         if (ConversationFragment.getConversation(this) == conversation) {
-            Log.d(Config.LOGTAG, "ignore onConversationSelected() because conversation is already open");
+            Log.d(
+                    Config.LOGTAG,
+                    "ignore onConversationSelected() because conversation is already open");
             return;
         }
         openConversation(conversation, null);
@@ -424,13 +453,12 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
     }
 
     private void displayToast(final String msg) {
-        runOnUiThread(() -> Toast.makeText(ConversationsActivity.this, msg, Toast.LENGTH_SHORT).show());
+        runOnUiThread(
+                () -> Toast.makeText(ConversationsActivity.this, msg, Toast.LENGTH_SHORT).show());
     }
 
     @Override
-    public void onAffiliationChangedSuccessful(Jid jid) {
-
-    }
+    public void onAffiliationChangedSuccessful(Jid jid) {}
 
     @Override
     public void onAffiliationChangeFailed(Jid jid, int resId) {
@@ -440,7 +468,8 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
     private void openConversation(Conversation conversation, Bundle extras) {
         final FragmentManager fragmentManager = getFragmentManager();
         executePendingTransactions(fragmentManager);
-        ConversationFragment conversationFragment = (ConversationFragment) fragmentManager.findFragmentById(R.id.secondary_fragment);
+        ConversationFragment conversationFragment =
+                (ConversationFragment) fragmentManager.findFragmentById(R.id.secondary_fragment);
         final boolean mainNeedsRefresh;
         if (conversationFragment == null) {
             mainNeedsRefresh = false;
@@ -456,7 +485,8 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
                     fragmentTransaction.commit();
                 } catch (IllegalStateException e) {
                     Log.w(Config.LOGTAG, "sate loss while opening conversation", e);
-                    //allowing state loss is probably fine since view intents et all are already stored and a click can probably be 'ignored'
+                    // allowing state loss is probably fine since view intents et all are already
+                    // stored and a click can probably be 'ignored'
                     return;
                 }
             }
@@ -474,14 +504,15 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         try {
             fragmentManager.executePendingTransactions();
         } catch (final Exception e) {
-            Log.e(Config.LOGTAG,"unable to execute pending fragment transactions");
+            Log.e(Config.LOGTAG, "unable to execute pending fragment transactions");
         }
     }
 
     public boolean onXmppUriClicked(Uri uri) {
         XmppUri xmppUri = new XmppUri(uri);
         if (xmppUri.isValidJid() && !xmppUri.hasFingerprints()) {
-            final Conversation conversation = xmppConnectionService.findUniqueConversationByJid(xmppUri);
+            final Conversation conversation =
+                    xmppConnectionService.findUniqueConversationByJid(xmppUri);
             if (conversation != null) {
                 openConversation(conversation, null);
                 return true;
@@ -540,7 +571,8 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
     @Override
     public void onSaveInstanceState(final Bundle savedInstanceState) {
         final Intent pendingIntent = pendingViewIntent.peek();
-        savedInstanceState.putParcelable("intent", pendingIntent != null ? pendingIntent : getIntent());
+        savedInstanceState.putParcelable(
+                "intent", pendingIntent != null ? pendingIntent : getIntent());
         super.onSaveInstanceState(savedInstanceState);
     }
 
@@ -580,7 +612,8 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         final FragmentManager fragmentManager = getFragmentManager();
         FragmentTransaction transaction = fragmentManager.beginTransaction();
         final Fragment mainFragment = fragmentManager.findFragmentById(R.id.main_fragment);
-        final Fragment secondaryFragment = fragmentManager.findFragmentById(R.id.secondary_fragment);
+        final Fragment secondaryFragment =
+                fragmentManager.findFragmentById(R.id.secondary_fragment);
         if (mainFragment != null) {
             if (binding.secondaryFragment != null) {
                 if (mainFragment instanceof ConversationFragment) {
@@ -628,13 +661,12 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
                 actionBar.setTitle(conversation.getName());
                 actionBar.setDisplayHomeAsUpEnabled(true);
                 ToolbarUtils.setActionBarOnClickListener(
-                        binding.toolbar,
-                        (v) -> openConversationDetails(conversation)
-                );
+                        binding.toolbar, (v) -> openConversationDetails(conversation));
                 return;
             }
         }
-        final Fragment secondaryFragment = fragmentManager.findFragmentById(R.id.secondary_fragment);
+        final Fragment secondaryFragment =
+                fragmentManager.findFragmentById(R.id.secondary_fragment);
         if (secondaryFragment instanceof ConversationFragment conversationFragment) {
             final Conversation conversation = conversationFragment.getConversation();
             if (conversation != null) {
@@ -673,15 +705,21 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
             try {
                 fragmentManager.popBackStack();
             } catch (final IllegalStateException e) {
-                Log.w(Config.LOGTAG, "state loss while popping back state after archiving conversation", e);
-                //this usually means activity is no longer active; meaning on the next open we will run through this again
+                Log.w(
+                        Config.LOGTAG,
+                        "state loss while popping back state after archiving conversation",
+                        e);
+                // this usually means activity is no longer active; meaning on the next open we will
+                // run through this again
             }
             return;
         }
-        final Fragment secondaryFragment = fragmentManager.findFragmentById(R.id.secondary_fragment);
+        final Fragment secondaryFragment =
+                fragmentManager.findFragmentById(R.id.secondary_fragment);
         if (secondaryFragment instanceof ConversationFragment) {
             if (((ConversationFragment) secondaryFragment).getConversation() == conversation) {
-                Conversation suggestion = ConversationsOverviewFragment.getSuggestion(this, conversation);
+                Conversation suggestion =
+                        ConversationsOverviewFragment.getSuggestion(this, conversation);
                 if (suggestion != null) {
                     openConversation(suggestion, null);
                 }
diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
index c33c3e6bd7ba2c7c23ba57b6dd4609fcbb2afb58..1f83d1f4546f8a027b4eec96fcc2335710aa4cc4 100644
--- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
@@ -8,11 +8,11 @@ import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
-
 import androidx.annotation.NonNull;
+import androidx.core.content.pm.ShortcutManagerCompat;
 import androidx.databinding.DataBindingUtil;
 import androidx.recyclerview.widget.LinearLayoutManager;
-
+import com.google.common.collect.Iterables;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.databinding.ActivityShareWithBinding;
@@ -21,7 +21,6 @@ import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.ui.adapter.ConversationAdapter;
 import eu.siacs.conversations.xmpp.Jid;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -112,7 +111,34 @@ public class ShareWithActivity extends XmppActivity
                 new LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false));
         binding.chooseConversationList.setAdapter(mAdapter);
         mAdapter.setConversationClickListener((view, conversation) -> share(conversation));
+        final var intent = getIntent();
+        final var shortcutId = intent.getStringExtra(ShortcutManagerCompat.EXTRA_SHORTCUT_ID);
         this.share = new Share();
+        if (shortcutId != null) {
+            final var conversation = shortcutIdToConversation(shortcutId);
+            if (conversation != null) {
+                // we have everything we need. Jump into chat
+                populateShare(intent);
+                share(conversation);
+            }
+        }
+    }
+
+    private String shortcutIdToConversation(final String shortcutId) {
+        final var shortcut =
+                Iterables.tryFind(
+                        ShortcutManagerCompat.getDynamicShortcuts(this),
+                        si -> si.getId().equals(shortcutId));
+        if (shortcut.isPresent()) {
+            final var extras = shortcut.get().getExtras();
+            if (extras == null) {
+                return null;
+            } else {
+                return extras.getString(ConversationsActivity.EXTRA_CONVERSATION);
+            }
+        } else {
+            return null;
+        }
     }
 
     @Override
@@ -137,10 +163,18 @@ public class ShareWithActivity extends XmppActivity
     @Override
     public void onStart() {
         super.onStart();
-        Intent intent = getIntent();
+        final Intent intent = getIntent();
         if (intent == null) {
             return;
         }
+        populateShare(intent);
+        if (xmppConnectionServiceBound) {
+            xmppConnectionService.populateWithOrderedConversations(
+                    mConversations, this.share.uris.isEmpty(), false);
+        }
+    }
+
+    private void populateShare(final Intent intent) {
         final String type = intent.getType();
         final String action = intent.getAction();
         final Uri data = intent.getData();
@@ -165,10 +199,6 @@ public class ShareWithActivity extends XmppActivity
             final ArrayList<Uri> uris = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
             this.share.uris = uris == null ? new ArrayList<>() : uris;
         }
-        if (xmppConnectionServiceBound) {
-            xmppConnectionService.populateWithOrderedConversations(
-                    mConversations, this.share.uris.isEmpty(), false);
-        }
     }
 
     @Override
@@ -209,8 +239,12 @@ public class ShareWithActivity extends XmppActivity
             mPendingConversation = conversation;
             return;
         }
+        share(conversation.getUuid());
+    }
+
+    private void share(final String conversation) {
         final Intent intent = new Intent(this, ConversationsActivity.class);
-        intent.putExtra(ConversationsActivity.EXTRA_CONVERSATION, conversation.getUuid());
+        intent.putExtra(ConversationsActivity.EXTRA_CONVERSATION, conversation);
         if (!share.uris.isEmpty()) {
             intent.setAction(Intent.ACTION_SEND_MULTIPLE);
             intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, share.uris);
@@ -225,7 +259,7 @@ public class ShareWithActivity extends XmppActivity
         }
         try {
             startActivity(intent);
-        } catch (SecurityException e) {
+        } catch (final SecurityException e) {
             Toast.makeText(
                             this,
                             R.string.sharing_application_not_grant_permission,
diff --git a/src/main/res/xml/shortcuts.xml b/src/main/res/xml/shortcuts.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8bb176555063882535621d602d02275994e7acea
--- /dev/null
+++ b/src/main/res/xml/shortcuts.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android">
+    <share-target android:targetClass="eu.siacs.conversations.ui.ShareWithActivity">
+        <data android:mimeType="*/*" />
+        <category android:name="eu.siacs.conversations.category.SHARE_TARGET" />
+    </share-target>
+</shortcuts>
\ No newline at end of file

From bd838e7e95798aeaab7842d4590542b88ba103a6 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 17 Dec 2024 16:10:11 +0100
Subject: [PATCH 227/357] link into custom notification settings from
 muc/contact details

---
 .../services/NotificationService.java         |  59 +-
 .../services/ShortcutService.java             |  10 +-
 .../services/XmppConnectionService.java       |   2 +
 .../ui/ConferenceDetailsActivity.java         | 445 +++++++-----
 .../ui/ContactDetailsActivity.java            | 335 +++++----
 .../siacs/conversations/ui/XmppActivity.java  | 635 +++++++++++-------
 src/main/res/menu/contact_details.xml         |  44 +-
 src/main/res/menu/muc_details.xml             |  39 +-
 src/main/res/values/strings.xml               |   2 +
 9 files changed, 994 insertions(+), 577 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index 4fd89f8a776cf6345fb96e652612ae25e9214f17..83bef27e7bd094dc5368b2b0e7a34638d58e9da8 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -78,6 +78,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -114,7 +115,7 @@ public class NotificationService {
     private static final String INCOMING_CALLS_NOTIFICATION_CHANNEL = "incoming_calls_channel";
     private static final String INCOMING_CALLS_NOTIFICATION_CHANNEL_PREFIX =
             "incoming_calls_channel#";
-    private static final String MESSAGES_NOTIFICATION_CHANNEL = "messages";
+    public static final String MESSAGES_NOTIFICATION_CHANNEL = "messages";
 
     NotificationService(final XmppConnectionService service) {
         this.mXmppConnectionService = service;
@@ -229,25 +230,8 @@ public class NotificationService {
         missedCallsChannel.setGroup("calls");
         notificationManager.createNotificationChannel(missedCallsChannel);
 
-        final NotificationChannel messagesChannel =
-                new NotificationChannel(
-                        MESSAGES_NOTIFICATION_CHANNEL,
-                        c.getString(R.string.messages_channel_name),
-                        NotificationManager.IMPORTANCE_HIGH);
-        messagesChannel.setShowBadge(true);
-        messagesChannel.setSound(
-                RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION),
-                new AudioAttributes.Builder()
-                        .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
-                        .setUsage(AudioAttributes.USAGE_NOTIFICATION)
-                        .build());
-        messagesChannel.setLightColor(LED_COLOR);
-        final int dat = 70;
-        final long[] pattern = {0, 3 * dat, dat, dat};
-        messagesChannel.setVibrationPattern(pattern);
-        messagesChannel.enableVibration(true);
-        messagesChannel.enableLights(true);
-        messagesChannel.setGroup("chats");
+        final var messagesChannel =
+                prepareMessagesChannel(mXmppConnectionService, MESSAGES_NOTIFICATION_CHANNEL);
         notificationManager.createNotificationChannel(messagesChannel);
         final NotificationChannel silentMessagesChannel =
                 new NotificationChannel(
@@ -278,6 +262,41 @@ public class NotificationService {
         notificationManager.createNotificationChannel(deliveryFailedChannel);
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.R)
+    public static void createConversationChannel(
+            final Context context, final ShortcutInfoCompat shortcut) {
+        final var messagesChannel = prepareMessagesChannel(context, UUID.randomUUID().toString());
+        messagesChannel.setName(shortcut.getShortLabel());
+        messagesChannel.setConversationId(MESSAGES_NOTIFICATION_CHANNEL, shortcut.getId());
+        final var notificationManager = context.getSystemService(NotificationManager.class);
+        notificationManager.createNotificationChannel(messagesChannel);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.O)
+    private static NotificationChannel prepareMessagesChannel(
+            final Context context, final String id) {
+        final NotificationChannel messagesChannel =
+                new NotificationChannel(
+                        id,
+                        context.getString(R.string.messages_channel_name),
+                        NotificationManager.IMPORTANCE_HIGH);
+        messagesChannel.setShowBadge(true);
+        messagesChannel.setSound(
+                RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION),
+                new AudioAttributes.Builder()
+                        .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                        .setUsage(AudioAttributes.USAGE_NOTIFICATION)
+                        .build());
+        messagesChannel.setLightColor(LED_COLOR);
+        final int dat = 70;
+        final long[] pattern = {0, 3 * dat, dat, dat};
+        messagesChannel.setVibrationPattern(pattern);
+        messagesChannel.enableVibration(true);
+        messagesChannel.enableLights(true);
+        messagesChannel.setGroup("chats");
+        return messagesChannel;
+    }
+
     @RequiresApi(api = Build.VERSION_CODES.O)
     private static void createInitialIncomingCallChannelIfNecessary(final Context context) {
         final var currentIteration = getCurrentIncomingCallChannelIteration(context);
diff --git a/src/main/java/eu/siacs/conversations/services/ShortcutService.java b/src/main/java/eu/siacs/conversations/services/ShortcutService.java
index ef208d690fb174aee109ff1072f2b0c16f4cdd77..b2a3cce750b9d19df4b78fd204497917ea809996 100644
--- a/src/main/java/eu/siacs/conversations/services/ShortcutService.java
+++ b/src/main/java/eu/siacs/conversations/services/ShortcutService.java
@@ -93,6 +93,12 @@ public class ShortcutService {
         }
     }
 
+    public ShortcutInfoCompat getShortcutInfo(final Contact contact) {
+        final var conversation = xmppConnectionService.find(contact);
+        final var uuid = conversation == null ? null : conversation.getUuid();
+        return getShortcutInfo(contact, uuid);
+    }
+
     public ShortcutInfoCompat getShortcutInfo(final Contact contact, final String conversation) {
         final ShortcutInfoCompat.Builder builder =
                 new ShortcutInfoCompat.Builder(xmppConnectionService, getShortcutId(contact))
@@ -199,9 +205,7 @@ public class ShortcutService {
     public Intent createShortcut(final Contact contact, final boolean legacy) {
         Intent intent;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !legacy) {
-            final var conversation = xmppConnectionService.find(contact);
-            final var uuid = conversation == null ? null : conversation.getUuid();
-            final var shortcut = getShortcutInfo(contact, uuid);
+            final var shortcut = getShortcutInfo(contact);
             intent =
                     ShortcutManagerCompat.createShortcutResultIntent(
                             xmppConnectionService, shortcut);
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index a5511bd23c0c9189fb44dd9f3883fa9a49366aff..832c6c8d6ce875386d57ecb68be5a67f4aa2d699 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2302,6 +2302,7 @@ public class XmppConnectionService extends Service {
                     Config.LOGTAG,
                     account.getJid().asBareJid() + ": pushing bookmark via Bookmarks 2");
             final Element item = mIqGenerator.publishBookmarkItem(bookmark);
+            Log.d(Config.LOGTAG, "publishing: " + item.toString());
             pushNodeAndEnforcePublishOptions(
                     account,
                     Namespace.BOOKMARKS2,
@@ -2873,6 +2874,7 @@ public class XmppConnectionService extends Service {
                                 existing.getMode() == Conversational.MODE_MULTI,
                                 null));
         this.conversations.add(existing);
+        // TODO push bookmark
         updateConversationUi();
         return existing;
     }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index 2cd9cb5d32305f25eed9023339173deb5c097d06..8a1a0a1335c07c87541babff4d506ddeeb55b167 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -1,9 +1,13 @@
 package eu.siacs.conversations.ui;
 
+import static eu.siacs.conversations.entities.Bookmark.printableValue;
+import static eu.siacs.conversations.utils.StringUtils.changed;
+
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.SpannableStringBuilder;
@@ -14,20 +18,14 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Toast;
-
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.databinding.DataBindingUtil;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import eu.siacs.conversations.Config;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.databinding.ActivityMucDetailsBinding;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Bookmark;
 import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.entities.Conversational;
 import eu.siacs.conversations.entities.MucOptions;
 import eu.siacs.conversations.entities.MucOptions.User;
 import eu.siacs.conversations.services.XmppConnectionService;
@@ -50,14 +48,19 @@ import eu.siacs.conversations.utils.StringUtils;
 import eu.siacs.conversations.utils.StylingHelper;
 import eu.siacs.conversations.utils.XmppUri;
 import eu.siacs.conversations.xmpp.Jid;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 import me.drakeet.support.toast.ToastCompat;
 
-import static eu.siacs.conversations.entities.Bookmark.printableValue;
-import static eu.siacs.conversations.utils.StringUtils.changed;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-public class ConferenceDetailsActivity extends XmppActivity implements OnConversationUpdate, OnMucRosterUpdate, XmppConnectionService.OnAffiliationChanged, XmppConnectionService.OnConfigurationPushed, XmppConnectionService.OnRoomDestroy, TextWatcher, OnMediaLoaded {
+public class ConferenceDetailsActivity extends XmppActivity
+        implements OnConversationUpdate,
+                OnMucRosterUpdate,
+                XmppConnectionService.OnAffiliationChanged,
+                XmppConnectionService.OnConfigurationPushed,
+                XmppConnectionService.OnRoomDestroy,
+                TextWatcher,
+                OnMediaLoaded {
     public static final String ACTION_VIEW_MUC = "view_muc";
 
     private Conversation mConversation;
@@ -68,26 +71,25 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 
     private boolean mAdvancedMode = false;
 
-    private final UiCallback<Conversation> renameCallback = new UiCallback<Conversation>() {
-        @Override
-        public void success(Conversation object) {
-            displayToast(getString(R.string.your_nick_has_been_changed));
-            runOnUiThread(() -> {
-                updateView();
-            });
-
-        }
-
-        @Override
-        public void error(final int errorCode, Conversation object) {
-            displayToast(getString(errorCode));
-        }
+    private final UiCallback<Conversation> renameCallback =
+            new UiCallback<Conversation>() {
+                @Override
+                public void success(Conversation object) {
+                    displayToast(getString(R.string.your_nick_has_been_changed));
+                    runOnUiThread(
+                            () -> {
+                                updateView();
+                            });
+                }
 
-        @Override
-        public void userInputRequired(PendingIntent pi, Conversation object) {
+                @Override
+                public void error(final int errorCode, Conversation object) {
+                    displayToast(getString(errorCode));
+                }
 
-        }
-    };
+                @Override
+                public void userInputRequired(PendingIntent pi, Conversation object) {}
+            };
 
     public static void open(final Activity activity, final Conversation conversation) {
         Intent intent = new Intent(activity, ConferenceDetailsActivity.class);
@@ -96,37 +98,45 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         activity.startActivity(intent);
     }
 
-    private final OnClickListener mNotifyStatusClickListener = new OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(ConferenceDetailsActivity.this);
-            builder.setTitle(R.string.pref_notification_settings);
-            String[] choices = {
-                    getString(R.string.notify_on_all_messages),
-                    getString(R.string.notify_only_when_highlighted),
-                    getString(R.string.notify_never)
-            };
-            final AtomicInteger choice;
-            if (mConversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL, 0) == Long.MAX_VALUE) {
-                choice = new AtomicInteger(2);
-            } else {
-                choice = new AtomicInteger(mConversation.alwaysNotify() ? 0 : 1);
-            }
-            builder.setSingleChoiceItems(choices, choice.get(), (dialog, which) -> choice.set(which));
-            builder.setNegativeButton(R.string.cancel, null);
-            builder.setPositiveButton(R.string.ok, (dialog, which) -> {
-                if (choice.get() == 2) {
-                    mConversation.setMutedTill(Long.MAX_VALUE);
-                } else {
-                    mConversation.setMutedTill(0);
-                    mConversation.setAttribute(Conversation.ATTRIBUTE_ALWAYS_NOTIFY, String.valueOf(choice.get() == 0));
+    private final OnClickListener mNotifyStatusClickListener =
+            new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    final MaterialAlertDialogBuilder builder =
+                            new MaterialAlertDialogBuilder(ConferenceDetailsActivity.this);
+                    builder.setTitle(R.string.pref_notification_settings);
+                    String[] choices = {
+                        getString(R.string.notify_on_all_messages),
+                        getString(R.string.notify_only_when_highlighted),
+                        getString(R.string.notify_never)
+                    };
+                    final AtomicInteger choice;
+                    if (mConversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL, 0)
+                            == Long.MAX_VALUE) {
+                        choice = new AtomicInteger(2);
+                    } else {
+                        choice = new AtomicInteger(mConversation.alwaysNotify() ? 0 : 1);
+                    }
+                    builder.setSingleChoiceItems(
+                            choices, choice.get(), (dialog, which) -> choice.set(which));
+                    builder.setNegativeButton(R.string.cancel, null);
+                    builder.setPositiveButton(
+                            R.string.ok,
+                            (dialog, which) -> {
+                                if (choice.get() == 2) {
+                                    mConversation.setMutedTill(Long.MAX_VALUE);
+                                } else {
+                                    mConversation.setMutedTill(0);
+                                    mConversation.setAttribute(
+                                            Conversation.ATTRIBUTE_ALWAYS_NOTIFY,
+                                            String.valueOf(choice.get() == 0));
+                                }
+                                xmppConnectionService.updateConversation(mConversation);
+                                updateView();
+                            });
+                    builder.create().show();
                 }
-                xmppConnectionService.updateConversation(mConversation);
-                updateView();
-            });
-            builder.create().show();
-        }
-    };
+            };
 
     private final OnClickListener mChangeConferenceSettings =
             new OnClickListener() {
@@ -185,37 +195,56 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         this.binding.changeConferenceButton.setOnClickListener(this.mChangeConferenceSettings);
         setSupportActionBar(binding.toolbar);
         configureActionBar(getSupportActionBar());
-        this.binding.editNickButton.setOnClickListener(v -> quickEdit(mConversation.getMucOptions().getActualNick(),
-                R.string.nickname,
-                value -> {
-                    if (xmppConnectionService.renameInMuc(mConversation, value, renameCallback)) {
-                        return null;
-                    } else {
-                        return getString(R.string.invalid_muc_nick);
-                    }
-                }));
+        this.binding.editNickButton.setOnClickListener(
+                v ->
+                        quickEdit(
+                                mConversation.getMucOptions().getActualNick(),
+                                R.string.nickname,
+                                value -> {
+                                    if (xmppConnectionService.renameInMuc(
+                                            mConversation, value, renameCallback)) {
+                                        return null;
+                                    } else {
+                                        return getString(R.string.invalid_muc_nick);
+                                    }
+                                }));
         this.mAdvancedMode = getPreferences().getBoolean("advanced_muc_mode", false);
         this.binding.mucInfoMore.setVisibility(this.mAdvancedMode ? View.VISIBLE : View.GONE);
         this.binding.notificationStatusButton.setOnClickListener(this.mNotifyStatusClickListener);
-        this.binding.yourPhoto.setOnClickListener(v -> {
-            final MucOptions mucOptions = mConversation.getMucOptions();
-            if (!mucOptions.hasVCards()) {
-                Toast.makeText(this, R.string.host_does_not_support_group_chat_avatars, Toast.LENGTH_SHORT).show();
-                return;
-            }
-            if (!mucOptions.getSelf().getAffiliation().ranks(MucOptions.Affiliation.OWNER)) {
-                Toast.makeText(this, R.string.only_the_owner_can_change_group_chat_avatar, Toast.LENGTH_SHORT).show();
-                return;
-            }
-            final Intent intent = new Intent(this, PublishGroupChatProfilePictureActivity.class);
-            intent.putExtra("uuid", mConversation.getUuid());
-            startActivity(intent);
-        });
-        this.binding.editMucNameButton.setContentDescription(getString(R.string.edit_name_and_topic));
+        this.binding.yourPhoto.setOnClickListener(
+                v -> {
+                    final MucOptions mucOptions = mConversation.getMucOptions();
+                    if (!mucOptions.hasVCards()) {
+                        Toast.makeText(
+                                        this,
+                                        R.string.host_does_not_support_group_chat_avatars,
+                                        Toast.LENGTH_SHORT)
+                                .show();
+                        return;
+                    }
+                    if (!mucOptions
+                            .getSelf()
+                            .getAffiliation()
+                            .ranks(MucOptions.Affiliation.OWNER)) {
+                        Toast.makeText(
+                                        this,
+                                        R.string.only_the_owner_can_change_group_chat_avatar,
+                                        Toast.LENGTH_SHORT)
+                                .show();
+                        return;
+                    }
+                    final Intent intent =
+                            new Intent(this, PublishGroupChatProfilePictureActivity.class);
+                    intent.putExtra("uuid", mConversation.getUuid());
+                    startActivity(intent);
+                });
+        this.binding.editMucNameButton.setContentDescription(
+                getString(R.string.edit_name_and_topic));
         this.binding.editMucNameButton.setOnClickListener(this::onMucEditButtonClicked);
         this.binding.mucEditTitle.addTextChangedListener(this);
         this.binding.mucEditSubject.addTextChangedListener(this);
-        this.binding.mucEditSubject.addTextChangedListener(new StylingHelper.MessageEditorStyler(this.binding.mucEditSubject));
+        this.binding.mucEditSubject.addTextChangedListener(
+                new StylingHelper.MessageEditorStyler(this.binding.mucEditSubject));
         this.mMediaAdapter = new MediaAdapter(this, R.dimen.media_size);
         this.mUserPreviewAdapter = new UserPreviewAdapter();
         this.binding.media.setAdapter(mMediaAdapter);
@@ -223,17 +252,19 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         GridManager.setupLayoutManager(this, this.binding.media, R.dimen.media_size);
         GridManager.setupLayoutManager(this, this.binding.users, R.dimen.media_size);
         this.binding.invite.setOnClickListener(v -> inviteToConversation(mConversation));
-        this.binding.showUsers.setOnClickListener(v -> {
-            Intent intent = new Intent(this, MucUsersActivity.class);
-            intent.putExtra("uuid", mConversation.getUuid());
-            startActivity(intent);
-        });
+        this.binding.showUsers.setOnClickListener(
+                v -> {
+                    Intent intent = new Intent(this, MucUsersActivity.class);
+                    intent.putExtra("uuid", mConversation.getUuid());
+                    startActivity(intent);
+                });
     }
 
     @Override
     public void onStart() {
         super.onStart();
-        binding.mediaWrapper.setVisibility(Compatibility.hasStoragePermission(this) ? View.VISIBLE : View.GONE);
+        binding.mediaWrapper.setVisibility(
+                Compatibility.hasStoragePermission(this) ? View.VISIBLE : View.GONE);
     }
 
     @Override
@@ -261,23 +292,43 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
                 this.mAdvancedMode = !menuItem.isChecked();
                 menuItem.setChecked(this.mAdvancedMode);
                 getPreferences().edit().putBoolean("advanced_muc_mode", mAdvancedMode).apply();
-                final boolean online = mConversation != null && mConversation.getMucOptions().online();
-                this.binding.mucInfoMore.setVisibility(this.mAdvancedMode && online ? View.VISIBLE : View.GONE);
+                final boolean online =
+                        mConversation != null && mConversation.getMucOptions().online();
+                this.binding.mucInfoMore.setVisibility(
+                        this.mAdvancedMode && online ? View.VISIBLE : View.GONE);
                 invalidateOptionsMenu();
                 updateView();
                 break;
+            case R.id.action_custom_notifications:
+                if (mConversation != null) {
+                    configureCustomNotifications(mConversation);
+                }
+                break;
         }
         return super.onOptionsItemSelected(menuItem);
     }
 
+    private void configureCustomNotifications(final Conversation conversation) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R
+                || conversation.getMode() != Conversational.MODE_MULTI) {
+            return;
+        }
+        final var shortcut =
+                xmppConnectionService
+                        .getShortcutService()
+                        .getShortcutInfo(conversation.getMucOptions());
+        configureCustomNotification(shortcut);
+    }
+
     @Override
-    public boolean onContextItemSelected(MenuItem item) {
+    public boolean onContextItemSelected(@NonNull final MenuItem item) {
         final User user = mUserPreviewAdapter.getSelectedUser();
         if (user == null) {
             Toast.makeText(this, R.string.unable_to_perform_this_action, Toast.LENGTH_SHORT).show();
             return true;
         }
-        if (!MucDetailsContextMenuHelper.onContextItemSelected(item, mUserPreviewAdapter.getSelectedUser(), this)) {
+        if (!MucDetailsContextMenuHelper.onContextItemSelected(
+                item, mUserPreviewAdapter.getSelectedUser(), this)) {
             return super.onContextItemSelected(item);
         }
         return true;
@@ -292,7 +343,8 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             this.binding.editMucNameButton.setContentDescription(getString(R.string.cancel));
             final String name = mucOptions.getName();
             this.binding.mucEditTitle.setText("");
-            final boolean owner = mucOptions.getSelf().getAffiliation().ranks(MucOptions.Affiliation.OWNER);
+            final boolean owner =
+                    mucOptions.getSelf().getAffiliation().ranks(MucOptions.Affiliation.OWNER);
             if (owner || printableValue(name)) {
                 this.binding.mucEditTitle.setVisibility(View.VISIBLE);
                 if (name != null) {
@@ -312,8 +364,14 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
                 this.binding.mucEditSubject.requestFocus();
             }
         } else {
-            String subject = this.binding.mucEditSubject.isEnabled() ? this.binding.mucEditSubject.getEditableText().toString().trim() : null;
-            String name = this.binding.mucEditTitle.isEnabled() ? this.binding.mucEditTitle.getEditableText().toString().trim() : null;
+            String subject =
+                    this.binding.mucEditSubject.isEnabled()
+                            ? this.binding.mucEditSubject.getEditableText().toString().trim()
+                            : null;
+            String name =
+                    this.binding.mucEditTitle.isEnabled()
+                            ? this.binding.mucEditTitle.getEditableText().toString().trim()
+                            : null;
             onMucInfoUpdated(subject, name);
             SoftKeyboardUtils.hideSoftKeyboard(this);
             hideEditor();
@@ -324,7 +382,8 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         this.binding.mucEditor.setVisibility(View.GONE);
         this.binding.mucDisplay.setVisibility(View.VISIBLE);
         this.binding.editMucNameButton.setImageResource(R.drawable.ic_edit_24dp);
-        this.binding.editMucNameButton.setContentDescription(getString(R.string.edit_name_and_topic));
+        this.binding.editMucNameButton.setContentDescription(
+                getString(R.string.edit_name_and_topic));
     }
 
     private void onMucInfoUpdated(String subject, String name) {
@@ -332,7 +391,8 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         if (mucOptions.canChangeSubject() && changed(mucOptions.getSubject(), subject)) {
             xmppConnectionService.pushSubjectToConference(mConversation, subject);
         }
-        if (mucOptions.getSelf().getAffiliation().ranks(MucOptions.Affiliation.OWNER) && changed(mucOptions.getName(), name)) {
+        if (mucOptions.getSelf().getAffiliation().ranks(MucOptions.Affiliation.OWNER)
+                && changed(mucOptions.getName(), name)) {
             Bundle options = new Bundle();
             options.putString("muc#roomconfig_persistentroom", "1");
             options.putString("muc#roomconfig_roomname", StringUtils.nullOnEmpty(name));
@@ -340,12 +400,13 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         }
     }
 
-
     @Override
     protected String getShareableUri(boolean http) {
         if (mConversation != null) {
             if (http) {
-                return "https://conversations.im/j/" + XmppUri.lameUrlEncode(mConversation.getJid().asBareJid().toEscapedString());
+                return "https://conversations.im/j/"
+                        + XmppUri.lameUrlEncode(
+                                mConversation.getJid().asBareJid().toEscapedString());
             } else {
                 return "xmpp:" + mConversation.getJid().asBareJid() + "?join";
             }
@@ -364,7 +425,12 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             return true;
         }
         menuItemSaveBookmark.setVisible(mConversation.getBookmark() == null);
-        menuItemDestroyRoom.setVisible(mConversation.getMucOptions().getSelf().getAffiliation().ranks(MucOptions.Affiliation.OWNER));
+        menuItemDestroyRoom.setVisible(
+                mConversation
+                        .getMucOptions()
+                        .getSelf()
+                        .getAffiliation()
+                        .ranks(MucOptions.Affiliation.OWNER));
         return true;
     }
 
@@ -377,32 +443,40 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         final MenuItem destroy = menu.findItem(R.id.action_destroy_room);
         destroy.setTitle(groupChat ? R.string.destroy_room : R.string.destroy_channel);
         AccountUtils.showHideMenuItems(menu);
+        final MenuItem customNotifications = menu.findItem(R.id.action_custom_notifications);
+        customNotifications.setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
-    public void onMediaLoaded(List<Attachment> attachments) {
-        runOnUiThread(() -> {
-            int limit = GridManager.getCurrentColumnCount(binding.media);
-            mMediaAdapter.setAttachments(attachments.subList(0, Math.min(limit, attachments.size())));
-            binding.mediaWrapper.setVisibility(attachments.size() > 0 ? View.VISIBLE : View.GONE);
-        });
-
+    public void onMediaLoaded(final List<Attachment> attachments) {
+        runOnUiThread(
+                () -> {
+                    final int limit = GridManager.getCurrentColumnCount(binding.media);
+                    mMediaAdapter.setAttachments(
+                            attachments.subList(0, Math.min(limit, attachments.size())));
+                    binding.mediaWrapper.setVisibility(
+                            attachments.isEmpty() ? View.GONE : View.VISIBLE);
+                });
     }
 
-
     protected void saveAsBookmark() {
-        xmppConnectionService.saveConversationAsBookmark(mConversation, mConversation.getMucOptions().getName());
+        xmppConnectionService.saveConversationAsBookmark(
+                mConversation, mConversation.getMucOptions().getName());
     }
 
     protected void destroyRoom() {
         final boolean groupChat = mConversation != null && mConversation.isPrivateAndNonAnonymous();
         final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
         builder.setTitle(groupChat ? R.string.destroy_room : R.string.destroy_channel);
-        builder.setMessage(groupChat ? R.string.destroy_room_dialog : R.string.destroy_channel_dialog);
-        builder.setPositiveButton(R.string.ok, (dialog, which) -> {
-            xmppConnectionService.destroyRoom(mConversation, ConferenceDetailsActivity.this);
-        });
+        builder.setMessage(
+                groupChat ? R.string.destroy_room_dialog : R.string.destroy_channel_dialog);
+        builder.setPositiveButton(
+                R.string.ok,
+                (dialog, which) -> {
+                    xmppConnectionService.destroyRoom(
+                            mConversation, ConferenceDetailsActivity.this);
+                });
         builder.setNegativeButton(R.string.cancel, null);
         final AlertDialog dialog = builder.create();
         dialog.setCanceledOnTouchOutside(false);
@@ -424,7 +498,8 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
                 if (Compatibility.hasStoragePermission(this)) {
                     final int limit = GridManager.getCurrentColumnCount(this.binding.media);
                     xmppConnectionService.getAttachments(this.mConversation, limit, this);
-                    this.binding.showMedia.setOnClickListener((v) -> MediaBrowserActivity.launch(this, mConversation));
+                    this.binding.showMedia.setOnClickListener(
+                            (v) -> MediaBrowserActivity.launch(this, mConversation));
                 }
                 updateView();
             }
@@ -448,15 +523,24 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         final MucOptions mucOptions = mConversation.getMucOptions();
         final User self = mucOptions.getSelf();
         final String account = mConversation.getAccount().getJid().asBareJid().toEscapedString();
-        setTitle(mucOptions.isPrivateAndNonAnonymous() ? R.string.action_muc_details : R.string.channel_details);
-        this.binding.editMucNameButton.setVisibility((self.getAffiliation().ranks(MucOptions.Affiliation.OWNER) || mucOptions.canChangeSubject()) ? View.VISIBLE : View.GONE);
+        setTitle(
+                mucOptions.isPrivateAndNonAnonymous()
+                        ? R.string.action_muc_details
+                        : R.string.channel_details);
+        this.binding.editMucNameButton.setVisibility(
+                (self.getAffiliation().ranks(MucOptions.Affiliation.OWNER)
+                                || mucOptions.canChangeSubject())
+                        ? View.VISIBLE
+                        : View.GONE);
         this.binding.detailsAccount.setText(getString(R.string.using_account, account));
         if (mConversation.isPrivateAndNonAnonymous()) {
-            this.binding.jid.setText(getString(R.string.hosted_on, mConversation.getJid().getDomain()));
+            this.binding.jid.setText(
+                    getString(R.string.hosted_on, mConversation.getJid().getDomain()));
         } else {
             this.binding.jid.setText(mConversation.getJid().asBareJid().toEscapedString());
         }
-        AvatarWorkerTask.loadAvatar(mConversation, binding.yourPhoto, R.dimen.avatar_on_details_screen_size);
+        AvatarWorkerTask.loadAvatar(
+                mConversation, binding.yourPhoto, R.dimen.avatar_on_details_screen_size);
         String roomName = mucOptions.getName();
         String subject = mucOptions.getSubject();
         final boolean hasTitle;
@@ -477,7 +561,12 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             StylingHelper.format(spannable, this.binding.mucSubject.getCurrentTextColor());
             MyLinkify.addLinks(spannable, false);
             this.binding.mucSubject.setText(spannable);
-            this.binding.mucSubject.setTextAppearance( subject.length() > (hasTitle ? 128 : 196) ? com.google.android.material.R.style.TextAppearance_Material3_BodyMedium : com.google.android.material.R.style.TextAppearance_Material3_BodyLarge);
+            this.binding.mucSubject.setTextAppearance(
+                    subject.length() > (hasTitle ? 128 : 196)
+                            ? com.google.android.material.R.style
+                                    .TextAppearance_Material3_BodyMedium
+                            : com.google.android.material.R.style
+                                    .TextAppearance_Material3_BodyLarge);
             this.binding.mucSubject.setAutoLinkMask(0);
             this.binding.mucSubject.setVisibility(View.VISIBLE);
             this.binding.mucSubject.setMovementMethod(LinkMovementMethod.getInstance());
@@ -495,7 +584,8 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
                 this.binding.mucConferenceType.setText(MucConfiguration.describe(this, mucOptions));
             } else if (!mucOptions.isPrivateAndNonAnonymous() && mucOptions.nonanonymous()) {
                 this.binding.mucSettings.setVisibility(View.VISIBLE);
-                this.binding.mucConferenceType.setText(R.string.group_chat_will_make_your_jabber_id_public);
+                this.binding.mucConferenceType.setText(
+                        R.string.group_chat_will_make_your_jabber_id_public);
             } else {
                 this.binding.mucSettings.setVisibility(View.GONE);
             }
@@ -518,50 +608,64 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         final long mutedTill = mConversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL, 0);
         if (mutedTill == Long.MAX_VALUE) {
             this.binding.notificationStatusText.setText(R.string.notify_never);
-            this.binding.notificationStatusButton.setImageResource(R.drawable.ic_notifications_off_24dp);
+            this.binding.notificationStatusButton.setImageResource(
+                    R.drawable.ic_notifications_off_24dp);
         } else if (System.currentTimeMillis() < mutedTill) {
             this.binding.notificationStatusText.setText(R.string.notify_paused);
-            this.binding.notificationStatusButton.setImageResource(R.drawable.ic_notifications_paused_24dp);
+            this.binding.notificationStatusButton.setImageResource(
+                    R.drawable.ic_notifications_paused_24dp);
         } else if (mConversation.alwaysNotify()) {
             this.binding.notificationStatusText.setText(R.string.notify_on_all_messages);
-            this.binding.notificationStatusButton.setImageResource(R.drawable.ic_notifications_24dp);
+            this.binding.notificationStatusButton.setImageResource(
+                    R.drawable.ic_notifications_24dp);
         } else {
             this.binding.notificationStatusText.setText(R.string.notify_only_when_highlighted);
-            this.binding.notificationStatusButton.setImageResource(R.drawable.ic_notifications_none_24dp);
+            this.binding.notificationStatusButton.setImageResource(
+                    R.drawable.ic_notifications_none_24dp);
         }
         final List<User> users = mucOptions.getUsers();
-        Collections.sort(users, (a, b) -> {
-            if (b.getAffiliation().outranks(a.getAffiliation())) {
-                return 1;
-            } else if (a.getAffiliation().outranks(b.getAffiliation())) {
-                return -1;
-            } else {
-                if (a.getAvatar() != null && b.getAvatar() == null) {
-                    return -1;
-                } else if (a.getAvatar() == null && b.getAvatar() != null) {
-                    return 1;
-                } else {
-                    return a.getComparableName().compareToIgnoreCase(b.getComparableName());
-                }
-            }
-        });
-        this.mUserPreviewAdapter.submitList(MucOptions.sub(users, GridManager.getCurrentColumnCount(binding.users)));
+        Collections.sort(
+                users,
+                (a, b) -> {
+                    if (b.getAffiliation().outranks(a.getAffiliation())) {
+                        return 1;
+                    } else if (a.getAffiliation().outranks(b.getAffiliation())) {
+                        return -1;
+                    } else {
+                        if (a.getAvatar() != null && b.getAvatar() == null) {
+                            return -1;
+                        } else if (a.getAvatar() == null && b.getAvatar() != null) {
+                            return 1;
+                        } else {
+                            return a.getComparableName().compareToIgnoreCase(b.getComparableName());
+                        }
+                    }
+                });
+        this.mUserPreviewAdapter.submitList(
+                MucOptions.sub(users, GridManager.getCurrentColumnCount(binding.users)));
         this.binding.invite.setVisibility(mucOptions.canInvite() ? View.VISIBLE : View.GONE);
         this.binding.showUsers.setVisibility(users.size() > 0 ? View.VISIBLE : View.GONE);
-        this.binding.showUsers.setText(getResources().getQuantityString(R.plurals.view_users, users.size(), users.size()));
-        this.binding.usersWrapper.setVisibility(users.size() > 0 || mucOptions.canInvite() ? View.VISIBLE : View.GONE);
+        this.binding.showUsers.setText(
+                getResources().getQuantityString(R.plurals.view_users, users.size(), users.size()));
+        this.binding.usersWrapper.setVisibility(
+                users.size() > 0 || mucOptions.canInvite() ? View.VISIBLE : View.GONE);
         if (users.size() == 0) {
-            this.binding.noUsersHints.setText(mucOptions.isPrivateAndNonAnonymous() ? R.string.no_users_hint_group_chat : R.string.no_users_hint_channel);
+            this.binding.noUsersHints.setText(
+                    mucOptions.isPrivateAndNonAnonymous()
+                            ? R.string.no_users_hint_group_chat
+                            : R.string.no_users_hint_channel);
             this.binding.noUsersHints.setVisibility(View.VISIBLE);
         } else {
             this.binding.noUsersHints.setVisibility(View.GONE);
         }
-
     }
 
     public static String getStatus(Context context, User user, final boolean advanced) {
         if (advanced) {
-            return String.format("%s (%s)", context.getString(user.getAffiliation().getResId()), context.getString(user.getRole().getResId()));
+            return String.format(
+                    "%s (%s)",
+                    context.getString(user.getAffiliation().getResId()),
+                    context.getString(user.getRole().getResId()));
         } else {
             return context.getString(user.getAffiliation().getResId());
         }
@@ -571,7 +675,6 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         return getStatus(this, user, mAdvancedMode);
     }
 
-
     @Override
     public void onAffiliationChangedSuccessful(Jid jid) {
         refreshUi();
@@ -590,7 +693,11 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
     @Override
     public void onRoomDestroyFailed() {
         final boolean groupChat = mConversation != null && mConversation.isPrivateAndNonAnonymous();
-        displayToast(getString(groupChat ? R.string.could_not_destroy_room : R.string.could_not_destroy_channel));
+        displayToast(
+                getString(
+                        groupChat
+                                ? R.string.could_not_destroy_room
+                                : R.string.could_not_destroy_channel));
     }
 
     @Override
@@ -604,23 +711,20 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
     }
 
     private void displayToast(final String msg) {
-        runOnUiThread(() -> {
-            if (isFinishing()) {
-                return;
-            }
-            ToastCompat.makeText(this, msg, Toast.LENGTH_SHORT).show();
-        });
+        runOnUiThread(
+                () -> {
+                    if (isFinishing()) {
+                        return;
+                    }
+                    ToastCompat.makeText(this, msg, Toast.LENGTH_SHORT).show();
+                });
     }
 
     @Override
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-
-    }
+    public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
 
     @Override
-    public void onTextChanged(CharSequence s, int start, int before, int count) {
-
-    }
+    public void onTextChanged(CharSequence s, int start, int before, int count) {}
 
     @Override
     public void afterTextChanged(Editable s) {
@@ -629,8 +733,14 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
         }
         final MucOptions mucOptions = mConversation.getMucOptions();
         if (this.binding.mucEditor.getVisibility() == View.VISIBLE) {
-            boolean subjectChanged = changed(binding.mucEditSubject.getEditableText().toString(), mucOptions.getSubject());
-            boolean nameChanged = changed(binding.mucEditTitle.getEditableText().toString(), mucOptions.getName());
+            boolean subjectChanged =
+                    changed(
+                            binding.mucEditSubject.getEditableText().toString(),
+                            mucOptions.getSubject());
+            boolean nameChanged =
+                    changed(
+                            binding.mucEditTitle.getEditableText().toString(),
+                            mucOptions.getName());
             if (subjectChanged || nameChanged) {
                 this.binding.editMucNameButton.setImageResource(R.drawable.ic_save_24dp);
                 this.binding.editMucNameButton.setContentDescription(getString(R.string.save));
@@ -640,5 +750,4 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             }
         }
     }
-
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 5eb368b7e8c38e32ab10463610faabe0a2894ddd..69e78124f9c881d9bb2725a0934c41bfcedcc4c2 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -26,23 +26,14 @@ import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.databinding.DataBindingUtil;
-
 import com.google.android.material.color.MaterialColors;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Ints;
-
-import org.openintents.openpgp.util.OpenPgpUtils;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
 import eu.siacs.conversations.AppSettings;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
@@ -78,48 +69,72 @@ import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.OnKeyStatusUpdated;
 import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
 import eu.siacs.conversations.xmpp.XmppConnection;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import org.openintents.openpgp.util.OpenPgpUtils;
 
-public class ContactDetailsActivity extends OmemoActivity implements OnAccountUpdate, OnRosterUpdate, OnUpdateBlocklist, OnKeyStatusUpdated, OnMediaLoaded {
+public class ContactDetailsActivity extends OmemoActivity
+        implements OnAccountUpdate,
+                OnRosterUpdate,
+                OnUpdateBlocklist,
+                OnKeyStatusUpdated,
+                OnMediaLoaded {
     public static final String ACTION_VIEW_CONTACT = "view_contact";
     private final int REQUEST_SYNC_CONTACTS = 0x28cf;
     ActivityContactDetailsBinding binding;
     private MediaAdapter mMediaAdapter;
 
     private Contact contact;
-    private final DialogInterface.OnClickListener removeFromRoster = new DialogInterface.OnClickListener() {
+    private final DialogInterface.OnClickListener removeFromRoster =
+            new DialogInterface.OnClickListener() {
 
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-            xmppConnectionService.deleteContactOnServer(contact);
-        }
-    };
-    private final OnCheckedChangeListener mOnSendCheckedChange = new OnCheckedChangeListener() {
-
-        @Override
-        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-            if (isChecked) {
-                if (contact.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
-                    xmppConnectionService.stopPresenceUpdatesTo(contact);
-                } else {
-                    contact.setOption(Contact.Options.PREEMPTIVE_GRANT);
+                @Override
+                public void onClick(DialogInterface dialog, int which) {
+                    xmppConnectionService.deleteContactOnServer(contact);
                 }
-            } else {
-                contact.resetOption(Contact.Options.PREEMPTIVE_GRANT);
-                xmppConnectionService.sendPresencePacket(contact.getAccount(), xmppConnectionService.getPresenceGenerator().stopPresenceUpdatesTo(contact));
-            }
-        }
-    };
-    private final OnCheckedChangeListener mOnReceiveCheckedChange = new OnCheckedChangeListener() {
-
-        @Override
-        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-            if (isChecked) {
-                xmppConnectionService.sendPresencePacket(contact.getAccount(), xmppConnectionService.getPresenceGenerator().requestPresenceUpdatesFrom(contact));
-            } else {
-                xmppConnectionService.sendPresencePacket(contact.getAccount(), xmppConnectionService.getPresenceGenerator().stopPresenceUpdatesFrom(contact));
-            }
-        }
-    };
+            };
+    private final OnCheckedChangeListener mOnSendCheckedChange =
+            new OnCheckedChangeListener() {
+
+                @Override
+                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                    if (isChecked) {
+                        if (contact.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
+                            xmppConnectionService.stopPresenceUpdatesTo(contact);
+                        } else {
+                            contact.setOption(Contact.Options.PREEMPTIVE_GRANT);
+                        }
+                    } else {
+                        contact.resetOption(Contact.Options.PREEMPTIVE_GRANT);
+                        xmppConnectionService.sendPresencePacket(
+                                contact.getAccount(),
+                                xmppConnectionService
+                                        .getPresenceGenerator()
+                                        .stopPresenceUpdatesTo(contact));
+                    }
+                }
+            };
+    private final OnCheckedChangeListener mOnReceiveCheckedChange =
+            new OnCheckedChangeListener() {
+
+                @Override
+                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                    if (isChecked) {
+                        xmppConnectionService.sendPresencePacket(
+                                contact.getAccount(),
+                                xmppConnectionService
+                                        .getPresenceGenerator()
+                                        .requestPresenceUpdatesFrom(contact));
+                    } else {
+                        xmppConnectionService.sendPresencePacket(
+                                contact.getAccount(),
+                                xmppConnectionService
+                                        .getPresenceGenerator()
+                                        .stopPresenceUpdatesFrom(contact));
+                    }
+                }
+            };
     private Jid accountJid;
     private Jid contactJid;
     private boolean showDynamicTags = false;
@@ -130,14 +145,18 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
     private void checkContactPermissionAndShowAddDialog() {
         if (hasContactsPermission()) {
             showAddToPhoneBookDialog();
-        } else if (QuickConversationsService.isContactListIntegration(this) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            requestPermissions(new String[]{Manifest.permission.READ_CONTACTS}, REQUEST_SYNC_CONTACTS);
+        } else if (QuickConversationsService.isContactListIntegration(this)
+                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            requestPermissions(
+                    new String[] {Manifest.permission.READ_CONTACTS}, REQUEST_SYNC_CONTACTS);
         }
     }
 
     private boolean hasContactsPermission() {
-        if (QuickConversationsService.isContactListIntegration(this) && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            return checkSelfPermission(Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED;
+        if (QuickConversationsService.isContactListIntegration(this)
+                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            return checkSelfPermission(Manifest.permission.READ_CONTACTS)
+                    == PackageManager.PERMISSION_GRANTED;
         } else {
             return true;
         }
@@ -145,9 +164,10 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
 
     private void showAddToPhoneBookDialog() {
         final Jid jid = contact.getJid();
-        final boolean quicksyContact = AbstractQuickConversationsService.isQuicksy()
-                && Config.QUICKSY_DOMAIN.equals(jid.getDomain())
-                && jid.getLocal() != null;
+        final boolean quicksyContact =
+                AbstractQuickConversationsService.isQuicksy()
+                        && Config.QUICKSY_DOMAIN.equals(jid.getDomain())
+                        && jid.getLocal() != null;
         final String value;
         if (quicksyContact) {
             value = PhoneNumberUtilWrapper.toFormattedPhoneNumber(this, jid);
@@ -158,24 +178,33 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
         builder.setTitle(getString(R.string.action_add_phone_book));
         builder.setMessage(getString(R.string.add_phone_book_text, value));
         builder.setNegativeButton(getString(R.string.cancel), null);
-        builder.setPositiveButton(getString(R.string.add), (dialog, which) -> {
-            final Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
-            intent.setType(Contacts.CONTENT_ITEM_TYPE);
-            if (quicksyContact) {
-                intent.putExtra(Intents.Insert.PHONE, value);
-            } else {
-                intent.putExtra(Intents.Insert.IM_HANDLE, value);
-                intent.putExtra(Intents.Insert.IM_PROTOCOL, CommonDataKinds.Im.PROTOCOL_JABBER);
-                //TODO for modern use we want PROTOCOL_CUSTOM and an extra field with a value of 'XMPP'
-                // however we don’t have such a field and thus have to use the legacy PROTOCOL_JABBER
-            }
-            intent.putExtra("finishActivityOnSaveCompleted", true);
-            try {
-                startActivityForResult(intent, 0);
-            } catch (ActivityNotFoundException e) {
-                Toast.makeText(ContactDetailsActivity.this, R.string.no_application_found_to_view_contact, Toast.LENGTH_SHORT).show();
-            }
-        });
+        builder.setPositiveButton(
+                getString(R.string.add),
+                (dialog, which) -> {
+                    final Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
+                    intent.setType(Contacts.CONTENT_ITEM_TYPE);
+                    if (quicksyContact) {
+                        intent.putExtra(Intents.Insert.PHONE, value);
+                    } else {
+                        intent.putExtra(Intents.Insert.IM_HANDLE, value);
+                        intent.putExtra(
+                                Intents.Insert.IM_PROTOCOL, CommonDataKinds.Im.PROTOCOL_JABBER);
+                        // TODO for modern use we want PROTOCOL_CUSTOM and an extra field with a
+                        // value of 'XMPP'
+                        // however we don’t have such a field and thus have to use the legacy
+                        // PROTOCOL_JABBER
+                    }
+                    intent.putExtra("finishActivityOnSaveCompleted", true);
+                    try {
+                        startActivityForResult(intent, 0);
+                    } catch (ActivityNotFoundException e) {
+                        Toast.makeText(
+                                        ContactDetailsActivity.this,
+                                        R.string.no_application_found_to_view_contact,
+                                        Toast.LENGTH_SHORT)
+                                .show();
+                    }
+                });
         builder.create().show();
     }
 
@@ -203,7 +232,8 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
     @Override
     protected String getShareableUri(boolean http) {
         if (http) {
-            return "https://conversations.im/i/" + XmppUri.lameUrlEncode(contact.getJid().asBareJid().toEscapedString());
+            return "https://conversations.im/i/"
+                    + XmppUri.lameUrlEncode(contact.getJid().asBareJid().toEscapedString());
         } else {
             return "xmpp:" + contact.getJid().asBareJid().toEscapedString();
         }
@@ -212,7 +242,9 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        showInactiveOmemo = savedInstanceState != null && savedInstanceState.getBoolean("show_inactive_omemo", false);
+        showInactiveOmemo =
+                savedInstanceState != null
+                        && savedInstanceState.getBoolean("show_inactive_omemo", false);
         if (getIntent().getAction().equals(ACTION_VIEW_CONTACT)) {
             try {
                 this.accountJid = Jid.ofEscaped(getIntent().getExtras().getString(EXTRA_ACCOUNT));
@@ -229,10 +261,11 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
 
         setSupportActionBar(binding.toolbar);
         configureActionBar(getSupportActionBar());
-        binding.showInactiveDevices.setOnClickListener(v -> {
-            showInactiveOmemo = !showInactiveOmemo;
-            populateView();
-        });
+        binding.showInactiveDevices.setOnClickListener(
+                v -> {
+                    showInactiveOmemo = !showInactiveOmemo;
+                    populateView();
+                });
         binding.addContactButton.setOnClickListener(v -> showAddToRosterDialog(contact));
 
         mMediaAdapter = new MediaAdapter(this, R.dimen.media_size);
@@ -252,12 +285,14 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
         final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
         this.showDynamicTags = preferences.getBoolean(AppSettings.SHOW_DYNAMIC_TAGS, false);
         this.showLastSeen = preferences.getBoolean("last_activity", false);
-        binding.mediaWrapper.setVisibility(Compatibility.hasStoragePermission(this) ? View.VISIBLE : View.GONE);
+        binding.mediaWrapper.setVisibility(
+                Compatibility.hasStoragePermission(this) ? View.VISIBLE : View.GONE);
         mMediaAdapter.setAttachments(Collections.emptyList());
     }
 
     @Override
-    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+    public void onRequestPermissionsResult(
+            int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         // TODO check for Camera / Scan permission
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
         if (grantResults.length > 0)
@@ -289,19 +324,29 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
                 final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
                 builder.setNegativeButton(getString(R.string.cancel), null);
                 builder.setTitle(getString(R.string.action_delete_contact))
-                        .setMessage(JidDialog.style(this, R.string.remove_contact_text, contact.getJid().toEscapedString()))
-                        .setPositiveButton(getString(R.string.delete),
-                                removeFromRoster).create().show();
+                        .setMessage(
+                                JidDialog.style(
+                                        this,
+                                        R.string.remove_contact_text,
+                                        contact.getJid().toEscapedString()))
+                        .setPositiveButton(getString(R.string.delete), removeFromRoster)
+                        .create()
+                        .show();
                 break;
             case R.id.action_edit_contact:
-                Uri systemAccount = contact.getSystemAccount();
+                final Uri systemAccount = contact.getSystemAccount();
                 if (systemAccount == null) {
-                    quickEdit(contact.getServerName(), R.string.contact_name, value -> {
-                        contact.setServerName(value);
-                        ContactDetailsActivity.this.xmppConnectionService.pushContactToServer(contact);
-                        populateView();
-                        return null;
-                    }, true);
+                    quickEdit(
+                            contact.getServerName(),
+                            R.string.contact_name,
+                            value -> {
+                                contact.setServerName(value);
+                                ContactDetailsActivity.this.xmppConnectionService
+                                        .pushContactToServer(contact);
+                                populateView();
+                                return null;
+                            },
+                            true);
                 } else {
                     Intent intent = new Intent(Intent.ACTION_EDIT);
                     intent.setDataAndType(systemAccount, Contacts.CONTENT_ITEM_TYPE);
@@ -309,29 +354,42 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
                     try {
                         startActivity(intent);
                     } catch (ActivityNotFoundException e) {
-                        Toast.makeText(ContactDetailsActivity.this, R.string.no_application_found_to_view_contact, Toast.LENGTH_SHORT).show();
+                        Toast.makeText(
+                                        ContactDetailsActivity.this,
+                                        R.string.no_application_found_to_view_contact,
+                                        Toast.LENGTH_SHORT)
+                                .show();
                     }
-
                 }
                 break;
-            case R.id.action_block:
+            case R.id.action_block, R.id.action_unblock:
                 BlockContactDialog.show(this, contact);
                 break;
-            case R.id.action_unblock:
-                BlockContactDialog.show(this, contact);
+            case R.id.action_custom_notifications:
+                configureCustomNotifications(contact);
                 break;
         }
         return super.onOptionsItemSelected(menuItem);
     }
 
+    private void configureCustomNotifications(final Contact contact) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+            return;
+        }
+        final var shortcut = xmppConnectionService.getShortcutService().getShortcutInfo(contact);
+        configureCustomNotification(shortcut);
+    }
+
     @Override
     public boolean onCreateOptionsMenu(final Menu menu) {
         getMenuInflater().inflate(R.menu.contact_details, menu);
         AccountUtils.showHideMenuItems(menu);
-        MenuItem block = menu.findItem(R.id.action_block);
-        MenuItem unblock = menu.findItem(R.id.action_unblock);
-        MenuItem edit = menu.findItem(R.id.action_edit_contact);
-        MenuItem delete = menu.findItem(R.id.action_delete_contact);
+        final MenuItem block = menu.findItem(R.id.action_block);
+        final MenuItem unblock = menu.findItem(R.id.action_unblock);
+        final MenuItem edit = menu.findItem(R.id.action_edit_contact);
+        final MenuItem delete = menu.findItem(R.id.action_delete_contact);
+        final MenuItem customNotifications = menu.findItem(R.id.action_custom_notifications);
+        customNotifications.setVisible(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R);
         if (contact == null) {
             return true;
         }
@@ -374,7 +432,11 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
                 binding.statusMessage.setVisibility(View.VISIBLE);
                 final Spannable span = new SpannableString(message);
                 if (Emoticons.isOnlyEmoji(message)) {
-                    span.setSpan(new RelativeSizeSpan(2.0f), 0, message.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                    span.setSpan(
+                            new RelativeSizeSpan(2.0f),
+                            0,
+                            message.length(),
+                            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                 }
                 binding.statusMessage.setText(span);
             } else {
@@ -398,14 +460,16 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
                 binding.detailsSendPresence.setText(R.string.send_presence_updates);
             } else {
                 binding.detailsSendPresence.setText(R.string.preemptively_grant);
-                binding.detailsSendPresence.setChecked(contact.getOption(Contact.Options.PREEMPTIVE_GRANT));
+                binding.detailsSendPresence.setChecked(
+                        contact.getOption(Contact.Options.PREEMPTIVE_GRANT));
             }
             if (contact.getOption(Contact.Options.TO)) {
                 binding.detailsReceivePresence.setText(R.string.receive_presence_updates);
                 binding.detailsReceivePresence.setChecked(true);
             } else {
                 binding.detailsReceivePresence.setText(R.string.ask_for_presence_updates);
-                binding.detailsReceivePresence.setChecked(contact.getOption(Contact.Options.ASKING));
+                binding.detailsReceivePresence.setChecked(
+                        contact.getOption(Contact.Options.ASKING));
             }
             if (contact.getAccount().isOnlineAndConnected()) {
                 binding.detailsReceivePresence.setEnabled(true);
@@ -431,7 +495,11 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
                     && contact.getLastseen() > 0
                     && contact.getPresences().allOrNonSupport(Namespace.IDLE)) {
                 binding.detailsLastseen.setVisibility(View.VISIBLE);
-                binding.detailsLastseen.setText(UIHelper.lastseen(getApplicationContext(), contact.isActive(), contact.getLastseen()));
+                binding.detailsLastseen.setText(
+                        UIHelper.lastseen(
+                                getApplicationContext(),
+                                contact.isActive(),
+                                contact.getLastseen()));
             } else {
                 binding.detailsLastseen.setVisibility(View.GONE);
             }
@@ -440,7 +508,8 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
         binding.detailsContactjid.setText(IrregularUnicodeDetector.style(this, contact.getJid()));
         final String account = contact.getAccount().getJid().asBareJid().toEscapedString();
         binding.detailsAccount.setText(getString(R.string.using_account, account));
-        AvatarWorkerTask.loadAvatar(contact, binding.detailsContactBadge, R.dimen.avatar_on_details_screen_size);
+        AvatarWorkerTask.loadAvatar(
+                contact, binding.detailsContactBadge, R.dimen.avatar_on_details_screen_size);
         binding.detailsContactBadge.setOnClickListener(this::onBadgeClick);
 
         binding.detailsContactKeys.removeAllViews();
@@ -448,7 +517,8 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
         final LayoutInflater inflater = getLayoutInflater();
         final AxolotlService axolotlService = contact.getAccount().getAxolotlService();
         if (Config.supportOmemo() && axolotlService != null) {
-            final Collection<XmppAxolotlSession> sessions = axolotlService.findSessionsForContact(contact);
+            final Collection<XmppAxolotlSession> sessions =
+                    axolotlService.findSessionsForContact(contact);
             boolean anyActive = false;
             for (XmppAxolotlSession session : sessions) {
                 anyActive = session.getTrust().isActive();
@@ -478,9 +548,13 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
                     showUnverifiedWarning = true;
                 }
             }
-            binding.unverifiedWarning.setVisibility(showUnverifiedWarning ? View.VISIBLE : View.GONE);
+            binding.unverifiedWarning.setVisibility(
+                    showUnverifiedWarning ? View.VISIBLE : View.GONE);
             if (showsInactive || skippedInactive) {
-                binding.showInactiveDevices.setText(showsInactive ? R.string.hide_inactive_devices : R.string.show_inactive_devices);
+                binding.showInactiveDevices.setText(
+                        showsInactive
+                                ? R.string.hide_inactive_devices
+                                : R.string.show_inactive_devices);
                 binding.showInactiveDevices.setVisibility(View.VISIBLE);
             } else {
                 binding.showInactiveDevices.setVisibility(View.GONE);
@@ -489,7 +563,8 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
             binding.showInactiveDevices.setVisibility(View.GONE);
         }
         final boolean isCameraFeatureAvailable = isCameraFeatureAvailable();
-        binding.scanButton.setVisibility(hasKeys && isCameraFeatureAvailable ? View.VISIBLE : View.GONE);
+        binding.scanButton.setVisibility(
+                hasKeys && isCameraFeatureAvailable ? View.VISIBLE : View.GONE);
         if (hasKeys) {
             binding.scanButton.setOnClickListener((v) -> ScanActivity.scan(this));
         }
@@ -500,7 +575,9 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
             TextView keyType = view.findViewById(R.id.key_type);
             keyType.setText(R.string.openpgp_key_id);
             if ("pgp".equals(messageFingerprint)) {
-                keyType.setTextColor(MaterialColors.getColor(keyType, com.google.android.material.R.attr.colorPrimaryVariant));
+                keyType.setTextColor(
+                        MaterialColors.getColor(
+                                keyType, com.google.android.material.R.attr.colorPrimaryVariant));
             }
             key.setText(OpenPgpUtils.convertKeyIdToHex(contact.getPgpKeyId()));
             final OnClickListener openKey = v -> launchOpenKeyChain(contact.getPgpKeyId());
@@ -512,7 +589,8 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
         binding.keysWrapper.setVisibility(hasKeys ? View.VISIBLE : View.GONE);
 
         final List<ListItem.Tag> tagList = contact.getTags(this);
-        final boolean hasMetaTags = contact.isBlocked() || contact.getShownStatus() != Presence.Status.OFFLINE;
+        final boolean hasMetaTags =
+                contact.isBlocked() || contact.getShownStatus() != Presence.Status.OFFLINE;
         if ((tagList.isEmpty() && !hasMetaTags) || !this.showDynamicTags) {
             binding.tags.setVisibility(View.GONE);
         } else {
@@ -521,9 +599,13 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
             final ImmutableList.Builder<Integer> viewIdBuilder = new ImmutableList.Builder<>();
             for (final ListItem.Tag tag : tagList) {
                 final String name = tag.getName();
-                final TextView tv = (TextView) inflater.inflate(R.layout.item_tag, binding.tags, false);
+                final TextView tv =
+                        (TextView) inflater.inflate(R.layout.item_tag, binding.tags, false);
                 tv.setText(name);
-                tv.setBackgroundTintList(ColorStateList.valueOf(MaterialColors.harmonizeWithPrimary(this,XEP0392Helper.rgbFromNick(name))));
+                tv.setBackgroundTintList(
+                        ColorStateList.valueOf(
+                                MaterialColors.harmonizeWithPrimary(
+                                        this, XEP0392Helper.rgbFromNick(name))));
                 final int id = ViewCompat.generateViewId();
                 tv.setId(id);
                 viewIdBuilder.add(id);
@@ -531,11 +613,14 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
             }
             if (contact.isBlocked()) {
                 final TextView tv =
-                        (TextView)
-                                inflater.inflate(
-                                        R.layout.item_tag, binding.tags, false);
+                        (TextView) inflater.inflate(R.layout.item_tag, binding.tags, false);
                 tv.setText(R.string.blocked);
-                tv.setBackgroundTintList(ColorStateList.valueOf(MaterialColors.harmonizeWithPrimary(tv.getContext(), ContextCompat.getColor(tv.getContext(),R.color.gray_800))));
+                tv.setBackgroundTintList(
+                        ColorStateList.valueOf(
+                                MaterialColors.harmonizeWithPrimary(
+                                        tv.getContext(),
+                                        ContextCompat.getColor(
+                                                tv.getContext(), R.color.gray_800))));
                 final int id = ViewCompat.generateViewId();
                 tv.setId(id);
                 viewIdBuilder.add(id);
@@ -544,9 +629,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
                 final Presence.Status status = contact.getShownStatus();
                 if (status != Presence.Status.OFFLINE) {
                     final TextView tv =
-                            (TextView)
-                                    inflater.inflate(
-                                            R.layout.item_tag, binding.tags, false);
+                            (TextView) inflater.inflate(R.layout.item_tag, binding.tags, false);
                     UIHelper.setStatus(tv, status);
                     final int id = ViewCompat.generateViewId();
                     tv.setId(id);
@@ -599,8 +682,10 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
 
             if (Compatibility.hasStoragePermission(this)) {
                 final int limit = GridManager.getCurrentColumnCount(this.binding.media);
-                xmppConnectionService.getAttachments(account, contact.getJid().asBareJid(), limit, this);
-                this.binding.showMedia.setOnClickListener((v) -> MediaBrowserActivity.launch(this, contact));
+                xmppConnectionService.getAttachments(
+                        account, contact.getJid().asBareJid(), limit, this);
+                this.binding.showMedia.setOnClickListener(
+                        (v) -> MediaBrowserActivity.launch(this, contact));
             }
             populateView();
         }
@@ -613,7 +698,9 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
 
     @Override
     protected void processFingerprintVerification(XmppUri uri) {
-        if (contact != null && contact.getJid().asBareJid().equals(uri.getJid()) && uri.hasFingerprints()) {
+        if (contact != null
+                && contact.getJid().asBareJid().equals(uri.getJid())
+                && uri.hasFingerprints()) {
             if (xmppConnectionService.verifyFingerprints(contact, uri.getFingerprints())) {
                 Toast.makeText(this, R.string.verified_fingerprints, Toast.LENGTH_SHORT).show();
             }
@@ -624,11 +711,13 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
 
     @Override
     public void onMediaLoaded(List<Attachment> attachments) {
-        runOnUiThread(() -> {
-            int limit = GridManager.getCurrentColumnCount(binding.media);
-            mMediaAdapter.setAttachments(attachments.subList(0, Math.min(limit, attachments.size())));
-            binding.mediaWrapper.setVisibility(attachments.size() > 0 ? View.VISIBLE : View.GONE);
-        });
-
+        runOnUiThread(
+                () -> {
+                    int limit = GridManager.getCurrentColumnCount(binding.media);
+                    mMediaAdapter.setAttachments(
+                            attachments.subList(0, Math.min(limit, attachments.size())));
+                    binding.mediaWrapper.setVisibility(
+                            attachments.size() > 0 ? View.VISIBLE : View.GONE);
+                });
     }
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 0798994f6adc1d49be6a869f05a9da9d345fac1a..fa304e810fb2f4cff824448cc0266ce4208d7292 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -2,6 +2,7 @@ package eu.siacs.conversations.ui;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
+import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.ActivityNotFoundException;
 import android.content.ClipData;
@@ -15,7 +16,6 @@ import android.content.IntentSender.SendIntentException;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Point;
@@ -31,6 +31,7 @@ import android.os.IBinder;
 import android.os.PowerManager;
 import android.os.SystemClock;
 import android.preference.PreferenceManager;
+import android.provider.Settings;
 import android.text.Html;
 import android.text.InputType;
 import android.util.DisplayMetrics;
@@ -42,19 +43,19 @@ import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.Toast;
-
 import androidx.annotation.BoolRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatDelegate;
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
 import androidx.databinding.DataBindingUtil;
-
 import com.google.android.material.color.MaterialColors;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
-
 import eu.siacs.conversations.AppSettings;
 import eu.siacs.conversations.BuildConfig;
 import eu.siacs.conversations.Config;
@@ -70,6 +71,7 @@ import eu.siacs.conversations.entities.Presences;
 import eu.siacs.conversations.entities.Reaction;
 import eu.siacs.conversations.services.AvatarService;
 import eu.siacs.conversations.services.BarcodeProvider;
+import eu.siacs.conversations.services.NotificationService;
 import eu.siacs.conversations.services.QuickConversationsService;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.services.XmppConnectionService.XmppConnectionBinder;
@@ -79,16 +81,13 @@ import eu.siacs.conversations.ui.util.SettingsUtils;
 import eu.siacs.conversations.ui.util.SoftKeyboardUtils;
 import eu.siacs.conversations.utils.AccountUtils;
 import eu.siacs.conversations.utils.Compatibility;
-import eu.siacs.conversations.utils.ExceptionHelper;
 import eu.siacs.conversations.utils.SignupUtils;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.OnKeyStatusUpdated;
 import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
-
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.RejectedExecutionException;
@@ -112,50 +111,58 @@ public abstract class XmppActivity extends ActionBarActivity {
     protected boolean mUsingEnterKey = false;
     protected boolean mUseTor = false;
     protected Toast mToast;
-    public Runnable onOpenPGPKeyPublished = () -> Toast.makeText(XmppActivity.this, R.string.openpgp_has_been_published, Toast.LENGTH_SHORT).show();
+    public Runnable onOpenPGPKeyPublished =
+            () ->
+                    Toast.makeText(
+                                    XmppActivity.this,
+                                    R.string.openpgp_has_been_published,
+                                    Toast.LENGTH_SHORT)
+                            .show();
     protected ConferenceInvite mPendingConferenceInvite = null;
-    protected ServiceConnection mConnection = new ServiceConnection() {
+    protected ServiceConnection mConnection =
+            new ServiceConnection() {
 
-        @Override
-        public void onServiceConnected(ComponentName className, IBinder service) {
-            XmppConnectionBinder binder = (XmppConnectionBinder) service;
-            xmppConnectionService = binder.getService();
-            xmppConnectionServiceBound = true;
-            registerListeners();
-            onBackendConnected();
-        }
+                @Override
+                public void onServiceConnected(ComponentName className, IBinder service) {
+                    XmppConnectionBinder binder = (XmppConnectionBinder) service;
+                    xmppConnectionService = binder.getService();
+                    xmppConnectionServiceBound = true;
+                    registerListeners();
+                    onBackendConnected();
+                }
 
-        @Override
-        public void onServiceDisconnected(ComponentName arg0) {
-            xmppConnectionServiceBound = false;
-        }
-    };
+                @Override
+                public void onServiceDisconnected(ComponentName arg0) {
+                    xmppConnectionServiceBound = false;
+                }
+            };
     private DisplayMetrics metrics;
     private long mLastUiRefresh = 0;
     private final Handler mRefreshUiHandler = new Handler();
-    private final Runnable mRefreshUiRunnable = () -> {
-        mLastUiRefresh = SystemClock.elapsedRealtime();
-        refreshUiReal();
-    };
-    private final UiCallback<Conversation> adhocCallback = new UiCallback<Conversation>() {
-        @Override
-        public void success(final Conversation conversation) {
-            runOnUiThread(() -> {
-                switchToConversation(conversation);
-                hideToast();
-            });
-        }
-
-        @Override
-        public void error(final int errorCode, Conversation object) {
-            runOnUiThread(() -> replaceToast(getString(errorCode)));
-        }
+    private final Runnable mRefreshUiRunnable =
+            () -> {
+                mLastUiRefresh = SystemClock.elapsedRealtime();
+                refreshUiReal();
+            };
+    private final UiCallback<Conversation> adhocCallback =
+            new UiCallback<Conversation>() {
+                @Override
+                public void success(final Conversation conversation) {
+                    runOnUiThread(
+                            () -> {
+                                switchToConversation(conversation);
+                                hideToast();
+                            });
+                }
 
-        @Override
-        public void userInputRequired(PendingIntent pi, Conversation object) {
+                @Override
+                public void error(final int errorCode, Conversation object) {
+                    runOnUiThread(() -> replaceToast(getString(errorCode)));
+                }
 
-        }
-    };
+                @Override
+                public void userInputRequired(PendingIntent pi, Conversation object) {}
+            };
 
     public static boolean cancelPotentialWork(Message message, ImageView imageView) {
         final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
@@ -212,7 +219,7 @@ public abstract class XmppActivity extends ActionBarActivity {
         }
     }
 
-    abstract protected void refreshUiReal();
+    protected abstract void refreshUiReal();
 
     @Override
     public void onStart() {
@@ -248,6 +255,41 @@ public abstract class XmppActivity extends ActionBarActivity {
         }
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.R)
+    protected void configureCustomNotification(final ShortcutInfoCompat shortcut) {
+        final var notificationManager = getSystemService(NotificationManager.class);
+        final var channel =
+                notificationManager.getNotificationChannel(
+                        NotificationService.MESSAGES_NOTIFICATION_CHANNEL, shortcut.getId());
+        if (channel != null && channel.getConversationId() != null) {
+            ShortcutManagerCompat.pushDynamicShortcut(this, shortcut);
+            openNotificationSettings(shortcut);
+        } else {
+            new MaterialAlertDialogBuilder(this)
+                    .setTitle(R.string.custom_notifications)
+                    .setMessage(R.string.custom_notifications_enable)
+                    .setPositiveButton(
+                            R.string.continue_btn,
+                            (d, w) -> {
+                                NotificationService.createConversationChannel(this, shortcut);
+                                ShortcutManagerCompat.pushDynamicShortcut(this, shortcut);
+                                openNotificationSettings(shortcut);
+                            })
+                    .setNegativeButton(R.string.cancel, null)
+                    .create()
+                    .show();
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.R)
+    protected void openNotificationSettings(final ShortcutInfoCompat shortcut) {
+        final var intent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS);
+        intent.putExtra(Settings.EXTRA_APP_PACKAGE, getPackageName());
+        intent.putExtra(
+                Settings.EXTRA_CHANNEL_ID, NotificationService.MESSAGES_NOTIFICATION_CHANNEL);
+        intent.putExtra(Settings.EXTRA_CONVERSATION_ID, shortcut.getId());
+        startActivity(intent);
+    }
 
     public boolean hasPgp() {
         return xmppConnectionService.getPgpEngine() != null;
@@ -257,16 +299,20 @@ public abstract class XmppActivity extends ActionBarActivity {
         final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
         builder.setTitle(getString(R.string.openkeychain_required));
         builder.setIconAttribute(android.R.attr.alertDialogIcon);
-        builder.setMessage(Html.fromHtml(getString(R.string.openkeychain_required_long, getString(R.string.app_name))));
+        builder.setMessage(
+                Html.fromHtml(
+                        getString(
+                                R.string.openkeychain_required_long,
+                                getString(R.string.app_name))));
         builder.setNegativeButton(getString(R.string.cancel), null);
-        builder.setNeutralButton(getString(R.string.restart),
+        builder.setNeutralButton(
+                getString(R.string.restart),
                 (dialog, which) -> {
                     if (xmppConnectionServiceBound) {
                         unbindService(mConnection);
                         xmppConnectionServiceBound = false;
                     }
-                    stopService(new Intent(XmppActivity.this,
-                            XmppConnectionService.class));
+                    stopService(new Intent(XmppActivity.this, XmppConnectionService.class));
                     finish();
                 });
         builder.setPositiveButton(
@@ -344,58 +390,89 @@ public abstract class XmppActivity extends ActionBarActivity {
     protected void deleteAccount(final Account account, final Runnable postDelete) {
         final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
         final View dialogView = getLayoutInflater().inflate(R.layout.dialog_delete_account, null);
-        final CheckBox deleteFromServer =
-                dialogView.findViewById(R.id.delete_from_server);
+        final CheckBox deleteFromServer = dialogView.findViewById(R.id.delete_from_server);
         builder.setView(dialogView);
         builder.setTitle(R.string.mgmt_account_delete);
-        builder.setPositiveButton(getString(R.string.delete),null);
+        builder.setPositiveButton(getString(R.string.delete), null);
         builder.setNegativeButton(getString(R.string.cancel), null);
         final AlertDialog dialog = builder.create();
-        dialog.setOnShowListener(dialogInterface->{
-            final Button button = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
-            button.setOnClickListener(v -> {
-                final boolean unregister = deleteFromServer.isChecked();
-                if (unregister) {
-                    if (account.isOnlineAndConnected()) {
-                        deleteFromServer.setEnabled(false);
-                        button.setText(R.string.please_wait);
-                        button.setEnabled(false);
-                        xmppConnectionService.unregisterAccount(account, result -> {
-                            runOnUiThread(()->{
-                                if (result) {
-                                    dialog.dismiss();
-                                    if (postDelete != null) {
-                                        postDelete.run();
+        dialog.setOnShowListener(
+                dialogInterface -> {
+                    final Button button = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
+                    button.setOnClickListener(
+                            v -> {
+                                final boolean unregister = deleteFromServer.isChecked();
+                                if (unregister) {
+                                    if (account.isOnlineAndConnected()) {
+                                        deleteFromServer.setEnabled(false);
+                                        button.setText(R.string.please_wait);
+                                        button.setEnabled(false);
+                                        xmppConnectionService.unregisterAccount(
+                                                account,
+                                                result -> {
+                                                    runOnUiThread(
+                                                            () -> {
+                                                                if (result) {
+                                                                    dialog.dismiss();
+                                                                    if (postDelete != null) {
+                                                                        postDelete.run();
+                                                                    }
+                                                                    if (xmppConnectionService
+                                                                                            .getAccounts()
+                                                                                            .size()
+                                                                                    == 0
+                                                                            && Config
+                                                                                            .MAGIC_CREATE_DOMAIN
+                                                                                    != null) {
+                                                                        final Intent intent =
+                                                                                SignupUtils
+                                                                                        .getSignUpIntent(
+                                                                                                this);
+                                                                        intent.setFlags(
+                                                                                Intent
+                                                                                                .FLAG_ACTIVITY_NEW_TASK
+                                                                                        | Intent
+                                                                                                .FLAG_ACTIVITY_CLEAR_TASK);
+                                                                        startActivity(intent);
+                                                                    }
+                                                                } else {
+                                                                    deleteFromServer.setEnabled(
+                                                                            true);
+                                                                    button.setText(R.string.delete);
+                                                                    button.setEnabled(true);
+                                                                    Toast.makeText(
+                                                                                    this,
+                                                                                    R.string
+                                                                                            .could_not_delete_account_from_server,
+                                                                                    Toast
+                                                                                            .LENGTH_LONG)
+                                                                            .show();
+                                                                }
+                                                            });
+                                                });
+                                    } else {
+                                        Toast.makeText(
+                                                        this,
+                                                        R.string.not_connected_try_again,
+                                                        Toast.LENGTH_LONG)
+                                                .show();
                                     }
-                                    if (xmppConnectionService.getAccounts().size() == 0 && Config.MAGIC_CREATE_DOMAIN != null) {
+                                } else {
+                                    xmppConnectionService.deleteAccount(account);
+                                    dialog.dismiss();
+                                    if (xmppConnectionService.getAccounts().size() == 0
+                                            && Config.MAGIC_CREATE_DOMAIN != null) {
                                         final Intent intent = SignupUtils.getSignUpIntent(this);
-                                        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+                                        intent.setFlags(
+                                                Intent.FLAG_ACTIVITY_NEW_TASK
+                                                        | Intent.FLAG_ACTIVITY_CLEAR_TASK);
                                         startActivity(intent);
+                                    } else if (postDelete != null) {
+                                        postDelete.run();
                                     }
-                                } else {
-                                    deleteFromServer.setEnabled(true);
-                                    button.setText(R.string.delete);
-                                    button.setEnabled(true);
-                                    Toast.makeText(this,R.string.could_not_delete_account_from_server,Toast.LENGTH_LONG).show();
                                 }
                             });
-                        });
-                    } else {
-                        Toast.makeText(this,R.string.not_connected_try_again,Toast.LENGTH_LONG).show();
-                    }
-                } else {
-                    xmppConnectionService.deleteAccount(account);
-                    dialog.dismiss();
-                    if (xmppConnectionService.getAccounts().size() == 0 && Config.MAGIC_CREATE_DOMAIN != null) {
-                        final Intent intent = SignupUtils.getSignUpIntent(this);
-                        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-                        startActivity(intent);
-                    } else if (postDelete != null) {
-                        postDelete.run();
-                    }
-                }
-            });
-        });
+                });
         dialog.show();
     }
 
@@ -403,61 +480,75 @@ public abstract class XmppActivity extends ActionBarActivity {
 
     protected void registerListeners() {
         if (this instanceof XmppConnectionService.OnConversationUpdate) {
-            this.xmppConnectionService.setOnConversationListChangedListener((XmppConnectionService.OnConversationUpdate) this);
+            this.xmppConnectionService.setOnConversationListChangedListener(
+                    (XmppConnectionService.OnConversationUpdate) this);
         }
         if (this instanceof XmppConnectionService.OnAccountUpdate) {
-            this.xmppConnectionService.setOnAccountListChangedListener((XmppConnectionService.OnAccountUpdate) this);
+            this.xmppConnectionService.setOnAccountListChangedListener(
+                    (XmppConnectionService.OnAccountUpdate) this);
         }
         if (this instanceof XmppConnectionService.OnCaptchaRequested) {
-            this.xmppConnectionService.setOnCaptchaRequestedListener((XmppConnectionService.OnCaptchaRequested) this);
+            this.xmppConnectionService.setOnCaptchaRequestedListener(
+                    (XmppConnectionService.OnCaptchaRequested) this);
         }
         if (this instanceof XmppConnectionService.OnRosterUpdate) {
-            this.xmppConnectionService.setOnRosterUpdateListener((XmppConnectionService.OnRosterUpdate) this);
+            this.xmppConnectionService.setOnRosterUpdateListener(
+                    (XmppConnectionService.OnRosterUpdate) this);
         }
         if (this instanceof XmppConnectionService.OnMucRosterUpdate) {
-            this.xmppConnectionService.setOnMucRosterUpdateListener((XmppConnectionService.OnMucRosterUpdate) this);
+            this.xmppConnectionService.setOnMucRosterUpdateListener(
+                    (XmppConnectionService.OnMucRosterUpdate) this);
         }
         if (this instanceof OnUpdateBlocklist) {
             this.xmppConnectionService.setOnUpdateBlocklistListener((OnUpdateBlocklist) this);
         }
         if (this instanceof XmppConnectionService.OnShowErrorToast) {
-            this.xmppConnectionService.setOnShowErrorToastListener((XmppConnectionService.OnShowErrorToast) this);
+            this.xmppConnectionService.setOnShowErrorToastListener(
+                    (XmppConnectionService.OnShowErrorToast) this);
         }
         if (this instanceof OnKeyStatusUpdated) {
             this.xmppConnectionService.setOnKeyStatusUpdatedListener((OnKeyStatusUpdated) this);
         }
         if (this instanceof XmppConnectionService.OnJingleRtpConnectionUpdate) {
-            this.xmppConnectionService.setOnRtpConnectionUpdateListener((XmppConnectionService.OnJingleRtpConnectionUpdate) this);
+            this.xmppConnectionService.setOnRtpConnectionUpdateListener(
+                    (XmppConnectionService.OnJingleRtpConnectionUpdate) this);
         }
     }
 
     protected void unregisterListeners() {
         if (this instanceof XmppConnectionService.OnConversationUpdate) {
-            this.xmppConnectionService.removeOnConversationListChangedListener((XmppConnectionService.OnConversationUpdate) this);
+            this.xmppConnectionService.removeOnConversationListChangedListener(
+                    (XmppConnectionService.OnConversationUpdate) this);
         }
         if (this instanceof XmppConnectionService.OnAccountUpdate) {
-            this.xmppConnectionService.removeOnAccountListChangedListener((XmppConnectionService.OnAccountUpdate) this);
+            this.xmppConnectionService.removeOnAccountListChangedListener(
+                    (XmppConnectionService.OnAccountUpdate) this);
         }
         if (this instanceof XmppConnectionService.OnCaptchaRequested) {
-            this.xmppConnectionService.removeOnCaptchaRequestedListener((XmppConnectionService.OnCaptchaRequested) this);
+            this.xmppConnectionService.removeOnCaptchaRequestedListener(
+                    (XmppConnectionService.OnCaptchaRequested) this);
         }
         if (this instanceof XmppConnectionService.OnRosterUpdate) {
-            this.xmppConnectionService.removeOnRosterUpdateListener((XmppConnectionService.OnRosterUpdate) this);
+            this.xmppConnectionService.removeOnRosterUpdateListener(
+                    (XmppConnectionService.OnRosterUpdate) this);
         }
         if (this instanceof XmppConnectionService.OnMucRosterUpdate) {
-            this.xmppConnectionService.removeOnMucRosterUpdateListener((XmppConnectionService.OnMucRosterUpdate) this);
+            this.xmppConnectionService.removeOnMucRosterUpdateListener(
+                    (XmppConnectionService.OnMucRosterUpdate) this);
         }
         if (this instanceof OnUpdateBlocklist) {
             this.xmppConnectionService.removeOnUpdateBlocklistListener((OnUpdateBlocklist) this);
         }
         if (this instanceof XmppConnectionService.OnShowErrorToast) {
-            this.xmppConnectionService.removeOnShowErrorToastListener((XmppConnectionService.OnShowErrorToast) this);
+            this.xmppConnectionService.removeOnShowErrorToastListener(
+                    (XmppConnectionService.OnShowErrorToast) this);
         }
         if (this instanceof OnKeyStatusUpdated) {
             this.xmppConnectionService.removeOnNewKeysAvailableListener((OnKeyStatusUpdated) this);
         }
         if (this instanceof XmppConnectionService.OnJingleRtpConnectionUpdate) {
-            this.xmppConnectionService.removeRtpConnectionUpdateListener((XmppConnectionService.OnJingleRtpConnectionUpdate) this);
+            this.xmppConnectionService.removeRtpConnectionUpdateListener(
+                    (XmppConnectionService.OnJingleRtpConnectionUpdate) this);
         }
     }
 
@@ -465,7 +556,9 @@ public abstract class XmppActivity extends ActionBarActivity {
     public boolean onOptionsItemSelected(final MenuItem item) {
         switch (item.getItemId()) {
             case R.id.action_settings:
-                startActivity(new Intent(this, eu.siacs.conversations.ui.activity.SettingsActivity.class));
+                startActivity(
+                        new Intent(
+                                this, eu.siacs.conversations.ui.activity.SettingsActivity.class));
                 break;
             case R.id.action_privacy_policy:
                 openPrivacyPolicy();
@@ -500,7 +593,8 @@ public abstract class XmppActivity extends ActionBarActivity {
         }
     }
 
-    public void selectPresence(final Conversation conversation, final PresenceSelector.OnPresenceSelected listener) {
+    public void selectPresence(
+            final Conversation conversation, final PresenceSelector.OnPresenceSelected listener) {
         final Contact contact = conversation.getContact();
         if (contact.showInRoster() || contact.isSelf()) {
             final Presences presences = contact.getPresences();
@@ -521,7 +615,8 @@ public abstract class XmppActivity extends ActionBarActivity {
                 }
             } else if (presences.size() == 1) {
                 final String presence = presences.toResourceArray()[0];
-                conversation.setNextCounterpart(PresenceSelector.getNextCounterpart(contact, presence));
+                conversation.setNextCounterpart(
+                        PresenceSelector.getNextCounterpart(contact, presence));
                 listener.onPresenceSelected();
             } else {
                 PresenceSelector.showPresenceSelectionDialog(this, conversation, listener);
@@ -536,7 +631,8 @@ public abstract class XmppActivity extends ActionBarActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         metrics = getResources().getDisplayMetrics();
-        this.isCameraFeatureAvailable = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
+        this.isCameraFeatureAvailable =
+                getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY);
     }
 
     protected boolean isCameraFeatureAvailable() {
@@ -546,14 +642,16 @@ public abstract class XmppActivity extends ActionBarActivity {
     protected boolean isOptimizingBattery() {
         final PowerManager pm = getSystemService(PowerManager.class);
         return !pm.isIgnoringBatteryOptimizations(getPackageName());
-}
+    }
 
     protected boolean isAffectedByDataSaver() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            final ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+            final ConnectivityManager cm =
+                    (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
             return cm != null
                     && cm.isActiveNetworkMetered()
-                    && Compatibility.getRestrictBackgroundStatus(cm) == ConnectivityManager.RESTRICT_BACKGROUND_STATUS_ENABLED;
+                    && Compatibility.getRestrictBackgroundStatus(cm)
+                            == ConnectivityManager.RESTRICT_BACKGROUND_STATUS_ENABLED;
         } else {
             return false;
         }
@@ -564,7 +662,8 @@ public abstract class XmppActivity extends ActionBarActivity {
     }
 
     private boolean useTor() {
-        return QuickConversationsService.isConversations() && getBooleanPreference("use_tor", R.bool.use_tor);
+        return QuickConversationsService.isConversations()
+                && getBooleanPreference("use_tor", R.bool.use_tor);
     }
 
     protected SharedPreferences getPreferences() {
@@ -599,7 +698,13 @@ public abstract class XmppActivity extends ActionBarActivity {
         switchToConversation(conversation, null, false, nick, true, false);
     }
 
-    private void switchToConversation(Conversation conversation, String text, boolean asQuote, String nick, boolean pm, boolean doNotAppend) {
+    private void switchToConversation(
+            Conversation conversation,
+            String text,
+            boolean asQuote,
+            String nick,
+            boolean pm,
+            boolean doNotAppend) {
         Intent intent = new Intent(this, ConversationsActivity.class);
         intent.setAction(ConversationsActivity.ACTION_VIEW_CONVERSATION);
         intent.putExtra(ConversationsActivity.EXTRA_CONVERSATION, conversation.getUuid());
@@ -647,7 +752,10 @@ public abstract class XmppActivity extends ActionBarActivity {
         intent.putExtra("jid", account.getJid().asBareJid().toEscapedString());
         intent.putExtra("init", init);
         if (init) {
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
+            intent.setFlags(
+                    Intent.FLAG_ACTIVITY_NEW_TASK
+                            | Intent.FLAG_ACTIVITY_CLEAR_TASK
+                            | Intent.FLAG_ACTIVITY_NO_ANIMATION);
         }
         if (fingerprint != null) {
             intent.putExtra("fingerprint", fingerprint);
@@ -671,85 +779,113 @@ public abstract class XmppActivity extends ActionBarActivity {
     }
 
     protected void inviteToConversation(Conversation conversation) {
-        startActivityForResult(ChooseContactActivity.create(this, conversation), REQUEST_INVITE_TO_CONVERSATION);
+        startActivityForResult(
+                ChooseContactActivity.create(this, conversation), REQUEST_INVITE_TO_CONVERSATION);
     }
 
-    protected void announcePgp(final Account account, final Conversation conversation, Intent intent, final Runnable onSuccess) {
+    protected void announcePgp(
+            final Account account,
+            final Conversation conversation,
+            Intent intent,
+            final Runnable onSuccess) {
         if (account.getPgpId() == 0) {
             choosePgpSignId(account);
         } else {
             final String status = Strings.nullToEmpty(account.getPresenceStatusMessage());
-            xmppConnectionService.getPgpEngine().generateSignature(intent, account, status, new UiCallback<String>() {
-
-                @Override
-                public void userInputRequired(final PendingIntent pi, final String signature) {
-                    try {
-                        startIntentSenderForResult(pi.getIntentSender(), REQUEST_ANNOUNCE_PGP, null, 0, 0, 0,Compatibility.pgpStartIntentSenderOptions());
-                    } catch (final SendIntentException ignored) {
-                    }
-                }
+            xmppConnectionService
+                    .getPgpEngine()
+                    .generateSignature(
+                            intent,
+                            account,
+                            status,
+                            new UiCallback<String>() {
+
+                                @Override
+                                public void userInputRequired(
+                                        final PendingIntent pi, final String signature) {
+                                    try {
+                                        startIntentSenderForResult(
+                                                pi.getIntentSender(),
+                                                REQUEST_ANNOUNCE_PGP,
+                                                null,
+                                                0,
+                                                0,
+                                                0,
+                                                Compatibility.pgpStartIntentSenderOptions());
+                                    } catch (final SendIntentException ignored) {
+                                    }
+                                }
 
-                @Override
-                public void success(String signature) {
-                    account.setPgpSignature(signature);
-                    xmppConnectionService.databaseBackend.updateAccount(account);
-                    xmppConnectionService.sendPresence(account);
-                    if (conversation != null) {
-                        conversation.setNextEncryption(Message.ENCRYPTION_PGP);
-                        xmppConnectionService.updateConversation(conversation);
-                        refreshUi();
-                    }
-                    if (onSuccess != null) {
-                        runOnUiThread(onSuccess);
-                    }
-                }
+                                @Override
+                                public void success(String signature) {
+                                    account.setPgpSignature(signature);
+                                    xmppConnectionService.databaseBackend.updateAccount(account);
+                                    xmppConnectionService.sendPresence(account);
+                                    if (conversation != null) {
+                                        conversation.setNextEncryption(Message.ENCRYPTION_PGP);
+                                        xmppConnectionService.updateConversation(conversation);
+                                        refreshUi();
+                                    }
+                                    if (onSuccess != null) {
+                                        runOnUiThread(onSuccess);
+                                    }
+                                }
 
-                @Override
-                public void error(int error, String signature) {
-                    if (error == 0) {
-                        account.setPgpSignId(0);
-                        account.unsetPgpSignature();
-                        xmppConnectionService.databaseBackend.updateAccount(account);
-                        choosePgpSignId(account);
-                    } else {
-                        displayErrorDialog(error);
-                    }
-                }
-            });
+                                @Override
+                                public void error(int error, String signature) {
+                                    if (error == 0) {
+                                        account.setPgpSignId(0);
+                                        account.unsetPgpSignature();
+                                        xmppConnectionService.databaseBackend.updateAccount(
+                                                account);
+                                        choosePgpSignId(account);
+                                    } else {
+                                        displayErrorDialog(error);
+                                    }
+                                }
+                            });
         }
     }
 
     protected void choosePgpSignId(final Account account) {
-        xmppConnectionService.getPgpEngine().chooseKey(account, new UiCallback<>() {
-            @Override
-            public void success(final Account a) {
-            }
-
-            @Override
-            public void error(int errorCode, Account object) {
-
-            }
-
-            @Override
-            public void userInputRequired(PendingIntent pi, Account object) {
-                try {
-                    startIntentSenderForResult(pi.getIntentSender(),
-                            REQUEST_CHOOSE_PGP_ID, null, 0, 0, 0, Compatibility.pgpStartIntentSenderOptions());
-                } catch (final SendIntentException ignored) {
-                }
-            }
-        });
+        xmppConnectionService
+                .getPgpEngine()
+                .chooseKey(
+                        account,
+                        new UiCallback<>() {
+                            @Override
+                            public void success(final Account a) {}
+
+                            @Override
+                            public void error(int errorCode, Account object) {}
+
+                            @Override
+                            public void userInputRequired(PendingIntent pi, Account object) {
+                                try {
+                                    startIntentSenderForResult(
+                                            pi.getIntentSender(),
+                                            REQUEST_CHOOSE_PGP_ID,
+                                            null,
+                                            0,
+                                            0,
+                                            0,
+                                            Compatibility.pgpStartIntentSenderOptions());
+                                } catch (final SendIntentException ignored) {
+                                }
+                            }
+                        });
     }
 
     protected void displayErrorDialog(final int errorCode) {
-        runOnUiThread(() -> {
-            final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(XmppActivity.this);
-            builder.setTitle(getString(R.string.error));
-            builder.setMessage(errorCode);
-            builder.setNeutralButton(R.string.accept, null);
-            builder.create().show();
-        });
-
+        runOnUiThread(
+                () -> {
+                    final MaterialAlertDialogBuilder builder =
+                            new MaterialAlertDialogBuilder(XmppActivity.this);
+                    builder.setTitle(getString(R.string.error));
+                    builder.setMessage(errorCode);
+                    builder.setNeutralButton(R.string.accept, null);
+                    builder.create().show();
+                });
     }
 
     protected void showAddToRosterDialog(final Contact contact) {
@@ -757,7 +893,9 @@ public abstract class XmppActivity extends ActionBarActivity {
         builder.setTitle(contact.getJid().toString());
         builder.setMessage(getString(R.string.not_in_roster));
         builder.setNegativeButton(getString(R.string.cancel), null);
-        builder.setPositiveButton(getString(R.string.add_contact), (dialog, which) -> xmppConnectionService.createContact(contact, true));
+        builder.setPositiveButton(
+                getString(R.string.add_contact),
+                (dialog, which) -> xmppConnectionService.createContact(contact, true));
         builder.create().show();
     }
 
@@ -766,13 +904,15 @@ public abstract class XmppActivity extends ActionBarActivity {
         builder.setTitle(contact.getJid().toString());
         builder.setMessage(R.string.request_presence_updates);
         builder.setNegativeButton(R.string.cancel, null);
-        builder.setPositiveButton(R.string.request_now,
+        builder.setPositiveButton(
+                R.string.request_now,
                 (dialog, which) -> {
                     if (xmppConnectionServiceBound) {
-                        xmppConnectionService.sendPresencePacket(contact
-                                .getAccount(), xmppConnectionService
-                                .getPresenceGenerator()
-                                .requestPresenceUpdatesFrom(contact));
+                        xmppConnectionService.sendPresencePacket(
+                                contact.getAccount(),
+                                xmppConnectionService
+                                        .getPresenceGenerator()
+                                        .requestPresenceUpdatesFrom(contact));
                     }
                 });
         builder.create().show();
@@ -782,7 +922,11 @@ public abstract class XmppActivity extends ActionBarActivity {
         quickEdit(previousValue, callback, hint, false, false);
     }
 
-    protected void quickEdit(String previousValue, @StringRes int hint, OnValueEdited callback, boolean permitEmpty) {
+    protected void quickEdit(
+            String previousValue,
+            @StringRes int hint,
+            OnValueEdited callback,
+            boolean permitEmpty) {
         quickEdit(previousValue, callback, hint, false, permitEmpty);
     }
 
@@ -791,15 +935,19 @@ public abstract class XmppActivity extends ActionBarActivity {
     }
 
     @SuppressLint("InflateParams")
-    private void quickEdit(final String previousValue,
-                           final OnValueEdited callback,
-                           final @StringRes int hint,
-                           boolean password,
-                           boolean permitEmpty) {
+    private void quickEdit(
+            final String previousValue,
+            final OnValueEdited callback,
+            final @StringRes int hint,
+            boolean password,
+            boolean permitEmpty) {
         final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
-        final DialogQuickeditBinding binding = DataBindingUtil.inflate(getLayoutInflater(), R.layout.dialog_quickedit, null, false);
+        final DialogQuickeditBinding binding =
+                DataBindingUtil.inflate(
+                        getLayoutInflater(), R.layout.dialog_quickedit, null, false);
         if (password) {
-            binding.inputEditText.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+            binding.inputEditText.setInputType(
+                    InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
         }
         builder.setPositiveButton(R.string.accept, null);
         if (hint != 0) {
@@ -814,33 +962,39 @@ public abstract class XmppActivity extends ActionBarActivity {
         final AlertDialog dialog = builder.create();
         dialog.setOnShowListener(d -> SoftKeyboardUtils.showKeyboard(binding.inputEditText));
         dialog.show();
-        View.OnClickListener clickListener = v -> {
-            String value = binding.inputEditText.getText().toString();
-            if (!value.equals(previousValue) && (!value.trim().isEmpty() || permitEmpty)) {
-                String error = callback.onValueEdited(value);
-                if (error != null) {
-                    binding.inputLayout.setError(error);
-                    return;
-                }
-            }
-            SoftKeyboardUtils.hideSoftKeyboard(binding.inputEditText);
-            dialog.dismiss();
-        };
+        View.OnClickListener clickListener =
+                v -> {
+                    String value = binding.inputEditText.getText().toString();
+                    if (!value.equals(previousValue) && (!value.trim().isEmpty() || permitEmpty)) {
+                        String error = callback.onValueEdited(value);
+                        if (error != null) {
+                            binding.inputLayout.setError(error);
+                            return;
+                        }
+                    }
+                    SoftKeyboardUtils.hideSoftKeyboard(binding.inputEditText);
+                    dialog.dismiss();
+                };
         dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(clickListener);
-        dialog.getButton(DialogInterface.BUTTON_NEGATIVE).setOnClickListener((v -> {
-            SoftKeyboardUtils.hideSoftKeyboard(binding.inputEditText);
-            dialog.dismiss();
-        }));
+        dialog.getButton(DialogInterface.BUTTON_NEGATIVE)
+                .setOnClickListener(
+                        (v -> {
+                            SoftKeyboardUtils.hideSoftKeyboard(binding.inputEditText);
+                            dialog.dismiss();
+                        }));
         dialog.setCanceledOnTouchOutside(false);
-        dialog.setOnDismissListener(dialog1 -> {
-            SoftKeyboardUtils.hideSoftKeyboard(binding.inputEditText);
-        });
+        dialog.setOnDismissListener(
+                dialog1 -> {
+                    SoftKeyboardUtils.hideSoftKeyboard(binding.inputEditText);
+                });
     }
 
     protected boolean hasStoragePermission(int requestCode) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-            if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
-                requestPermissions(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, requestCode);
+            if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                    != PackageManager.PERMISSION_GRANTED) {
+                requestPermissions(
+                        new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, requestCode);
                 return false;
             } else {
                 return true;
@@ -876,7 +1030,8 @@ public abstract class XmppActivity extends ActionBarActivity {
     }
 
     protected boolean manuallyChangePresence() {
-        return getBooleanPreference(AppSettings.MANUALLY_CHANGE_PRESENCE, R.bool.manually_change_presence);
+        return getBooleanPreference(
+                AppSettings.MANUALLY_CHANGE_PRESENCE, R.bool.manually_change_presence);
     }
 
     protected String getShareableUri() {
@@ -906,16 +1061,21 @@ public abstract class XmppActivity extends ActionBarActivity {
         PgpEngine pgp = XmppActivity.this.xmppConnectionService.getPgpEngine();
         try {
             startIntentSenderForResult(
-                    pgp.getIntentForKey(keyId).getIntentSender(), 0, null, 0,
-                    0, 0, Compatibility.pgpStartIntentSenderOptions());
+                    pgp.getIntentForKey(keyId).getIntentSender(),
+                    0,
+                    null,
+                    0,
+                    0,
+                    0,
+                    Compatibility.pgpStartIntentSenderOptions());
         } catch (final Throwable e) {
-            Log.d(Config.LOGTAG,"could not launch OpenKeyChain", e);
+            Log.d(Config.LOGTAG, "could not launch OpenKeyChain", e);
             Toast.makeText(XmppActivity.this, R.string.openpgp_error, Toast.LENGTH_SHORT).show();
         }
     }
 
     @Override
-    protected void onResume(){
+    protected void onResume() {
         super.onResume();
         SettingsUtils.applyScreenshotSetting(this);
     }
@@ -947,11 +1107,27 @@ public abstract class XmppActivity extends ActionBarActivity {
         final int black;
         final int white;
         if (Activities.isNightMode(this)) {
-            black = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurfaceContainerHighest,"No surface color configured");
-            white = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurfaceInverse,"No inverse surface color configured");
+            black =
+                    MaterialColors.getColor(
+                            this,
+                            com.google.android.material.R.attr.colorSurfaceContainerHighest,
+                            "No surface color configured");
+            white =
+                    MaterialColors.getColor(
+                            this,
+                            com.google.android.material.R.attr.colorSurfaceInverse,
+                            "No inverse surface color configured");
         } else {
-            black = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurfaceInverse,"No inverse surface color configured");
-            white = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurfaceContainerHighest,"No surface color configured");
+            black =
+                    MaterialColors.getColor(
+                            this,
+                            com.google.android.material.R.attr.colorSurfaceInverse,
+                            "No inverse surface color configured");
+            white =
+                    MaterialColors.getColor(
+                            this,
+                            com.google.android.material.R.attr.colorSurfaceContainerHighest,
+                            "No surface color configured");
         }
         final var bitmap = BarcodeProvider.create2dBarcodeBitmap(uri, width, black, white);
         final ImageView view = new ImageView(this);
@@ -978,7 +1154,10 @@ public abstract class XmppActivity extends ActionBarActivity {
     public void loadBitmap(Message message, ImageView imageView) {
         Bitmap bm;
         try {
-            bm = xmppConnectionService.getFileBackend().getThumbnail(message, (int) (metrics.density * 288), true);
+            bm =
+                    xmppConnectionService
+                            .getFileBackend()
+                            .getThumbnail(message, (int) (metrics.density * 288), true);
         } catch (IOException e) {
             bm = null;
         }
@@ -991,8 +1170,7 @@ public abstract class XmppActivity extends ActionBarActivity {
                 imageView.setBackgroundColor(0xff333333);
                 imageView.setImageDrawable(null);
                 final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
-                final AsyncDrawable asyncDrawable = new AsyncDrawable(
-                        getResources(), null, task);
+                final AsyncDrawable asyncDrawable = new AsyncDrawable(getResources(), null, task);
                 imageView.setImageDrawable(asyncDrawable);
                 try {
                     task.execute(message);
@@ -1035,7 +1213,8 @@ public abstract class XmppActivity extends ActionBarActivity {
                 return false;
             } else {
                 jids.add(conversation.getJid().asBareJid());
-                return service.createAdhocConference(conversation.getAccount(), null, jids, activity.adhocCallback);
+                return service.createAdhocConference(
+                        conversation.getAccount(), null, jids, activity.adhocCallback);
             }
         }
     }
@@ -1057,7 +1236,9 @@ public abstract class XmppActivity extends ActionBarActivity {
             try {
                 final XmppActivity activity = find(imageViewReference);
                 if (activity != null && activity.xmppConnectionService != null) {
-                    return activity.xmppConnectionService.getFileBackend().getThumbnail(message, (int) (activity.metrics.density * 288), false);
+                    return activity.xmppConnectionService
+                            .getFileBackend()
+                            .getThumbnail(message, (int) (activity.metrics.density * 288), false);
                 } else {
                     return null;
                 }
diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index c7d330d11e813f92a124dd600e6fbdc84ee061df..6a851d8b4302b82f7037d53fbe1266a156a270af 100644
--- a/src/main/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
@@ -1,64 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_edit_contact"
         android:icon="@drawable/ic_edit_24dp"
         android:orderInCategory="10"
-        app:showAsAction="always"
-        android:title="@string/action_edit_contact"/>
+        android:title="@string/action_edit_contact"
+        app:showAsAction="always" />
 
     <item
         android:id="@+id/action_share"
         android:icon="@drawable/ic_share_24dp"
         android:orderInCategory="15"
-        app:showAsAction="always"
-        android:title="@string/share_uri_with">
+        android:title="@string/share_uri_with"
+        app:showAsAction="always">
         <menu>
             <item
                 android:id="@+id/action_share_uri"
-                android:title="@string/share_as_uri"/>
+                android:title="@string/share_as_uri" />
             <item
                 android:id="@+id/action_share_http"
-                android:title="@string/share_as_http"/>
+                android:title="@string/share_as_http" />
             <item
                 android:id="@+id/action_show_qr_code"
-                android:title="@string/show_qr_code"/>
+                android:title="@string/show_qr_code" />
         </menu>
     </item>
     <item
         android:id="@+id/action_delete_contact"
         android:orderInCategory="10"
-        app:showAsAction="never"
-        android:title="@string/action_delete_contact"/>
+        android:title="@string/action_delete_contact"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/action_block"
         android:orderInCategory="72"
-        app:showAsAction="never"
-        android:title="@string/action_block_contact"/>
+        android:title="@string/action_block_contact"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/action_unblock"
         android:orderInCategory="73"
-        app:showAsAction="never"
-        android:title="@string/action_unblock_contact"/>
+        android:title="@string/action_unblock_contact"
+        app:showAsAction="never" />
+
+    <item
+        android:id="@+id/action_custom_notifications"
+        android:orderInCategory="75"
+        android:title="@string/custom_notifications"
+        app:showAsAction="never" />
 
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
-        app:showAsAction="never"
-        android:title="@string/action_accounts"/>
+        android:title="@string/action_accounts"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_account"
         android:orderInCategory="90"
         android:title="@string/action_account"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
-        app:showAsAction="never"
-        android:title="@string/action_settings"/>
+        android:title="@string/action_settings"
+        app:showAsAction="never" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 4c515ce67184a79746218289108fc24c957511e9..81c58ff926313b2bc951996f38b2ff9173398206 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -1,57 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/action_share"
         android:icon="@drawable/ic_share_24dp"
         android:orderInCategory="15"
-        app:showAsAction="ifRoom"
-        android:title="@string/share_uri_with">
+        android:title="@string/share_uri_with"
+        app:showAsAction="ifRoom">
         <menu>
             <item
                 android:id="@+id/action_share_uri"
-                android:title="@string/share_as_uri"/>
+                android:title="@string/share_as_uri" />
             <item
                 android:id="@+id/action_share_http"
-                android:title="@string/share_as_http"/>
+                android:title="@string/share_as_http" />
             <item
                 android:id="@+id/action_show_qr_code"
-                android:title="@string/show_qr_code"/>
+                android:title="@string/show_qr_code" />
         </menu>
     </item>
 
     <item
         android:id="@+id/action_save_as_bookmark"
         android:orderInCategory="80"
-        app:showAsAction="never"
-        android:title="@string/save_as_bookmark"/>
+        android:title="@string/save_as_bookmark"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_destroy_room"
         android:orderInCategory="82"
-        app:showAsAction="never"
-        android:title="@string/destroy_room"/>
+        android:title="@string/destroy_room"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_advanced_mode"
         android:checkable="true"
         android:checked="false"
         android:orderInCategory="85"
-        app:showAsAction="never"
-        android:title="@string/advanced_mode"/>
+        android:title="@string/advanced_mode"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_custom_notifications"
+        android:orderInCategory="89"
+        android:title="@string/custom_notifications"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
-        app:showAsAction="never"
-        android:title="@string/action_accounts"/>
+        android:title="@string/action_accounts"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_account"
         android:orderInCategory="90"
         android:title="@string/action_account"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
-        app:showAsAction="never"
-        android:title="@string/action_settings"/>
+        android:title="@string/action_settings"
+        app:showAsAction="never" />
 
 </menu>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index fde70c71b2b38622e5a594693a14da759a18300e..5a46d0910681036a3e51d2291aab44719ce272fa 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1097,4 +1097,6 @@
     <string name="pref_call_integration_summary">Calls from this app interact with regular phone calls, such as ending one call when another starts.</string>
     <string name="pref_align_start">Left-aligned messages</string>
     <string name="pref_align_start_summary">Display all messages, including sent ones, on the left side for a uniform chat layout.</string>
+    <string name="custom_notifications">Custom notifications</string>
+    <string name="custom_notifications_enable">Enable customized notification settings (importance, sound, vibration) settings for this conversation?</string>
 </resources>

From 6e72ef748619c04465fa1786ea0e4bb053397a79 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 18 Dec 2024 10:51:36 +0100
Subject: [PATCH 228/357] ensure bookmarks are set up after restoring by uuid

---
 .../services/XmppConnectionService.java       |  21 ++-
 .../ui/ChannelDiscoveryActivity.java          | 126 ++++++++++--------
 2 files changed, 87 insertions(+), 60 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 832c6c8d6ce875386d57ecb68be5a67f4aa2d699..81e6b361da6e50a7f938174117b5033b3c795079 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2290,6 +2290,22 @@ public class XmppConnectionService extends Service {
         processModifiedBookmark(bookmark, true);
     }
 
+    public void ensureBookmarkIsAutoJoin(final Conversation conversation) {
+        final var account = conversation.getAccount();
+        final var existingBookmark = conversation.getBookmark();
+        if (existingBookmark == null) {
+            final var bookmark = new Bookmark(account, conversation.getJid().asBareJid());
+            bookmark.setAutojoin(true);
+            createBookmark(account, bookmark);
+        } else {
+            if (existingBookmark.autojoin()) {
+                return;
+            }
+            existingBookmark.setAutojoin(true);
+            createBookmark(account, existingBookmark);
+        }
+    }
+
     public void createBookmark(final Account account, final Bookmark bookmark) {
         account.putBookmark(bookmark);
         final XmppConnection connection = account.getXmppConnection();
@@ -2302,7 +2318,6 @@ public class XmppConnectionService extends Service {
                     Config.LOGTAG,
                     account.getJid().asBareJid() + ": pushing bookmark via Bookmarks 2");
             final Element item = mIqGenerator.publishBookmarkItem(bookmark);
-            Log.d(Config.LOGTAG, "publishing: " + item.toString());
             pushNodeAndEnforcePublishOptions(
                     account,
                     Namespace.BOOKMARKS2,
@@ -2874,7 +2889,9 @@ public class XmppConnectionService extends Service {
                                 existing.getMode() == Conversational.MODE_MULTI,
                                 null));
         this.conversations.add(existing);
-        // TODO push bookmark
+        if (existing.getMode() == Conversational.MODE_MULTI) {
+            ensureBookmarkIsAutoJoin(existing);
+        }
         updateConversationUi();
         return existing;
     }
diff --git a/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java b/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java
index 92240d4f102160e02d03954acb8cb85ff1bb5ac1..420494d4d3c745047bc0569ca5b2440509083dc5 100644
--- a/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java
@@ -1,6 +1,5 @@
 package eu.siacs.conversations.ui;
 
-import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -17,24 +16,16 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
-
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
 import androidx.databinding.DataBindingUtil;
-
 import com.google.android.material.color.MaterialColors;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.common.base.Strings;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.databinding.ActivityChannelDiscoveryBinding;
 import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Bookmark;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Room;
 import eu.siacs.conversations.services.ChannelDiscoveryService;
@@ -44,8 +35,15 @@ import eu.siacs.conversations.ui.util.PendingItem;
 import eu.siacs.conversations.ui.util.SoftKeyboardUtils;
 import eu.siacs.conversations.utils.AccountUtils;
 import eu.siacs.conversations.xmpp.Jid;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 
-public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.OnActionExpandListener, TextView.OnEditorActionListener, ChannelDiscoveryService.OnChannelSearchResultsFound, ChannelSearchResultAdapter.OnChannelSearchResultSelected {
+public class ChannelDiscoveryActivity extends XmppActivity
+        implements MenuItem.OnActionExpandListener,
+                TextView.OnEditorActionListener,
+                ChannelDiscoveryService.OnChannelSearchResultsFound,
+                ChannelSearchResultAdapter.OnChannelSearchResultSelected {
 
     private static final String CHANNEL_DISCOVERY_OPT_IN = "channel_discovery_opt_in";
 
@@ -60,9 +58,7 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
     private boolean optedIn = false;
 
     @Override
-    protected void refreshUiReal() {
-
-    }
+    protected void refreshUiReal() {}
 
     @Override
     protected void onBackendConnected() {
@@ -89,21 +85,25 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
         this.adapter.setOnChannelSearchResultSelectedListener(this);
         this.optedIn = getPreferences().getBoolean(CHANNEL_DISCOVERY_OPT_IN, false);
 
-        final String search = savedInstanceState == null ? null : savedInstanceState.getString("search");
+        final String search =
+                savedInstanceState == null ? null : savedInstanceState.getString("search");
         if (search != null) {
             mInitialSearchValue.push(search);
         }
     }
 
     private static ChannelDiscoveryService.Method getMethod(final Context c) {
-        if ( Strings.isNullOrEmpty(Config.CHANNEL_DISCOVERY)) {
+        if (Strings.isNullOrEmpty(Config.CHANNEL_DISCOVERY)) {
             return ChannelDiscoveryService.Method.LOCAL_SERVER;
         }
         if (QuickConversationsService.isQuicksy()) {
             return ChannelDiscoveryService.Method.JABBER_NETWORK;
         }
         final SharedPreferences p = PreferenceManager.getDefaultSharedPreferences(c);
-        final String m = p.getString("channel_discovery_method", c.getString(R.string.default_channel_discovery));
+        final String m =
+                p.getString(
+                        "channel_discovery_method",
+                        c.getString(R.string.default_channel_discovery));
         try {
             return ChannelDiscoveryService.Method.valueOf(m);
         } catch (IllegalArgumentException e) {
@@ -124,7 +124,8 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
             mMenuSearchView.expandActionView();
             mSearchEditText.append(initialSearchValue);
             mSearchEditText.requestFocus();
-            if ((optedIn || method == ChannelDiscoveryService.Method.LOCAL_SERVER) && xmppConnectionService != null) {
+            if ((optedIn || method == ChannelDiscoveryService.Method.LOCAL_SERVER)
+                    && xmppConnectionService != null) {
                 xmppConnectionService.discoverChannels(initialSearchValue, this.method, this);
             }
         }
@@ -135,18 +136,22 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
 
     @Override
     public boolean onMenuItemActionExpand(@NonNull MenuItem item) {
-        mSearchEditText.post(() -> {
-            mSearchEditText.requestFocus();
-            final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-            imm.showSoftInput(mSearchEditText, InputMethodManager.SHOW_IMPLICIT);
-        });
+        mSearchEditText.post(
+                () -> {
+                    mSearchEditText.requestFocus();
+                    final InputMethodManager imm =
+                            (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                    imm.showSoftInput(mSearchEditText, InputMethodManager.SHOW_IMPLICIT);
+                });
         return true;
     }
 
     @Override
     public boolean onMenuItemActionCollapse(@NonNull MenuItem item) {
-        final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-        imm.hideSoftInputFromWindow(mSearchEditText.getWindowToken(), InputMethodManager.HIDE_IMPLICIT_ONLY);
+        final InputMethodManager imm =
+                (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.hideSoftInputFromWindow(
+                mSearchEditText.getWindowToken(), InputMethodManager.HIDE_IMPLICIT_ONLY);
         mSearchEditText.setText("");
         toggleLoadingScreen();
         if (optedIn || method == ChannelDiscoveryService.Method.LOCAL_SERVER) {
@@ -158,7 +163,9 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
     private void toggleLoadingScreen() {
         adapter.submitList(Collections.emptyList());
         binding.progressBar.setVisibility(View.VISIBLE);
-        binding.list.setBackgroundColor(MaterialColors.getColor(binding.list, com.google.android.material.R.attr.colorSurface));
+        binding.list.setBackgroundColor(
+                MaterialColors.getColor(
+                        binding.list, com.google.android.material.R.attr.colorSurface));
     }
 
     @Override
@@ -173,13 +180,14 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
             builder.setPositiveButton(R.string.confirm, (dialog, which) -> optIn());
             builder.setOnCancelListener(dialog -> finish());
             final androidx.appcompat.app.AlertDialog dialog = builder.create();
-            dialog.setOnShowListener(d -> {
-                final TextView textView = dialog.findViewById(android.R.id.message);
-                if (textView == null) {
-                    return;
-                }
-                textView.setMovementMethod(LinkMovementMethod.getInstance());
-            });
+            dialog.setOnShowListener(
+                    d -> {
+                        final TextView textView = dialog.findViewById(android.R.id.message);
+                        if (textView == null) {
+                            return;
+                        }
+                        textView.setMovementMethod(LinkMovementMethod.getInstance());
+                    });
             dialog.setCanceledOnTouchOutside(false);
             dialog.show();
             holdLoading();
@@ -189,13 +197,17 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
     private void holdLoading() {
         adapter.submitList(Collections.emptyList());
         binding.progressBar.setVisibility(View.GONE);
-        binding.list.setBackgroundColor(MaterialColors.getColor(binding.list, com.google.android.material.R.attr.colorSurface));
+        binding.list.setBackgroundColor(
+                MaterialColors.getColor(
+                        binding.list, com.google.android.material.R.attr.colorSurface));
     }
 
     @Override
     public void onSaveInstanceState(@NonNull Bundle savedInstanceState) {
         if (mMenuSearchView != null && mMenuSearchView.isActionViewExpanded()) {
-            savedInstanceState.putString("search", mSearchEditText != null ? mSearchEditText.getText().toString() : null);
+            savedInstanceState.putString(
+                    "search",
+                    mSearchEditText != null ? mSearchEditText.getText().toString() : null);
         }
         super.onSaveInstanceState(savedInstanceState);
     }
@@ -220,16 +232,20 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
 
     @Override
     public void onChannelSearchResultsFound(final List<Room> results) {
-        runOnUiThread(() -> {
-            adapter.submitList(results);
-            binding.progressBar.setVisibility(View.GONE);
-            if (results.isEmpty()) {
-                binding.list.setBackground(ContextCompat.getDrawable(this,R.drawable.background_no_results));
-            } else {
-                binding.list.setBackgroundColor(MaterialColors.getColor(binding.list, com.google.android.material.R.attr.colorSurface));
-            }
-        });
-
+        runOnUiThread(
+                () -> {
+                    adapter.submitList(results);
+                    binding.progressBar.setVisibility(View.GONE);
+                    if (results.isEmpty()) {
+                        binding.list.setBackground(
+                                ContextCompat.getDrawable(this, R.drawable.background_no_results));
+                    } else {
+                        binding.list.setBackgroundColor(
+                                MaterialColors.getColor(
+                                        binding.list,
+                                        com.google.android.material.R.attr.colorSurface));
+                    }
+                });
     }
 
     @Override
@@ -243,12 +259,16 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
             final AtomicReference<String> account = new AtomicReference<>(accounts.get(0));
             final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
             builder.setTitle(R.string.choose_account);
-            builder.setSingleChoiceItems(accounts.toArray(new CharSequence[0]), 0, (dialog, which) -> account.set(accounts.get(which)));
-            builder.setPositiveButton(R.string.join, (dialog, which) -> joinChannelSearchResult(account.get(), result));
+            builder.setSingleChoiceItems(
+                    accounts.toArray(new CharSequence[0]),
+                    0,
+                    (dialog, which) -> account.set(accounts.get(which)));
+            builder.setPositiveButton(
+                    R.string.join,
+                    (dialog, which) -> joinChannelSearchResult(account.get(), result));
             builder.setNegativeButton(R.string.cancel, null);
             builder.create().show();
         }
-
     }
 
     @Override
@@ -279,17 +299,7 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O
         final Conversation conversation =
                 xmppConnectionService.findOrCreateConversation(
                         account, result.getRoom(), true, true, true);
-        final var existingBookmark = conversation.getBookmark();
-        if (existingBookmark == null) {
-            final var bookmark = new Bookmark(account, conversation.getJid().asBareJid());
-            bookmark.setAutojoin(true);
-            xmppConnectionService.createBookmark(account, bookmark);
-        } else {
-            if (!existingBookmark.autojoin()) {
-                existingBookmark.setAutojoin(true);
-                xmppConnectionService.createBookmark(account, existingBookmark);
-            }
-        }
+        xmppConnectionService.ensureBookmarkIsAutoJoin(conversation);
         switchToConversation(conversation);
     }
 }

From 033621a7f407c54db84cdcb870977392dd0c8a12 Mon Sep 17 00:00:00 2001
From: Besnik_b <Besnik_b@users.noreply.translate.codeberg.org>
Date: Wed, 18 Dec 2024 10:34:48 +0000
Subject: [PATCH 229/357] Translated using Weblate (Albanian)

Currently translated at 99.1% (1047 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sq/
---
 src/main/res/values-sq-rAL/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index 5dfeae476fd365ad68471c7d43abaee8a067e3ce..104ec0a7a97fafd428d20c6b252af9c4bd69209f 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -1111,4 +1111,10 @@
     <string name="pref_chat_bubbles">Flluska fjalosjesh</string>
     <string name="pref_chat_bubbles_summary">Ngjyrë sfondi, Madhësi shkronjash, avatarë</string>
     <string name="pref_title_bubbles">Flluska Fjalosjesh</string>
+    <string name="pref_align_start">Mesazhe të drejtuar majtas</string>
+    <string name="pref_align_start_summary">Shfaqi krejt mesazhet, përfshi ata të dërguarit, në anën e majtë, për një skemë të njëtrajtshme të fjalosjes.</string>
+    <string name="custom_notifications">Njoftime vetjake</string>
+    <string name="pref_call_integration">Integrim thirrjesh</string>
+    <string name="custom_notifications_enable">Të aktivizohen rregullime njoftimesh vetjake (rëndësi, tingull, dridhje) për këtë bisedë?</string>
+    <string name="pref_call_integration_summary">Thirrjet prej këtij aplikacioni ndërveprojnë me thirrjet e zakonshme telefonike, fjala vjen, përfundim i një thirrjeje, kur niset një tjetër.</string>
 </resources>
\ No newline at end of file

From f86d9cdbc8f655b387918327e44916fb335d69dc Mon Sep 17 00:00:00 2001
From: Besnik_b <Besnik_b@users.noreply.translate.codeberg.org>
Date: Wed, 18 Dec 2024 10:38:43 +0000
Subject: [PATCH 230/357] Translated using Weblate (Albanian)

Currently translated at 100.0% (78 of 78 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/sq/
---
 fastlane/metadata/android/sq/changelogs/4212604.txt | 2 ++
 fastlane/metadata/android/sq/changelogs/4212704.txt | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/sq/changelogs/4212604.txt
 create mode 100644 fastlane/metadata/android/sq/changelogs/4212704.txt

diff --git a/fastlane/metadata/android/sq/changelogs/4212604.txt b/fastlane/metadata/android/sq/changelogs/4212604.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4c80d1818c4d0aaff19760ea176f6fda645a5f6b
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/4212604.txt
@@ -0,0 +1,2 @@
+* Kalim i flluskave të mesazheve më afër njëra-tjetrës, në vend se përzierje e tyre
+* Shtim aftësie për fshehje avatarësh në pamje fjalosjesh, kur s’është domosdo e nevojshme (Rregullime -> Ndërfaqe -> Flluska Fjalosjesh -> Shfaq avatarë)
diff --git a/fastlane/metadata/android/sq/changelogs/4212704.txt b/fastlane/metadata/android/sq/changelogs/4212704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7b61ac22db17afbaaf33a613ed91a99e17ece928
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/4212704.txt
@@ -0,0 +1 @@
+* Shtim aftësie për t’i shfaqur flluskat e mesazheve në të majtë

From ab151eb29fdbe85694f8ce1bd017dcdc2f4a2fdb Mon Sep 17 00:00:00 2001
From: Dirk <Dirk@users.noreply.translate.codeberg.org>
Date: Wed, 18 Dec 2024 11:14:49 +0000
Subject: [PATCH 231/357] Translated using Weblate (German)

Currently translated at 100.0% (1056 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/de/
---
 src/main/res/values-de/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 048678a7b90cc7d68f085442e460da5ade1f79d4..76b4141289aa3e4108d1819aca4b1917aa98ebfe 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -1100,4 +1100,10 @@
     <string name="pref_show_avatars_summary">Profilbilder an deinen Nachrichten und in 1:1 Chats statt nur in Gruppenchats anzeigen.</string>
     <string name="pref_chat_bubbles_summary">Hintergrundfarbe, Schriftgröße, Profilbilder</string>
     <string name="pref_title_bubbles">Sprechblasen</string>
+    <string name="pref_call_integration">Anrufintegration</string>
+    <string name="pref_align_start">Linksbündige Nachrichten</string>
+    <string name="pref_align_start_summary">Zeige alle Nachrichten, inklusive gesendeter, linksbündig für ein einheitliches Chatlayout an.</string>
+    <string name="custom_notifications">Angepasste Benachrichtigungen</string>
+    <string name="pref_call_integration_summary">Anrufe aus dieser App interagieren mit normalen Telefonanrufen, wie beispielsweise das Beenden eines Anrufs, wenn ein anderer beginnt.</string>
+    <string name="custom_notifications_enable">Individuelle Benachrichtigungseinstellungen (Wichtigkeit, Nachrichtenton, vibration) für diese Unterhaltung aktivieren?</string>
 </resources>
\ No newline at end of file

From c520ac991d2320de31f98bc77f5f3b6a8704106b Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Wed, 18 Dec 2024 11:23:27 +0000
Subject: [PATCH 232/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1056 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index de98344c757ed8d783cd8480e862214297ac22a6..4b3d10ed7d935773f7f6b18f19e88d09f7dd646f 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -50,7 +50,7 @@
     <string name="blocked">Заблокирован</string>
     <string name="register_account">Создать новый аккаунт на сервере</string>
     <string name="change_password_on_server">Изменить пароль на сервере</string>
-    <string name="share_with">Поделиться с…</string>
+    <string name="share_with">Поделиться…</string>
     <string name="invite_contact">Пригласить контакт</string>
     <string name="invite">Пригласить</string>
     <string name="contacts">Контакты</string>
@@ -847,7 +847,7 @@
     <string name="ebook">Электронная книга</string>
     <string name="video_original">Оригинал (без сжатия)</string>
     <string name="open_with">Открыть с помощью…</string>
-    <string name="set_profile_picture">Фотография профиля Conversations</string>
+    <string name="set_profile_picture">Изображение профиля Conversations</string>
     <string name="choose_account">Выбрать аккаунт</string>
     <string name="restore_backup">Восстановить из резервной копии</string>
     <string name="restore">Восстановить</string>
@@ -1065,8 +1065,8 @@
     <string name="pref_title_security">Безопасность</string>
     <string name="pref_allow_screenshots">Разрешить снимки экрана</string>
     <string name="pref_keyboard_options">Клавиатура</string>
-    <string name="title_activity_share_with">Поделиться с…</string>
-    <string name="pref_use_colorful_bubbles">Цветные пузырьки сообщений</string>
+    <string name="title_activity_share_with">Поделиться…</string>
+    <string name="pref_use_colorful_bubbles">Цветные пузыри сообщений</string>
     <string name="pref_use_colorful_bubbles_summary">Различные цвета фона для отправленных и полученных сообщений</string>
     <string name="pref_dynamic_colors">Динамичные цвета</string>
     <string name="pref_dynamic_colors_summary">Цвет системы (Material You)</string>
@@ -1145,6 +1145,12 @@
     <string name="pref_chat_bubbles_summary">Цвет фона, размер текста, аватары</string>
     <string name="pref_show_avatars">Показывать аватары</string>
     <string name="pref_title_bubbles">Сообщения в пузырях</string>
-    <string name="pref_chat_bubbles">Пузырьки сообщений</string>
-    <string name="pref_show_avatars_summary">Показывать аватары в своих сообщениях и приватных чатах в дополнение к конференциям</string>
+    <string name="pref_chat_bubbles">Пузыри сообщений</string>
+    <string name="pref_show_avatars_summary">Показывать аватары в своих сообщениях и приватных беседах в дополнение к конференциям</string>
+    <string name="pref_call_integration">Интеграция звонков</string>
+    <string name="pref_align_start">Выравнивать сообщения слева</string>
+    <string name="pref_align_start_summary">Показывать все сообщения, включая отправленные, выровненными по левому краю для единообразия вида беседы</string>
+    <string name="custom_notifications">Настраиваемые уведомления</string>
+    <string name="pref_call_integration_summary">Звонки из этого приложения взаимодействуют с обычными телефонными звонками, например, завершение одного звонка при начале другого</string>
+    <string name="custom_notifications_enable">Использовать индивидуальные настройки уведомлений (важность, звук, вибрация) для этой беседы?</string>
 </resources>
\ No newline at end of file

From ce640fead8ccd7ea42f951199c56a70eb682a6ef Mon Sep 17 00:00:00 2001
From: licaon-kter <licaon-kter@users.noreply.translate.codeberg.org>
Date: Wed, 18 Dec 2024 10:56:16 +0000
Subject: [PATCH 233/357] Translated using Weblate (Romanian)

Currently translated at 100.0% (1056 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ro/
---
 src/main/res/values-ro-rRO/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 1de74fe9845bce3b27da9b255ab3f67ea0aa32bd..a558b9290b4a0b734d37cdba0a12448140af86f2 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -1119,4 +1119,10 @@
     <string name="pref_title_bubbles">Bule de mesaj</string>
     <string name="pref_chat_bubbles">Bule de mesaj</string>
     <string name="pref_show_avatars">Arată avatare</string>
+    <string name="custom_notifications_enable">Activați setările de notificare personalizate (importanță, sunet, vibrații) pentru această conversație?</string>
+    <string name="custom_notifications">Notificări personalizate</string>
+    <string name="pref_align_start_summary">Afișați toate mesajele, inclusiv cele trimise, în partea stângă pentru un aspect uniform al discuției.</string>
+    <string name="pref_align_start">Mesaje aliniate la stânga</string>
+    <string name="pref_call_integration_summary">Apelurile din această aplicație interacționează cu apelurile telefonice obișnuite, cum ar fi terminarea unui apel atunci când începe altul.</string>
+    <string name="pref_call_integration">Integrarea apelurilor</string>
 </resources>
\ No newline at end of file

From d57f82803c9e66829e3338b019c729ee6a2c80fd Mon Sep 17 00:00:00 2001
From: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Date: Wed, 18 Dec 2024 11:33:09 +0000
Subject: [PATCH 234/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 99.8% (1054 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/zh_Hans/
---
 src/main/res/values-zh-rCN/strings.xml | 243 ++++++++++++-------------
 1 file changed, 120 insertions(+), 123 deletions(-)

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 2c05c0f851ddc25d4a0592d08f8ddcb045b4a772..e0f774972b11c357e3ce2522eb5458075075e21b 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -11,11 +11,11 @@
     <string name="action_add_phone_book">添加到通讯录</string>
     <string name="action_delete_contact">删除联系人</string>
     <string name="action_block_contact">屏蔽联系人</string>
-    <string name="action_unblock_contact">解除屏蔽联系人</string>
+    <string name="action_unblock_contact">取消屏蔽联系人</string>
     <string name="action_block_domain">屏蔽域名</string>
-    <string name="action_unblock_domain">解除屏蔽域名</string>
+    <string name="action_unblock_domain">取消屏蔽域名</string>
     <string name="action_block_participant">屏蔽参与者</string>
-    <string name="action_unblock_participant">解除屏蔽参与者</string>
+    <string name="action_unblock_participant">取消屏蔽参与者</string>
     <string name="title_activity_manage_accounts">管理账号</string>
     <string name="title_activity_settings">设置</string>
     <string name="title_activity_choose_contact">选择联系人</string>
@@ -40,14 +40,14 @@
     <string name="visitor">访客</string>
     <string name="remove_contact_text">是否从联系人列表中移除 %s？将不会移除与对方的对话。</string>
     <string name="block_contact_text">是否屏蔽 %s 向您发送消息？</string>
-    <string name="unblock_contact_text">是否解除屏蔽 %s 并允许对方向您发送消息？</string>
+    <string name="unblock_contact_text">是否取消屏蔽 %s 并允许对方向您发送消息？</string>
     <string name="block_domain_text">屏蔽来自 %s 的所有联系人？</string>
-    <string name="unblock_domain_text">解除屏蔽来自 %s 的所有联系人？</string>
+    <string name="unblock_domain_text">取消屏蔽来自 %s 的所有联系人？</string>
     <string name="contact_blocked">联系人已屏蔽</string>
     <string name="blocked">已屏蔽</string>
     <string name="register_account">在服务器上注册新账号</string>
-    <string name="change_password_on_server">在服务器上修改密码</string>
-    <string name="share_with">分享至…</string>
+    <string name="change_password_on_server">在服务器上更改密码</string>
+    <string name="share_with">分享…</string>
     <string name="invite_contact">邀请联系人</string>
     <string name="invite">邀请</string>
     <string name="contacts">联系人</string>
@@ -58,20 +58,20 @@
     <string name="edit">编辑</string>
     <string name="delete">删除</string>
     <string name="block">屏蔽</string>
-    <string name="unblock">解除屏蔽</string>
+    <string name="unblock">取消屏蔽</string>
     <string name="save">保存</string>
-    <string name="ok">完成</string>
-    <string name="crash_report_title">%1$s 已崩溃</string>
+    <string name="ok">确定</string>
+    <string name="crash_report_title">%1$s 崩溃了</string>
     <string name="crash_report_message">使用您的 XMPP 账号发送崩溃报告有助于 %1$s 的持续开发。</string>
     <string name="send_now">立即发送</string>
     <string name="send_never">不再询问</string>
     <string name="problem_connecting_to_account">无法连接到账号</string>
     <string name="problem_connecting_to_accounts">无法连接到多个账号</string>
-    <string name="touch_to_fix">点击以管理您的账号</string>
+    <string name="touch_to_fix">点按即可管理账号</string>
     <string name="attach_file">附加文件</string>
     <string name="not_in_roster">对方不在您的联系人列表中，是否添加？</string>
     <string name="add_contact">添加联系人</string>
-    <string name="send_failed">传递失败</string>
+    <string name="send_failed">发送失败</string>
     <string name="preparing_image">正在准备发送图片</string>
     <string name="preparing_images">正在准备发送图片</string>
     <string name="sharing_files_please_wait">分享文件中。请稍候…</string>
@@ -117,8 +117,8 @@
     <string name="pref_led">LED 通知</string>
     <string name="pref_led_summary">收到新消息时闪烁通知灯</string>
     <string name="pref_ringtone">铃声</string>
-    <string name="pref_notification_sound">通知铃声</string>
-    <string name="pref_notification_sound_summary">新消息的通知铃声</string>
+    <string name="pref_notification_sound">通知提示音</string>
+    <string name="pref_notification_sound_summary">新消息的通知提示音</string>
     <string name="pref_call_ringtone_summary">来电铃声</string>
     <string name="pref_notification_grace_period">静默期</string>
     <string name="pref_notification_grace_period_summary">在其他设备上检测到活动之后，通知在此期间静音。</string>
@@ -139,9 +139,9 @@
     <string name="receive_presence_updates">接收在线状态更新</string>
     <string name="ask_for_presence_updates">请求在线状态更新</string>
     <string name="attach_choose_picture">选择图片</string>
-    <string name="attach_take_picture">拍摄图片</string>
+    <string name="attach_take_picture">拍摄照片</string>
     <string name="preemptively_grant">预先同意订阅请求</string>
-    <string name="error_not_an_image_file">所选的文件不是图片</string>
+    <string name="error_not_an_image_file">所选文件不是图片</string>
     <string name="error_compressing_image">无法转换图片文件</string>
     <string name="error_file_not_found">文件未找到</string>
     <string name="error_io_exception">常规 I/O 错误。也许存储空间已用完？</string>
@@ -199,7 +199,7 @@
     <string name="server_info_roster_version">XEP-0237：花名册版本控制</string>
     <string name="server_info_stream_management">XEP-0198：流管理</string>
     <string name="server_info_external_service_discovery">XEP-0215：外部服务发现</string>
-    <string name="server_info_pep">XEP-0163：个人事件协议 (头像/OMEMO)</string>
+    <string name="server_info_pep">XEP-0163：个人事件协议（头像/OMEMO）</string>
     <string name="server_info_http_upload">XEP-0363：HTTP 文件上传</string>
     <string name="server_info_push">XEP-0357：推送</string>
     <string name="server_info_available">有效</string>
@@ -217,8 +217,8 @@
     <string name="openpgp_key_id">OpenPGP 密钥 ID</string>
     <string name="omemo_fingerprint">OMEMO 指纹</string>
     <string name="omemo_fingerprint_x509">v\\OMEMO 指纹</string>
-    <string name="omemo_fingerprint_selected_message">OMEMO 指纹 (消息来源)</string>
-    <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO 指纹 (消息来源)</string>
+    <string name="omemo_fingerprint_selected_message">OMEMO 指纹（消息来源）</string>
+    <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO 指纹（消息来源）</string>
     <string name="other_devices">其他设备</string>
     <string name="trust_omemo_fingerprints">信任 OMEMO 指纹</string>
     <string name="fetching_keys">正在获取密钥…</string>
@@ -229,8 +229,8 @@
     <string name="delete_contact">删除联系人</string>
     <string name="view_contact_details">查看联系人详情</string>
     <string name="block_contact">屏蔽联系人</string>
-    <string name="unblock_contact">解除屏蔽联系人</string>
-    <string name="create">新建</string>
+    <string name="unblock_contact">取消屏蔽联系人</string>
+    <string name="create">创建</string>
     <string name="select">选择</string>
     <string name="contact_already_exists">此联系人已存在</string>
     <string name="join">加入</string>
@@ -259,12 +259,12 @@
     <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s 和其他 %2$d 人已阅读至此</string>
     <string name="everyone_has_read_up_to_this_point">每个人都已阅读至此</string>
     <string name="publish">发布</string>
-    <string name="touch_to_choose_picture">点击头像从图库中选择图片</string>
+    <string name="touch_to_choose_picture">点按头像即可从图库选择图片</string>
     <string name="publishing">正在发布…</string>
     <string name="error_publish_avatar_server_reject">服务器拒绝了您的发布</string>
     <string name="error_publish_avatar_converting">无法转换图片</string>
     <string name="error_saving_avatar">无法将头像保存到磁盘</string>
-    <string name="or_long_press_for_default">(或长按恢复默认)</string>
+    <string name="or_long_press_for_default">（或长按恢复默认）</string>
     <string name="error_publish_avatar_no_server_support">服务器不支持发布头像</string>
     <string name="private_message">私聊</string>
     <string name="private_message_to">至 %s</string>
@@ -276,7 +276,7 @@
     <string name="skip">跳过</string>
     <string name="disable_notifications">禁用通知</string>
     <string name="enable">启用</string>
-    <string name="conference_requires_password">进入群聊需要输入密码</string>
+    <string name="conference_requires_password">进入群聊需要密码</string>
     <string name="enter_password">输入密码</string>
     <string name="request_presence_updates">请先向您的联系人请求在线状态更新。
 \n
@@ -290,13 +290,13 @@
     <string name="pref_allow_message_correction">消息更正</string>
     <string name="pref_allow_message_correction_summary">允许您的联系人发送后编辑其消息</string>
     <string name="pref_expert_options">专家设置</string>
-    <string name="pref_expert_options_summary">请谨慎设置这些</string>
+    <string name="pref_expert_options_summary">请谨慎设置</string>
     <string name="title_activity_about_x">关于 %s</string>
-    <string name="title_pref_quiet_hours">免打扰时间</string>
+    <string name="title_pref_quiet_hours">勿扰时段</string>
     <string name="title_pref_quiet_hours_start_time">开始时间</string>
     <string name="title_pref_quiet_hours_end_time">结束时间</string>
-    <string name="title_pref_enable_quiet_hours">启用免打扰时间</string>
-    <string name="pref_quiet_hours_summary">通知将在免打扰时间内静音</string>
+    <string name="title_pref_enable_quiet_hours">启用勿扰时段</string>
+    <string name="pref_quiet_hours_summary">通知将在勿扰时段内静音</string>
     <string name="pref_expert_options_other">其他</string>
     <string name="pref_autojoin">同步书签</string>
     <string name="pref_autojoin_summary">在进入或离开群聊时设置“自动加入”标志，并回应其他客户端所做的改变。</string>
@@ -306,12 +306,12 @@
     <string name="conference_resource_constraint">资源限制</string>
     <string name="conference_kicked">已从群聊中踢出了您</string>
     <string name="conference_shutdown">此群聊已关闭</string>
-    <string name="conference_unknown_error">您已不在群聊中</string>
+    <string name="conference_unknown_error">您已不在此群聊中</string>
     <string name="conference_technical_problems">由于技术原因，您离开了群聊</string>
-    <string name="using_account">正在使用账号 %s</string>
-    <string name="hosted_on">托管于 %s</string>
+    <string name="using_account">使用账号 %s</string>
+    <string name="hosted_on">托管在 %s</string>
     <string name="checking_x">正在 HTTP 主机上检查 %s</string>
-    <string name="not_connected_try_again">您未连接。稍后再试</string>
+    <string name="not_connected_try_again">您未连接，请稍后重试</string>
     <string name="check_x_filesize">检查 %s 的大小</string>
     <string name="check_x_filesize_on_host">在 %2$s 上检查 %1$s 的大小</string>
     <string name="message_options">消息选项</string>
@@ -322,14 +322,14 @@
     <string name="file_url">文件 URL</string>
     <string name="url_copied_to_clipboard">已复制 URL 到剪贴板</string>
     <string name="jabber_id_copied_to_clipboard">已复制 XMPP 地址到剪贴板</string>
-    <string name="error_message_copied_to_clipboard">已复制错误消息到剪贴板</string>
-    <string name="web_address">web 地址</string>
+    <string name="error_message_copied_to_clipboard">已复制出错信息到剪贴板</string>
+    <string name="web_address">网址</string>
     <string name="scan_qr_code">扫描二维码</string>
     <string name="show_qr_code">显示二维码</string>
     <string name="show_block_list">显示屏蔽列表</string>
     <string name="account_details">账号详情</string>
     <string name="confirm">确认</string>
-    <string name="try_again">再试一次</string>
+    <string name="try_again">重试</string>
     <string name="pref_keep_foreground_service">前台服务</string>
     <string name="pref_keep_foreground_service_summary">防止操作系统中断连接</string>
     <string name="pref_create_backup">创建备份</string>
@@ -339,14 +339,14 @@
     <string name="notification_backup_created_subtitle">此备份文件已存储在 %s</string>
     <string name="restoring_backup">正在恢复备份</string>
     <string name="notification_restored_backup_title">已恢复备份</string>
-    <string name="notification_restored_backup_subtitle">不要忘记启用账号。</string>
+    <string name="notification_restored_backup_subtitle">请勿忘记启用账号。</string>
     <string name="choose_file">选择文件</string>
-    <string name="receiving_x_file">正在接收 %1$s (%2$d%% 已完成)</string>
+    <string name="receiving_x_file">正在接收 %1$s（%2$d%% 已完成）</string>
     <string name="download_x_file">下载 %s</string>
     <string name="delete_x_file">删除 %s</string>
     <string name="file">文件</string>
     <string name="open_x_file">打开 %s</string>
-    <string name="sending_file">正在发送 (%1$d%% 已完成)</string>
+    <string name="sending_file">正在发送（%1$d%% 已完成）</string>
     <string name="preparing_file">正在准备分享文件</string>
     <string name="x_file_offered_for_download">%s 可供下载</string>
     <string name="cancel_transmission">取消传输</string>
@@ -374,9 +374,9 @@
     <string name="fetching_history_from_server">正在从服务器获取聊天记录</string>
     <string name="no_more_history_on_server">服务器上没有更多聊天记录</string>
     <string name="updating">正在更新…</string>
-    <string name="password_changed">密码已修改！</string>
-    <string name="could_not_change_password">无法修改密码</string>
-    <string name="change_password">修改密码</string>
+    <string name="password_changed">密码已更改！</string>
+    <string name="could_not_change_password">无法更改密码</string>
+    <string name="change_password">更改密码</string>
     <string name="current_password">当前密码</string>
     <string name="new_password">新密码</string>
     <string name="password_should_not_be_empty">密码不能为空</string>
@@ -444,7 +444,7 @@
     <string name="location">位置</string>
     <string name="title_undo_swipe_out_group_chat">离开私人群聊</string>
     <string name="title_undo_swipe_out_channel">离开公开频道</string>
-    <string name="pref_dont_trust_system_cas_title">不信任系统证书颁发机构</string>
+    <string name="pref_dont_trust_system_cas_title">不信任系统 CA</string>
     <string name="pref_dont_trust_system_cas_summary">所有证书必须手动批准</string>
     <string name="pref_remove_trusted_certificates_title">移除证书</string>
     <string name="pref_remove_trusted_certificates_summary">删除手动批准的证书</string>
@@ -491,8 +491,8 @@
     <string name="fetching_mam_prefs">获取存档首选项中。请稍候…</string>
     <string name="unable_to_fetch_mam_prefs">无法获取存档首选项</string>
     <string name="captcha_required">需要验证码</string>
-    <string name="captcha_hint">输入上图中的文字</string>
-    <string name="certificate_chain_is_not_trusted">不受信任的证书链</string>
+    <string name="captcha_hint">请按上图输入文本</string>
+    <string name="certificate_chain_is_not_trusted">未受信任的证书链</string>
     <string name="jid_does_not_match_certificate">XMPP 地址与证书不匹配</string>
     <string name="action_renew_certificate">续订证书</string>
     <string name="error_fetching_omemo_key">获取 OMEMO 密钥时出错！</string>
@@ -518,37 +518,31 @@
     <string name="no_storage_permission">授予 %1$s 访问外部存储的权限</string>
     <string name="no_camera_permission">授予 %1$s 访问相机的权限</string>
     <string name="sync_with_contacts">联系人列表集成</string>
-    <string name="sync_with_contacts_long">%1$s 在您的设备上本地处理您的联系人列表，以向您显示 XMPP 上匹配联系人的名称和个人资料图片。
-\n
-\n任何联系人列表数据都不会离开您的设备！</string>
+    <string name="sync_with_contacts_long">%1$s 在您的设备上本地处理您的联系人列表，以向您显示 XMPP 上匹配联系人的名称和个人资料照片。\n\n任何联系人列表数据都不会离开您的设备！</string>
     <string name="notify_on_all_messages">通知所有消息</string>
     <string name="notify_only_when_highlighted">仅在提及时通知</string>
     <string name="notify_never">通知已禁用</string>
     <string name="notify_paused">通知已暂停</string>
     <string name="pref_picture_compression">图片压缩</string>
-    <string name="pref_picture_compression_summary">提示：无论此设置如何，使用“选择文件”会发送未压缩的图片。</string>
+    <string name="pref_picture_compression_summary">提示：使用“选择文件”始终会发送未压缩的图片。</string>
     <string name="always">始终</string>
     <string name="large_images_only">仅限大图片</string>
     <string name="battery_optimizations_enabled">电池优化已启用</string>
-    <string name="battery_optimizations_enabled_explained">您的设备正在对 %1$s 使用重度电池优化，可能会导致通知延迟甚至消息丢失。
-\n建议禁用此设置。</string>
-    <string name="battery_optimizations_enabled_dialog">您的设备正在对 %1$s 使用重度电池优化，可能会导致通知延迟甚至消息丢失。
-\n
-\n现在将要求您禁用此设置。</string>
+    <string name="battery_optimizations_enabled_explained">您的设备正在对 %1$s 使用重度电池优化，可能会导致通知延迟甚至消息丢失。\n建议禁用电池优化。</string>
+    <string name="battery_optimizations_enabled_dialog">您的设备正在对 %1$s 使用重度电池优化，可能会导致通知延迟甚至消息丢失。\n\n现在将要求您禁用电池优化。</string>
     <string name="disable">禁用</string>
     <string name="selection_too_large">所选区域太大</string>
-    <string name="no_accounts">(没有启用的账号)</string>
-    <string name="this_field_is_required">此字段是必需的</string>
+    <string name="no_accounts">（没有启用的账号）</string>
+    <string name="this_field_is_required">必填字段</string>
     <string name="correct_message">更正消息</string>
     <string name="send_corrected_message">发送更正后的消息</string>
     <string name="no_keys_just_confirm">您已信任此人的指纹。选择“完成”即表示您确认 %s 是此群聊的一员。</string>
-    <string name="this_account_is_disabled">您已禁用了此账号</string>
+    <string name="this_account_is_disabled">您禁用了此账号</string>
     <string name="security_error_invalid_file_access">安全错误：文件访问无效！</string>
     <string name="no_application_to_share_uri">未找到可以分享 URI 的应用</string>
-    <string name="share_uri_with">分享 URI 至…</string>
+    <string name="share_uri_with">分享 URI…</string>
     <string name="agree_and_continue">同意并继续</string>
-    <string name="magic_create_text">指导您在 conversations.im 上创建账号。
-\n当选择 conversations.im 作为提供者时，向其他 XMPP 用户提供您的完整地址，就能和对方交流。</string>
+    <string name="magic_create_text">指导您在 conversations.im 上创建账号。\n选择 conversations.im 作为提供者时，向别人提供您的完整 XMPP 地址，就能和对方交流。</string>
     <string name="your_full_jid_will_be">您的完整 XMPP 地址将是：%s</string>
     <string name="create_account">创建账号</string>
     <string name="use_own_provider">使用我自己的提供者</string>
@@ -563,7 +557,7 @@
     <string name="presence_dnd">忙碌</string>
     <string name="secure_password_generated">已生成安全密码</string>
     <string name="device_does_not_support_battery_op">您的设备不支持选择退出电池优化</string>
-    <string name="registration_please_wait">注册失败：稍后再试</string>
+    <string name="registration_please_wait">注册失败：请稍后重试</string>
     <string name="registration_password_too_weak">注册失败：密码太弱</string>
     <string name="choose_participants">选择参与者</string>
     <string name="creating_conference">正在创建群聊…</string>
@@ -576,7 +570,7 @@
     <string name="pref_broadcast_last_activity_summary">让您的联系人知道您最后一次使用此应用的时间</string>
     <string name="pref_privacy">隐私</string>
     <string name="pref_theme_options">主题</string>
-    <string name="pref_theme_options_summary">选择主题色彩</string>
+    <string name="pref_theme_options_summary">选择调色板</string>
     <string name="pref_theme_automatic">自动</string>
     <string name="pref_theme_light">浅色</string>
     <string name="pref_theme_dark">深色</string>
@@ -585,7 +579,7 @@
     <string name="type_pc">电脑</string>
     <string name="type_phone">手机</string>
     <string name="type_tablet">平板</string>
-    <string name="type_web">Web 浏览器</string>
+    <string name="type_web">网络浏览器</string>
     <string name="type_console">控制台</string>
     <string name="payment_required">需要付款</string>
     <string name="missing_internet_permission">授予使用互联网的权限</string>
@@ -596,13 +590,13 @@
     <string name="remote_server_not_found">远程服务器未找到</string>
     <string name="remote_server_timeout">远程服务器超时</string>
     <string name="unable_to_update_account">无法更新账号</string>
-    <string name="report_jid_as_spammer">报告此 XMPP 地址发送垃圾消息。</string>
+    <string name="report_jid_as_spammer">举报此 XMPP 地址发送垃圾信息。</string>
     <string name="pref_delete_omemo_identities">删除 OMEMO 身份</string>
     <string name="pref_delete_omemo_identities_summary">重新生成 OMEMO 密钥。您的所有联系人将必须再次验证您。仅将此作为最后的方法。</string>
-    <string name="delete_selected_keys">删除已选密钥</string>
+    <string name="delete_selected_keys">删除所选密钥</string>
     <string name="error_publish_avatar_offline">需要连接到网络才能发布头像。</string>
-    <string name="show_error_message">显示出错消息</string>
-    <string name="error_message">出错消息</string>
+    <string name="show_error_message">显示出错信息</string>
+    <string name="error_message">出错信息</string>
     <string name="data_saver_enabled">省流量模式已启用</string>
     <string name="data_saver_enabled_explained">操作系统正限制 %1$s 在后台时访问互联网。要接收新消息通知，应当在“省流量模式”开启时允许 %1$s 无限制访问。
 \n%1$s 仍将在可能的情况下努力节省数据。</string>
@@ -614,28 +608,27 @@
     <string name="verified_fingerprints">已验证的指纹</string>
     <string name="use_camera_icon_to_scan_barcode">使用相机扫描对方二维码</string>
     <string name="please_wait_for_keys_to_be_fetched">正在获取密钥，请稍候</string>
-    <string name="share_as_barcode">分享为二维码</string>
-    <string name="share_as_uri">分享为 XMPP URI</string>
-    <string name="share_as_http">分享为 HTTP 链接</string>
+    <string name="share_as_barcode">以二维码形式分享</string>
+    <string name="share_as_uri">以 XMPP URI 形式分享</string>
+    <string name="share_as_http">以 HTTP 链接形式分享</string>
     <string name="pref_blind_trust_before_verification">验证前盲目信任</string>
     <string name="pref_blind_trust_before_verification_summary">信任来自未经验证的联系人的新设备，但对于已验证的联系人，提示手动确认新设备。</string>
     <string name="blindly_trusted_omemo_keys">盲目信任的 OMEMO 密钥，表示它们可能是其他人或者某人可能冒充别人发送消息。</string>
-    <string name="not_trusted">不信任的</string>
+    <string name="not_trusted">未受信任</string>
     <string name="invalid_barcode">二维码无效</string>
-    <string name="pref_clean_cache_summary">清理缓存文件夹 (由相机应用使用)</string>
+    <string name="pref_clean_cache_summary">清理缓存文件夹（由相机使用）</string>
     <string name="pref_clean_cache">清理缓存</string>
     <string name="pref_clean_private_storage">清理私人存储空间</string>
-    <string name="pref_clean_private_storage_summary">清理保存文件的私人存储 (它们可以从服务器重新下载)</string>
+    <string name="pref_clean_private_storage_summary">清理保存文件的私人存储（可从服务器重新下载）</string>
     <string name="i_followed_this_link_from_a_trusted_source">我从可信来源收到此链接</string>
-    <string name="verifying_omemo_keys_trusted_source">单击链接后，您将验证 %1$s 的 OMEMO 密钥。只有从可信来源（只有 %2$s 可以发布此链接）收到此链接才是安全的。</string>
+    <string name="verifying_omemo_keys_trusted_source">点击链接后，您将验证 %1$s 的 OMEMO 密钥。只有从可信来源（只有 %2$s 可以发布此链接）收到此链接才是安全的。</string>
     <string name="verifying_omemo_keys_trusted_source_account">您将验证自己账号的 OMEMO 密钥。只有从可信来源（只有您可以发布此链接）收到此链接才是安全的。</string>
     <string name="continue_btn">继续</string>
     <string name="verify_omemo_keys">验证 OMEMO 密钥</string>
     <string name="show_inactive_devices">显示非活动设备</string>
     <string name="hide_inactive_devices">隐藏非活动设备</string>
     <string name="distrust_omemo_key">不再信任设备</string>
-    <string name="distrust_omemo_key_text">是否确定要移除此设备的验证？
-\n此设备及其消息将标记为“不信任的”。</string>
+    <string name="distrust_omemo_key_text">是否确定要移除此设备的验证？\n此设备及其消息将标记为“未受信任”。</string>
     <plurals name="seconds">
         <item quantity="other">%d 秒</item>
     </plurals>
@@ -655,14 +648,14 @@
         <item quantity="other">%d 个月</item>
     </plurals>
     <string name="pref_automatically_delete_messages">自动删除消息</string>
-    <string name="pref_automatically_delete_messages_description">从此设备上自动删除超过配置时限的消息。</string>
+    <string name="pref_automatically_delete_messages_description">自动删除此设备上超过配置时限的消息。</string>
     <string name="encrypting_message">正在加密消息</string>
     <string name="not_fetching_history_retention_period">由于本地保留期限设置，无法获取消息。</string>
     <string name="transcoding_video">正在压缩视频</string>
     <string name="contact_blocked_past_tense">联系人已屏蔽。</string>
     <string name="pref_notifications_from_strangers">陌生人的通知</string>
     <string name="pref_notifications_from_strangers_summary">收到陌生人的消息和来电时通知。</string>
-    <string name="received_message_from_stranger">收到了陌生人发来的消息</string>
+    <string name="received_message_from_stranger">收到了陌生人的消息</string>
     <string name="block_stranger">屏蔽陌生人</string>
     <string name="block_entire_domain">屏蔽整个域名</string>
     <string name="online_right_now">当前在线</string>
@@ -713,7 +706,7 @@
     <string name="create_shortcut">创建快捷方式</string>
     <string name="default_on">默认开启</string>
     <string name="default_off">默认关闭</string>
-    <string name="not_encrypted_for_this_device">消息未对本设备加密。</string>
+    <string name="not_encrypted_for_this_device">未对此设备加密消息。</string>
     <string name="omemo_decryption_failed">解密 OMEMO 消息失败。</string>
     <string name="undo">撤销</string>
     <string name="location_disabled">已禁用位置共享</string>
@@ -721,7 +714,7 @@
     <string name="action_unfix_from_location">取消固定位置</string>
     <string name="action_copy_location">复制位置</string>
     <string name="action_share_location">分享位置</string>
-    <string name="action_directions">方向</string>
+    <string name="action_directions">路线</string>
     <string name="title_activity_share_location">分享位置</string>
     <string name="title_activity_show_location">显示位置</string>
     <string name="share">分享</string>
@@ -733,7 +726,7 @@
     <string name="view_conversation">查看对话</string>
     <string name="pref_use_share_location_plugin">位置共享插件</string>
     <string name="pref_use_share_location_plugin_summary">使用位置共享插件代替内置地图</string>
-    <string name="copy_link">复制 web 地址</string>
+    <string name="copy_link">复制网址</string>
     <string name="copy_jabber_id">复制 XMPP 地址</string>
     <string name="p1_s3_filetransfer">用于 S3 的 HTTP 文件共享</string>
     <string name="pref_start_search">直接搜索</string>
@@ -760,11 +753,11 @@
     <string name="ongoing_calls_channel_name">正在进行的通话</string>
     <string name="missed_calls_channel_name">未接来电</string>
     <string name="silent_messages_channel_name">静音消息</string>
-    <string name="silent_messages_channel_description">此通知组用于显示不应触发任何声音的通知。例如，在另一台设备上处于活动状态时（静默期）。</string>
-    <string name="delivery_failed_channel_name">传递失败</string>
+    <string name="silent_messages_channel_description">（静默期）此通知组用于显示不应触发任何声音的通知。例如，在另一台设备上处于活动状态时。</string>
+    <string name="delivery_failed_channel_name">发送失败</string>
     <string name="pref_message_notification_settings">消息通知设置</string>
     <string name="pref_incoming_call_notification_settings">来电通知设置</string>
-    <string name="pref_more_notification_settings_summary">重要性、声音、振动</string>
+    <string name="pref_more_notification_settings_summary">重要程度、声音、振动</string>
     <string name="video_compression_channel_name">视频压缩</string>
     <string name="view_media">查看媒体</string>
     <string name="group_chat_members">参与者</string>
@@ -772,8 +765,8 @@
     <string name="security_violation_not_attaching_file">由于违反安全规定，文件已删除。</string>
     <string name="pref_video_compression">视频质量</string>
     <string name="pref_video_compression_summary">质量越低，文件越小</string>
-    <string name="video_360p">中 (360p)</string>
-    <string name="video_720p">高 (720p)</string>
+    <string name="video_360p">360p（中）</string>
+    <string name="video_720p">720p（高）</string>
     <string name="cancelled">已取消</string>
     <string name="already_drafting_message">您已经在起草一条消息了。</string>
     <string name="feature_not_implemented">功能未实现</string>
@@ -796,7 +789,7 @@
     <string name="back">返回</string>
     <string name="possible_pin">已自动从剪贴板粘贴可能的 PIN 码。</string>
     <string name="please_enter_pin">请输入您的 6 位 PIN 码。</string>
-    <string name="abort_registration_procedure">是否确定要中止注册程序？</string>
+    <string name="abort_registration_procedure">是否确定要中止注册过程？</string>
     <string name="yes">是</string>
     <string name="no">否</string>
     <string name="verifying">正在验证…</string>
@@ -808,9 +801,9 @@
     <string name="unable_to_connect_to_server">无法连接到服务器。</string>
     <string name="unable_to_establish_secure_connection">无法建立安全连接。</string>
     <string name="unable_to_find_server">无法找到服务器。</string>
-    <string name="something_went_wrong_processing_your_request">处理请求时出了问题。</string>
+    <string name="something_went_wrong_processing_your_request">处理您的请求时出了点问题。</string>
     <string name="invalid_user_input">用户输入无效</string>
-    <string name="temporarily_unavailable">暂时不可用。稍后再试。</string>
+    <string name="temporarily_unavailable">暂时不可用，请稍后重试。</string>
     <string name="no_network_connection">无网络连接。</string>
     <string name="try_again_in_x">请在 %s 后重试</string>
     <string name="rate_limited">您的速率受到限制</string>
@@ -828,13 +821,13 @@
     <string name="no_market_app_installed">未安装应用商店。</string>
     <string name="group_chat_will_make_your_jabber_id_public">此频道将公开您的 XMPP 地址</string>
     <string name="ebook">电子书</string>
-    <string name="video_original">原始 (未压缩)</string>
-    <string name="open_with">打开为…</string>
-    <string name="set_profile_picture">Conversations 个人资料图片</string>
+    <string name="video_original">未压缩（原始）</string>
+    <string name="open_with">打开…</string>
+    <string name="set_profile_picture">Conversations 个人资料照片</string>
     <string name="choose_account">选择账号</string>
     <string name="restore_backup">恢复备份</string>
     <string name="restore">恢复</string>
-    <string name="enter_password_to_restore">输入 %s 账号的密码以恢复备份。</string>
+    <string name="enter_password_to_restore">请输入 %s 的密码以恢复备份。</string>
     <string name="restore_warning">请勿使用恢复备份功能尝试克隆（同时运行）安装。恢复备份仅适用于迁移或您丢失原始设备的情况。</string>
     <string name="unable_to_restore_backup">无法恢复备份。</string>
     <string name="unable_to_decrypt_backup">无法解密备份。密码是否正确？</string>
@@ -854,12 +847,12 @@
     <string name="joined_an_existing_channel">您已加入现有的频道</string>
     <string name="unable_to_set_channel_configuration">无法保存频道配置</string>
     <string name="allow_participants_to_edit_subject">允许参与者（非访客）编辑话题</string>
-    <string name="allow_participants_to_invite_others">允许任何参与者邀请其他用户</string>
+    <string name="allow_participants_to_invite_others">允许任何参与者邀请别人</string>
     <string name="anyone_can_edit_subject">参与者（非访客）可以编辑话题。</string>
     <string name="owners_can_edit_subject">所有者可以编辑话题。</string>
     <string name="admins_can_edit_subject">管理员可以编辑话题。</string>
-    <string name="owners_can_invite_others">所有者可以邀请其他用户。</string>
-    <string name="anyone_can_invite_others">任何参与者可以邀请其他用户。</string>
+    <string name="owners_can_invite_others">所有者可以邀请别人。</string>
+    <string name="anyone_can_invite_others">任何参与者可以邀请别人。</string>
     <string name="jabber_ids_are_visible_to_admins">用户的 XMPP 地址仅管理员可见。</string>
     <string name="jabber_ids_are_visible_to_anyone">用户的 XMPP 地址对任何人可见。</string>
     <string name="no_users_hint_channel">此公开频道无参与者。邀请联系人或使用分享按钮分发频道的 XMPP 地址。</string>
@@ -897,13 +890,13 @@
     <string name="please_enable_an_account">请启用账号</string>
     <string name="make_call">进行通话</string>
     <string name="rtp_state_incoming_call">来电</string>
-    <string name="rtp_state_incoming_video_call">视频来电</string>
+    <string name="rtp_state_incoming_video_call">视频通话来电</string>
     <string name="rtp_state_content_add_video">切换到视频通话？</string>
     <string name="rtp_state_content_add">添加额外轨道？</string>
     <string name="rtp_state_connecting">正在连接</string>
     <string name="rtp_state_connected">已连接</string>
     <string name="rtp_state_reconnecting">正在重新连接</string>
-    <string name="rtp_state_accepting_call">正在接受通话</string>
+    <string name="rtp_state_accepting_call">正在接听通话</string>
     <string name="rtp_state_ending_call">正在结束通话</string>
     <string name="answer_call">接听</string>
     <string name="dismiss_call">拒接</string>
@@ -912,7 +905,7 @@
     <string name="rtp_state_declined_or_busy">占线</string>
     <string name="rtp_state_connectivity_error">无法连接通话</string>
     <string name="rtp_state_connectivity_lost_error">连接已中断</string>
-    <string name="rtp_state_retracted">已撤回通话</string>
+    <string name="rtp_state_retracted">已取消通话</string>
     <string name="rtp_state_application_failure">应用错误</string>
     <string name="rtp_state_security_error">验证问题</string>
     <string name="hang_up">挂断</string>
@@ -961,9 +954,9 @@
         <item quantity="other">查看 %1$d 位参与者</item>
     </plurals>
     <plurals name="some_messages_could_not_be_delivered">
-        <item quantity="other">无法传递一些消息</item>
+        <item quantity="other">一些消息发送失败</item>
     </plurals>
-    <string name="failed_deliveries">传递失败</string>
+    <string name="failed_deliveries">发送失败</string>
     <string name="more_options">更多选项</string>
     <string name="no_application_found">未找到应用程序</string>
     <string name="invite_to_app">邀请至 Conversations</string>
@@ -977,17 +970,17 @@
     <string name="no_xmpp_adddress_found">未找到 XMPP 地址</string>
     <string name="account_status_temporary_auth_failure">验证暂时失败</string>
     <string name="delete_avatar">删除头像</string>
-    <string name="audio_video_disabled_tor">使用 Tor 时，已禁用通话</string>
+    <string name="audio_video_disabled_tor">使用 Tor 时会禁用通话</string>
     <string name="switch_to_video">切换到视频</string>
     <string name="reject_switch_to_video">拒绝视频切换请求</string>
     <string name="pref_up_push_account_title">XMPP 账号</string>
     <string name="pref_up_push_server_title">推送服务器</string>
-    <string name="no_account_deactivated">无 (已停用)</string>
+    <string name="no_account_deactivated">无（已停用）</string>
     <string name="unified_push_distributor">UnifiedPush 分发程序</string>
     <string name="pref_up_push_account_summary">接收推送消息的账号。</string>
     <string name="decline">拒绝</string>
-    <string name="incoming_call_duration_timestamp">来电 (%s) · %s</string>
-    <string name="outgoing_call_duration_timestamp">去电 (%s) · %s</string>
+    <string name="incoming_call_duration_timestamp">来电（%s）· %s</string>
+    <string name="outgoing_call_duration_timestamp">去电（%s）· %s</string>
     <string name="outgoing_call_timestamp">去电 · %s</string>
     <string name="could_not_delete_account_from_server">无法从服务器删除账号</string>
     <string name="group_chats">群聊</string>
@@ -997,33 +990,33 @@
     <string name="outdated_backup_file_format">您正尝试导入过时的备份文件格式</string>
     <string name="audiobook">有声读物</string>
     <string name="reconnect_on_other_host">在其他主机上重新连接</string>
-    <string name="this_account_is_logged_out">您已登出此账号</string>
+    <string name="this_account_is_logged_out">您登出了此账号</string>
     <string name="log_in">登入</string>
     <string name="hide_notification">隐藏通知</string>
     <string name="contact_uses_unverified_keys">您的联系人使用未经验证的设备。扫描对方二维码进行验证并阻止主动式中间人攻击。</string>
     <string name="log_out">登出</string>
     <string name="account_state_logged_out">已登出</string>
     <string name="unverified_devices">您正在使用未经验证的设备。扫描您其他设备的二维码进行验证并阻止主动式中间人攻击。</string>
-    <string name="report_spam_and_block">报告垃圾消息并屏蔽垃圾消息发送者</string>
-    <string name="report_spam">报告垃圾消息</string>
+    <string name="report_spam_and_block">举报垃圾信息并屏蔽垃圾信息发送者</string>
+    <string name="report_spam">举报垃圾信息</string>
     <string name="welcome_header_quicksy">欢迎使用 Quicksy！</string>
     <string name="quicksy_wants_your_consent">Quicksy 请求您同意使用您的数据</string>
     <string name="privacy_policy">隐私政策</string>
     <string name="contact_list_integration_not_available">联系人列表集成不可用</string>
     <string name="rtp_state_contact_offline">联系人不可用</string>
     <string name="no_permission_to_place_call">没有拨打电话的权限</string>
-    <string name="call_integration_not_available">呼叫集成不可用！</string>
+    <string name="call_integration_not_available">通话集成不可用！</string>
     <string name="remove_bookmark_and_close">是否移除 %s 的书签并存档对话？</string>
     <string name="remove_bookmark">是否移除 %s 的书签？</string>
     <string name="delete_and_close">删除并存档对话</string>
     <string name="channel_discover_opt_in_message">频道发现使用称为 &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt; 的第三方服务。&lt;br&gt;&lt;br&gt;使用此功能会将您的 IP 地址和搜索词传输到此服务。请参阅其 &lt;a href=https://search.jabber.network/privacy&gt;隐私政策&lt;/a&gt; 以获取更多信息。</string>
     <string name="start_chat">开始对话</string>
-    <string name="title_activity_share_with">分享至…</string>
-    <string name="pref_use_colorful_bubbles_summary">为已发送和已接收消息使用不同的背景颜色</string>
+    <string name="title_activity_share_with">分享…</string>
+    <string name="pref_use_colorful_bubbles_summary">为发送和接收的消息使用不同的背景颜色</string>
     <string name="no_certificate_selected">未选择客户端证书！</string>
-    <string name="pref_use_colorful_bubbles">彩色消息气泡</string>
-    <string name="pref_dynamic_colors">动态色彩</string>
-    <string name="pref_dynamic_colors_summary">系统色彩 (Material You)</string>
+    <string name="pref_use_colorful_bubbles">多彩消息气泡</string>
+    <string name="pref_dynamic_colors">动态配色</string>
+    <string name="pref_dynamic_colors_summary">系统配色 (Material You)</string>
     <string name="title_activity_new_chat">新对话</string>
     <string name="archive_this_chat">之后删除对话</string>
     <string name="title_undo_swipe_out_chat">对话已存档</string>
@@ -1042,20 +1035,20 @@
     <string name="pref_light_dark_mode">浅色/深色模式</string>
     <string name="pref_allow_screenshots">允许截屏</string>
     <string name="pref_category_e2ee">端到端加密</string>
-    <string name="pref_title_trust_system_ca_store">证书颁发机构</string>
+    <string name="pref_title_trust_system_ca_store">证书授权服务</string>
     <string name="pref_title_trust_system_ca_store_summary">信任系统的 CA 证书</string>
     <string name="detect_mim">需要通道绑定</string>
     <string name="detect_mim_summary">通道绑定可以检测某些中间人攻击</string>
     <string name="pref_category_server_connection">服务器连接</string>
-    <string name="pref_summary_appearance">主题、色彩、截屏、输入</string>
+    <string name="pref_summary_appearance">主题、配色、截屏、输入</string>
     <string name="pref_category_sending">发送</string>
     <string name="pref_category_receiving">接收</string>
     <string name="pref_connection_summary">主机名和端口、Tor</string>
     <string name="pref_connection_summary_w_cd">主机名和端口、Tor、频道发现</string>
     <string name="pref_keyboard_options">键盘</string>
     <string name="pref_category_application">应用程序</string>
-    <string name="pref_category_interaction">交互</string>
-    <string name="pref_category_on_this_device">在设备上</string>
+    <string name="pref_category_interaction">互动</string>
+    <string name="pref_category_on_this_device">设备上</string>
     <string name="pref_title_interface">界面</string>
     <string name="pref_category_operating_system">操作系统</string>
     <string name="pref_summary_security">端到端加密、验证前盲目信任、中间人攻击检测</string>
@@ -1077,7 +1070,7 @@
     <string name="pref_backup_summary">创建一次性备份、计划定期备份</string>
     <string name="allow_private_messages">允许频道内私信</string>
     <string name="edit_nick">编辑昵称</string>
-    <string name="your_avatar_tap_to_select_new_avatar">您的头像。点击从图库中选择新头像。</string>
+    <string name="your_avatar_tap_to_select_new_avatar">您的头像。点按即可从图库选择新头像。</string>
     <string name="could_not_disable_video">无法禁用视频。</string>
     <string name="delete_pgp_key">删除 OpenPGP 密钥</string>
     <string name="edit_name_and_topic">编辑名称和话题</string>
@@ -1088,10 +1081,10 @@
     <string name="call_is_using_speaker">正在使用扬声器进行通话。</string>
     <string name="call_is_using_bluetooth">正在使用蓝牙进行通话。</string>
     <string name="flip_camera">翻转摄像头</string>
-    <string name="video_is_disabled_tap_to_enable">视频已禁用，点击以启用。</string>
-    <string name="video_is_enabled_tap_to_disable">视频已启用，点击以禁用。</string>
-    <string name="call_is_using_speaker_tap_to_switch_to_earpiece">正在使用扬声器进行通话，点击切换到听筒。</string>
-    <string name="call_is_using_earpiece_tap_to_switch_to_speaker">正在使用听筒进行通话，点击切换到扬声器。</string>
+    <string name="video_is_disabled_tap_to_enable">已禁用视频，点按即可启用。</string>
+    <string name="video_is_enabled_tap_to_disable">已启用视频，点按即可禁用。</string>
+    <string name="call_is_using_speaker_tap_to_switch_to_earpiece">正在使用扬声器进行通话，点按即可切换到听筒。</string>
+    <string name="call_is_using_earpiece_tap_to_switch_to_speaker">正在使用听筒进行通话，点按即可切换到扬声器。</string>
     <string name="server_info_login_mechanism">登录机制</string>
     <string name="server_info_bind2">XEP-0386：绑定 2</string>
     <string name="server_info_sasl2">XEP-0388：可扩展 SASL 配置文件</string>
@@ -1105,5 +1098,9 @@
     <string name="pref_chat_bubbles_summary">背景颜色、字体大小、头像</string>
     <string name="pref_chat_bubbles">消息气泡</string>
     <string name="pref_title_bubbles">消息气泡</string>
-    <string name="pref_show_avatars_summary">除了群聊，您的消息还有一对一聊天也会显示头像。</string>
+    <string name="pref_show_avatars_summary">在群聊和一对一聊天中为您的消息显示头像。</string>
+    <string name="pref_call_integration">通话集成</string>
+    <string name="custom_notifications">自定义通知</string>
+    <string name="custom_notifications_enable">是否为此对话启用自定义通知（重要程度、声音、振动）设置？</string>
+    <string name="pref_call_integration_summary">此应用的通话与常规通话交互，例如另一个通话开始时结束一个通话。</string>
 </resources>
\ No newline at end of file

From 6ee692173234b76f022a77dfb6bb83ade9f8c695 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Wed, 18 Dec 2024 11:47:42 +0000
Subject: [PATCH 235/357] Translated using Weblate (Russian)

Currently translated at 100.0% (13 of 13 strings)

Translation: Conversations/Android App (Conversations)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-conversations/ru/
---
 src/conversations/res/values-ru/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/conversations/res/values-ru/strings.xml b/src/conversations/res/values-ru/strings.xml
index 9661e76f62ee39f1115cf2668d0aea48838289fc..6b9f61657750e8d7ea8e7032ad86179687e5ff55 100644
--- a/src/conversations/res/values-ru/strings.xml
+++ b/src/conversations/res/values-ru/strings.xml
@@ -13,8 +13,8 @@
 \nЭтот аккаунт позволит вам общаться с пользователями и на этом, и на других серверах, используя ваш полный XMPP-адрес.</string>
     <string name="your_server_invitation">Ваше приглашение</string>
     <string name="improperly_formatted_provisioning">Неправильный формат кода</string>
-    <string name="tap_share_button_send_invite">Нажмите кнопку «Поделиться», чтобы отправить вашему контакту приглашение в %1$s.</string>
+    <string name="tap_share_button_send_invite">Нажмите кнопку \"Поделиться\", чтобы отправить вашему контакту приглашение в %1$s.</string>
     <string name="if_contact_is_nearby_use_qr">Если ваш контакт находится поблизости, он также может отсканировать приведённый ниже код, чтобы принять ваше приглашение.</string>
     <string name="easy_invite_share_text">Присоединяйтесь к %1$s и пообщайтесь со мной: %2$s</string>
-    <string name="share_invite_with">Поделиться приглашением с…</string>
+    <string name="share_invite_with">Поделиться приглашением…</string>
 </resources>
\ No newline at end of file

From ee9a04eaa3b7406be08a8a0f161c26aa0740394d Mon Sep 17 00:00:00 2001
From: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Date: Wed, 18 Dec 2024 12:41:23 +0000
Subject: [PATCH 236/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (13 of 13 strings)

Translation: Conversations/Android App (Conversations)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-conversations/zh_Hans/
---
 .../res/values-zh-rCN/strings.xml             | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/conversations/res/values-zh-rCN/strings.xml b/src/conversations/res/values-zh-rCN/strings.xml
index e1507867a4fffc811492721f88e39a81b136be03..1e4379eac9db994a766fe76ffd71231c3fdfd452 100644
--- a/src/conversations/res/values-zh-rCN/strings.xml
+++ b/src/conversations/res/values-zh-rCN/strings.xml
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="pick_a_server">选择您的 XMPP 提供者</string>
+    <string name="pick_a_server">选择 XMPP 提供者</string>
     <string name="use_conversations.im">使用 conversations.im</string>
     <string name="create_new_account">创建新账号</string>
-    <string name="do_you_have_an_account">您已经有 XMPP 账号了吗？如果您之前使用过 Conversations 或其他 XMPP 客户端，那么您已经有账号了。如果没有，您可以立即创建一个。
-\n提示：一些电子邮件服务也提供 XMPP 账号。</string>
-    <string name="server_select_text">XMPP 是独立于提供者的即时通讯网络。您选择的任何 XMPP 服务器都可以使用此应用。
-\n不过，您可以轻松地在 conversations.im 上创建账号；特别适合与 Conversations 使用的提供者。</string>
-    <string name="magic_create_text_on_x">您已受邀加入 %1$s。我们将指导您创建账号。
-\n当选择 %1$s 作为提供者时，向其他 XMPP 用户提供您的完整地址，就能和对方交流。</string>
-    <string name="magic_create_text_fixed">您已受邀加入 %1$s。已为您选择了用户名。我们将指导您创建账号。
-\n向其他 XMPP 用户提供您的完整地址，就能和对方交流。</string>
+    <string name="do_you_have_an_account">您已经有 XMPP 账号了吗？如果之前使用过 Conversations 或其他 XMPP 客户端，那么已经有账号了。如果没有，现在可以创建一个。\n提示：一些邮件服务提供者也提供 XMPP 账号。</string>
+    <string name="server_select_text">XMPP 是独立于提供者的即时通讯网络。您选择的任何 XMPP 服务器都可以使用此应用。\n不过，您可以轻松地在 conversations.im 上创建账号，这是专门适用于 Conversations 的提供者。</string>
+    <string name="magic_create_text_on_x">您已受邀加入 %1$s。我们将指导您创建账号。\n选择 %1$s 作为提供者时，向别人提供您的完整 XMPP 地址，就能和对方交流。</string>
+    <string name="magic_create_text_fixed">您已受邀加入 %1$s。已为您选择了用户名。我们将指导您创建账号。\n向别人提供您的完整 XMPP 地址，就能和对方交流。</string>
     <string name="your_server_invitation">您的服务器邀请</string>
     <string name="improperly_formatted_provisioning">配置代码格式不正确</string>
-    <string name="tap_share_button_send_invite">点击分享按钮，向您的联系人发送加入 %1$s 的邀请。</string>
-    <string name="if_contact_is_nearby_use_qr">如果您的联系人在附近，对方也可以扫描下方二维码接受邀请。</string>
+    <string name="tap_share_button_send_invite">点按分享按钮，向您的联系人发送 %1$s 的邀请。</string>
+    <string name="if_contact_is_nearby_use_qr">如果联系人在附近，也可以扫描下方二维码接受邀请。</string>
     <string name="easy_invite_share_text">加入 %1$s 和我聊天：%2$s</string>
-    <string name="share_invite_with">分享邀请至…</string>
+    <string name="share_invite_with">分享邀请…</string>
 </resources>
\ No newline at end of file

From ffd14fac91cc24379ff7b789b308ba37efedfe91 Mon Sep 17 00:00:00 2001
From: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Date: Wed, 18 Dec 2024 11:10:24 +0000
Subject: [PATCH 237/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (9 of 9 strings)

Translation: Conversations/Android App (Quicksy)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-quicksy/zh_Hans/
---
 src/quicksy/res/values-zh-rCN/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/quicksy/res/values-zh-rCN/strings.xml b/src/quicksy/res/values-zh-rCN/strings.xml
index cf4f46cf6cec6627b21eaf4fc2e632441b40ca48..d1b981b742210dbcbb5feb99c216d8ae7028b3d9 100644
--- a/src/quicksy/res/values-zh-rCN/strings.xml
+++ b/src/quicksy/res/values-zh-rCN/strings.xml
@@ -4,7 +4,7 @@
     <string name="pref_never_send_crash_summary">通过发送崩溃报告，您可以帮助 Quicksy 的持续开发</string>
     <string name="pref_broadcast_last_activity_summary">让您的所有联系人知道您最后使用 Quicksy 的时间</string>
     <string name="huawei_protected_apps_summary">为了在屏幕关闭后继续接收通知，您需要将 Quicksy 加入受保护的应用列表。</string>
-    <string name="set_profile_picture">Quicksy 个人资料图片</string>
+    <string name="set_profile_picture">Quicksy 个人资料照片</string>
     <string name="not_available_in_your_country">Quicksy 在您所在的国家/地区无法使用。</string>
     <string name="unable_to_verify_server_identity">无法验证服务器身份。</string>
     <string name="unknown_security_error">安全错误未知。</string>

From ee010a1b76a628233ba8e3789f8097cb33662af1 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Wed, 18 Dec 2024 11:38:41 +0000
Subject: [PATCH 238/357] Translated using Weblate (Russian)

Currently translated at 30.7% (24 of 78 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/ru/
---
 fastlane/metadata/android/ru-RU/changelogs/4212504.txt | 2 +-
 fastlane/metadata/android/ru-RU/changelogs/4212604.txt | 2 ++
 fastlane/metadata/android/ru-RU/changelogs/4212704.txt | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4212604.txt
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4212704.txt

diff --git a/fastlane/metadata/android/ru-RU/changelogs/4212504.txt b/fastlane/metadata/android/ru-RU/changelogs/4212504.txt
index 34a6c925415338666b27b39049b794bede41d658..a5d2269b6ead8f35c91e4c64c87511010b9f4112 100644
--- a/fastlane/metadata/android/ru-RU/changelogs/4212504.txt
+++ b/fastlane/metadata/android/ru-RU/changelogs/4212504.txt
@@ -1 +1 @@
-* улучшена обработка некоторых реакций на эмодзи
+* Улучшена обработка некоторых реакций на эмодзи
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4212604.txt b/fastlane/metadata/android/ru-RU/changelogs/4212604.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c58561c659a578bcd671eab21a810d9b7813ebc4
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4212604.txt
@@ -0,0 +1,2 @@
+* Пузыри сообщений сдвигаются ближе друг к другу без объединения
+* Добавлена возможность скрывать аватары в беседах, если в них нет особой необходимости (Настройки → Интерфейс → Пузыри сообщений → Показывать аватары)
diff --git a/fastlane/metadata/android/ru-RU/changelogs/4212704.txt b/fastlane/metadata/android/ru-RU/changelogs/4212704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cd37b9c69be1214b7c3922fed5a1bb221b66163a
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4212704.txt
@@ -0,0 +1 @@
+* Добавьте возможность показывать пузыри сообщений с выравниванием по левому краю

From d22013cc5f6d13e9a0ec14d7e83cc1119604af87 Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Wed, 18 Dec 2024 16:48:53 +0000
Subject: [PATCH 239/357] Translated using Weblate (German)

Currently translated at 100.0% (1056 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/de/
---
 src/main/res/values-de/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 76b4141289aa3e4108d1819aca4b1917aa98ebfe..8ffdf8b65885f7800d9a85412d28783a3207eafe 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -753,7 +753,7 @@
     <string name="delivery_failed_channel_name">Fehlgeschlagene Zustellungen</string>
     <string name="pref_message_notification_settings">Benachrichtigungseinstellungen</string>
     <string name="pref_incoming_call_notification_settings">Einstellungen für die Benachrichtigung bei eingehenden Anrufen</string>
-    <string name="pref_more_notification_settings_summary">Wichtigkeit, Klang, Vibrationen</string>
+    <string name="pref_more_notification_settings_summary">Wichtigkeit, Ton, Vibration</string>
     <string name="video_compression_channel_name">Video komprimieren</string>
     <string name="view_media">Medien anzeigen</string>
     <string name="group_chat_members">Teilnehmer</string>
@@ -1102,8 +1102,8 @@
     <string name="pref_title_bubbles">Sprechblasen</string>
     <string name="pref_call_integration">Anrufintegration</string>
     <string name="pref_align_start">Linksbündige Nachrichten</string>
-    <string name="pref_align_start_summary">Zeige alle Nachrichten, inklusive gesendeter, linksbündig für ein einheitliches Chatlayout an.</string>
-    <string name="custom_notifications">Angepasste Benachrichtigungen</string>
+    <string name="pref_align_start_summary">Alle Nachrichten, einschließlich der gesendeten, auf der linken Seite anzeigen, um ein einheitliches Chatlayout zu erhalten.</string>
+    <string name="custom_notifications">Individuelle Benachrichtigungen</string>
     <string name="pref_call_integration_summary">Anrufe aus dieser App interagieren mit normalen Telefonanrufen, wie beispielsweise das Beenden eines Anrufs, wenn ein anderer beginnt.</string>
-    <string name="custom_notifications_enable">Individuelle Benachrichtigungseinstellungen (Wichtigkeit, Nachrichtenton, vibration) für diese Unterhaltung aktivieren?</string>
+    <string name="custom_notifications_enable">Individuelle Benachrichtigungseinstellungen (Wichtigkeit, Ton, Vibration) für diese Unterhaltung aktivieren?</string>
 </resources>
\ No newline at end of file

From a6d4055ff82da886f2f1911a66ce200c183924a0 Mon Sep 17 00:00:00 2001
From: "lucasmz.dev" <git@lucasmz.dev>
Date: Thu, 19 Dec 2024 02:56:03 +0000
Subject: [PATCH 240/357] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1056 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pt_BR/
---
 src/main/res/values-pt-rBR/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 499458078b1e3ef32741a16d976b3ee8661a5b59..3214d0ff63f68c8a364547cea4b874ca1e749ff2 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -1118,4 +1118,10 @@
     <string name="pref_chat_bubbles">Bolhas de conversa</string>
     <string name="pref_chat_bubbles_summary">Cor do fundo, Tamanho da fonte, Avatares</string>
     <string name="pref_title_bubbles">Bolhas de Conversa</string>
+    <string name="pref_align_start">Mensagens alinhadas à esquerda</string>
+    <string name="custom_notifications">Notificações customizadas</string>
+    <string name="pref_align_start_summary">Mostrar todas as mensagens, incluindo as enviadas por você, no lado esquerdo, para um layout de conversa uniforme.</string>
+    <string name="custom_notifications_enable">Ativar as configurações de notificações customizadas (importância, som, vibração) para esta conversa?</string>
+    <string name="pref_call_integration">Integração de chamadas</string>
+    <string name="pref_call_integration_summary">Chamadas deste app interagem com as chamadas comuns do sistema, como quando uma chamada é terminada quando outra começa.</string>
 </resources>
\ No newline at end of file

From abdb9a10403617f50e98017e3ca679c43757aba0 Mon Sep 17 00:00:00 2001
From: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Date: Wed, 18 Dec 2024 13:23:58 +0000
Subject: [PATCH 241/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1056 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/zh_Hans/
---
 src/main/res/values-zh-rCN/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index e0f774972b11c357e3ce2522eb5458075075e21b..2b7760d3347bdd9ab53474701cef62a74977b2f5 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -1103,4 +1103,6 @@
     <string name="custom_notifications">自定义通知</string>
     <string name="custom_notifications_enable">是否为此对话启用自定义通知（重要程度、声音、振动）设置？</string>
     <string name="pref_call_integration_summary">此应用的通话与常规通话交互，例如另一个通话开始时结束一个通话。</string>
+    <string name="pref_align_start_summary">在左侧显示所有消息，包括发送的消息，以实现统一的聊天布局。</string>
+    <string name="pref_align_start">左对齐消息</string>
 </resources>
\ No newline at end of file

From 8aba66b88204bdbb85693cefc5b78bf4ccebdf1b Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Wed, 18 Dec 2024 16:44:44 +0000
Subject: [PATCH 242/357] Translated using Weblate (German)

Currently translated at 100.0% (78 of 78 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/de/
---
 fastlane/metadata/android/de-DE/changelogs/4212604.txt | 2 ++
 fastlane/metadata/android/de-DE/changelogs/4212704.txt | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/de-DE/changelogs/4212604.txt
 create mode 100644 fastlane/metadata/android/de-DE/changelogs/4212704.txt

diff --git a/fastlane/metadata/android/de-DE/changelogs/4212604.txt b/fastlane/metadata/android/de-DE/changelogs/4212604.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d36b0cd264100a4da4ff95c0c182ff7602aba624
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/4212604.txt
@@ -0,0 +1,2 @@
+* Nachrichten näher zusammengerückt, anstatt sie zu verschmelzen
+* Möglichkeit hinzugefügt, Profilbilder in Chat-Ansichten auszublenden, wenn sie nicht zwingend erforderlich sind (Einstellungen > Benutzeroberfläche > Sprechblasen > Profilbilder anzeigen)
diff --git a/fastlane/metadata/android/de-DE/changelogs/4212704.txt b/fastlane/metadata/android/de-DE/changelogs/4212704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2fdd237623319693005051fd1bc1eeb44ae72b71
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/4212704.txt
@@ -0,0 +1 @@
+* Möglichkeit hinzugefügt, Nachrichten linksbündig anzuzeigen

From 8670ee454658b50e29a68e7e5478e585f2043fe5 Mon Sep 17 00:00:00 2001
From: Outbreak2096 <Outbreak2096@users.noreply.translate.codeberg.org>
Date: Wed, 18 Dec 2024 13:25:43 +0000
Subject: [PATCH 243/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (78 of 78 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/zh_Hans/
---
 fastlane/metadata/android/zh-CN/changelogs/4212604.txt | 2 ++
 fastlane/metadata/android/zh-CN/changelogs/4212704.txt | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/zh-CN/changelogs/4212604.txt
 create mode 100644 fastlane/metadata/android/zh-CN/changelogs/4212704.txt

diff --git a/fastlane/metadata/android/zh-CN/changelogs/4212604.txt b/fastlane/metadata/android/zh-CN/changelogs/4212604.txt
new file mode 100644
index 0000000000000000000000000000000000000000..609cdbe23a7f8e2338819119beb8985b2fddeef3
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/4212604.txt
@@ -0,0 +1,2 @@
+* 将消息气泡靠得更近而不是合并它们
+* 添加在聊天视图中隐藏头像的功能（设置 -> 界面 -> 消息气泡 -> 显示头像）
diff --git a/fastlane/metadata/android/zh-CN/changelogs/4212704.txt b/fastlane/metadata/android/zh-CN/changelogs/4212704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..160aa46d04425c642a02c4607e7da5938ec90d64
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/4212704.txt
@@ -0,0 +1 @@
+* 添加左对齐显示消息气泡的功能

From 04377baab8cd247d32b78b2af6c6ea53ffaf869c Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Thu, 19 Dec 2024 05:37:25 +0000
Subject: [PATCH 244/357] Translated using Weblate (Galician)

Currently translated at 100.0% (1056 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/gl/
---
 src/main/res/values-gl/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index f7a0e1afba0b63d9242bdc5dff764b3a05022bbd..4273f98c24acda90d074fcb0aa250828816261fc 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -1100,4 +1100,10 @@
     <string name="pref_title_bubbles">Burbullas na conversa</string>
     <string name="pref_show_avatars_summary">Mostrar avatares para as túas mensaxes en conversas 1:1, ademáis de nas parolas en grupo.</string>
     <string name="pref_chat_bubbles_summary">Cor de fondo, Tamaño da letra, Avatares</string>
+    <string name="pref_call_integration">Integración das chamadas</string>
+    <string name="pref_call_integration_summary">As chamadas desde esta app interactúan coas chamadas de teléfono normais, por exemplo finalizando unha chamada cando outra comeza.</string>
+    <string name="pref_align_start">Mensaxes enfeitadas á esquerda</string>
+    <string name="pref_align_start_summary">Mostrar todas as mensaxes, incluíndo as propias, no lado esquerdo para unha aparencia uniforme.</string>
+    <string name="custom_notifications">Notificacións personalizadas</string>
+    <string name="custom_notifications_enable">Activar axustes personalizados para as notificacións (importancia, son, vibración) nesta conversa?</string>
 </resources>
\ No newline at end of file

From 900d80c9f4fe5201760976e704ed183bc597555f Mon Sep 17 00:00:00 2001
From: Stephan-P <Stephan-P@users.noreply.translate.codeberg.org>
Date: Thu, 19 Dec 2024 06:02:14 +0000
Subject: [PATCH 245/357] Translated using Weblate (Dutch)

Currently translated at 100.0% (1056 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/nl/
---
 src/main/res/values-nl/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index f2412f6aadffee506ddaa0e0f3beb87b52fda422..abccbfe0c0eb0bced9fb9cd95768171c661f7777 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -1116,4 +1116,10 @@
     <string name="pref_title_bubbles">Chat-bubbels</string>
     <string name="pref_show_avatars_summary">Avatars weergeven in jouw berichten en in 1:1-chats, naast groepschats.</string>
     <string name="pref_show_avatars">Avatars weergeven</string>
+    <string name="pref_call_integration">Integratie van gesprekken</string>
+    <string name="pref_align_start">Links uitgelijnde berichten</string>
+    <string name="pref_align_start_summary">Toon alle berichten, inclusief verzonden berichten, aan de linkerkant voor een uniforme chatlay-out.</string>
+    <string name="custom_notifications">Aangepaste meldingen</string>
+    <string name="custom_notifications_enable">Aangepaste meldingsinstellingen (belangrijkheid, geluid, trillingen) inschakelen voor dit gesprek?</string>
+    <string name="pref_call_integration_summary">Oproepen van deze app werken samen met gewone telefoongesprekken, zoals het beëindigen van een gesprek wanneer een ander begint.</string>
 </resources>
\ No newline at end of file

From 7cdc21acc19d6ade0c52343d24fb7c4147cec40d Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Thu, 19 Dec 2024 05:42:26 +0000
Subject: [PATCH 246/357] Translated using Weblate (Galician)

Currently translated at 64.1% (50 of 78 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/gl/
---
 fastlane/metadata/android/gl-ES/changelogs/4212604.txt | 2 ++
 fastlane/metadata/android/gl-ES/changelogs/4212704.txt | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/gl-ES/changelogs/4212604.txt
 create mode 100644 fastlane/metadata/android/gl-ES/changelogs/4212704.txt

diff --git a/fastlane/metadata/android/gl-ES/changelogs/4212604.txt b/fastlane/metadata/android/gl-ES/changelogs/4212604.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8375c7fb1277537fae1b300e3d241fb60133a01a
--- /dev/null
+++ b/fastlane/metadata/android/gl-ES/changelogs/4212604.txt
@@ -0,0 +1,2 @@
+* Xuntar máis as burbullas das mensaxes no lugar de xuntalas
+* Poder agochar os avatares na vista de conversas cando non é estritamente necesario (Axustes -> Interface -> Burbullas -> Mostrar avatares)
diff --git a/fastlane/metadata/android/gl-ES/changelogs/4212704.txt b/fastlane/metadata/android/gl-ES/changelogs/4212704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b3969bf8cab5cfa7061575d20501ea7818bad80c
--- /dev/null
+++ b/fastlane/metadata/android/gl-ES/changelogs/4212704.txt
@@ -0,0 +1 @@
+* Podes enfeitar no lado esquerdo todas as mensaxes

From e8a51611450c23f729d972e492a015834a350931 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Thu, 19 Dec 2024 06:48:43 +0000
Subject: [PATCH 247/357] Translated using Weblate (Russian)

Currently translated at 30.7% (24 of 78 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/ru/
---
 fastlane/metadata/android/ru-RU/changelogs/4212704.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/metadata/android/ru-RU/changelogs/4212704.txt b/fastlane/metadata/android/ru-RU/changelogs/4212704.txt
index cd37b9c69be1214b7c3922fed5a1bb221b66163a..39910ddef4aa262d11bc7b3d69341fea828b39df 100644
--- a/fastlane/metadata/android/ru-RU/changelogs/4212704.txt
+++ b/fastlane/metadata/android/ru-RU/changelogs/4212704.txt
@@ -1 +1 @@
-* Добавьте возможность показывать пузыри сообщений с выравниванием по левому краю
+* Добавлена возможность показывать пузыри сообщений с выравниванием по левому краю

From 9fc55f8a8a401a531b806de3f027c3e0d74285b1 Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Thu, 19 Dec 2024 12:39:54 +0000
Subject: [PATCH 248/357] Translated using Weblate (Polish)

Currently translated at 100.0% (1056 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pl/
---
 src/main/res/values-pl/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 32dabf6fa6d3c28469bb66f5d4143103dc3a8165..9f1718594e425797dd451d6e07b3aadd99fc174c 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -1132,4 +1132,10 @@
     <string name="pref_chat_bubbles">Dymki rozmowy</string>
     <string name="pref_chat_bubbles_summary">Kolor tła, rozmiar czcionki, awatary</string>
     <string name="pref_title_bubbles">Dymki rozmowy</string>
+    <string name="pref_call_integration">Integracja rozmów</string>
+    <string name="pref_call_integration_summary">Rozmowy w tej aplikacji wchodzą w interakcję ze zwykłymi rozmowami telefonicznymi, np. kończenie jednej rozmowy gdy zaczyna się inna.</string>
+    <string name="pref_align_start">Wiadomości wyrównane do lewej</string>
+    <string name="pref_align_start_summary">Wyświetlaj wszystkie wiadomości, również wysłane, po lewej stronie, dla jednolitego układu rozmowy.</string>
+    <string name="custom_notifications">Własne powiadomienia</string>
+    <string name="custom_notifications_enable">Włączyć dedykowane ustawienia powiadomień (ważność, dźwięk, wibracje) dla tej rozmowy?</string>
 </resources>
\ No newline at end of file

From 3409ed0a13bcbc570b015e644ce7436a449c6499 Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Thu, 19 Dec 2024 12:44:35 +0000
Subject: [PATCH 249/357] Translated using Weblate (Polish)

Currently translated at 33.3% (26 of 78 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/pl/
---
 fastlane/metadata/android/pl-PL/changelogs/4209404.txt | 1 +
 fastlane/metadata/android/pl-PL/changelogs/4210104.txt | 1 +
 fastlane/metadata/android/pl-PL/changelogs/4210404.txt | 3 +++
 fastlane/metadata/android/pl-PL/changelogs/4210504.txt | 2 ++
 fastlane/metadata/android/pl-PL/changelogs/4212604.txt | 2 ++
 fastlane/metadata/android/pl-PL/changelogs/4212704.txt | 1 +
 6 files changed, 10 insertions(+)
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4209404.txt
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4210104.txt
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4210404.txt
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4210504.txt
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4212604.txt
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4212704.txt

diff --git a/fastlane/metadata/android/pl-PL/changelogs/4209404.txt b/fastlane/metadata/android/pl-PL/changelogs/4209404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..3cd789377b9a6ff0b9da09191cedc48356cee4a6
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4209404.txt
@@ -0,0 +1 @@
+* Naprawiono małą regresję wprowadzoną w 2.13.1
diff --git a/fastlane/metadata/android/pl-PL/changelogs/4210104.txt b/fastlane/metadata/android/pl-PL/changelogs/4210104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..49e01c70d00637cb4751c19edf0a84bcdf79d547
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4210104.txt
@@ -0,0 +1 @@
+* Ulepszono integrację rozmów głosowych i wideo z systemem operacyjnym
diff --git a/fastlane/metadata/android/pl-PL/changelogs/4210404.txt b/fastlane/metadata/android/pl-PL/changelogs/4210404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b70775e0c18d7f41b3bd2b5dc896a6f69dc797ce
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4210404.txt
@@ -0,0 +1,3 @@
+* Naprawiono rozmowy głosowe i wideo w Androidzie 8
+* Naprawiono problemy typu race condition w nowej integracji rozmów
+* Naprawiono nieznikającą kompresję wideo
diff --git a/fastlane/metadata/android/pl-PL/changelogs/4210504.txt b/fastlane/metadata/android/pl-PL/changelogs/4210504.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b480b09bb04d3e7e984821a1f90d213cfabd5a76
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4210504.txt
@@ -0,0 +1,2 @@
+* Przywrócenie dostępu do odkrywania kanałów w Androidzie 6 i 7
+* Ulepszenie logowania nieudanej integracji rozmów
diff --git a/fastlane/metadata/android/pl-PL/changelogs/4212604.txt b/fastlane/metadata/android/pl-PL/changelogs/4212604.txt
new file mode 100644
index 0000000000000000000000000000000000000000..defd53fd1caf3188b4344b8198cca8d7dfbe2d63
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4212604.txt
@@ -0,0 +1,2 @@
+* Przeniesienie dymków wiadomości bliżej siebie zamiast ich łączenia
+* Dodanie możliwości ukrywania awatarów w widokach rozmów gdy nie są konieczne (Ustawienia → Interfejs → Dymki rozmów → Pokaż awatary)
diff --git a/fastlane/metadata/android/pl-PL/changelogs/4212704.txt b/fastlane/metadata/android/pl-PL/changelogs/4212704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..276739170ec81e5224235d761e63b97cfff4b03e
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4212704.txt
@@ -0,0 +1 @@
+* Dodanie możliwości pokazywania dymków wiadomości wyrównanych do lewej

From b656a359d319db6978d5fc8e8819f2322216f92c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Thu, 19 Dec 2024 11:32:22 +0000
Subject: [PATCH 250/357] Translated using Weblate (Estonian)

Currently translated at 100.0% (1056 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index 5e255dcea4a0e0f4116ef5b22869c3871bfc6ae6..b916d8d6989b95656d6f23e8845bba47812d684c 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -1120,4 +1120,10 @@
     <string name="pref_chat_bubbles">Jutumullid</string>
     <string name="pref_chat_bubbles_summary">Taustavärv, kirjatüübi suurus, tunnuspildid</string>
     <string name="pref_title_bubbles">Jutumullid</string>
+    <string name="pref_align_start">Kõned joonduvad vasakule</string>
+    <string name="pref_align_start_summary">Kõik saadetud ja saadunud sõnumid joonduvad vasakule ning moodustavad ühtselt kujundatud sõnumivoo.</string>
+    <string name="custom_notifications">Sinu seadistatud teavitused</string>
+    <string name="pref_call_integration_summary">Kõned suudavad suhestuda nutiseadme muude kõnede loogikaga, näiteks uue kõne algamisel eelmine kõne lõppeb.</string>
+    <string name="custom_notifications_enable">Kas kasutad selle vestluse jaoks enda määratud teavituste seadistusi (olulisus, helimärguanded, värina kasutamine)?</string>
+    <string name="pref_call_integration">Kõnede lõimimine</string>
 </resources>
\ No newline at end of file

From 9a9a182a0d1a92de445731f494d6f2410e012e7d Mon Sep 17 00:00:00 2001
From: user11 <user11@users.noreply.translate.codeberg.org>
Date: Thu, 19 Dec 2024 19:25:15 +0000
Subject: [PATCH 251/357] Translated using Weblate (Serbian)

Currently translated at 100.0% (1056 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sr/
---
 src/main/res/values-sr/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 1af2ee4bfc213cf09490fa3de69dbec7312241e3..9d3b7caab0a8a6e380aface357b69f8491ae2dac 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -1134,4 +1134,10 @@
     <string name="pref_chat_bubbles">Балончићи у препискама</string>
     <string name="pref_chat_bubbles_summary">Боја позадине, Величина слова, Аватари</string>
     <string name="pref_title_bubbles">Балончићи у препискама</string>
+    <string name="pref_call_integration">Интеграција позива</string>
+    <string name="pref_call_integration_summary">Позиви из ове апликације реагују на обичне телефонске позиве, попут прекидања једног позива када почне други.</string>
+    <string name="pref_align_start">Поруке с леве стране</string>
+    <string name="pref_align_start_summary">Приказуј све поруке, укључујући послате, са леве стране за обједињени изглед преписке.</string>
+    <string name="custom_notifications">Посебна обавештења</string>
+    <string name="custom_notifications_enable">Укључи посебна подешавања обавештења (важност, звук, вибрација) за ову преписку?</string>
 </resources>
\ No newline at end of file

From 5aa08e32aa2ec239c0d95f437e3cb84bcd09d844 Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Thu, 19 Dec 2024 23:47:25 +0000
Subject: [PATCH 252/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1056 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/uk/
---
 src/main/res/values-uk/strings.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 9db40080b404cfeaa31cc9aab50d01a6326274b6..26e661f56ff6e4cc3700aafbe30714046e36f5a5 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -1148,4 +1148,10 @@
     <string name="pref_chat_bubbles_summary">Колір фону, розмір шрифту, аватари</string>
     <string name="pref_title_bubbles">Вигляд повідомлень</string>
     <string name="pref_show_avatars_summary">Крім групових чатів, показувати аватари також у Ваших повідомленнях і приватних чатах.</string>
+    <string name="pref_call_integration">Інтеграція викликів</string>
+    <string name="pref_call_integration_summary">Виклики з цього застосунку взаємодіють зі звичайними телефонними дзвінками — наприклад, завершення одного дзвінка, коли починається інший.</string>
+    <string name="pref_align_start">Вирівнювання повідомлень ліворуч</string>
+    <string name="pref_align_start_summary">Вирівнювати всі повідомлення, включно з надісланими, по лівому краю для одноманітного вигляду розмов.</string>
+    <string name="custom_notifications_enable">Увімкнути індивідуальні налаштування сповіщень (важливість, звук, вібрація) для цієї розмови?</string>
+    <string name="custom_notifications">Пристосування сповіщень</string>
 </resources>
\ No newline at end of file

From ac8a1c012be58e369bab3f4796d8f13ae283d6d2 Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Fri, 20 Dec 2024 00:13:57 +0000
Subject: [PATCH 253/357] Translated using Weblate (Ukrainian)

Currently translated at 98.7% (77 of 78 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/uk/
---
 fastlane/metadata/android/uk/changelogs/4212704.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 fastlane/metadata/android/uk/changelogs/4212704.txt

diff --git a/fastlane/metadata/android/uk/changelogs/4212704.txt b/fastlane/metadata/android/uk/changelogs/4212704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..decf2874bcd5d459aecc35e70df1852c17d1b5b1
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/4212704.txt
@@ -0,0 +1 @@
+* Додано можливість вирівнювати бульбашки повідомлень ліворуч

From 387fcc96110af17ec08ee48cdd71166b3a0d1dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Thu, 19 Dec 2024 15:29:22 +0000
Subject: [PATCH 254/357] Translated using Weblate (Estonian)

Currently translated at 21.7% (17 of 78 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/et/
---
 fastlane/metadata/android/et/changelogs/4210704.txt | 3 +++
 fastlane/metadata/android/et/changelogs/4210804.txt | 2 ++
 fastlane/metadata/android/et/changelogs/4210904.txt | 2 ++
 fastlane/metadata/android/et/changelogs/4211004.txt | 2 ++
 fastlane/metadata/android/et/changelogs/4211104.txt | 3 +++
 fastlane/metadata/android/et/changelogs/4211204.txt | 2 ++
 fastlane/metadata/android/et/changelogs/4212704.txt | 1 +
 7 files changed, 15 insertions(+)
 create mode 100644 fastlane/metadata/android/et/changelogs/4210704.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4210804.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4210904.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4211004.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4211104.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4211204.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4212704.txt

diff --git a/fastlane/metadata/android/et/changelogs/4210704.txt b/fastlane/metadata/android/et/changelogs/4210704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..3f26994c0269c1329bd7df8a7c54d471a0c097e7
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4210704.txt
@@ -0,0 +1,3 @@
+* Kasutame Material 3 kujundust
+* Korraldasime seadistused ümber
+* Sünkroniseerime lugemise olekuid eri seadmete vahel
diff --git a/fastlane/metadata/android/et/changelogs/4210804.txt b/fastlane/metadata/android/et/changelogs/4210804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..08fe87e75a673ed465c9d45ececc09c8108a8885
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4210804.txt
@@ -0,0 +1,2 @@
+* Näitame sõnumite olekuid ikoonidena
+* Lisasime sõnumimullide välimusele suurema kirjatüübi valimise võimaluse
diff --git a/fastlane/metadata/android/et/changelogs/4210904.txt b/fastlane/metadata/android/et/changelogs/4210904.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cf7fc5a5235a9c52d610c07909ff80f901bb72a2
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4210904.txt
@@ -0,0 +1,2 @@
+* Parandasime Quicksy registreerimise Androidi versioonides 6/7
+* Saabuva kõne märguanne teavituskanalis
diff --git a/fastlane/metadata/android/et/changelogs/4211004.txt b/fastlane/metadata/android/et/changelogs/4211004.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ffbd895b3847674047dce96992afded22bc6f8e2
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4211004.txt
@@ -0,0 +1,2 @@
+* Parandasime kõnede lõimimise vead mõnedes Android 14-põhistes nutiseadmetes
+* Lisasime seadistuse „Kutsed võõrastelt“
diff --git a/fastlane/metadata/android/et/changelogs/4211104.txt b/fastlane/metadata/android/et/changelogs/4211104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..be8b646b221233887e9d950d9e420a931bb1b696
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4211104.txt
@@ -0,0 +1,3 @@
+* Nüüd saab teha regulaarseid varukoopiaid
+* Välistame kõnede lõimimise kõikides Realme nutiseadmetes kuni Androidi versioonini 11
+* Väikesed kasutajaliidese parandused (kõnemullid)
diff --git a/fastlane/metadata/android/et/changelogs/4211204.txt b/fastlane/metadata/android/et/changelogs/4211204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5cb5fecd1b2627d31fb52fb52d2f805798562c95
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4211204.txt
@@ -0,0 +1,2 @@
+* Parandasime vea, kus kõne summutamine lõppeb väljundseadmete vahetamisel
+* Välistame kõnede lõimimise kõikides Umidigi nutiseadmetes
diff --git a/fastlane/metadata/android/et/changelogs/4212704.txt b/fastlane/metadata/android/et/changelogs/4212704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..422e57094d4db000a57c3db6494af65aaf3634eb
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4212704.txt
@@ -0,0 +1 @@
+* Lisasime võimaluse kuvada kõiki jutumulle joondatuna vasakule

From 31058280fe479cf5c50c572811c535b058d646b0 Mon Sep 17 00:00:00 2001
From: SomeTr <SomeTr@users.noreply.translate.codeberg.org>
Date: Sat, 21 Dec 2024 09:50:39 +0000
Subject: [PATCH 255/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (78 of 78 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/uk/
---
 fastlane/metadata/android/uk/changelogs/4212604.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/uk/changelogs/4212604.txt

diff --git a/fastlane/metadata/android/uk/changelogs/4212604.txt b/fastlane/metadata/android/uk/changelogs/4212604.txt
new file mode 100644
index 0000000000000000000000000000000000000000..19c44c1cf6d9febf2006a57930ffd7a66a306511
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/4212604.txt
@@ -0,0 +1,2 @@
+* Бульбашки повідомлень розташовуються ближче одна до одної, а не об'єднуються
+* Додано можливість приховати непотрібні аватари у розмовах (Налаштування -> Інтерфейс -> Вигляд повідомлень -> Показувати аватари)

From 75f23a3f2ac03a1bf0d04dcafbf0d66ff6f53c97 Mon Sep 17 00:00:00 2001
From: Umeaman <umeaman@users.noreply.translate.codeberg.org>
Date: Sun, 22 Dec 2024 01:03:50 +0000
Subject: [PATCH 256/357] Translated using Weblate (Swedish)

Currently translated at 41.0% (32 of 78 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/sv/
---
 fastlane/metadata/android/sv-SE/changelogs/390.txt     | 1 +
 fastlane/metadata/android/sv-SE/changelogs/397.txt     | 3 +++
 fastlane/metadata/android/sv-SE/changelogs/404.txt     | 1 +
 fastlane/metadata/android/sv-SE/changelogs/42010.txt   | 2 ++
 fastlane/metadata/android/sv-SE/changelogs/42023.txt   | 2 ++
 fastlane/metadata/android/sv-SE/changelogs/42043.txt   | 1 +
 fastlane/metadata/android/sv-SE/changelogs/42061.txt   | 1 +
 fastlane/metadata/android/sv-SE/changelogs/42062.txt   | 1 +
 fastlane/metadata/android/sv-SE/changelogs/42068.txt   | 2 ++
 fastlane/metadata/android/sv-SE/changelogs/4209404.txt | 1 +
 fastlane/metadata/android/sv-SE/changelogs/4210104.txt | 1 +
 fastlane/metadata/android/sv-SE/changelogs/4210704.txt | 3 +++
 fastlane/metadata/android/sv-SE/changelogs/4210804.txt | 2 ++
 fastlane/metadata/android/sv-SE/changelogs/4211304.txt | 1 +
 fastlane/metadata/android/sv-SE/changelogs/4211404.txt | 2 ++
 fastlane/metadata/android/sv-SE/changelogs/4211804.txt | 1 +
 fastlane/metadata/android/sv-SE/changelogs/4212204.txt | 1 +
 fastlane/metadata/android/sv-SE/changelogs/4212404.txt | 2 ++
 fastlane/metadata/android/sv-SE/changelogs/4212504.txt | 1 +
 fastlane/metadata/android/sv-SE/changelogs/4212704.txt | 1 +
 20 files changed, 30 insertions(+)
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/390.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/397.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/404.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/42010.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/42023.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/42043.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/42061.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/42062.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/42068.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/4209404.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/4210104.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/4210704.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/4210804.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/4211304.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/4211404.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/4211804.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/4212204.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/4212404.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/4212504.txt
 create mode 100644 fastlane/metadata/android/sv-SE/changelogs/4212704.txt

diff --git a/fastlane/metadata/android/sv-SE/changelogs/390.txt b/fastlane/metadata/android/sv-SE/changelogs/390.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8f0882eaa7e8b0c1f12e6e12bd35bde7d5429fe5
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/390.txt
@@ -0,0 +1 @@
+* Erbjud att spela in ljudmeddelande när mottagaren av samtalet är upptagen
diff --git a/fastlane/metadata/android/sv-SE/changelogs/397.txt b/fastlane/metadata/android/sv-SE/changelogs/397.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fc9da9de91e30aa3d2b86fa4f29612c8d6d945dd
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/397.txt
@@ -0,0 +1,3 @@
+* Hantera GPX-filer
+* Förbättra prestanda för återställning av säkerhetskopia
+* bugg-fixar
diff --git a/fastlane/metadata/android/sv-SE/changelogs/404.txt b/fastlane/metadata/android/sv-SE/changelogs/404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dd3de07b5aec01b9baca0dc21287ff779b457324
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/404.txt
@@ -0,0 +1 @@
+* mindre stabilitetsförbättringar för A/V-samtal
diff --git a/fastlane/metadata/android/sv-SE/changelogs/42010.txt b/fastlane/metadata/android/sv-SE/changelogs/42010.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1a7fa4133e0dbf64ef982b0f6713cfafd252c4a9
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/42010.txt
@@ -0,0 +1,2 @@
+* Diverse bugg-fixar runt stöd för Tor
+* Förbättra samtalskompabilitet med Dino
diff --git a/fastlane/metadata/android/sv-SE/changelogs/42023.txt b/fastlane/metadata/android/sv-SE/changelogs/42023.txt
new file mode 100644
index 0000000000000000000000000000000000000000..49e8451cfcc2ab9417c50451b60c38d6375f4454
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/42023.txt
@@ -0,0 +1,2 @@
+* Fixade krasch vid rendering av några citat
+* Fixade krasch i välkomstskärmen
diff --git a/fastlane/metadata/android/sv-SE/changelogs/42043.txt b/fastlane/metadata/android/sv-SE/changelogs/42043.txt
new file mode 100644
index 0000000000000000000000000000000000000000..147c7262e0c57ba838f9c408127d3b4f61bdabd4
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/42043.txt
@@ -0,0 +1 @@
+* Fixade återgång med filöverföring via P2P
diff --git a/fastlane/metadata/android/sv-SE/changelogs/42061.txt b/fastlane/metadata/android/sv-SE/changelogs/42061.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9fbbf81e77b2fa17f87473aa2e91831f2ed01b26
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/42061.txt
@@ -0,0 +1 @@
+* Ta bort funktionen för att upptäcka kanaler från Google Play-versionen
diff --git a/fastlane/metadata/android/sv-SE/changelogs/42062.txt b/fastlane/metadata/android/sv-SE/changelogs/42062.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7745cedaf4d065436309b50dff69b75bf7bca35c
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/42062.txt
@@ -0,0 +1 @@
+* Inaktivera öppnandet av säkerhetskopieringsfiler (.ceb) från filhanteraren
diff --git a/fastlane/metadata/android/sv-SE/changelogs/42068.txt b/fastlane/metadata/android/sv-SE/changelogs/42068.txt
new file mode 100644
index 0000000000000000000000000000000000000000..003deb4458450c042fddd42cac3c9110a3c6d9b3
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/42068.txt
@@ -0,0 +1,2 @@
+* stöd för inställningar för meddelanden per konversation
+* använd opus för ljudmeddelanden i Android 10
diff --git a/fastlane/metadata/android/sv-SE/changelogs/4209404.txt b/fastlane/metadata/android/sv-SE/changelogs/4209404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a1a5dbbbb2731754f81b63ef873ecd32f4740bec
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/4209404.txt
@@ -0,0 +1 @@
+* Fixade mindre återgångar som introducerades med 2.13.1
diff --git a/fastlane/metadata/android/sv-SE/changelogs/4210104.txt b/fastlane/metadata/android/sv-SE/changelogs/4210104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..70cb22a2ee63de867ea30352dd1b9602296ea868
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/4210104.txt
@@ -0,0 +1 @@
+* Förbättra integrationen av A/V-samtal i operativsystemet
diff --git a/fastlane/metadata/android/sv-SE/changelogs/4210704.txt b/fastlane/metadata/android/sv-SE/changelogs/4210704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5c540aadbda65059adfc2aa98cddb13783ea8522
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/4210704.txt
@@ -0,0 +1,3 @@
+* Använd temat Material 3
+* Omorganisera inställningar
+* Synkronisera läs-status mellan enheter
diff --git a/fastlane/metadata/android/sv-SE/changelogs/4210804.txt b/fastlane/metadata/android/sv-SE/changelogs/4210804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..70eb6e2b2676521327f9798e04a64d0b38b63a83
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/4210804.txt
@@ -0,0 +1,2 @@
+* Visa meddelandestatus som ikoner
+* Introducera inställningen 'Stort typsnitt' för meddelandebubblor
diff --git a/fastlane/metadata/android/sv-SE/changelogs/4211304.txt b/fastlane/metadata/android/sv-SE/changelogs/4211304.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b6af679a13ee18beb1d67e5b90094762a7b3ef01
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/4211304.txt
@@ -0,0 +1 @@
+* Kör säkerhetskopiering som en förgrundstjänst för att förhindra processer stoppas efter 10 minuter
diff --git a/fastlane/metadata/android/sv-SE/changelogs/4211404.txt b/fastlane/metadata/android/sv-SE/changelogs/4211404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..37e23821a097fc515cbee769b5b324b7e1f1d2a2
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/4211404.txt
@@ -0,0 +1,2 @@
+* exkludera äldre Oppo-enheter från samtalsintegrering
+* diverse bugg-fixar
diff --git a/fastlane/metadata/android/sv-SE/changelogs/4211804.txt b/fastlane/metadata/android/sv-SE/changelogs/4211804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..3d130ecbc35a16a0c2c2426cebb34f7b74dd2b67
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/4211804.txt
@@ -0,0 +1 @@
+* Lägg till en tidsgräns för att påbörja samtalet
diff --git a/fastlane/metadata/android/sv-SE/changelogs/4212204.txt b/fastlane/metadata/android/sv-SE/changelogs/4212204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..39b1bfb0fc305e4504fa9d5349f2b0b39515447d
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/4212204.txt
@@ -0,0 +1 @@
+* Fixade en störning i det grafiska gränssnittet när flertalet reaktioner visas
diff --git a/fastlane/metadata/android/sv-SE/changelogs/4212404.txt b/fastlane/metadata/android/sv-SE/changelogs/4212404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..925c7c03345a131968a17c970435619fd66da02e
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/4212404.txt
@@ -0,0 +1,2 @@
+* Visa alltid samtalsknapp
+* Diverse bugg-fixar
diff --git a/fastlane/metadata/android/sv-SE/changelogs/4212504.txt b/fastlane/metadata/android/sv-SE/changelogs/4212504.txt
new file mode 100644
index 0000000000000000000000000000000000000000..403a4f07f8a37e747e7d2392d08e1bcbb513b5af
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/4212504.txt
@@ -0,0 +1 @@
+* förbättra hantering av en del emoji-reaktioner
diff --git a/fastlane/metadata/android/sv-SE/changelogs/4212704.txt b/fastlane/metadata/android/sv-SE/changelogs/4212704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1269ecd58716e8f2c98ac1e6129f0812d6100a2b
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/4212704.txt
@@ -0,0 +1 @@
+* Lägg till förmåga att visa vänster-justerade meddelande-bubblor

From 2cca34ab94baa97d8820ae83a3977d0e7a068c21 Mon Sep 17 00:00:00 2001
From: jumase <jumase@users.noreply.translate.codeberg.org>
Date: Sun, 22 Dec 2024 22:12:34 +0000
Subject: [PATCH 257/357] Translated using Weblate (Spanish)

Currently translated at 97.4% (76 of 78 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/es/
---
 fastlane/metadata/android/es-ES/changelogs/4212404.txt | 2 ++
 fastlane/metadata/android/es-ES/changelogs/4212504.txt | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/es-ES/changelogs/4212404.txt
 create mode 100644 fastlane/metadata/android/es-ES/changelogs/4212504.txt

diff --git a/fastlane/metadata/android/es-ES/changelogs/4212404.txt b/fastlane/metadata/android/es-ES/changelogs/4212404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1b555cccb22f84fe289a674e200c8529a05262f6
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/4212404.txt
@@ -0,0 +1,2 @@
+* Mostrar siempre el botón de llamada
+* Correcciones de errores varios
diff --git a/fastlane/metadata/android/es-ES/changelogs/4212504.txt b/fastlane/metadata/android/es-ES/changelogs/4212504.txt
new file mode 100644
index 0000000000000000000000000000000000000000..310442197e313e061937ec589647a5009b5f39d7
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/4212504.txt
@@ -0,0 +1 @@
+* mejorar el manejo de algunas reacciones con emojis

From 2c44ad7e812d17ca72fe4c3cd93d8be0686aa2f1 Mon Sep 17 00:00:00 2001
From: jumase <jumase@users.noreply.translate.codeberg.org>
Date: Sun, 22 Dec 2024 22:42:44 +0000
Subject: [PATCH 258/357] Translated using Weblate (Spanish)

Currently translated at 99.5% (1051 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/es/
---
 src/main/res/values-es/strings.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index ad6406713504fc954a78691acc5040751604d4e0..27733286220d81d67e3650ca5f2bb299d4c6aaf9 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -1107,4 +1107,12 @@
     <string name="could_not_add_reaction">No se pudo agregar la reacción</string>
     <string name="add_reaction">Agregar reacción…</string>
     <string name="add_reaction_title">Agregar reacción</string>
+    <string name="clients_may_not_support_av">El cliente XMPP de tu contacto puede que no soporte llamadas de audio/video.</string>
+    <string name="could_not_modify_call">No se pudo modificar la llamada</string>
+    <string name="pref_chat_bubbles">Burbujas de chat</string>
+    <string name="pref_chat_bubbles_summary">Color, Tamaño de fuente, Imágenes de perfil</string>
+    <string name="pref_title_bubbles">Burbujas de Chat</string>
+    <string name="pref_call_integration">Integración de llamadas</string>
+    <string name="pref_show_avatars">Ver imágenes de perfil</string>
+    <string name="pref_show_avatars_summary">Mostrar imágenes de perfil para tus mensajes y conversaciones 1:1, aparte de las conversaciones en grupo.</string>
 </resources>
\ No newline at end of file

From 929151ff11ff988d6e39ebc3a0bfa90038043c2e Mon Sep 17 00:00:00 2001
From: jumase <jumase@users.noreply.translate.codeberg.org>
Date: Sun, 22 Dec 2024 22:39:14 +0000
Subject: [PATCH 259/357] Translated using Weblate (Spanish)

Currently translated at 100.0% (78 of 78 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/es/
---
 fastlane/metadata/android/es-ES/changelogs/4212604.txt | 2 ++
 fastlane/metadata/android/es-ES/changelogs/4212704.txt | 1 +
 2 files changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/es-ES/changelogs/4212604.txt
 create mode 100644 fastlane/metadata/android/es-ES/changelogs/4212704.txt

diff --git a/fastlane/metadata/android/es-ES/changelogs/4212604.txt b/fastlane/metadata/android/es-ES/changelogs/4212604.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fe1ca6a77a686167f15867451b41e1c4a4f78bdd
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/4212604.txt
@@ -0,0 +1,2 @@
+* Acercar burbujas de chat en vez de combinarlas en una sola
+* Posibilidad de ocultar imágenes de perfil cuando no es estrictamente necesario (Ajustes -> Interfaz -> Burbujas de chat -> Ver imágenes de perfil)
diff --git a/fastlane/metadata/android/es-ES/changelogs/4212704.txt b/fastlane/metadata/android/es-ES/changelogs/4212704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f72fc661ba183a400c5c62a46feaff59e0933ea9
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/4212704.txt
@@ -0,0 +1 @@
+* Posibilidad de alinear burbujas de mensaje sobre el margen izquierdo

From 0c152a74ba83f168f5035fb6d7b220152573041f Mon Sep 17 00:00:00 2001
From: jumase <jumase@users.noreply.translate.codeberg.org>
Date: Sun, 22 Dec 2024 23:13:25 +0000
Subject: [PATCH 260/357] Translated using Weblate (Spanish)

Currently translated at 99.6% (1052 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/es/
---
 src/main/res/values-es/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 27733286220d81d67e3650ca5f2bb299d4c6aaf9..c832e367ff527785ec1d6e271e4610fff88405ab 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -1115,4 +1115,5 @@
     <string name="pref_call_integration">Integración de llamadas</string>
     <string name="pref_show_avatars">Ver imágenes de perfil</string>
     <string name="pref_show_avatars_summary">Mostrar imágenes de perfil para tus mensajes y conversaciones 1:1, aparte de las conversaciones en grupo.</string>
+    <string name="pref_call_integration_summary">Las llamadas desde esta app interactúan con las llamadas telefónicas regulares, como ser finalizar una llamada cuando recibimos otra.</string>
 </resources>
\ No newline at end of file

From b3ba1e6232daee215d26e3f1bcbe4be0b5303cbf Mon Sep 17 00:00:00 2001
From: jumase <jumase@users.noreply.translate.codeberg.org>
Date: Mon, 23 Dec 2024 00:04:48 +0000
Subject: [PATCH 261/357] Translated using Weblate (Spanish)

Currently translated at 100.0% (1056 of 1056 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/es/
---
 src/main/res/values-es/strings.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index c832e367ff527785ec1d6e271e4610fff88405ab..451bd879a6b89bee2a63acfc95125e6235134215 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -853,7 +853,7 @@
     <string name="unable_to_set_channel_configuration">No se ha podido guardar la configuración del canal</string>
     <string name="allow_participants_to_edit_subject">Permitir a cualquiera editar el asunto</string>
     <string name="allow_participants_to_invite_others">Permitir a cualquiera invitar a otros contactos</string>
-    <string name="anyone_can_edit_subject">Cualquiera puede editar el tema.</string>
+    <string name="anyone_can_edit_subject">Cualquiera puede editar el asunto.</string>
     <string name="owners_can_edit_subject">Los propietarios pueden editar el asunto.</string>
     <string name="admins_can_edit_subject">Los administradores pueden editar el asunto.</string>
     <string name="owners_can_invite_others">Los propietarios pueden invitar a otros contactos.</string>
@@ -1116,4 +1116,8 @@
     <string name="pref_show_avatars">Ver imágenes de perfil</string>
     <string name="pref_show_avatars_summary">Mostrar imágenes de perfil para tus mensajes y conversaciones 1:1, aparte de las conversaciones en grupo.</string>
     <string name="pref_call_integration_summary">Las llamadas desde esta app interactúan con las llamadas telefónicas regulares, como ser finalizar una llamada cuando recibimos otra.</string>
+    <string name="pref_align_start">Mensajes alineados a la izquierda</string>
+    <string name="pref_align_start_summary">Mostrar todos los mensajes, incluso los propios, sobre el margen izquierdo para una distribución uniforme del chat.</string>
+    <string name="custom_notifications">Notificaciones personalizadas</string>
+    <string name="custom_notifications_enable">¿Habilitar los ajustes de notificaciones personalizadas (importancia, sonido, vibración) para esta conversación?</string>
 </resources>
\ No newline at end of file

From a03b96b94b5c414f13e1040734e8885197df8d8e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 23 Dec 2024 10:21:31 +0100
Subject: [PATCH 262/357] add todo

---
 .../java/eu/siacs/conversations/xmpp/XmppConnection.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 5762736cb591fc5d725f3d619db321b7d975d7a9..bd96bb96ce58c282ab30099699568759b03b935f 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -1595,6 +1595,11 @@ public class XmppConnection implements Runnable {
                 hashTokenRequest =
                         HashedToken.Mechanism.best(
                                 inline.getFastMechanisms(), SSLSockets.version(this.socket));
+                // TODO warn or fail early if channel binding priority isn’t high enough compared to
+                // login mechanism
+                // ChannelBinding.priority(hashTokenRequest.channelBinding)
+                //                        <
+                // ChannelBindingMechanism.getPriority(saslMechanism)
             } else {
                 hashTokenRequest = null;
             }

From d0397114c1d38c060218a9220e69ee7287e8b5b8 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 23 Dec 2024 17:24:03 +0100
Subject: [PATCH 263/357] add option to restrict avatar access model to
 contacts

---
 .../services/XmppConnectionService.java       |  65 +++---
 .../ui/PublishProfilePictureActivity.java     | 207 ++++++++++--------
 .../xmpp/pep/PublishOptions.java              |  18 +-
 .../activity_publish_profile_picture.xml      |  36 +--
 src/main/res/values/strings.xml               |   2 +
 5 files changed, 192 insertions(+), 136 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 81e6b361da6e50a7f938174117b5033b3c795079..2762f29e0aa0f03156538108d075ed4a1971d9d1 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -4678,28 +4678,32 @@ public class XmppConnectionService extends Service {
                 .start();
     }
 
-    public void publishAvatar(
-            final Account account, final Uri image, final OnAvatarPublication callback) {
-        new Thread(
-                        () -> {
-                            final Bitmap.CompressFormat format = Config.AVATAR_FORMAT;
-                            final int size = Config.AVATAR_SIZE;
-                            final Avatar avatar =
-                                    getFileBackend().getPepAvatar(image, size, format);
-                            if (avatar != null) {
-                                if (!getFileBackend().save(avatar)) {
-                                    Log.d(Config.LOGTAG, "unable to save vcard");
-                                    callback.onAvatarPublicationFailed(
-                                            R.string.error_saving_avatar);
-                                    return;
-                                }
-                                publishAvatar(account, avatar, callback);
-                            } else {
-                                callback.onAvatarPublicationFailed(
-                                        R.string.error_publish_avatar_converting);
-                            }
-                        })
-                .start();
+    public void publishAvatarAsync(
+            final Account account,
+            final Uri image,
+            final boolean open,
+            final OnAvatarPublication callback) {
+        new Thread(() -> publishAvatar(account, image, open, callback)).start();
+    }
+
+    private void publishAvatar(
+            final Account account,
+            final Uri image,
+            final boolean open,
+            final OnAvatarPublication callback) {
+        final Bitmap.CompressFormat format = Config.AVATAR_FORMAT;
+        final int size = Config.AVATAR_SIZE;
+        final Avatar avatar = getFileBackend().getPepAvatar(image, size, format);
+        if (avatar != null) {
+            if (!getFileBackend().save(avatar)) {
+                Log.d(Config.LOGTAG, "unable to save vcard");
+                callback.onAvatarPublicationFailed(R.string.error_saving_avatar);
+                return;
+            }
+            publishAvatar(account, avatar, open, callback);
+        } else {
+            callback.onAvatarPublicationFailed(R.string.error_publish_avatar_converting);
+        }
     }
 
     private void publishMucAvatar(
@@ -4753,10 +4757,13 @@ public class XmppConnectionService extends Service {
     }
 
     public void publishAvatar(
-            Account account, final Avatar avatar, final OnAvatarPublication callback) {
+            final Account account,
+            final Avatar avatar,
+            final boolean open,
+            final OnAvatarPublication callback) {
         final Bundle options;
         if (account.getXmppConnection().getFeatures().pepPublishOptions()) {
-            options = PublishOptions.openAccess();
+            options = open ? PublishOptions.openAccess() : PublishOptions.presenceAccess();
         } else {
             options = null;
         }
@@ -4886,7 +4893,7 @@ public class XmppConnectionService extends Service {
                 });
     }
 
-    public void republishAvatarIfNeeded(Account account) {
+    public void republishAvatarIfNeeded(final Account account) {
         if (account.getAxolotlService().isPepBroken()) {
             Log.d(
                     Config.LOGTAG,
@@ -4922,17 +4929,21 @@ public class XmppConnectionService extends Service {
                     @Override
                     public void accept(final Iq packet) {
                         if (packet.getType() == Iq.Type.RESULT || errorIsItemNotFound(packet)) {
-                            Avatar serverAvatar = parseAvatar(packet);
+                            final Avatar serverAvatar = parseAvatar(packet);
                             if (serverAvatar == null && account.getAvatar() != null) {
-                                Avatar avatar = fileBackend.getStoredPepAvatar(account.getAvatar());
+                                final Avatar avatar =
+                                        fileBackend.getStoredPepAvatar(account.getAvatar());
                                 if (avatar != null) {
                                     Log.d(
                                             Config.LOGTAG,
                                             account.getJid().asBareJid()
                                                     + ": avatar on server was null. republishing");
+                                    // publishing as 'open' - old server (that requires
+                                    // republication) likely doesn't support access models anyway
                                     publishAvatar(
                                             account,
                                             fileBackend.getStoredPepAvatar(account.getAvatar()),
+                                            true,
                                             null);
                                 } else {
                                     Log.e(
diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
index 2c972734cf3c87b1cbf0358bc6594b5743674b76..dafbbabfc5564c94cdeb9c15d013726900b5b70f 100644
--- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
@@ -11,19 +11,12 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnLongClickListener;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
 import android.widget.Toast;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.databinding.DataBindingUtil;
-
 import com.canhub.cropper.CropImage;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.databinding.ActivityPublishProfilePictureBinding;
@@ -31,83 +24,89 @@ import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.ui.interfaces.OnAvatarPublication;
 import eu.siacs.conversations.utils.PhoneHelper;
+import java.util.concurrent.atomic.AtomicBoolean;
 
-public class PublishProfilePictureActivity extends XmppActivity implements XmppConnectionService.OnAccountUpdate, OnAvatarPublication {
+public class PublishProfilePictureActivity extends XmppActivity
+        implements XmppConnectionService.OnAccountUpdate, OnAvatarPublication {
 
     public static final int REQUEST_CHOOSE_PICTURE = 0x1337;
 
-    private ImageView avatar;
-    private TextView hintOrWarning;
-    private TextView secondaryHint;
-    private Button cancelButton;
-    private Button publishButton;
+    private ActivityPublishProfilePictureBinding binding;
     private Uri avatarUri;
     private Uri defaultUri;
     private Account account;
     private boolean support = false;
     private boolean publishing = false;
     private final AtomicBoolean handledExternalUri = new AtomicBoolean(false);
-    private final OnLongClickListener backToDefaultListener = new OnLongClickListener() {
-
-        @Override
-        public boolean onLongClick(View v) {
-            avatarUri = defaultUri;
-            loadImageIntoPreview(defaultUri);
-            return true;
-        }
-    };
+    private final OnLongClickListener backToDefaultListener =
+            new OnLongClickListener() {
+
+                @Override
+                public boolean onLongClick(View v) {
+                    avatarUri = defaultUri;
+                    loadImageIntoPreview(defaultUri);
+                    return true;
+                }
+            };
     private boolean mInitialAccountSetup;
 
     @Override
     public void onAvatarPublicationSucceeded() {
-        runOnUiThread(() -> {
-            if (mInitialAccountSetup) {
-                Intent intent = new Intent(getApplicationContext(), StartConversationActivity.class);
-                StartConversationActivity.addInviteUri(intent, getIntent());
-                intent.putExtra("init", true);
-                intent.putExtra(EXTRA_ACCOUNT, account.getJid().asBareJid().toEscapedString());
-                startActivity(intent);
-            }
-            Toast.makeText(PublishProfilePictureActivity.this,
-                    R.string.avatar_has_been_published,
-                    Toast.LENGTH_SHORT).show();
-            finish();
-        });
+        runOnUiThread(
+                () -> {
+                    if (mInitialAccountSetup) {
+                        Intent intent =
+                                new Intent(
+                                        getApplicationContext(), StartConversationActivity.class);
+                        StartConversationActivity.addInviteUri(intent, getIntent());
+                        intent.putExtra("init", true);
+                        intent.putExtra(
+                                EXTRA_ACCOUNT, account.getJid().asBareJid().toEscapedString());
+                        startActivity(intent);
+                    }
+                    Toast.makeText(
+                                    PublishProfilePictureActivity.this,
+                                    R.string.avatar_has_been_published,
+                                    Toast.LENGTH_SHORT)
+                            .show();
+                    finish();
+                });
     }
 
     @Override
-    public void onAvatarPublicationFailed(int res) {
-        runOnUiThread(() -> {
-            hintOrWarning.setText(res);
-            hintOrWarning.setVisibility(View.VISIBLE);
-            publishing = false;
-            togglePublishButton(true, R.string.publish);
-        });
+    public void onAvatarPublicationFailed(final int res) {
+        runOnUiThread(
+                () -> {
+                    this.binding.hintOrWarning.setText(res);
+                    this.binding.hintOrWarning.setVisibility(View.VISIBLE);
+                    this.publishing = false;
+                    togglePublishButton(true, R.string.publish);
+                });
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        ActivityPublishProfilePictureBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_publish_profile_picture);
+        this.binding =
+                DataBindingUtil.setContentView(this, R.layout.activity_publish_profile_picture);
 
         setSupportActionBar(binding.toolbar);
 
         Activities.setStatusAndNavigationBarColors(this, binding.getRoot());
 
-        this.avatar = findViewById(R.id.account_image);
-        this.cancelButton = findViewById(R.id.cancel_button);
-        this.publishButton = findViewById(R.id.publish_button);
-        this.hintOrWarning = findViewById(R.id.hint_or_warning);
-        this.secondaryHint = findViewById(R.id.secondary_hint);
-        this.publishButton.setOnClickListener(v -> {
-            if (avatarUri != null) {
-                publishing = true;
-                togglePublishButton(false, R.string.publishing);
-                xmppConnectionService.publishAvatar(account, avatarUri, this);
-            }
-        });
-        this.cancelButton.setOnClickListener(
+        this.binding.publishButton.setOnClickListener(
+                v -> {
+                    final boolean open = !this.binding.contactOnly.isChecked();
+                    final var uri = this.avatarUri;
+                    if (uri == null) {
+                        return;
+                    }
+                    publishing = true;
+                    togglePublishButton(false, R.string.publishing);
+                    xmppConnectionService.publishAvatarAsync(account, uri, open, this);
+                });
+        this.binding.cancelButton.setOnClickListener(
                 v -> {
                     if (mInitialAccountSetup) {
                         final Intent intent =
@@ -126,11 +125,12 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC
                     }
                     finish();
                 });
-        this.avatar.setOnClickListener(v -> chooseAvatar(this));
+        this.binding.accountImage.setOnClickListener(v -> chooseAvatar(this));
         this.defaultUri = PhoneHelper.getProfilePictureUri(getApplicationContext());
         if (savedInstanceState != null) {
             this.avatarUri = savedInstanceState.getParcelable("uri");
-            this.handledExternalUri.set(savedInstanceState.getBoolean("handle_external_uri",false));
+            this.handledExternalUri.set(
+                    savedInstanceState.getBoolean("handle_external_uri", false));
         }
     }
 
@@ -143,8 +143,8 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC
     @Override
     public boolean onOptionsItemSelected(final MenuItem item) {
         if (item.getItemId() == R.id.action_delete_avatar) {
-            if (xmppConnectionService != null && account != null) {
-                xmppConnectionService.deleteAvatar(account);
+            if (account != null) {
+                deleteAvatar(account);
             }
             return true;
         } else {
@@ -152,6 +152,22 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC
         }
     }
 
+    private void deleteAvatar(final Account account) {
+        new MaterialAlertDialogBuilder(this)
+                .setTitle(R.string.delete_avatar)
+                .setMessage(R.string.delete_avatar_message)
+                .setNegativeButton(R.string.cancel, null)
+                .setPositiveButton(
+                        R.string.confirm,
+                        (d, v) -> {
+                            if (xmppConnectionService != null) {
+                                xmppConnectionService.deleteAvatar(account);
+                            }
+                        })
+                .create()
+                .show();
+    }
+
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
         if (this.avatarUri != null) {
@@ -161,7 +177,6 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC
         super.onSaveInstanceState(outState);
     }
 
-
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -190,9 +205,9 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC
             final Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
             intent.setType("image/*");
             activity.startActivityForResult(
-                    Intent.createChooser(intent, activity.getString(R.string.attach_choose_picture)),
-                    REQUEST_CHOOSE_PICTURE
-            );
+                    Intent.createChooser(
+                            intent, activity.getString(R.string.attach_choose_picture)),
+                    REQUEST_CHOOSE_PICTURE);
         } else {
             CropImage.activity()
                     .setOutputCompressFormat(Bitmap.CompressFormat.PNG)
@@ -211,7 +226,9 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC
     }
 
     private void reloadAvatar() {
-        this.support = this.account.getXmppConnection() != null && this.account.getXmppConnection().getFeatures().pep();
+        this.support =
+                this.account.getXmppConnection() != null
+                        && this.account.getXmppConnection().getFeatures().pep();
         if (this.avatarUri == null) {
             if (this.account.getAvatar() != null || this.defaultUri == null) {
                 loadImageIntoPreview(null);
@@ -232,69 +249,82 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC
 
         final Uri uri = intent != null ? intent.getData() : null;
 
-        if (uri != null && handledExternalUri.compareAndSet(false,true)) {
+        if (uri != null && handledExternalUri.compareAndSet(false, true)) {
             cropUri(this, uri);
             return;
         }
 
         if (this.mInitialAccountSetup) {
-            this.cancelButton.setText(R.string.skip);
+            this.binding.cancelButton.setText(R.string.skip);
         }
-        configureActionBar(getSupportActionBar(), !this.mInitialAccountSetup && !handledExternalUri.get());
+        configureActionBar(
+                getSupportActionBar(), !this.mInitialAccountSetup && !handledExternalUri.get());
     }
 
     public static void cropUri(final Activity activity, final Uri uri) {
-        CropImage.activity(uri).setOutputCompressFormat(Bitmap.CompressFormat.PNG)
+        CropImage.activity(uri)
+                .setOutputCompressFormat(Bitmap.CompressFormat.PNG)
                 .setAspectRatio(1, 1)
                 .setMinCropResultSize(Config.AVATAR_SIZE, Config.AVATAR_SIZE)
                 .start(activity);
     }
 
-    protected void loadImageIntoPreview(Uri uri) {
+    protected void loadImageIntoPreview(final Uri uri) {
 
         Bitmap bm = null;
         if (uri == null) {
-            bm = avatarService().get(account, (int) getResources().getDimension(R.dimen.publish_avatar_size));
+            bm =
+                    avatarService()
+                            .get(
+                                    account,
+                                    (int) getResources().getDimension(R.dimen.publish_avatar_size));
         } else {
             try {
-                bm = xmppConnectionService.getFileBackend().cropCenterSquare(uri, (int) getResources().getDimension(R.dimen.publish_avatar_size));
-            } catch (Exception e) {
+                bm =
+                        xmppConnectionService
+                                .getFileBackend()
+                                .cropCenterSquare(
+                                        uri,
+                                        (int)
+                                                getResources()
+                                                        .getDimension(R.dimen.publish_avatar_size));
+            } catch (final Exception e) {
                 Log.d(Config.LOGTAG, "unable to load bitmap into image view", e);
             }
         }
 
         if (bm == null) {
             togglePublishButton(false, R.string.publish);
-            this.hintOrWarning.setVisibility(View.VISIBLE);
-            this.hintOrWarning.setText(R.string.error_publish_avatar_converting);
+            this.binding.hintOrWarning.setVisibility(View.VISIBLE);
+            this.binding.hintOrWarning.setText(R.string.error_publish_avatar_converting);
             return;
         }
-        this.avatar.setImageBitmap(bm);
+        this.binding.accountImage.setImageBitmap(bm);
         if (support) {
             togglePublishButton(uri != null, R.string.publish);
-            this.hintOrWarning.setVisibility(View.INVISIBLE);
+            this.binding.hintOrWarning.setVisibility(View.INVISIBLE);
         } else {
             togglePublishButton(false, R.string.publish);
-            this.hintOrWarning.setVisibility(View.VISIBLE);
+            this.binding.hintOrWarning.setVisibility(View.VISIBLE);
             if (account.getStatus() == Account.State.ONLINE) {
-                this.hintOrWarning.setText(R.string.error_publish_avatar_no_server_support);
+                this.binding.hintOrWarning.setText(R.string.error_publish_avatar_no_server_support);
             } else {
-                this.hintOrWarning.setText(R.string.error_publish_avatar_offline);
+                this.binding.hintOrWarning.setText(R.string.error_publish_avatar_offline);
             }
         }
         if (this.defaultUri == null || this.defaultUri.equals(uri)) {
-            this.secondaryHint.setVisibility(View.INVISIBLE);
-            this.avatar.setOnLongClickListener(null);
+            this.binding.secondaryHint.setVisibility(View.INVISIBLE);
+            this.binding.accountImage.setOnLongClickListener(null);
         } else if (this.defaultUri != null) {
-            this.secondaryHint.setVisibility(View.VISIBLE);
-            this.avatar.setOnLongClickListener(this.backToDefaultListener);
+            this.binding.secondaryHint.setVisibility(View.VISIBLE);
+            this.binding.accountImage.setOnLongClickListener(this.backToDefaultListener);
         }
     }
 
     protected void togglePublishButton(boolean enabled, @StringRes int res) {
         final boolean status = enabled && !publishing;
-        this.publishButton.setText(publishing ? R.string.publishing : res);
-        this.publishButton.setEnabled(status);
+        this.binding.publishButton.setText(publishing ? R.string.publishing : res);
+        this.binding.publishButton.setEnabled(status);
     }
 
     public void refreshUiReal() {
@@ -307,5 +337,4 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC
     public void onAccountUpdate() {
         refreshUi();
     }
-
 }
diff --git a/src/main/java/eu/siacs/conversations/xmpp/pep/PublishOptions.java b/src/main/java/eu/siacs/conversations/xmpp/pep/PublishOptions.java
index ee3770ead9f3a56322ba8fd62c4660b7f954b701..c9b764752d3bbea3225ffa4b67bb1a3a75b31730 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/pep/PublishOptions.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/pep/PublishOptions.java
@@ -1,16 +1,13 @@
 package eu.siacs.conversations.xmpp.pep;
 
 import android.os.Bundle;
-
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xml.Namespace;
 import im.conversations.android.xmpp.model.stanza.Iq;
 
 public class PublishOptions {
 
-    private PublishOptions() {
-
-    }
+    private PublishOptions() {}
 
     public static Bundle openAccess() {
         final Bundle options = new Bundle();
@@ -18,6 +15,12 @@ public class PublishOptions {
         return options;
     }
 
+    public static Bundle presenceAccess() {
+        final Bundle options = new Bundle();
+        options.putString("pubsub#access_model", "presence");
+        return options;
+    }
+
     public static Bundle persistentWhitelistAccess() {
         final Bundle options = new Bundle();
         options.putString("pubsub#persist_items", "true");
@@ -32,14 +35,15 @@ public class PublishOptions {
         options.putString("pubsub#send_last_published_item", "never");
         options.putString("pubsub#max_items", "max");
         options.putString("pubsub#notify_delete", "true");
-        options.putString("pubsub#notify_retract", "true"); //one could also set notify=true on the retract
+        options.putString(
+                "pubsub#notify_retract", "true"); // one could also set notify=true on the retract
 
         return options;
     }
 
     public static boolean preconditionNotMet(Iq response) {
-        final Element error = response.getType() == Iq.Type.ERROR ? response.findChild("error") : null;
+        final Element error =
+                response.getType() == Iq.Type.ERROR ? response.findChild("error") : null;
         return error != null && error.hasChild("precondition-not-met", Namespace.PUBSUB_ERROR);
     }
-
 }
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 0eb4dd516ca6e8af33a5682fe388476650859e1e..6516e432ce4a9ddd1c3e87f1d124da04a2dea662 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -19,18 +20,19 @@
         </com.google.android.material.appbar.AppBarLayout>
 
 
-        <LinearLayout
-            android:layout_width="fill_parent"
+        <ScrollView
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/app_bar_layout"
-            android:layout_marginLeft="@dimen/activity_horizontal_margin"
-            android:layout_marginTop="@dimen/activity_vertical_margin"
-            android:layout_marginRight="@dimen/activity_horizontal_margin"
-            android:layout_marginBottom="@dimen/activity_vertical_margin">
+            android:layout_above="@+id/button_bar"
+            android:layout_below="@id/app_bar_layout">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:layout_marginRight="@dimen/activity_horizontal_margin"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:gravity="center_horizontal"
                 android:orientation="vertical">
 
@@ -63,17 +65,25 @@
                     android:text="@string/or_long_press_for_default"
                     android:textAppearance="?textAppearanceBodyMedium" />
 
+                <com.google.android.material.materialswitch.MaterialSwitch
+                    android:id="@+id/contact_only"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginVertical="12dp"
+                    android:text="@string/show_to_contacts_only" />
+
                 <TextView
                     android:id="@+id/hint_or_warning"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp"
+                    android:layout_marginVertical="12dp"
                     android:textAppearance="?textAppearanceBodyMedium"
-                    android:textColor="?colorError" />
-
+                    android:textColor="?colorError"
+                    tools:text="@string/error_saving_avatar" />
             </LinearLayout>
-        </LinearLayout>
+
+
+        </ScrollView>
 
         <RelativeLayout
             android:id="@+id/button_bar"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 5a46d0910681036a3e51d2291aab44719ce272fa..f38d7cae16c34bad868b4acc2c94bfca44c19ee8 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1099,4 +1099,6 @@
     <string name="pref_align_start_summary">Display all messages, including sent ones, on the left side for a uniform chat layout.</string>
     <string name="custom_notifications">Custom notifications</string>
     <string name="custom_notifications_enable">Enable customized notification settings (importance, sound, vibration) settings for this conversation?</string>
+    <string name="delete_avatar_message">Would you like to delete your avatar? Some clients might continue to display a cached copy of your avatar.</string>
+    <string name="show_to_contacts_only">Show to contacts only</string>
 </resources>

From 4c0919d26bb445b2532c8a4060b5b36f4970ee07 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 24 Dec 2024 11:21:13 +0100
Subject: [PATCH 264/357] trim hostname before connecting via tor

---
 .../siacs/conversations/entities/Account.java | 33 +++++++++----------
 .../conversations/xmpp/XmppConnection.java    | 23 +++++--------
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index 3146abe466d1b27bf525c2584f7c87cf6bfab64f..b667428e0b72657a696eacb9d4a4edf049ed2f9f 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -4,22 +4,9 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.os.SystemClock;
 import android.util.Log;
-
+import androidx.annotation.NonNull;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
-
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.PgpDecryptionService;
@@ -38,6 +25,16 @@ import eu.siacs.conversations.utils.XmppUri;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.XmppConnection;
 import eu.siacs.conversations.xmpp.jingle.RtpCapability;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public class Account extends AbstractEntity implements AvatarService.Avatarable {
 
@@ -306,11 +303,12 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
         this.password = password;
     }
 
+    @NonNull
     public String getHostname() {
         return Strings.nullToEmpty(this.hostname);
     }
 
-    public void setHostname(String hostname) {
+    public void setHostname(final String hostname) {
         this.hostname = hostname;
     }
 
@@ -398,7 +396,8 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public HashedToken getFastMechanism() {
-        final HashedToken.Mechanism fastMechanism = HashedToken.Mechanism.ofOrNull(this.fastMechanism);
+        final HashedToken.Mechanism fastMechanism =
+                HashedToken.Mechanism.ofOrNull(this.fastMechanism);
         final String token = this.fastToken;
         if (fastMechanism == null || Strings.isNullOrEmpty(token)) {
             return null;
@@ -775,7 +774,7 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
 
     public enum State {
         DISABLED(false, false),
-        LOGGED_OUT(false,false),
+        LOGGED_OUT(false, false),
         OFFLINE(false),
         CONNECTING(false),
         ONLINE(false),
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index bd96bb96ce58c282ab30099699568759b03b935f..8c6cc0e800587251bfb55d9bfbcd4acad7565d67 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -303,6 +303,7 @@ public class XmppConnection implements Runnable {
             // TODO collapse Tor usage into normal connection code path
             if (useTor) {
                 final var seeOtherHost = this.seeOtherHostResolverResult;
+                final var hostname = account.getHostname();
                 final Resolver.Result resume = streamId == null ? null : streamId.location;
                 final Resolver.Result viaTor;
                 if (account.isOnion()) {
@@ -315,7 +316,7 @@ public class XmppConnection implements Runnable {
                     viaTor = resume;
                 } else if (seeOtherHost != null) {
                     viaTor = seeOtherHost;
-                } else if (account.getHostname().isEmpty()) {
+                } else if (hostname.isEmpty()) {
                     viaTor =
                             Iterables.getOnlyElement(
                                     Resolver.fromHardCoded(
@@ -323,18 +324,12 @@ public class XmppConnection implements Runnable {
                 } else {
                     viaTor =
                             Iterables.getOnlyElement(
-                                    Resolver.fromHardCoded(
-                                            account.getHostname(), account.getPort()));
-                    this.verifiedHostname = account.getHostname();
+                                    Resolver.fromHardCoded(hostname, account.getPort()));
+                    this.verifiedHostname = hostname;
                 }
 
-                Log.d(
-                        Config.LOGTAG,
-                        account.getJid().asBareJid()
-                                + ": connect to "
-                                + viaTor.asDestination()
-                                + " via Tor. directTls="
-                                + viaTor.isDirectTls());
+                Log.d(Config.LOGTAG, account.getJid().asBareJid() + " via Tor: " + viaTor);
+
                 localSocket =
                         SocksSocketFactory.createSocketOverTor(
                                 viaTor.asDestination(), viaTor.getPort());
@@ -359,12 +354,12 @@ public class XmppConnection implements Runnable {
                     throw new IOException("Could not start stream", e);
                 }
             } else {
+                final var hostname = account.getHostname().trim();
                 final String domain = account.getServer();
                 final List<Resolver.Result> results = new ArrayList<>();
-                final boolean hardcoded = extended && !account.getHostname().isEmpty();
+                final boolean hardcoded = extended && !hostname.isEmpty();
                 if (hardcoded) {
-                    results.addAll(
-                            Resolver.fromHardCoded(account.getHostname(), account.getPort()));
+                    results.addAll(Resolver.fromHardCoded(hostname, account.getPort()));
                 } else {
                     results.addAll(Resolver.resolve(domain));
                 }

From d2dfad51123de8575d10fcf276f186c5cf277262 Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Tue, 24 Dec 2024 04:59:54 +0000
Subject: [PATCH 265/357] Translated using Weblate (Galician)

Currently translated at 100.0% (1058 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/gl/
---
 src/main/res/values-gl/strings.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 4273f98c24acda90d074fcb0aa250828816261fc..9f1b0fd9d2704028cc0cf18cc3fc12b85d5a0ae2 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -92,7 +92,7 @@
     <string name="send_unencrypted">Enviar texto sen cifrar</string>
     <string name="decryption_failed">Fallou o desencriptado. Quizais non teñas a chave privada apropiada.</string>
     <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long"><![CDATA[%1$s utiliza <b>OpenKeychain</b> para cifrar e descifrar as mensaxes e xestionar a túas chaves públicas.<br><br>Está baixo licenza  GPLv3+ e dispoñible en F-Droid e Google Play.<br><br><small>(Reinicia %1$s após a instalación.)</small>]]></string>
+    <string name="openkeychain_required_long"><![CDATA[%1$s utiliza <b>OpenKeychain</b> para cifrar e descifrar as mensaxes e xestionar a túas chaves públicas.<br><br>Está baixo licenza GPLv3+ e dispoñible en F-Droid e Google Play.<br><br><small>(Reinicia %1$s após a instalación.)</small>]]></string>
     <string name="restart">Reiniciar</string>
     <string name="install">Instalar</string>
     <string name="openkeychain_not_installed">Instala OpenKeychain por favor</string>
@@ -618,7 +618,7 @@
     <string name="show_inactive_devices">Mostrar inactivos</string>
     <string name="hide_inactive_devices">Agochar inactivos</string>
     <string name="distrust_omemo_key">Retirar confianza a dispositivo</string>
-    <string name="distrust_omemo_key_text">Tes a certeza de que queres eliminar a verificación deste dispositivo?\nEste dispositivo e as súas mensaxes serán marcados como \"Non confiable\".</string>
+    <string name="distrust_omemo_key_text">Tes a certeza de querer retirar a verificación a este dispositivo?\nEste dispositivo e as súas mensaxes serán marcados como «Non confiable».</string>
     <plurals name="seconds">
         <item quantity="one">%d segundo</item>
         <item quantity="other">%d segundos</item>
@@ -1106,4 +1106,6 @@
     <string name="pref_align_start_summary">Mostrar todas as mensaxes, incluíndo as propias, no lado esquerdo para unha aparencia uniforme.</string>
     <string name="custom_notifications">Notificacións personalizadas</string>
     <string name="custom_notifications_enable">Activar axustes personalizados para as notificacións (importancia, son, vibración) nesta conversa?</string>
+    <string name="delete_avatar_message">Queres eliminar o teu avatar? Algúns clientes poderían continuar mostrando unha copia almacenada do teu avatar.</string>
+    <string name="show_to_contacts_only">Mostrar só aos contactos</string>
 </resources>
\ No newline at end of file

From a3824b65f253ce533a5847ced46714e7c2e1b8bb Mon Sep 17 00:00:00 2001
From: Besnik_b <besnik_b@users.noreply.translate.codeberg.org>
Date: Mon, 23 Dec 2024 20:31:41 +0000
Subject: [PATCH 266/357] Translated using Weblate (Albanian)

Currently translated at 99.1% (1049 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sq/
---
 src/main/res/values-sq-rAL/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index 104ec0a7a97fafd428d20c6b252af9c4bd69209f..1cac18d45d49c65a99b5c512d75808a615cf6afa 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -928,7 +928,7 @@
     <string name="pref_notifications_from_strangers_summary">Njofto për mesazhe dhe thirrje të mara prej të huajish.</string>
     <string name="pref_validate_hostname_summary">Dëshmi shërbyesi që përmbajnë strehëemrin e vlerësuar, konsiderohen të verifikuara</string>
     <string name="certificate_does_not_contain_jid">Dëshmia s’përmban adresë XMPP</string>
-    <string name="mtm_hostname_mismatch">Shërbyesi s’bëri dot mirëfilltësimin si “%s”. Dëshmia është e vlefshme vetëm për:</string>
+    <string name="mtm_hostname_mismatch">Shërbyesi s’bëri dot mirëfilltësimin si s. Dëshmia është e vlefshme vetëm për:</string>
     <string name="pref_scroll_to_bottom_summary">Pas dërgimit të një mesazhi, rrëshqit poshtë</string>
     <string name="error_trustkey_general">%1$s s’është në gjendje të fshehtëzojë mesazhe te %2$s. Kjo mund të vijë për shkak se kontakti juaj përdor një shërbyes, ose klient të vjetruar, që s’mund të përdorë OMEMO.</string>
     <string name="error_trustkey_hint_mutual">Ndihmëz: Në disa raste, kjo mund të ndreqet duke shtuar listat e kontakteve të njëri-tjetrit.</string>
@@ -1117,4 +1117,6 @@
     <string name="pref_call_integration">Integrim thirrjesh</string>
     <string name="custom_notifications_enable">Të aktivizohen rregullime njoftimesh vetjake (rëndësi, tingull, dridhje) për këtë bisedë?</string>
     <string name="pref_call_integration_summary">Thirrjet prej këtij aplikacioni ndërveprojnë me thirrjet e zakonshme telefonike, fjala vjen, përfundim i një thirrjeje, kur niset një tjetër.</string>
+    <string name="show_to_contacts_only">Shfaqja vetëm kontakteve</string>
+    <string name="delete_avatar_message">Doni të fshihet avatari jua? Disa klientë mund të vazhdojnë të shfaqin një kopje të ruajtur në fshehtinat e tyre të avatarit tuaj.</string>
 </resources>
\ No newline at end of file

From b36c08b162e76a5cd3133674109a40f65f678d1c Mon Sep 17 00:00:00 2001
From: melanotosjaunty <melanotosjaunty@users.noreply.translate.codeberg.org>
Date: Tue, 24 Dec 2024 01:23:05 +0000
Subject: [PATCH 267/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1058 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/zh_Hans/
---
 src/main/res/values-zh-rCN/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 2b7760d3347bdd9ab53474701cef62a74977b2f5..faa8f1008854b4289cd8a6f9285c3694ce1c6927 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -681,7 +681,7 @@
     <string name="mtm_accept_cert">接受未知证书？</string>
     <string name="mtm_trust_anchor">此服务器证书不是由已知的证书颁发机构签发的。</string>
     <string name="mtm_accept_servername">接受不匹配的服务器名称？</string>
-    <string name="mtm_hostname_mismatch">由于“%s”，服务器无法验证。证书仅对此有效：</string>
+    <string name="mtm_hostname_mismatch">无法验证服务器，因证书只对下列域名有效：</string>
     <string name="mtm_connect_anyway">是否仍要连接？</string>
     <string name="mtm_cert_details">证书详情：</string>
     <string name="once">仅一次</string>
@@ -1105,4 +1105,6 @@
     <string name="pref_call_integration_summary">此应用的通话与常规通话交互，例如另一个通话开始时结束一个通话。</string>
     <string name="pref_align_start_summary">在左侧显示所有消息，包括发送的消息，以实现统一的聊天布局。</string>
     <string name="pref_align_start">左对齐消息</string>
+    <string name="delete_avatar_message">你想删除你的头像吗？一些客户端可能继续显示你头像的缓存副本。</string>
+    <string name="show_to_contacts_only">只对联系人显示</string>
 </resources>
\ No newline at end of file

From 3e465635d79ca4c38c71b130ec0aa9c9e27d4898 Mon Sep 17 00:00:00 2001
From: Stephan-P <stephan-p@users.noreply.translate.codeberg.org>
Date: Tue, 24 Dec 2024 06:46:05 +0000
Subject: [PATCH 268/357] Translated using Weblate (Dutch)

Currently translated at 100.0% (1058 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/nl/
---
 src/main/res/values-nl/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index abccbfe0c0eb0bced9fb9cd95768171c661f7777..0144b91dab95cc270a1dea7517ac0cca46e7f80a 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -1122,4 +1122,6 @@
     <string name="custom_notifications">Aangepaste meldingen</string>
     <string name="custom_notifications_enable">Aangepaste meldingsinstellingen (belangrijkheid, geluid, trillingen) inschakelen voor dit gesprek?</string>
     <string name="pref_call_integration_summary">Oproepen van deze app werken samen met gewone telefoongesprekken, zoals het beëindigen van een gesprek wanneer een ander begint.</string>
+    <string name="show_to_contacts_only">Alleen weergeven aan contacten</string>
+    <string name="delete_avatar_message">Wil je je avatar verwijderen? Sommige clients kunnen nog steeds een kopie van jouw avatar in de cache weergeven.</string>
 </resources>
\ No newline at end of file

From a9b27fb9ab2261f813fc023fd13cb7a91eea8703 Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Tue, 24 Dec 2024 09:58:04 +0000
Subject: [PATCH 269/357] Translated using Weblate (Polish)

Currently translated at 100.0% (1058 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pl/
---
 src/main/res/values-pl/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 9f1718594e425797dd451d6e07b3aadd99fc174c..da9698687a135b544e03b679620e67159a316267 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -1138,4 +1138,6 @@
     <string name="pref_align_start_summary">Wyświetlaj wszystkie wiadomości, również wysłane, po lewej stronie, dla jednolitego układu rozmowy.</string>
     <string name="custom_notifications">Własne powiadomienia</string>
     <string name="custom_notifications_enable">Włączyć dedykowane ustawienia powiadomień (ważność, dźwięk, wibracje) dla tej rozmowy?</string>
+    <string name="delete_avatar_message">Czy chcesz usunąć swój awatar? Niektórzy klienci mogą nadal pokazywać zachowaną kopię.</string>
+    <string name="show_to_contacts_only">Pokazuj wyłącznie kontaktom</string>
 </resources>
\ No newline at end of file

From 1f70d3563122ebcb545102625b5ad6822be494d9 Mon Sep 17 00:00:00 2001
From: SomeTr <sometr@users.noreply.translate.codeberg.org>
Date: Tue, 24 Dec 2024 09:23:13 +0000
Subject: [PATCH 270/357] Translated using Weblate (Ukrainian)

Currently translated at 99.9% (1057 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/uk/
---
 src/main/res/values-uk/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 26e661f56ff6e4cc3700aafbe30714046e36f5a5..116182f47de9003985e397e206eeb0129054d84d 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -1154,4 +1154,6 @@
     <string name="pref_align_start_summary">Вирівнювати всі повідомлення, включно з надісланими, по лівому краю для одноманітного вигляду розмов.</string>
     <string name="custom_notifications_enable">Увімкнути індивідуальні налаштування сповіщень (важливість, звук, вібрація) для цієї розмови?</string>
     <string name="custom_notifications">Пристосування сповіщень</string>
+    <string name="show_to_contacts_only">Показувати лише контактам</string>
+    <string name="delete_avatar_message">Бажаєте видалити свій аватар? Деякі клієнти можуть продовжувати відображати копію Вашого аватара з кешу.</string>
 </resources>
\ No newline at end of file

From c322a3d739597a056941a93518353bc232fbc081 Mon Sep 17 00:00:00 2001
From: "lucasmz.dev" <git@lucasmz.dev>
Date: Tue, 24 Dec 2024 05:36:50 +0000
Subject: [PATCH 271/357] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1058 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pt_BR/
---
 src/main/res/values-pt-rBR/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 3214d0ff63f68c8a364547cea4b874ca1e749ff2..f8478e9f8ac937bcd2a9b0a99b81b88b879a8bd8 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -1124,4 +1124,6 @@
     <string name="custom_notifications_enable">Ativar as configurações de notificações customizadas (importância, som, vibração) para esta conversa?</string>
     <string name="pref_call_integration">Integração de chamadas</string>
     <string name="pref_call_integration_summary">Chamadas deste app interagem com as chamadas comuns do sistema, como quando uma chamada é terminada quando outra começa.</string>
+    <string name="show_to_contacts_only">Mostrar somente para contatos</string>
+    <string name="delete_avatar_message">Você gostaria de excluir seu avatar? Alguns clientes podem continuar mostrando uma cópia em cache do seu avatar.</string>
 </resources>
\ No newline at end of file

From e9f165c32cd628548ca10176c2c8629e8e8c4115 Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Tue, 24 Dec 2024 10:00:23 +0000
Subject: [PATCH 272/357] Translated using Weblate (Polish)

Currently translated at 37.1% (29 of 78 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/pl/
---
 fastlane/metadata/android/pl-PL/changelogs/4208804.txt | 3 +++
 fastlane/metadata/android/pl-PL/changelogs/4209004.txt | 2 ++
 fastlane/metadata/android/pl-PL/changelogs/4209204.txt | 2 ++
 3 files changed, 7 insertions(+)
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4208804.txt
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4209004.txt
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4209204.txt

diff --git a/fastlane/metadata/android/pl-PL/changelogs/4208804.txt b/fastlane/metadata/android/pl-PL/changelogs/4208804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..653b7cbb26e88d0e55b18064d27803923aed5841
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4208804.txt
@@ -0,0 +1,3 @@
+* Obsługa przesyłanie plików P2P przez kanały danych WebRTC
+* Naprawiono problemy interoperacyjności z Bind 2.0 na ejabberd
+* Wbudowanie certyfikatów głównych Let’s Encrypt dla Androida 7 i starszych
diff --git a/fastlane/metadata/android/pl-PL/changelogs/4209004.txt b/fastlane/metadata/android/pl-PL/changelogs/4209004.txt
new file mode 100644
index 0000000000000000000000000000000000000000..656ecf22295f5fa0af3b8d169d5f1091d82fec80
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4209004.txt
@@ -0,0 +1,2 @@
+* Drobne poprawki błędów
+* Małe zmiany we wprowadzeniu do Quicksy
diff --git a/fastlane/metadata/android/pl-PL/changelogs/4209204.txt b/fastlane/metadata/android/pl-PL/changelogs/4209204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5fa281e23c93599ab2e0b7b506cd998abd9ca788
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4209204.txt
@@ -0,0 +1,2 @@
+* Łatwiejszy dostęp do polityki prywatności w wersji dla Sklepu Play (Quicksy i Conversations)
+* Usunięcie integracji z książką adresową w wersji Conversations dla Sklepu Play

From c52c7ed1eb4e375c97ee8b6e783c1c07f8edf0d5 Mon Sep 17 00:00:00 2001
From: licaon-kter <licaon-kter@users.noreply.translate.codeberg.org>
Date: Tue, 24 Dec 2024 10:25:40 +0000
Subject: [PATCH 273/357] Translated using Weblate (Romanian)

Currently translated at 100.0% (1058 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ro/
---
 src/main/res/values-ro-rRO/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index a558b9290b4a0b734d37cdba0a12448140af86f2..9b4e1a40361847899848519aa15fbb8ab176e794 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -1125,4 +1125,6 @@
     <string name="pref_align_start">Mesaje aliniate la stânga</string>
     <string name="pref_call_integration_summary">Apelurile din această aplicație interacționează cu apelurile telefonice obișnuite, cum ar fi terminarea unui apel atunci când începe altul.</string>
     <string name="pref_call_integration">Integrarea apelurilor</string>
+    <string name="delete_avatar_message">Ați dori să vă ștergeți avatarul? Unii clienți ar putea să continue să arate o copie a avatarului.</string>
+    <string name="show_to_contacts_only">Arată doar contactelor</string>
 </resources>
\ No newline at end of file

From 57040e3a5490fd869daa984e23d40aea8588850a Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 24 Dec 2024 13:12:54 +0100
Subject: [PATCH 274/357] version bump to 2.17.7 + changelog

---
 CHANGELOG.md                                           | 6 ++++++
 build.gradle                                           | 6 +++---
 fastlane/metadata/android/en-US/changelogs/4212804.txt | 3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/4212804.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b935547858289e53ae1b1e217b9b448dd768f590..455fcdb726b2fbec084321142998c837c4ba2b0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+### Version 2.17.7
+
+* Easier access to custom notification sounds via Contact details -> Overflow menu -> Custom notifications)
+* Fix direct share targets on new Android versions
+* Ability to restrict avatar visibility to contacts
+
 ### Version 2.17.6
 
 * Add ability to show message bubbles left-aligned
diff --git a/build.gradle b/build.gradle
index 1839ee0bae642d83e5c6b25859706e5427c4c989..94dd2afb5adfd7cf814e53d8697defad4f9cf1dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,7 +66,7 @@ dependencies {
     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.13.0-alpha08'
+    implementation 'com.google.android.material:material:1.13.0-alpha09'
     implementation 'androidx.work:work-runtime:2.9.1'
 
     implementation "androidx.emoji2:emoji2:1.5.0"
@@ -113,8 +113,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 42127
-        versionName "2.17.6"
+        versionCode 42128
+        versionName "2.17.7"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/4212804.txt b/fastlane/metadata/android/en-US/changelogs/4212804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9055128c02d915a6025c5ac17bfb89f43332e74a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/4212804.txt
@@ -0,0 +1,3 @@
+* Easier access to custom notification sounds via Contact details -> Overflow menu -> Custom notifications)
+* Fix direct share targets on new Android versions
+* Ability to restrict avatar visibility to contacts

From 2116f1fbf20baed36770d5295b0329cc2250c7f8 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Tue, 24 Dec 2024 19:30:24 +0000
Subject: [PATCH 275/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1058 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 4b3d10ed7d935773f7f6b18f19e88d09f7dd646f..0ac910b1f4357b198c2754f62b528c372c9ed172 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -1153,4 +1153,6 @@
     <string name="custom_notifications">Настраиваемые уведомления</string>
     <string name="pref_call_integration_summary">Звонки из этого приложения взаимодействуют с обычными телефонными звонками, например, завершение одного звонка при начале другого</string>
     <string name="custom_notifications_enable">Использовать индивидуальные настройки уведомлений (важность, звук, вибрация) для этой беседы?</string>
+    <string name="delete_avatar_message">Хотите удалить свой аватар? Некоторые клиенты могут продолжать отображать кэшированную копию вашего аватара.</string>
+    <string name="show_to_contacts_only">Показывать только контактам</string>
 </resources>
\ No newline at end of file

From ac8e514f6d103e6de5e4574e802052bb1033956a Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Tue, 24 Dec 2024 19:36:29 +0000
Subject: [PATCH 276/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1058 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 0ac910b1f4357b198c2754f62b528c372c9ed172..c5bfde08d713b4b36b1c15e51582044f0870edaf 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -218,9 +218,9 @@
     <string name="openpgp_messages_found">Найдены новые зашифрованные OpenPGP сообщения</string>
     <string name="openpgp_key_id">ID ключа OpenPGP</string>
     <string name="omemo_fingerprint">Отпечаток OMEMO</string>
-    <string name="omemo_fingerprint_x509">v\\Отпечаток OMEMO</string>
+    <string name="omemo_fingerprint_x509">Отпечаток vOMEMO</string>
     <string name="omemo_fingerprint_selected_message">Отпечаток OMEMO (выбранного сообщения)</string>
-    <string name="omemo_fingerprint_x509_selected_message">v\\Отпечаток OMEMO (выбранного сообщения)</string>
+    <string name="omemo_fingerprint_x509_selected_message">Отпечаток vOMEMO (выбранного сообщения)</string>
     <string name="other_devices">Другие устройства</string>
     <string name="trust_omemo_fingerprints">Доверенные отпечатки OMEMO</string>
     <string name="fetching_keys">Получение ключей…</string>

From eac4fa584810a9c91cb5f70939ba7d691a9f182f Mon Sep 17 00:00:00 2001
From: langos <langos@users.noreply.translate.codeberg.org>
Date: Wed, 25 Dec 2024 19:20:56 +0000
Subject: [PATCH 277/357] Translated using Weblate (Hungarian)

Currently translated at 99.1% (1049 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/hu/
---
 src/main/res/values-hu/strings.xml | 185 +++++++++++++++++++++++++++++
 1 file changed, 185 insertions(+)

diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 9ce1ca47b87421778e2e472e50288576429070ee..c6dd67432e3fb0624593fcbd2ba076679c3638f4 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -912,4 +912,189 @@
     <string name="search_group_chats">Csoportos csevegés keresése</string>
     <string name="this_account_is_logged_out">Kijelentkezett ebből a fiókból</string>
     <string name="continue_btn">Folytatás</string>
+    <string name="delivery_failed_channel_name">Sikertelen kézbesítések</string>
+    <plurals name="n_missed_calls_from_x">
+        <item quantity="one">%1$d nem fogadott hívás tőle: %2$s</item>
+        <item quantity="other">%1$d nem fogadott hívás tőle: %2$s</item>
+    </plurals>
+    <plurals name="n_missed_calls">
+        <item quantity="one">%d nem fogadott hívás</item>
+        <item quantity="other">%d nem fogadott hívás</item>
+    </plurals>
+    <string name="magic_create_text">A conversations.im oldalon talál egy útmutatót a fiók létrehozásához.\nHa a conversations.im-et választja kiszolgálóként, akkor más kiszolgálóként felhasználóival is kommunikálhat, ha megadja nekik a teljes XMPP-címét.</string>
+    <string name="device_does_not_support_data_saver">Az Ön készüléke nem támogatja az Adatkímélő kikapcsolását %1$s esetében.</string>
+    <string name="verifying_omemo_keys_trusted_source_account">Ön most fogja ellenőrizni a saját fiókjának OMEMO kulcsait. Ez csak akkor biztonságos, ha megbízható forrásból származó linket követett és ha maga tette azt közzé.</string>
+    <string name="distrust_omemo_key_text">Biztos, hogy el akarja távolítani az eszköz hitelesítését?\nEz az eszköz és az általa küldött üzenetek nem megbízható jelölést kapnak.</string>
+    <string name="corresponding_chats_closed">A megfelelő beszélgetések archiválva.</string>
+    <string name="foreground_service_channel_description">Ez az értesítési kategória egy állandó értesítés megjelenítésére szolgál, hogy %1$s fut továbbra is.</string>
+    <string name="outdated_backup_file_format">Ön egy elavult biztonsági mentési fájlformátumot próbál importálni</string>
+    <string name="rtp_state_content_add">Hozzáad további sávokat?</string>
+    <string name="rtp_state_content_add_video">Át szeretne váltani videóhívásra?</string>
+    <string name="rtp_state_security_error">Ellenőrzési probléma</string>
+    <string name="reconnecting_call">Újracsatlakozás a híváshoz</string>
+    <string name="incoming_call_duration_timestamp">Bejövő hívás (%s) · %s</string>
+    <string name="outgoing_call_duration_timestamp">Kimenő hívás (%s) · %s</string>
+    <string name="missed_call_timestamp">Nem fogadott hívás · %s</string>
+    <string name="switch_to_chat">Váltás a csevegésre</string>
+    <string name="add_to_favorites">Kitűzés felülre</string>
+    <string name="remove_from_favorites">Levétel felülről</string>
+    <string name="gpx_track">GPX nyomvonal</string>
+    <string name="could_not_correct_message">Nem sikerült kijavítani az üzenetet</string>
+    <string name="search_all_conversations">Minden csevegés</string>
+    <string name="search_this_conversation">Ez a csevegés</string>
+    <string name="your_avatar">Saját avatar</string>
+    <string name="avatar_for_x">Avatár %s profiljához</string>
+    <string name="encrypted_with_omemo">OMEMO-val titkosítva</string>
+    <string name="more_options">További lehetőségek</string>
+    <string name="failed_deliveries">Meghiúsult küldések</string>
+    <string name="unable_to_enable_video">A videó engedélyezése nem lehetséges.</string>
+    <string name="reject_switch_to_video">Videóra váltás iránti kérelem elutasítása</string>
+    <string name="pref_up_push_account_title">XMPP fiók</string>
+    <string name="pref_up_push_account_summary">Az a fiók, amelyen keresztül a push-üzenetek érkeznek.</string>
+    <string name="delete_from_server">Fiók eltávolítása a szerverről</string>
+    <string name="could_not_delete_account_from_server">Nem sikerült törölni a fiókot a szerverről</string>
+    <string name="unified_push_distributor">UnifiedPush terjesztő</string>
+    <string name="log_in">Bejelentkezés</string>
+    <string name="contact_uses_unverified_keys">Az Ön partnere nem ellenőrzött eszközt használ. Szkennelje be a QR-kódját, hogy elvégezzük az ellenőrzését a MITM-támadások megakadályozásához.</string>
+    <string name="unverified_devices">Ön nem ellenőrzött eszközöket használ. Az ellenőrzés elvégzéséhez és az aktív MITM-támadások megakadályozásához olvassa be a QR-kódot a többi eszközén.</string>
+    <string name="log_out">Kijelentkezés</string>
+    <string name="hide_notification">Értesítés elrejtése</string>
+    <string name="report_spam_and_block">Spam bejelentése és a feladó blokkolása</string>
+    <string name="delete_and_close">Beszélgetés törlése és archiválása</string>
+    <string name="call_integration_not_available">Hívásintegráció nem elérhető!</string>
+    <string name="no_certificate_selected">Nincs kiválasztva ügyféltanúsítvány!</string>
+    <string name="start_chat">Beszélgetés indítása</string>
+    <string name="pref_title_interface">Interfész</string>
+    <string name="pref_summary_appearance">Téma, színek, képernyőképek, bevitel</string>
+    <string name="pref_title_security">Biztonság</string>
+    <string name="unified_push_summary">Értesítések továbbítása az UnifiedPush kompatibilis harmadik féltől származó alkalmazások számára</string>
+    <string name="pref_notifications_summary">Időtúllépés, hang, rezgés, ismeretlen felhasználók</string>
+    <string name="notifications">Értesítések</string>
+    <string name="pref_attachments_summary">Fájlméret, képtömörítés, videó minőség</string>
+    <string name="pref_category_sending">Küldés</string>
+    <string name="pref_category_receiving">Fogadás</string>
+    <string name="pref_automatic_download">Automatikus letöltés</string>
+    <string name="appearance">Megjelenés</string>
+    <string name="pref_light_dark_mode">Világos/sötét mód</string>
+    <string name="pref_allow_screenshots">Képernyőképek engedélyezése</string>
+    <string name="pref_allow_screenshots_summary">Alkalmazás tartalmának megjelenítése az alkalmazásváltóban és a képernyőképek készítésének engedélyezése</string>
+    <string name="detect_mim">Csatorna összekapcsolás szükséges</string>
+    <string name="pref_title_trust_system_ca_store">Tanúsítványkiadó</string>
+    <string name="pref_title_trust_system_ca_store_summary">Bízzon a rendszer hitelesítésszolgáltatói tanúsítványaiban</string>
+    <string name="detect_mim_summary">A csatorna összekapcsolás képes felismerni néhány machine-in-the-middle támadást</string>
+    <string name="pref_category_server_connection">Szerver kapcsolat</string>
+    <string name="pref_category_operating_system">Operációs rendszer</string>
+    <string name="pref_connection_summary">Hostnév és port, Tor</string>
+    <plurals name="n_missed_calls_from_m_contacts">
+        <item quantity="one">%1$d nem fogadott hívás %2$d partnertől</item>
+        <item quantity="other">%1$d nem fogadott hívás %2$d partnertől</item>
+    </plurals>
+    <plurals name="some_messages_could_not_be_delivered">
+        <item quantity="one">Az üzenet elküldése sikertelen</item>
+        <item quantity="other">Több üzenetet nem sikerült elküldeni</item>
+    </plurals>
+    <string name="pref_summary_security">E2E titkosítás, vak bizalom az ellenőrzés előtt, MITM felderítés</string>
+    <string name="privacy_policy">Adatvédelmi szabályzat</string>
+    <string name="contact_list_integration_not_available">A partnerek integrációja nem elérhető</string>
+    <string name="help">Segítség</string>
+    <string name="could_not_modify_call">Nem sikerült módosítani a hívást</string>
+    <string name="allow_private_messages">Privát üzenetek engedélyezése</string>
+    <string name="pref_accept_invites_from_strangers_summary">Idegenek meghívásainak elfogadása csoportos csevegésekre</string>
+    <string name="pref_accept_invites_from_strangers">Meghívók idegenektől</string>
+    <string name="rtp_state_contact_offline">A partner nem elérhető</string>
+    <string name="rtp_state_connectivity_lost_error">A kapcsolat megszakadt</string>
+    <string name="pref_large_font">Nagy betűtípus</string>
+    <string name="pref_large_font_summary">A betűméret növelése az üzenetbuborékokban</string>
+    <string name="encrypted_with_openpgp">OpenPGP-vel titkosítva</string>
+    <string name="not_encrypted">Titkosítatlan</string>
+    <string name="exit">Kilépés</string>
+    <string name="record_voice_mail">Hangposta rögzítése</string>
+    <string name="play_audio">Audió lejátszása</string>
+    <string name="pause_audio">Audió szüneteltetése</string>
+    <string name="no_application_found">Nem található alkalmazás</string>
+    <string name="invite_to_app">Meghívás a Conversations-be</string>
+    <string name="unable_to_parse_invite">Nem lehet elemezni a meghívót</string>
+    <string name="server_does_not_support_easy_onboarding_invites">A szerver nem támogatja a meghívók generálását</string>
+    <string name="pref_backup_recurring">Ismétlődő biztonsági mentés</string>
+    <string name="pref_fullscreen_notification">Teljes képernyős értesítések</string>
+    <string name="pref_create_backup_one_off_summary">Egyszeri biztonsági mentés létrehozása</string>
+    <string name="unsupported_operation">Nem támogatott művelet</string>
+    <string name="edit_nick">Nick szerkesztése</string>
+    <string name="delete_pgp_key">OpenPGP kulcs törlése</string>
+    <string name="edit_name_and_topic">Név és téma szerkesztése</string>
+    <string name="edit_configuration">Konfiguráció módosítása</string>
+    <string name="change_notification_settings">Értesítési beállítások módosítása</string>
+    <string name="call_is_using_earpiece">A hívás a fülhallgatót használja.</string>
+    <string name="server_info_bind2">XEP-0386: Bind 2</string>
+    <string name="server_info_sasl2">XEP-0388: Bővíthető SASL profil</string>
+    <string name="omemo_fingerprint_selected_message">OMEMO ujjlenyomat (üzenet eredete)</string>
+    <string name="clear_other_devices_desc">Biztos, hogy törölni akarja az összes többi eszközt az OMEMO bejelentésből? A következő csatlakozáskor az eszközök újra bejelentik magukat, de előfordulhat, hogy nem kapják meg az időközben küldött üzeneteket.</string>
+    <string name="pref_blind_trust_before_verification_summary">Megbízik a nem ellenőrzött kapcsolatok új eszközeiben, de az ellenőrzött kapcsolatok esetén az új eszközök kézi megerősítése szükséges.</string>
+    <string name="pref_dynamic_colors">Dinamikus színek</string>
+    <string name="pref_dynamic_colors_summary">Rendszerszínek (Material You)</string>
+    <string name="no_microphone_permission">%1$s hozzáférése a mikrofonhoz</string>
+    <string name="missed_calls_channel_name">Nem fogadott hívások</string>
+    <string name="restore_warning_continued">Ne próbálkozzon olyan biztonsági mentések visszaállításával, amelyeket nem saját maga készített!</string>
+    <string name="rtp_state_reconnecting">Újracsatlakozás</string>
+    <string name="reconnecting_video_call">Újracsatlakozás a videó híváshoz</string>
+    <string name="outgoing_call_timestamp">Kimenő hívás · %s</string>
+    <string name="no_active_accounts_support_this">Egyetlen aktív fiók sem támogatja ezt a funkciót</string>
+    <string name="could_not_disable_video">Nem sikerült letiltani a videót.</string>
+    <string name="plain_text_document">Egyszerű szöveges dokumentum</string>
+    <string name="account_registrations_are_not_supported">A fiókregisztráció nem támogatott</string>
+    <string name="no_xmpp_adddress_found">Nem található XMPP cím</string>
+    <string name="account_status_temporary_auth_failure">Ideiglenes hitelesítési hiba</string>
+    <string name="delete_avatar">Avatár törlése</string>
+    <string name="audio_video_disabled_tor">A hívások letiltva Tor használatakor</string>
+    <string name="switch_to_video">Videóra váltás</string>
+    <string name="pref_up_push_server_title">Push kiszolgáló</string>
+    <string name="no_account_deactivated">Nincs (kikapcsolva)</string>
+    <string name="decline">Visszautasít</string>
+    <string name="report_spam">Spam jelentése</string>
+    <string name="pref_category_e2ee">Végponttól-végpontig titkosítás</string>
+    <string name="pref_privacy_summary">Írás, olvasás és elérhetőség kijelzése</string>
+    <string name="pref_connection_summary_w_cd">Hostnév és port, Tor, Channel Discovery</string>
+    <string name="pref_keyboard_options">Billentyűzet</string>
+    <string name="pref_category_engagement_notifications">Interakciós értesítések</string>
+    <string name="pref_category_application">Alkalmazás</string>
+    <string name="pref_category_interaction">Interakciók</string>
+    <string name="pref_category_on_this_device">Az eszközön</string>
+    <string name="pref_up_long_summary">Ha az UnifiedPush funkció engedélyezve van, akkor a rendszer egy megbízható és akkumulátorbarát XMPP kapcsolatot használ a többi UnifiedPush kompatibilis alkalmazás indításához, mint pl. Tusky, Ltt.rs, FluffyChat és mások.</string>
+    <string name="call_is_using_earpiece_tap_to_switch_to_speaker">A hívás a fülhallgatót használja. Koppintson a hangszóróra váltáshoz.</string>
+    <string name="call_is_using_wired_headset">A hívás vezetékes headsetet használ</string>
+    <string name="call_is_using_speaker_tap_to_switch_to_earpiece">A hívás a hangszórót használja. Koppintson a gombra a fülhallgatóra való váltáshoz.</string>
+    <string name="call_is_using_speaker">A hívás a hangszórót használja.</string>
+    <string name="call_is_using_bluetooth">A hívás bluetooth-t használ.</string>
+    <string name="flip_camera">Kamera váltás</string>
+    <string name="video_is_enabled_tap_to_disable">A videó engedélyezve. Koppintson a letiltásához.</string>
+    <string name="video_is_disabled_tap_to_enable">A videó le van tiltva. Érintse meg az engedélyezéséhez.</string>
+    <string name="server_info_login_mechanism">Bejelentkezési folyamat</string>
+    <string name="clients_may_not_support_av">Előfordulhat, hogy a partner XMPP alkalmazása nem támogatja a hanghívást/videóhívásokat.</string>
+    <string name="pref_call_integration">Hívás integráció</string>
+    <string name="pref_call_integration_summary">Az alkalmazásból indított hívások együttműködnek a hagyományos telefonhívásokkal, például az egyik hívás befejeződik, amikor egy másik kezdődik.</string>
+    <string name="pref_align_start">Balra igazított üzenetek</string>
+    <string name="pref_align_start_summary">Az összes üzenet (beleértve az elküldötteket is) a bal oldalon jeleníthető meg az egységes csevegési elrendezés érdekében.</string>
+    <string name="custom_notifications">Egyéni értesítések</string>
+    <string name="custom_notifications_enable">Engedélyez egyéni értesítési beállítások (fontosság, hang, rezgés) ehhez a beszélgetéshez?</string>
+    <string name="show_to_contacts_only">Csak a partnereknek mutassa</string>
+    <string name="add_reaction">Reakció hozzáadása…</string>
+    <string name="add_reaction_title">Reakció hozzáadása</string>
+    <string name="more_reactions">Több reakció</string>
+    <string name="add_contact_or_create_or_join_group_chat">Partner hozzáadása, csoport létrehozása, csoporthoz csatlakozás vagy csatornák felfedezése</string>
+    <string name="your_avatar_tap_to_select_new_avatar">Az avatárja. Érintse meg az új avatár kiválasztásához a galériából.</string>
+    <string name="backup_started_message">A biztonsági mentés elindult. A mentés befejezése után értesítést fog kapni.</string>
+    <string name="pref_backup_summary">Egyszeri, ismétlődő ütemezés létrehozása</string>
+    <string name="pref_fullscreen_notification_summary">Engedélyezze, hogy ez az alkalmazás a bejövő hívásokról teljes képernyős értesítéseket jelenítse meg amikor a készülék le van zárva.</string>
+    <string name="omemo_fingerprint_x509_selected_message">vOMEMO ujjlenyomat (üzenet eredete)</string>
+    <string name="request_presence_updates">Először kérjen a partnertől jelenlétfrissítéseket.\n\n<small>Ez alapján határozzuk meg, hogy a partnere milyen csevegőalkalmazást használ.</small>.</string>
+    <string name="without_mutual_presence_updates"><b>Figyelem:</b> Ha kölcsönös jelenlétfrissítések nélküli küldi ezt el, akkor az váratlan problémákat okozhat.\n\n<small>Menjen a „Partner részletei” menüpontba, hogy ellenőrizze a jelenlétfrissítéseket.</small></string>
+    <string name="all_omemo_keys_have_been_verified">Az összes birtokában lévő OMEMO-kulcs ellenőrizve</string>
+    <string name="blindly_trusted_omemo_keys">Vakon bizalomba fogadott OMEMO kulcsok. Ez azt a veszélyt is magába foglalja, hogy lehet valaki más kulcsa vagy hamisított a kulcs.</string>
+    <string name="could_not_add_reaction">Nem sikerült reakciót hozzáadni</string>
+    <string name="delete_avatar_message">Szeretné törölni az avatárját? Egyes alkalmazások továbbra is megjeleníthetik az avatárjának gyorsítótárazott másolatát.</string>
+    <string name="pref_show_avatars">Avatárok mutatása</string>
+    <string name="pref_show_avatars_summary">A csoportos csevegések mellett az üzenetekben és az 1:1-es csevegésekben is megjelennek az avatárok.</string>
+    <string name="pref_chat_bubbles">Csevegőbuborékok</string>
+    <string name="pref_chat_bubbles_summary">Háttérszín, betűméret, avatárok</string>
+    <string name="pref_title_bubbles">Csevegőbuborékok</string>
 </resources>
\ No newline at end of file

From 2290974d787d466d3426cfb078474a77d3685131 Mon Sep 17 00:00:00 2001
From: SomeTr <sometr@users.noreply.translate.codeberg.org>
Date: Wed, 25 Dec 2024 18:34:36 +0000
Subject: [PATCH 278/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1058 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/uk/
---
 src/main/res/values-uk/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 116182f47de9003985e397e206eeb0129054d84d..5c8b82564580c88666ead520e3b505b43e7b433a 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -671,7 +671,7 @@
     <string name="mtm_accept_cert">Прийняти незнайомий сертифікат?</string>
     <string name="mtm_trust_anchor">Сертифікат сервера не підписано відомим центром сертифікації.</string>
     <string name="mtm_accept_servername">Прийняти сервер з невідповідним ім\'ям?</string>
-    <string name="mtm_hostname_mismatch">Серверу не вдалося авторизуватися як «%s». Сертифікат чинний лише для:</string>
+    <string name="mtm_hostname_mismatch">Серверу не вдалося авторизуватися як %s. Сертифікат чинний лише для:</string>
     <string name="mtm_connect_anyway">Усе одно бажаєте підключитися?</string>
     <string name="mtm_cert_details">Деталі сертифіката:</string>
     <string name="once">Один раз</string>

From a2476aaeb2a912d61d7d4ff7ec36e4ab57457ecb Mon Sep 17 00:00:00 2001
From: mmbd <mmbd@users.noreply.translate.codeberg.org>
Date: Thu, 26 Dec 2024 16:34:56 +0000
Subject: [PATCH 279/357] Translated using Weblate (Japanese)

Currently translated at 98.3% (1041 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ja/
---
 src/main/res/values-ja/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index c8d4a88179a5cdafb897d6f972f5b7e803147fcd..bea447bc146265e0bb5dfae8db446a90a36fadc6 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -856,7 +856,7 @@
     <string name="this_looks_like_channel">これは談話室アドレスのようです</string>
     <string name="share_backup_files">バックアップファイルを共有</string>
     <string name="conversations_backup">Conversations のバックアップ</string>
-    <string name="event">出来事</string>
+    <string name="event">予定</string>
     <string name="open_backup">バックアップを開く</string>
     <string name="not_a_backup_file">選択したファイルは、 Conversations のバックアップファイルではありません</string>
     <string name="account_already_setup">このアカウントは既に設定されています</string>
@@ -1075,4 +1075,6 @@
     <string name="welcome_header">会話に参加しよう</string>
     <string name="flip_camera">表裏反転カメラ</string>
     <string name="edit_name_and_topic">名前と題を編集</string>
+    <string name="pref_category_engagement_notifications">活動の知らせ</string>
+    <string name="pref_category_interaction">インターアクション</string>
 </resources>
\ No newline at end of file

From 08381e153538e50e8af2352fcf7f44bdddb1aef3 Mon Sep 17 00:00:00 2001
From: mmbd <mmbd@users.noreply.translate.codeberg.org>
Date: Fri, 27 Dec 2024 09:39:32 +0000
Subject: [PATCH 280/357] Translated using Weblate (Japanese)

Currently translated at 99.8% (1056 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ja/
---
 src/main/res/values-ja/strings.xml | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index bea447bc146265e0bb5dfae8db446a90a36fadc6..6f5a17e8bb6f721c7d304c30674755f4bf581c4f 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -163,13 +163,13 @@
     <string name="account_status_incompatible_client">互換性のない端末</string>
     <string name="account_status_stream_error">ストリーム エラー</string>
     <string name="account_status_stream_opening_error">ストリームを開く際にエラー</string>
-    <string name="encryption_choice_unencrypted">平文</string>
+    <string name="encryption_choice_unencrypted">非暗号化</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="encryption_choice_omemo">OMEMO</string>
     <string name="mgmt_account_delete">アカウントを削除</string>
     <string name="mgmt_account_disable">一時的に無効化</string>
-    <string name="mgmt_account_publish_avatar">アバターを公開</string>
+    <string name="mgmt_account_publish_avatar">プロフィール画像を公開</string>
     <string name="mgmt_account_publish_pgp">OpenPGP 公開鍵を公開</string>
     <string name="unpublish_pgp">OpenPGP 公開鍵を削除</string>
     <string name="unpublish_pgp_message">出席情報告知から OpenPGP 公開鍵を削除してもよろしいですか?\n連絡先はあなたに OpenPGP 暗号化メッセージを送信できなくなります。</string>
@@ -759,7 +759,7 @@
     <string name="phone_number">電話番号</string>
     <string name="verify_your_phone_number">電話番号を検証</string>
     <string name="enter_country_code_and_phone_number">Quicksy から電話番号を検証するための SMS メッセージ（キャリア料金がかかる場合があります）が送信されます。国番号と電話番号を入力してください:</string>
-    <string name="we_will_be_verifying">電話番号の検証を行います<br/><br/><b>%s</b><br/><br/>これでよろしいでしょうか、それとも番号を編集しますか?</string>
+    <string name="we_will_be_verifying"><![CDATA[この電話番号の検証を行います<br/><br/><b>%s</b><br/><br/>これでよろしいでしょうか、それとも番号を編集しますか?]]></string>
     <string name="not_a_valid_phone_number">%s は有効な電話番号ではありません。</string>
     <string name="please_enter_your_phone_number">電話番号を入力してください。</string>
     <string name="search_countries">国を検索</string>
@@ -1077,4 +1077,18 @@
     <string name="edit_name_and_topic">名前と題を編集</string>
     <string name="pref_category_engagement_notifications">活動の知らせ</string>
     <string name="pref_category_interaction">インターアクション</string>
+    <string name="pref_up_long_summary">UnifiedPushディストリビューターとして動作する場合、永続的で信頼性が高い、バッテリーに優しいXMPP接続は、Tusky、Ltt.rs、FluffyChatなどの他のUnifiedPush互換アプリを起動するために利用されます。</string>
+    <string name="clients_may_not_support_av">連絡先のXMPPクライアントは音声/ビデオ通話を対応していない可能性があります。</string>
+    <string name="pref_align_start">メッセージを左揃えにする</string>
+    <string name="pref_align_start_summary">自分のメッセージを含むすべてのメッセージを左側に表示し、統一されたチャットレイアウトになります。</string>
+    <string name="custom_notifications">独自通知</string>
+    <string name="delete_avatar_message">プロフィール画像を削除しますか？連絡先のクライアントによっては、更新しないままプロフィール画像を表示し続ける場合があります。</string>
+    <string name="show_to_contacts_only">画像の受信を連絡先だけに許可する</string>
+    <string name="could_not_modify_call">変更できませんでした</string>
+    <string name="custom_notifications_enable">このチャットには独自の通知設定（優先度、通知音、バイブレーションなど）を使用しますか？</string>
+    <string name="pref_show_avatars">プロフィール画像を表示</string>
+    <string name="pref_show_avatars_summary">グループチャットと個人チャットでプロフィール画像を表示する。</string>
+    <string name="pref_chat_bubbles">ふきだし</string>
+    <string name="pref_chat_bubbles_summary">背景色、文字サイズ、プロフィール画像など</string>
+    <string name="pref_title_bubbles">ふきだし</string>
 </resources>
\ No newline at end of file

From b639a497babe1464961b4ff4071799c667f5b616 Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Sat, 28 Dec 2024 08:11:02 +0000
Subject: [PATCH 281/357] Translated using Weblate (German)

Currently translated at 100.0% (1058 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/de/
---
 src/main/res/values-de/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 8ffdf8b65885f7800d9a85412d28783a3207eafe..0da02aa64e1edc020d58b8d71ecba6c7066e10f9 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -1106,4 +1106,6 @@
     <string name="custom_notifications">Individuelle Benachrichtigungen</string>
     <string name="pref_call_integration_summary">Anrufe aus dieser App interagieren mit normalen Telefonanrufen, wie beispielsweise das Beenden eines Anrufs, wenn ein anderer beginnt.</string>
     <string name="custom_notifications_enable">Individuelle Benachrichtigungseinstellungen (Wichtigkeit, Ton, Vibration) für diese Unterhaltung aktivieren?</string>
+    <string name="delete_avatar_message">Möchtest du deinen Profilbild löschen? Einige Clients zeigen möglicherweise weiterhin eine zwischengespeicherte Kopie deines Profilbildes an.</string>
+    <string name="show_to_contacts_only">Nur für Kontakte anzeigen</string>
 </resources>
\ No newline at end of file

From bb7925e0ce2a8ca6abdbb7c449007030d538e3a7 Mon Sep 17 00:00:00 2001
From: SomeTr <sometr@users.noreply.translate.codeberg.org>
Date: Sat, 28 Dec 2024 10:54:31 +0000
Subject: [PATCH 282/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1058 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/uk/
---
 src/main/res/values-uk/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 5c8b82564580c88666ead520e3b505b43e7b433a..c0ab0e047d30cb060a3c80ba7930e350fe910a41 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -1153,7 +1153,7 @@
     <string name="pref_align_start">Вирівнювання повідомлень ліворуч</string>
     <string name="pref_align_start_summary">Вирівнювати всі повідомлення, включно з надісланими, по лівому краю для одноманітного вигляду розмов.</string>
     <string name="custom_notifications_enable">Увімкнути індивідуальні налаштування сповіщень (важливість, звук, вібрація) для цієї розмови?</string>
-    <string name="custom_notifications">Пристосування сповіщень</string>
+    <string name="custom_notifications">Індивідуальні сповіщення</string>
     <string name="show_to_contacts_only">Показувати лише контактам</string>
     <string name="delete_avatar_message">Бажаєте видалити свій аватар? Деякі клієнти можуть продовжувати відображати копію Вашого аватара з кешу.</string>
 </resources>
\ No newline at end of file

From 98b36647e67bc4442bf7b80d98131c29a66361c2 Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Sat, 28 Dec 2024 08:09:33 +0000
Subject: [PATCH 283/357] Translated using Weblate (German)

Currently translated at 100.0% (79 of 79 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/de/
---
 fastlane/metadata/android/de-DE/changelogs/4212804.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/de-DE/changelogs/4212804.txt

diff --git a/fastlane/metadata/android/de-DE/changelogs/4212804.txt b/fastlane/metadata/android/de-DE/changelogs/4212804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..2a94e67805ab5e0f86182035bc63a4755db9ee25
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/4212804.txt
@@ -0,0 +1,3 @@
+* Leichterer Zugang zu benutzerdefinierten Benachrichtigungstönen über Kontaktdetails > weiteres Menü > Benutzerdefinierte Benachrichtigungen
+* Direkte Freigabeziele auf neuen Android-Versionen korrigiert
+* Möglichkeit, die Sichtbarkeit von Profilbildern auf Kontakte zu beschränken

From ae7903374a645aebd7a28d8f5583008e8bb1d652 Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Sat, 28 Dec 2024 05:55:56 +0000
Subject: [PATCH 284/357] Translated using Weblate (Polish)

Currently translated at 41.7% (33 of 79 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/pl/
---
 fastlane/metadata/android/pl-PL/changelogs/42072.txt   | 3 +++
 fastlane/metadata/android/pl-PL/changelogs/4207704.txt | 3 +++
 fastlane/metadata/android/pl-PL/changelogs/4208104.txt | 4 ++++
 fastlane/metadata/android/pl-PL/changelogs/4212804.txt | 3 +++
 4 files changed, 13 insertions(+)
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/42072.txt
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4207704.txt
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4208104.txt
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4212804.txt

diff --git a/fastlane/metadata/android/pl-PL/changelogs/42072.txt b/fastlane/metadata/android/pl-PL/changelogs/42072.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a1262e9d2309949a90de639b568224caa3eb40cb
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/42072.txt
@@ -0,0 +1,3 @@
+* Podwyższenie wymaganej wersji libwebrtc do M117 i podwyższenie wymaganej wersji libvpx
+* Powrót do AAC dla wiadomości głosowych
+* Obsługa ustawień języka dla aplikacji
diff --git a/fastlane/metadata/android/pl-PL/changelogs/4207704.txt b/fastlane/metadata/android/pl-PL/changelogs/4207704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b8aca91ba389474a870d2d85b40faf0b3a6abea9
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4207704.txt
@@ -0,0 +1,3 @@
+* Obsługa prywatnego DNS (DNS over TLS)
+* Obsługa motywów ikony uruchamiania aplikacji
+* Naprawa rzadkiego problemu z uprawnieniami podczas udostępniania plików na Androidzie 11 i nowszych
diff --git a/fastlane/metadata/android/pl-PL/changelogs/4208104.txt b/fastlane/metadata/android/pl-PL/changelogs/4208104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..05a85c99891be48432ae2c424ebb936a0a42c60e
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4208104.txt
@@ -0,0 +1,4 @@
+* Łatwiejszy dostęp do „Pokaż kod QR”
+* Obsługa natywnych zakładek PEP
+* Obsługa modelu SDP Offer/Answer (używanego przez bramki SIP)
+* Podwyższenie docelowego API do Androida 14
diff --git a/fastlane/metadata/android/pl-PL/changelogs/4212804.txt b/fastlane/metadata/android/pl-PL/changelogs/4212804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a5360a0533d0c4bd140e8863f6d28cf7d166ac10
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4212804.txt
@@ -0,0 +1,3 @@
+* Łatwiejszy dostęp do własnych dźwięków powiadomień poprzez Szczegóły kontaktu → Więcej opcji → Własne powiadomienia
+* Naprawienie bezpośrednich celów udostępniania w nowszych wersjach Androida
+* Możliwość ograniczenia widoczności awatara do kontaktów

From c9fb88c561546a7e7fe05dcce6ec8d7a9fc9202a Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Sat, 28 Dec 2024 04:47:39 +0000
Subject: [PATCH 285/357] Translated using Weblate (Galician)

Currently translated at 64.5% (51 of 79 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/gl/
---
 fastlane/metadata/android/gl-ES/changelogs/4212804.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/gl-ES/changelogs/4212804.txt

diff --git a/fastlane/metadata/android/gl-ES/changelogs/4212804.txt b/fastlane/metadata/android/gl-ES/changelogs/4212804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ac87c05627e523fac72a859a16e70b9a67c5b2f7
--- /dev/null
+++ b/fastlane/metadata/android/gl-ES/changelogs/4212804.txt
@@ -0,0 +1,3 @@
+* Acceso máis doado á personalización do son da notificación en Detalles do contacto -> Menú emerxente -> Notificacións personalizadas)
+* Arranxo das opcións directas para compartir nas novas versións de Android
+* Posibilidade de limitar a visibilidade do avatar só para contactos

From 48cdfe1c20cdf40d64ad1ebe6f089ae8ee17e6f8 Mon Sep 17 00:00:00 2001
From: SomeTr <sometr@users.noreply.translate.codeberg.org>
Date: Sat, 28 Dec 2024 10:54:50 +0000
Subject: [PATCH 286/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (79 of 79 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/uk/
---
 fastlane/metadata/android/uk/changelogs/4212804.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/uk/changelogs/4212804.txt

diff --git a/fastlane/metadata/android/uk/changelogs/4212804.txt b/fastlane/metadata/android/uk/changelogs/4212804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a838d64ede07b670786ef41a6f4bf3f5661d4a86
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/4212804.txt
@@ -0,0 +1,3 @@
+* Полегшено доступ до користувацьких звуків сповіщень (Деталі контакту -> Додатково -> Індивідуальні сповіщення)
+* Виправлення цілей прямого поширення на нових версіях Android
+* Можливість обмежити видимість аватара для контактів

From 6398cd15b0f076ebbf3651280a89d48f07d0f90a Mon Sep 17 00:00:00 2001
From: cosmin <cosmin@users.noreply.translate.codeberg.org>
Date: Sat, 28 Dec 2024 15:08:30 +0000
Subject: [PATCH 287/357] Translated using Weblate (Romanian)

Currently translated at 37.9% (30 of 79 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/ro/
---
 fastlane/metadata/android/ro/changelogs/394.txt   | 2 ++
 fastlane/metadata/android/ro/changelogs/395.txt   | 3 +++
 fastlane/metadata/android/ro/changelogs/397.txt   | 3 +++
 fastlane/metadata/android/ro/changelogs/398.txt   | 4 ++++
 fastlane/metadata/android/ro/changelogs/401.txt   | 2 ++
 fastlane/metadata/android/ro/changelogs/402.txt   | 3 +++
 fastlane/metadata/android/ro/changelogs/403.txt   | 3 +++
 fastlane/metadata/android/ro/changelogs/404.txt   | 1 +
 fastlane/metadata/android/ro/changelogs/405.txt   | 1 +
 fastlane/metadata/android/ro/changelogs/407.txt   | 3 +++
 fastlane/metadata/android/ro/changelogs/42000.txt | 4 ++++
 fastlane/metadata/android/ro/changelogs/42006.txt | 2 ++
 fastlane/metadata/android/ro/changelogs/42010.txt | 2 ++
 fastlane/metadata/android/ro/changelogs/42012.txt | 1 +
 fastlane/metadata/android/ro/changelogs/42013.txt | 1 +
 15 files changed, 35 insertions(+)
 create mode 100644 fastlane/metadata/android/ro/changelogs/394.txt
 create mode 100644 fastlane/metadata/android/ro/changelogs/395.txt
 create mode 100644 fastlane/metadata/android/ro/changelogs/397.txt
 create mode 100644 fastlane/metadata/android/ro/changelogs/398.txt
 create mode 100644 fastlane/metadata/android/ro/changelogs/401.txt
 create mode 100644 fastlane/metadata/android/ro/changelogs/402.txt
 create mode 100644 fastlane/metadata/android/ro/changelogs/403.txt
 create mode 100644 fastlane/metadata/android/ro/changelogs/404.txt
 create mode 100644 fastlane/metadata/android/ro/changelogs/405.txt
 create mode 100644 fastlane/metadata/android/ro/changelogs/407.txt
 create mode 100644 fastlane/metadata/android/ro/changelogs/42000.txt
 create mode 100644 fastlane/metadata/android/ro/changelogs/42006.txt
 create mode 100644 fastlane/metadata/android/ro/changelogs/42010.txt
 create mode 100644 fastlane/metadata/android/ro/changelogs/42012.txt
 create mode 100644 fastlane/metadata/android/ro/changelogs/42013.txt

diff --git a/fastlane/metadata/android/ro/changelogs/394.txt b/fastlane/metadata/android/ro/changelogs/394.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a42ade02aa14c37174b89a000fd1be3b9677e488
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/394.txt
@@ -0,0 +1,2 @@
+* Reparat notificările care nu apăreau în anumite condiții
+* Reparat probleme de compatibilitate și crăpări legate de apeluri A/V
diff --git a/fastlane/metadata/android/ro/changelogs/395.txt b/fastlane/metadata/android/ro/changelogs/395.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1c382e0ce94fe200a386878e771741b472f040f9
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/395.txt
@@ -0,0 +1,3 @@
+* adăugat 'Întoarcere la discuție' pe ecranul de apel audio
+* îmbunătățit scurtăturile de tastatură
+* corecturi de erori
diff --git a/fastlane/metadata/android/ro/changelogs/397.txt b/fastlane/metadata/android/ro/changelogs/397.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c6e8e3eafd1aa344000c8f82be9de58ccce757e8
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/397.txt
@@ -0,0 +1,3 @@
+* Gestionare fișiere GPX
+* Îmbunătățit performanța pentru restaurarea copiilor de siguranță
+* Corecturi de erori
diff --git a/fastlane/metadata/android/ro/changelogs/398.txt b/fastlane/metadata/android/ro/changelogs/398.txt
new file mode 100644
index 0000000000000000000000000000000000000000..52fe55e96bc05bce0c3c1e6ba9463c59b15d45cd
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/398.txt
@@ -0,0 +1,4 @@
+* Căutare în conversații individuale
+* Notifică utilizatorul dacă livrarea mesajului eșuează
+* Ține minte numele afișate (poreclele) de la utilizatorii Quicksy între reporniri
+* Adăugat buton pentru a porni Orbot (Tor) din notificare dacă este necesar
diff --git a/fastlane/metadata/android/ro/changelogs/401.txt b/fastlane/metadata/android/ro/changelogs/401.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c82c0d79975a9242cc6b456628e1e48fbecdeff2
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/401.txt
@@ -0,0 +1,2 @@
+* corectat căutarea pe Android <= 5
+* optimizat consumul de memorie
diff --git a/fastlane/metadata/android/ro/changelogs/402.txt b/fastlane/metadata/android/ro/changelogs/402.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7eec1b94417af4c1786f4d633f54146ba2c540c7
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/402.txt
@@ -0,0 +1,3 @@
+* Oferă generarea de invitație facilă pe serverele care suportă
+* Afișează GIFuri trimise din Movim
+* stochează avatarii în cache
diff --git a/fastlane/metadata/android/ro/changelogs/403.txt b/fastlane/metadata/android/ro/changelogs/403.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4945950151ebcd3becc6c9edea2b86c8d50cf245
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/403.txt
@@ -0,0 +1,3 @@
+* Corectat probleme de conectivitate când conturi diferite foloseau mecanisme SCRAM diferite
+* Adăugat suport pentru SCRAM-SHA-512
+* Permis transfer de fișiere P2P (Jingle) cu contactul sine
diff --git a/fastlane/metadata/android/ro/changelogs/404.txt b/fastlane/metadata/android/ro/changelogs/404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ca77ff37f1451c91d24b7434769d544dbf381c68
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/404.txt
@@ -0,0 +1 @@
+* mici îmbunătățiri de stabilitate pentru apeluri A/V
diff --git a/fastlane/metadata/android/ro/changelogs/405.txt b/fastlane/metadata/android/ro/changelogs/405.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fd7ce6de75a21538744276b1d225f0b25aa73826
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/405.txt
@@ -0,0 +1 @@
+* Quicksy: primește automat verificare SMS
diff --git a/fastlane/metadata/android/ro/changelogs/407.txt b/fastlane/metadata/android/ro/changelogs/407.txt
new file mode 100644
index 0000000000000000000000000000000000000000..86149b4de84e21aa711610bca80e0fe004b1cfd5
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/407.txt
@@ -0,0 +1,3 @@
+* Arată butonul de apel pentru contacte deconectate dacă au anuțat anterior suportul
+* Butonul de revenire nu mai termină apelul când apelul este conectat
+* corecturi de erori
diff --git a/fastlane/metadata/android/ro/changelogs/42000.txt b/fastlane/metadata/android/ro/changelogs/42000.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d8447d3cdc1ed77735010897b61ea3a0b32f31b1
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/42000.txt
@@ -0,0 +1,4 @@
+* Posibilitatea de a selecta tonuri de apel
+* Corectat descoperirea ID-ului cheii OpenPGP pentru OpenKeychain 5.6+
+* Verificarea corectă a certificatelor TLS punycode
+* Îmbunătățit stabilitatea creerii sesiunii RTP (apelare)
diff --git a/fastlane/metadata/android/ro/changelogs/42006.txt b/fastlane/metadata/android/ro/changelogs/42006.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9f7dabde46fc7b8b796fa85c920e486a5afdbeba
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/42006.txt
@@ -0,0 +1,2 @@
+* Verifică apelurile A/V cu sesiuni OMEMO preexistente
+* Îmbunătățit compatibilitatea cu implementări WebRTC non libwebrtc
diff --git a/fastlane/metadata/android/ro/changelogs/42010.txt b/fastlane/metadata/android/ro/changelogs/42010.txt
new file mode 100644
index 0000000000000000000000000000000000000000..46cd92ca690324d49ff13b7339498d2a3a5116ae
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/42010.txt
@@ -0,0 +1,2 @@
+* Corectat felurite erori relative la suportul pentru Tor
+* Îmbunătățit compatibilitatea apelurilor cu Dino
diff --git a/fastlane/metadata/android/ro/changelogs/42012.txt b/fastlane/metadata/android/ro/changelogs/42012.txt
new file mode 100644
index 0000000000000000000000000000000000000000..965afdc5bb80ed7ee0c362185373ba48e459e251
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/42012.txt
@@ -0,0 +1 @@
+* Corectat up/download HTTP pentru utilizatorii care nu au încredere în CA din sistem
diff --git a/fastlane/metadata/android/ro/changelogs/42013.txt b/fastlane/metadata/android/ro/changelogs/42013.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8924f3f943dd71b0292c127930a967a6a5b86889
--- /dev/null
+++ b/fastlane/metadata/android/ro/changelogs/42013.txt
@@ -0,0 +1 @@
+* Rezolvat problemele 'lipsă conectivitate' pe Android 7.1

From f34a9d18ae12bc44624390c257ea8f75cdd36489 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Sat, 28 Dec 2024 18:16:42 +0000
Subject: [PATCH 288/357] Translated using Weblate (Russian)

Currently translated at 31.6% (25 of 79 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/ru/
---
 fastlane/metadata/android/ru-RU/changelogs/4212804.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4212804.txt

diff --git a/fastlane/metadata/android/ru-RU/changelogs/4212804.txt b/fastlane/metadata/android/ru-RU/changelogs/4212804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..bc9bb30574136a862f75f6bcf0314a9d7165ad8d
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4212804.txt
@@ -0,0 +1,3 @@
+* Упрощён доступ к настройке звука уведомлений (через "Сведения о контакте" → Дополнительное меню → "Настраиваемые уведомления")
+* Исправлены получатели прямого обмена в новых версиях Android
+* Добавлена возможность ограничить отображение аватара для контактов

From 6074d8467e8477bc21cfea4d4813c2e925e2ed67 Mon Sep 17 00:00:00 2001
From: Juan M Sevilla <jumase@users.noreply.translate.codeberg.org>
Date: Sat, 28 Dec 2024 22:20:25 +0000
Subject: [PATCH 289/357] Translated using Weblate (Spanish)

Currently translated at 100.0% (1058 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/es/
---
 src/main/res/values-es/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 451bd879a6b89bee2a63acfc95125e6235134215..b78c949e5184867bdd66ba269a15ac5c168378b3 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -1120,4 +1120,6 @@
     <string name="pref_align_start_summary">Mostrar todos los mensajes, incluso los propios, sobre el margen izquierdo para una distribución uniforme del chat.</string>
     <string name="custom_notifications">Notificaciones personalizadas</string>
     <string name="custom_notifications_enable">¿Habilitar los ajustes de notificaciones personalizadas (importancia, sonido, vibración) para esta conversación?</string>
+    <string name="delete_avatar_message">¿Quieres eliminar tu imagen de perfil? Algunos clientes podrían seguir mostrando una copia en caché de tu avatar.</string>
+    <string name="show_to_contacts_only">Mostrar sólo a contactos</string>
 </resources>
\ No newline at end of file

From 43ff97a70087d7dd3cc916d743ef1ef941d7eddd Mon Sep 17 00:00:00 2001
From: user11 <user11@users.noreply.translate.codeberg.org>
Date: Sat, 28 Dec 2024 21:50:11 +0000
Subject: [PATCH 290/357] Translated using Weblate (Serbian)

Currently translated at 100.0% (1058 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sr/
---
 src/main/res/values-sr/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 9d3b7caab0a8a6e380aface357b69f8491ae2dac..5db9b00a4a973c4d619ab850a4f2f53539c88d20 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -1140,4 +1140,6 @@
     <string name="pref_align_start_summary">Приказуј све поруке, укључујући послате, са леве стране за обједињени изглед преписке.</string>
     <string name="custom_notifications">Посебна обавештења</string>
     <string name="custom_notifications_enable">Укључи посебна подешавања обавештења (важност, звук, вибрација) за ову преписку?</string>
+    <string name="delete_avatar_message">Желиш да обришеш свој аватар? Неки клијенти ће можда наставити да приказују кеширану копију твог аватара.</string>
+    <string name="show_to_contacts_only">Приказуј само контактима</string>
 </resources>
\ No newline at end of file

From 39997bc1b047293023eba74cc735a1c4c87ea83b Mon Sep 17 00:00:00 2001
From: Juan M Sevilla <jumase@users.noreply.translate.codeberg.org>
Date: Sat, 28 Dec 2024 22:31:41 +0000
Subject: [PATCH 291/357] Translated using Weblate (Spanish)

Currently translated at 100.0% (79 of 79 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/es/
---
 fastlane/metadata/android/es-ES/changelogs/4212804.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/es-ES/changelogs/4212804.txt

diff --git a/fastlane/metadata/android/es-ES/changelogs/4212804.txt b/fastlane/metadata/android/es-ES/changelogs/4212804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0733de85f4aca9a4526c0a13067055a15cf918c0
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/4212804.txt
@@ -0,0 +1,3 @@
+* Acceso más fácil a sonidos de notificación personalizados desde Detalles del contacto -> Menú emergente -> Notificaciones personalizadas
+* Corrección de compartición directa en nuevas versiones de Android
+* Posibilidad de limitar visibilidad de imagen de perfil sólo a contactos

From 346987c310d9ac7e416cc61183f4329e3c51a8b6 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 29 Dec 2024 23:16:46 +0100
Subject: [PATCH 292/357] do not show 'contact only' switch for group avatars

---
 ...ublishGroupChatProfilePictureActivity.java | 63 ++++++++++---------
 1 file changed, 32 insertions(+), 31 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java
index 8d686c36fc45ffbb35ce4a0cf035c8425d96166a..85a2b8b727909c8aa584f948857d7a9df1a97c04 100644
--- a/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java
@@ -29,6 +29,8 @@
 
 package eu.siacs.conversations.ui;
 
+import static eu.siacs.conversations.ui.PublishProfilePictureActivity.REQUEST_CHOOSE_PICTURE;
+
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
@@ -36,10 +38,9 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
-
 import androidx.annotation.StringRes;
 import androidx.databinding.DataBindingUtil;
-
+import com.canhub.cropper.CropImage;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.databinding.ActivityPublishProfilePictureBinding;
@@ -47,20 +48,15 @@ import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.ui.interfaces.OnAvatarPublication;
 import eu.siacs.conversations.ui.util.PendingItem;
 
-import static eu.siacs.conversations.ui.PublishProfilePictureActivity.REQUEST_CHOOSE_PICTURE;
-
-import com.canhub.cropper.CropImage;
-
-public class PublishGroupChatProfilePictureActivity extends XmppActivity implements OnAvatarPublication {
+public class PublishGroupChatProfilePictureActivity extends XmppActivity
+        implements OnAvatarPublication {
     private final PendingItem<String> pendingConversationUuid = new PendingItem<>();
     private ActivityPublishProfilePictureBinding binding;
     private Conversation conversation;
     private Uri uri;
 
     @Override
-    protected void refreshUiReal() {
-
-    }
+    protected void refreshUiReal() {}
 
     @Override
     protected void onBackendConnected() {
@@ -76,11 +72,11 @@ public class PublishGroupChatProfilePictureActivity extends XmppActivity impleme
 
     private void reloadAvatar() {
         final int size = (int) getResources().getDimension(R.dimen.publish_avatar_size);
-        Bitmap bitmap;
+        final Bitmap bitmap;
         if (uri == null) {
             bitmap = xmppConnectionService.getAvatarService().get(conversation, size);
         } else {
-            Log.d(Config.LOGTAG, "loading " + uri.toString() + " into preview");
+            Log.d(Config.LOGTAG, "loading " + uri + " into preview");
             bitmap = xmppConnectionService.getFileBackend().cropCenterSquare(uri, size);
         }
         this.binding.accountImage.setImageBitmap(bitmap);
@@ -88,17 +84,20 @@ public class PublishGroupChatProfilePictureActivity extends XmppActivity impleme
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        this.binding = DataBindingUtil.setContentView(this, R.layout.activity_publish_profile_picture);
+        this.binding =
+                DataBindingUtil.setContentView(this, R.layout.activity_publish_profile_picture);
+        this.binding.contactOnly.setVisibility(View.GONE);
         Activities.setStatusAndNavigationBarColors(this, binding.getRoot());
         setSupportActionBar(this.binding.toolbar);
         configureActionBar(getSupportActionBar());
         this.binding.cancelButton.setOnClickListener((v) -> this.finish());
         this.binding.secondaryHint.setVisibility(View.GONE);
-        this.binding.accountImage.setOnClickListener((v) -> PublishProfilePictureActivity.chooseAvatar(this));
-        Intent intent = getIntent();
-        String uuid = intent == null ? null : intent.getStringExtra("uuid");
+        this.binding.accountImage.setOnClickListener(
+                (v) -> PublishProfilePictureActivity.chooseAvatar(this));
+        final var intent = getIntent();
+        final var uuid = intent == null ? null : intent.getStringExtra("uuid");
         if (uuid != null) {
             pendingConversationUuid.push(uuid);
         }
@@ -106,25 +105,24 @@ public class PublishGroupChatProfilePictureActivity extends XmppActivity impleme
         this.binding.publishButton.setOnClickListener(this::publish);
     }
 
-
-    private void publish(View view) {
+    private void publish(final View view) {
         binding.publishButton.setText(R.string.publishing);
         binding.publishButton.setEnabled(false);
         xmppConnectionService.publishMucAvatar(conversation, uri, this);
     }
 
     @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == CropImage.CROP_IMAGE_ACTIVITY_REQUEST_CODE) {
             final CropImage.ActivityResult result = CropImage.getActivityResult(data);
             if (resultCode == RESULT_OK) {
-                this.uri = result.getUri();
+                this.uri = result == null ? null : result.getUri();
                 if (xmppConnectionServiceBound) {
                     reloadAvatar();
                 }
             } else if (resultCode == CropImage.CROP_IMAGE_ACTIVITY_RESULT_ERROR_CODE) {
-                Exception error = result.getError();
+                final var error = result == null ? null : result.getError();
                 if (error != null) {
                     Toast.makeText(this, error.getMessage(), Toast.LENGTH_SHORT).show();
                 }
@@ -138,18 +136,21 @@ public class PublishGroupChatProfilePictureActivity extends XmppActivity impleme
 
     @Override
     public void onAvatarPublicationSucceeded() {
-        runOnUiThread(() -> {
-            Toast.makeText(this, R.string.avatar_has_been_published, Toast.LENGTH_SHORT).show();
-            finish();
-        });
+        runOnUiThread(
+                () -> {
+                    Toast.makeText(this, R.string.avatar_has_been_published, Toast.LENGTH_SHORT)
+                            .show();
+                    finish();
+                });
     }
 
     @Override
     public void onAvatarPublicationFailed(@StringRes int res) {
-        runOnUiThread(() -> {
-            Toast.makeText(this, res, Toast.LENGTH_SHORT).show();
-            this.binding.publishButton.setText(R.string.publish);
-            this.binding.publishButton.setEnabled(true);
-        });
+        runOnUiThread(
+                () -> {
+                    Toast.makeText(this, res, Toast.LENGTH_SHORT).show();
+                    this.binding.publishButton.setText(R.string.publish);
+                    this.binding.publishButton.setEnabled(true);
+                });
     }
 }

From 0334c062e2c9688e91ed619fbb246d2523855d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Mon, 30 Dec 2024 04:34:56 +0000
Subject: [PATCH 293/357] Translated using Weblate (Estonian)

Currently translated at 99.9% (1057 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index b916d8d6989b95656d6f23e8845bba47812d684c..fc519ee7a562bf577ad8118fd8612d825306e6ab 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -1126,4 +1126,6 @@
     <string name="pref_call_integration_summary">Kõned suudavad suhestuda nutiseadme muude kõnede loogikaga, näiteks uue kõne algamisel eelmine kõne lõppeb.</string>
     <string name="custom_notifications_enable">Kas kasutad selle vestluse jaoks enda määratud teavituste seadistusi (olulisus, helimärguanded, värina kasutamine)?</string>
     <string name="pref_call_integration">Kõnede lõimimine</string>
+    <string name="delete_avatar_message">Kas sa sooviksid oma tunnuspildi kustutada? Palun arvesta, et mitmed klientrakendused võivad jätkata vana puhverdatud pildi kasutamist.</string>
+    <string name="show_to_contacts_only">Näita vaid kontaktidele</string>
 </resources>
\ No newline at end of file

From 011629e40ace0c32b2b6d218d0ca83ab1cdbd97a Mon Sep 17 00:00:00 2001
From: Outbreak2096 <outbreak2096@users.noreply.translate.codeberg.org>
Date: Thu, 2 Jan 2025 04:32:44 +0000
Subject: [PATCH 294/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1058 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/zh_Hans/
---
 src/main/res/values-zh-rCN/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index faa8f1008854b4289cd8a6f9285c3694ce1c6927..6ae84613b9b12168b7e739e3fe66c5cc87b37a3b 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -681,7 +681,7 @@
     <string name="mtm_accept_cert">接受未知证书？</string>
     <string name="mtm_trust_anchor">此服务器证书不是由已知的证书颁发机构签发的。</string>
     <string name="mtm_accept_servername">接受不匹配的服务器名称？</string>
-    <string name="mtm_hostname_mismatch">无法验证服务器，因证书只对下列域名有效：</string>
+    <string name="mtm_hostname_mismatch">由于“%s”，服务器无法验证。证书仅对此有效：</string>
     <string name="mtm_connect_anyway">是否仍要连接？</string>
     <string name="mtm_cert_details">证书详情：</string>
     <string name="once">仅一次</string>
@@ -1011,7 +1011,7 @@
     <string name="delete_and_close">删除并存档对话</string>
     <string name="channel_discover_opt_in_message">频道发现使用称为 &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt; 的第三方服务。&lt;br&gt;&lt;br&gt;使用此功能会将您的 IP 地址和搜索词传输到此服务。请参阅其 &lt;a href=https://search.jabber.network/privacy&gt;隐私政策&lt;/a&gt; 以获取更多信息。</string>
     <string name="start_chat">开始对话</string>
-    <string name="title_activity_share_with">分享…</string>
+    <string name="title_activity_share_with">分享至…</string>
     <string name="pref_use_colorful_bubbles_summary">为发送和接收的消息使用不同的背景颜色</string>
     <string name="no_certificate_selected">未选择客户端证书！</string>
     <string name="pref_use_colorful_bubbles">多彩消息气泡</string>
@@ -1105,6 +1105,6 @@
     <string name="pref_call_integration_summary">此应用的通话与常规通话交互，例如另一个通话开始时结束一个通话。</string>
     <string name="pref_align_start_summary">在左侧显示所有消息，包括发送的消息，以实现统一的聊天布局。</string>
     <string name="pref_align_start">左对齐消息</string>
-    <string name="delete_avatar_message">你想删除你的头像吗？一些客户端可能继续显示你头像的缓存副本。</string>
-    <string name="show_to_contacts_only">只对联系人显示</string>
+    <string name="delete_avatar_message">是否删除头像？某些客户端可能会继续显示您头像的缓存副本。</string>
+    <string name="show_to_contacts_only">仅显示给联系人</string>
 </resources>
\ No newline at end of file

From 80fa169d47119570dffd8b4f6e6ede2c90b170cf Mon Sep 17 00:00:00 2001
From: Outbreak2096 <outbreak2096@users.noreply.translate.codeberg.org>
Date: Thu, 2 Jan 2025 04:49:54 +0000
Subject: [PATCH 295/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (13 of 13 strings)

Translation: Conversations/Android App (Conversations)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-conversations/zh_Hans/
---
 src/conversations/res/values-zh-rCN/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conversations/res/values-zh-rCN/strings.xml b/src/conversations/res/values-zh-rCN/strings.xml
index 1e4379eac9db994a766fe76ffd71231c3fdfd452..73198d777707c7291bef21e051400cdc42151ab6 100644
--- a/src/conversations/res/values-zh-rCN/strings.xml
+++ b/src/conversations/res/values-zh-rCN/strings.xml
@@ -3,7 +3,7 @@
     <string name="pick_a_server">选择 XMPP 提供者</string>
     <string name="use_conversations.im">使用 conversations.im</string>
     <string name="create_new_account">创建新账号</string>
-    <string name="do_you_have_an_account">您已经有 XMPP 账号了吗？如果之前使用过 Conversations 或其他 XMPP 客户端，那么已经有账号了。如果没有，现在可以创建一个。\n提示：一些邮件服务提供者也提供 XMPP 账号。</string>
+    <string name="do_you_have_an_account">您已经有 XMPP 账号了吗？如果之前使用过 Conversations 或其他 XMPP 客户端，那么已经有账号了。如果没有，现在可以创建账号。\n提示：一些邮件服务提供者也提供 XMPP 账号。</string>
     <string name="server_select_text">XMPP 是独立于提供者的即时通讯网络。您选择的任何 XMPP 服务器都可以使用此应用。\n不过，您可以轻松地在 conversations.im 上创建账号，这是专门适用于 Conversations 的提供者。</string>
     <string name="magic_create_text_on_x">您已受邀加入 %1$s。我们将指导您创建账号。\n选择 %1$s 作为提供者时，向别人提供您的完整 XMPP 地址，就能和对方交流。</string>
     <string name="magic_create_text_fixed">您已受邀加入 %1$s。已为您选择了用户名。我们将指导您创建账号。\n向别人提供您的完整 XMPP 地址，就能和对方交流。</string>

From 4750a22d772156aee6d97aeca6b833b032b5f91d Mon Sep 17 00:00:00 2001
From: Outbreak2096 <outbreak2096@users.noreply.translate.codeberg.org>
Date: Thu, 2 Jan 2025 05:07:15 +0000
Subject: [PATCH 296/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (79 of 79 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/zh_Hans/
---
 fastlane/metadata/android/zh-CN/changelogs/4212804.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 fastlane/metadata/android/zh-CN/changelogs/4212804.txt

diff --git a/fastlane/metadata/android/zh-CN/changelogs/4212804.txt b/fastlane/metadata/android/zh-CN/changelogs/4212804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..217baa5879723ebe76fe0acd61f41219403ca8bb
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/4212804.txt
@@ -0,0 +1,3 @@
+* 通过（联系详情 -> 溢出菜单 -> 自定义通知）更轻松地访问自定义通知提示音
+* 修复新 Android 版本上的直接共享目标
+* 能够限制头像对联系人的可见性

From f89ad98b6bf2f1386b24b50140b2deaea9586189 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 3 Jan 2025 10:33:23 +0100
Subject: [PATCH 297/357] trim whitespace of messages in view

---
 .../siacs/conversations/entities/Message.java |   2 +-
 .../ui/adapter/MessageAdapter.java            | 176 +++++++++---------
 2 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index ee61056fa96d1bc1900cad6b2bd1cbb83261c33e..5b6f0e2aecbbb1b4f0cb061223ff74f5b8c9bf30 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -724,7 +724,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public boolean trusted() {
-        Contact contact = this.getContact();
+        final var contact = this.getContact();
         return status > STATUS_RECEIVED
                 || (contact != null && (contact.showInContactList() || contact.isSelf()));
     }
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 7eb8ea05ca7f4074585c260639197925bf0a5707..091ab1fbbcaf085772bd03267996dd66c7fe9e03 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -479,111 +479,111 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         setTextColor(viewHolder.messageBody(), bubbleColor);
         setTextSize(viewHolder.messageBody(), this.bubbleDesign.largeFont);
         viewHolder.messageBody().setTypeface(null, Typeface.NORMAL);
-
-        if (message.getBody() != null) {
-            final String nick = UIHelper.getMessageDisplayName(message);
-            final boolean hasMeCommand = message.hasMeCommand();
-            final var rawBody = message.getBody();
-            final SpannableStringBuilder body;
-            if (rawBody.length() > Config.MAX_DISPLAY_MESSAGE_CHARS) {
-                body = new SpannableStringBuilder(rawBody, 0, Config.MAX_DISPLAY_MESSAGE_CHARS);
-                body.append("…");
-            } else {
-                body = new SpannableStringBuilder(rawBody);
-            }
+        final var rawBody = message.getBody();
+        if (Strings.isNullOrEmpty(rawBody)) {
+            viewHolder.messageBody().setText("");
+            viewHolder.messageBody().setTextIsSelectable(false);
+            return;
+        }
+        final String nick = UIHelper.getMessageDisplayName(message);
+        final boolean hasMeCommand = message.hasMeCommand();
+        final var trimmedBody = rawBody.trim();
+        final SpannableStringBuilder body;
+        if (trimmedBody.length() > Config.MAX_DISPLAY_MESSAGE_CHARS) {
+            body = new SpannableStringBuilder(trimmedBody, 0, Config.MAX_DISPLAY_MESSAGE_CHARS);
+            body.append("…");
+        } else {
+            body = new SpannableStringBuilder(trimmedBody);
+        }
+        if (hasMeCommand) {
+            body.replace(0, Message.ME_COMMAND.length(), String.format("%s ", nick));
+        }
+        boolean startsWithQuote = handleTextQuotes(viewHolder.messageBody(), body, bubbleColor);
+        if (!message.isPrivateMessage()) {
             if (hasMeCommand) {
-                body.replace(0, Message.ME_COMMAND.length(), String.format("%s ", nick));
-            }
-            boolean startsWithQuote = handleTextQuotes(viewHolder.messageBody(), body, bubbleColor);
-            if (!message.isPrivateMessage()) {
-                if (hasMeCommand) {
-                    body.setSpan(
-                            new StyleSpan(Typeface.BOLD_ITALIC),
-                            0,
-                            nick.length(),
-                            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                }
-            } else {
-                String privateMarker;
-                if (message.getStatus() <= Message.STATUS_RECEIVED) {
-                    privateMarker = activity.getString(R.string.private_message);
-                } else {
-                    Jid cp = message.getCounterpart();
-                    privateMarker =
-                            activity.getString(
-                                    R.string.private_message_to,
-                                    Strings.nullToEmpty(cp == null ? null : cp.getResource()));
-                }
-                body.insert(0, privateMarker);
-                int privateMarkerIndex = privateMarker.length();
-                if (startsWithQuote) {
-                    body.insert(privateMarkerIndex, "\n\n");
-                    body.setSpan(
-                            new DividerSpan(false),
-                            privateMarkerIndex,
-                            privateMarkerIndex + 2,
-                            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                } else {
-                    body.insert(privateMarkerIndex, " ");
-                }
                 body.setSpan(
-                        new ForegroundColorSpan(
-                                bubbleToOnSurfaceVariant(viewHolder.messageBody(), bubbleColor)),
+                        new StyleSpan(Typeface.BOLD_ITALIC),
                         0,
-                        privateMarkerIndex,
+                        nick.length(),
                         Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            }
+        } else {
+            String privateMarker;
+            if (message.getStatus() <= Message.STATUS_RECEIVED) {
+                privateMarker = activity.getString(R.string.private_message);
+            } else {
+                Jid cp = message.getCounterpart();
+                privateMarker =
+                        activity.getString(
+                                R.string.private_message_to,
+                                Strings.nullToEmpty(cp == null ? null : cp.getResource()));
+            }
+            body.insert(0, privateMarker);
+            int privateMarkerIndex = privateMarker.length();
+            if (startsWithQuote) {
+                body.insert(privateMarkerIndex, "\n\n");
                 body.setSpan(
-                        new StyleSpan(Typeface.BOLD),
-                        0,
+                        new DividerSpan(false),
                         privateMarkerIndex,
+                        privateMarkerIndex + 2,
                         Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                if (hasMeCommand) {
-                    body.setSpan(
-                            new StyleSpan(Typeface.BOLD_ITALIC),
-                            privateMarkerIndex + 1,
-                            privateMarkerIndex + 1 + nick.length(),
-                            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                }
+            } else {
+                body.insert(privateMarkerIndex, " ");
             }
-            if (message.getConversation().getMode() == Conversation.MODE_MULTI
-                    && message.getStatus() == Message.STATUS_RECEIVED) {
-                if (message.getConversation() instanceof Conversation conversation) {
-                    Pattern pattern =
-                            NotificationService.generateNickHighlightPattern(
-                                    conversation.getMucOptions().getActualNick());
-                    Matcher matcher = pattern.matcher(body);
-                    while (matcher.find()) {
-                        body.setSpan(
-                                new StyleSpan(Typeface.BOLD),
-                                matcher.start(),
-                                matcher.end(),
-                                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                    }
-                }
+            body.setSpan(
+                    new ForegroundColorSpan(
+                            bubbleToOnSurfaceVariant(viewHolder.messageBody(), bubbleColor)),
+                    0,
+                    privateMarkerIndex,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            body.setSpan(
+                    new StyleSpan(Typeface.BOLD),
+                    0,
+                    privateMarkerIndex,
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            if (hasMeCommand) {
+                body.setSpan(
+                        new StyleSpan(Typeface.BOLD_ITALIC),
+                        privateMarkerIndex + 1,
+                        privateMarkerIndex + 1 + nick.length(),
+                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             }
-            Matcher matcher = Emoticons.getEmojiPattern(body).matcher(body);
-            while (matcher.find()) {
-                if (matcher.start() < matcher.end()) {
+        }
+        if (message.getConversation().getMode() == Conversation.MODE_MULTI
+                && message.getStatus() == Message.STATUS_RECEIVED) {
+            if (message.getConversation() instanceof Conversation conversation) {
+                Pattern pattern =
+                        NotificationService.generateNickHighlightPattern(
+                                conversation.getMucOptions().getActualNick());
+                Matcher matcher = pattern.matcher(body);
+                while (matcher.find()) {
                     body.setSpan(
-                            new RelativeSizeSpan(1.2f),
+                            new StyleSpan(Typeface.BOLD),
                             matcher.start(),
                             matcher.end(),
                             Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
                 }
             }
-
-            StylingHelper.format(body, viewHolder.messageBody().getCurrentTextColor());
-            MyLinkify.addLinks(body, true);
-            if (highlightedTerm != null) {
-                StylingHelper.highlight(viewHolder.messageBody(), body, highlightedTerm);
+        }
+        Matcher matcher = Emoticons.getEmojiPattern(body).matcher(body);
+        while (matcher.find()) {
+            if (matcher.start() < matcher.end()) {
+                body.setSpan(
+                        new RelativeSizeSpan(1.2f),
+                        matcher.start(),
+                        matcher.end(),
+                        Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
             }
-            viewHolder.messageBody().setAutoLinkMask(0);
-            viewHolder.messageBody().setText(body);
-            viewHolder.messageBody().setMovementMethod(ClickableMovementMethod.getInstance());
-        } else {
-            viewHolder.messageBody().setText("");
-            viewHolder.messageBody().setTextIsSelectable(false);
         }
+
+        StylingHelper.format(body, viewHolder.messageBody().getCurrentTextColor());
+        MyLinkify.addLinks(body, true);
+        if (highlightedTerm != null) {
+            StylingHelper.highlight(viewHolder.messageBody(), body, highlightedTerm);
+        }
+        viewHolder.messageBody().setAutoLinkMask(0);
+        viewHolder.messageBody().setText(body);
+        viewHolder.messageBody().setMovementMethod(ClickableMovementMethod.getInstance());
     }
 
     private void displayDownloadableMessage(

From 88968408516265a92395b1b7bdcc1ea171b05373 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 4 Jan 2025 11:46:13 +0100
Subject: [PATCH 298/357] remove unnecessary .onion branch; same as no hostname

---
 .../siacs/conversations/xmpp/XmppConnection.java  | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 8c6cc0e800587251bfb55d9bfbcd4acad7565d67..23508a82022776562bd46dd0d61904cfaed497d7 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -304,27 +304,20 @@ public class XmppConnection implements Runnable {
             if (useTor) {
                 final var seeOtherHost = this.seeOtherHostResolverResult;
                 final var hostname = account.getHostname();
+                final var port = account.getPort();
                 final Resolver.Result resume = streamId == null ? null : streamId.location;
                 final Resolver.Result viaTor;
-                if (account.isOnion()) {
-                    // for .onion JIDs we always connect to the onion address no matter what
-                    viaTor =
-                            Iterables.getOnlyElement(
-                                    Resolver.fromHardCoded(
-                                            account.getServer(), Resolver.XMPP_PORT_STARTTLS));
-                } else if (resume != null) {
+                if (resume != null) {
                     viaTor = resume;
                 } else if (seeOtherHost != null) {
                     viaTor = seeOtherHost;
-                } else if (hostname.isEmpty()) {
+                } else if (hostname.isEmpty() || port < 0) {
                     viaTor =
                             Iterables.getOnlyElement(
                                     Resolver.fromHardCoded(
                                             account.getServer(), Resolver.XMPP_PORT_STARTTLS));
                 } else {
-                    viaTor =
-                            Iterables.getOnlyElement(
-                                    Resolver.fromHardCoded(hostname, account.getPort()));
+                    viaTor = Iterables.getOnlyElement(Resolver.fromHardCoded(hostname, port));
                     this.verifiedHostname = hostname;
                 }
 

From 772c5b0d36352d520add0f469954262e8060ec53 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 4 Jan 2025 12:22:34 +0100
Subject: [PATCH 299/357] trim hostname for tor

---
 .../conversations/xmpp/XmppConnection.java    |  3 +-
 .../jingle/JingleFileTransferConnection.java  | 46 +++++++++----------
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 23508a82022776562bd46dd0d61904cfaed497d7..ba800163258ef9137b922cf788f9fcbaba4ddfe2 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -303,7 +303,7 @@ public class XmppConnection implements Runnable {
             // TODO collapse Tor usage into normal connection code path
             if (useTor) {
                 final var seeOtherHost = this.seeOtherHostResolverResult;
-                final var hostname = account.getHostname();
+                final var hostname = account.getHostname().trim();
                 final var port = account.getPort();
                 final Resolver.Result resume = streamId == null ? null : streamId.location;
                 final Resolver.Result viaTor;
@@ -446,7 +446,6 @@ public class XmppConnection implements Runnable {
                         localSocket = new Socket();
                         localSocket.connect(addr, Config.SOCKET_TIMEOUT * 1000);
 
-                        // TODO use result.isDirect() as condition and set encryptionEnabled after
                         if (features.encryptionEnabled) {
                             localSocket = upgradeSocketToTls(localSocket);
                         }
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
index e2f8be3393a806a2eb4fc0dc58569db8c61cccd9..ca035d5dfc7a7ab00c165c14e6b6db78d95a9f35 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
@@ -1,9 +1,7 @@
 package eu.siacs.conversations.xmpp.jingle;
 
 import android.util.Log;
-
 import androidx.annotation.NonNull;
-
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.base.Throwables;
@@ -16,7 +14,6 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
-
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.crypto.axolotl.XmppAxolotlMessage;
 import eu.siacs.conversations.entities.Conversation;
@@ -38,19 +35,8 @@ import eu.siacs.conversations.xmpp.jingle.transports.InbandBytestreamsTransport;
 import eu.siacs.conversations.xmpp.jingle.transports.SocksByteStreamsTransport;
 import eu.siacs.conversations.xmpp.jingle.transports.Transport;
 import eu.siacs.conversations.xmpp.jingle.transports.WebRTCDataChannelTransport;
-
 import im.conversations.android.xmpp.model.jingle.Jingle;
 import im.conversations.android.xmpp.model.stanza.Iq;
-
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.io.CipherInputStream;
-import org.bouncycastle.crypto.io.CipherOutputStream;
-import org.bouncycastle.crypto.modes.AEADBlockCipher;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.webrtc.IceCandidate;
-
 import java.io.Closeable;
 import java.io.EOFException;
 import java.io.File;
@@ -68,6 +54,14 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Queue;
 import java.util.concurrent.CountDownLatch;
+import org.bouncycastle.crypto.engines.AESEngine;
+import org.bouncycastle.crypto.io.CipherInputStream;
+import org.bouncycastle.crypto.io.CipherOutputStream;
+import org.bouncycastle.crypto.modes.AEADBlockCipher;
+import org.bouncycastle.crypto.modes.GCMBlockCipher;
+import org.bouncycastle.crypto.params.AEADParameters;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.webrtc.IceCandidate;
 
 public class JingleFileTransferConnection extends AbstractJingleConnection
         implements Transport.Callback, Transferable {
@@ -871,7 +865,8 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
             if (isTerminated()) {
                 Log.d(
                         Config.LOGTAG,
-                        "failed to set up file transceiver but session has already been terminated");
+                        "failed to set up file transceiver but session has already been"
+                                + " terminated");
             } else {
                 Log.d(Config.LOGTAG, "failed to set up file transceiver", e);
                 sendSessionTerminate(Reason.ofThrowable(e), e.getMessage());
@@ -1005,11 +1000,13 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
     public void onTransportSetupFailed() {
         final var transport = this.transport;
         if (transport == null) {
-            // this can happen on IQ timeouts
-            if (isTerminated()) {
-                return;
+            synchronized (this) {
+                // this can happen on IQ timeouts
+                if (isTerminated()) {
+                    return;
+                }
+                sendSessionTerminate(Reason.FAILED_APPLICATION, null);
             }
-            sendSessionTerminate(Reason.FAILED_APPLICATION, null);
             return;
         }
         Log.d(Config.LOGTAG, "onTransportSetupFailed");
@@ -1183,12 +1180,13 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
         }
         final var state = getState();
         return switch (state) {
-            case NULL, SESSION_INITIALIZED, SESSION_INITIALIZED_PRE_APPROVED -> Transferable
-                    .STATUS_OFFER;
+            case NULL, SESSION_INITIALIZED, SESSION_INITIALIZED_PRE_APPROVED ->
+                    Transferable.STATUS_OFFER;
             case TERMINATED_APPLICATION_FAILURE,
-                    TERMINATED_CONNECTIVITY_ERROR,
-                    TERMINATED_DECLINED_OR_BUSY,
-                    TERMINATED_SECURITY_ERROR -> Transferable.STATUS_FAILED;
+                            TERMINATED_CONNECTIVITY_ERROR,
+                            TERMINATED_DECLINED_OR_BUSY,
+                            TERMINATED_SECURITY_ERROR ->
+                    Transferable.STATUS_FAILED;
             case TERMINATED_CANCEL_OR_TIMEOUT -> Transferable.STATUS_CANCELLED;
             case SESSION_ACCEPTED -> Transferable.STATUS_DOWNLOADING;
             default -> Transferable.STATUS_UNKNOWN;

From ad119d1478fd99b96ed16fc4437c42b1b452a295 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 4 Jan 2025 12:23:11 +0100
Subject: [PATCH 300/357] bump copyright year

---
 src/main/res/values/about.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values/about.xml b/src/main/res/values/about.xml
index b5c2ba960fc621f7bfa354a9c613587d9adc0220..4076d92cba867a021e7e86589303c66fc6b03266 100644
--- a/src/main/res/values/about.xml
+++ b/src/main/res/values/about.xml
@@ -31,7 +31,7 @@
 <resources>
     <string name="pref_about_message" translatable="false">
 			Conversations • the very last word in instant messaging.
-			\n\nCopyright © 2014-2024 Daniel Gultsch
+			\n\nCopyright © 2014-2025 Daniel Gultsch
 			\n\nThis program is free software: you can redistribute it and/or modify
 			it under the terms of the GNU General Public License as published by
 			the Free Software Foundation, either version 3 of the License, or

From cefcd2792bf3f212a97b2ed2fa3c09cb3e6fe660 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 5 Jan 2025 22:11:37 +0100
Subject: [PATCH 301/357] version bump to 2.17.8 + changelog

---
 CHANGELOG.md                                           | 5 +++++
 build.gradle                                           | 4 ++--
 fastlane/metadata/android/en-US/changelogs/4212904.txt | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/4212904.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 455fcdb726b2fbec084321142998c837c4ba2b0e..9516c25bd2476b23b1f137e4a72d75e20ac5ea61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.17.8
+
+* Fix some minor UI bugs
+* Fix connection issues with .onion domains on non-default ports
+
 ### Version 2.17.7
 
 * Easier access to custom notification sounds via Contact details -> Overflow menu -> Custom notifications)
diff --git a/build.gradle b/build.gradle
index 94dd2afb5adfd7cf814e53d8697defad4f9cf1dd..b3c85abf16bcbb8a947c56669a7e0969766bfa2b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -113,8 +113,8 @@ android {
     defaultConfig {
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 42128
-        versionName "2.17.7"
+        versionCode 42129
+        versionName "2.17.8"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/fastlane/metadata/android/en-US/changelogs/4212904.txt b/fastlane/metadata/android/en-US/changelogs/4212904.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c700e2eff1327888e238dfd8b9e8176b786cce62
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/4212904.txt
@@ -0,0 +1,2 @@
+* Fix some minor UI bugs
+* Fix connection issues with .onion domains on non-default ports

From fa671a37bddd938ad554d7a7dc45f8b37d517d48 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 7 Jan 2025 10:05:54 +0100
Subject: [PATCH 302/357] limit woodpecker to master + tags

---
 .woodpecker.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index affaf71106c7209b45473f9a549d38958b1fa5ac..e4596179941d78fcf60a827a91e73e13906b88e9 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,7 +1,11 @@
 steps:
-    build:
-        image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
-        commands:
-            - ./gradlew clean
-            - ./gradlew assembleConversationsFreeDebug
-            - ./gradlew assembleQuicksyFreeDebug
+  build:
+    when:
+      - branch: master
+        event: push
+      - event: tag
+    image: codeberg.org/freeyourgadget/android-fdroid-tools:latest
+    commands:
+      - ./gradlew clean
+      - ./gradlew assembleConversationsFreeDebug
+      - ./gradlew assembleQuicksyFreeDebug

From 58a5adef4e179c9122b48eda406825d5d0c8f40b Mon Sep 17 00:00:00 2001
From: iNPUTmice <inputmice@noreply.codeberg.org>
Date: Tue, 7 Jan 2025 10:03:46 +0000
Subject: [PATCH 303/357] update p2 reference to point to codeberg

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index dc6892c8530e131708acaa2ebbc3728a6b3b3c54..4032f9b2b31fb667fa4298fc759f6df759809c09 100644
--- a/README.md
+++ b/README.md
@@ -156,13 +156,13 @@ Long press the permanent notification and disable that particular type of notifi
 Long press the permanent notification and press the info `(i)` button to get into the App info screen. In that screen touch the 'Notification' entry. In the next screen remove the checkbox for the 'Foreground service' entry. 
 
 #### How do XEP-0357: Push Notifications work?
-You need to be running the Play Store version of Conversations and your server needs to support push notifications.¹ Because *Google’s Firebase Cloud Messaging (FCM)* are tied with an API key to a specific app your server can not initiate the push message directly. Instead your server will send the push notification to the [Conversations App server](https://github.com/iNPUTmice/p2) (operated by us) which then acts as a proxy and initiates the push message for you. The push message sent from our App server through FCM doesn’t contain any personal information. It is just an empty message which will wake up your device and tell Conversations to reconnect to your server. The information sent from your server to our App server depends on the configuration of your server but can be limited to your account name. (In any case the Conversations App server won't redirect any information through FCM even if your server sends this information.)
+You need to be running the Play Store version of Conversations and your server needs to support push notifications.¹ Because *Google’s Firebase Cloud Messaging (FCM)* are tied with an API key to a specific app your server can not initiate the push message directly. Instead your server will send the push notification to the [Conversations App server](https://codeberg.org/iNPUTmice/p2) (operated by us) which then acts as a proxy and initiates the push message for you. The push message sent from our App server through FCM doesn’t contain any personal information. It is just an empty message which will wake up your device and tell Conversations to reconnect to your server. The information sent from your server to our App server depends on the configuration of your server but can be limited to your account name. (In any case the Conversations App server won't redirect any information through FCM even if your server sends this information.)
 
 In summary Google will never get hold of any personal information besides that *something* happened. (Which doesn’t even have to be a message but can be some automated event as well.) We - as the operator of the App server - will just get hold of your account name (without being able to tie this to your specific device).
 
 If you don’t want this simply pick a server which does not offer Push Notifications or build Conversations yourself without support for push notifications. (This is available via a gradle build flavor.) Non-play store source of Conversations like the Amazon App store will also offer a version without push notifications. Conversations will just work as before and maintain its own TCP connection in the background.
 
-You can find a detailed description of how your server, the app server and FCM are interacting with each other in the [README](https://github.com/iNPUTmice/p2/blob/master/README.md) of the Conversations App Server.
+You can find a detailed description of how your server, the app server and FCM are interacting with each other in the [README.md](https://codeberg.org/iNPUTmice/p2/src/branch/master/README.md) of the Conversations App Server.
 
  ¹ If you use the Play Store version you do **not** need to run your own app server. Your server only needs to support the server side of [XEP-0357: Push Notifications](http://xmpp.org/extensions/xep-0357.html) and [XEP-0198: Stream Management](https://xmpp.org/extensions/xep-0198.html). The prosody server modules are called *mod_cloud_notify* and *mod_smacks*. The ejabberd server modules are called *mod_push* and *mod_stream_mgmt*.
 

From efb70dddb3ae35b91440e536fed75aab5225be41 Mon Sep 17 00:00:00 2001
From: ffunk <ffunk@users.noreply.translate.codeberg.org>
Date: Sat, 4 Jan 2025 15:10:11 +0000
Subject: [PATCH 304/357] Translated using Weblate (Czech)

Currently translated at 93.6% (991 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/cs/
---
 src/main/res/values-cs/strings.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index afe234e000883972f2e17a92346295dbfc2b497f..d1bb6f52b2bee68dfb1100c31e6259542c28037c 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -92,10 +92,10 @@
     <string name="send_message_to_x">Odeslat zprávu pro %s</string>
     <string name="send_omemo_x509_message">Odeslat v\\OMEMO šifrovanou zprávu</string>
     <string name="your_nick_has_been_changed">Přezdívka změněna</string>
-    <string name="send_unencrypted">Poslat nešifrované</string>
+    <string name="send_unencrypted">Odeslat nešifrovaný text</string>
     <string name="decryption_failed">Zašifrování se nezdařilo. Možná nemáte správný privátní klíč.</string>
     <string name="openkeychain_required">OpenKeychain</string>
-    <string name="openkeychain_required_long">%1$s používá &lt;b&gt;OpenKeychain&lt;/b&gt; k šifrování a dešifrování zpráv a ke správě Vašich veřejných klíčů.&lt;br&gt;&lt;br&gt;OpenKeychain je vydána pod licencí GPLv3+ a dostupná na F-Droid nebo Google Play.&lt;br&gt;&lt;br&gt;&lt;small&gt;(Po instalaci, prosím, restartujte %1$s.)&lt;/small&gt;</string>
+    <string name="openkeychain_required_long"><![CDATA[%1$s používá <b>OpenKeychain</b> k šifrování a dešifrování zpráv a ke správě Vašich veřejných klíčů.<br><br>OpenKeychain je vydána pod licencí GPLv3+ a dostupná na F-Droid nebo Google Play.<br><br><small>(Po instalaci, prosím, restartujte %1$s.)</small>]]></string>
     <string name="restart">Restartovat</string>
     <string name="install">Instalovat</string>
     <string name="openkeychain_not_installed">Nainstalujte prosím OpenKeychain</string>
@@ -499,7 +499,7 @@
     <string name="shared_text_with_x">Text sdílen s %s</string>
     <string name="no_storage_permission">Povolit %1$s přístup k externímu úložišti</string>
     <string name="no_camera_permission">Povolit %1$s přístup ke kameře</string>
-    <string name="sync_with_contacts">Synchronizovat s kontakty</string>
+    <string name="sync_with_contacts">Integrace seznamu kontaktů</string>
     <string name="sync_with_contacts_long">%1$s zpracovává Váš seznam kontaktů místně na Vašem zařízení za účelem zobrazení jmen a profilových obrázků odpovídajících kontaktů na XMPP.
 \n
 \n
@@ -555,7 +555,7 @@
     <string name="gp_medium">Střední</string>
     <string name="gp_long">Dlouhý</string>
     <string name="pref_broadcast_last_activity">Naposledy spatřen</string>
-    <string name="pref_broadcast_last_activity_summary">Umožnit svým kontaktům vidět, kdy jste naposledy použili aplikaci</string>
+    <string name="pref_broadcast_last_activity_summary">Umožnit kontaktům vidět, kdy jste byli v aplikaci naposledy aktivní</string>
     <string name="pref_privacy">Soukromí</string>
     <string name="pref_theme_options">Vzhled</string>
     <string name="pref_theme_options_summary">Vybrat paletu barev</string>
@@ -1088,4 +1088,6 @@
     <string name="pref_accept_invites_from_strangers_summary">Přijímat pozvánky do skupinových chatů od neznámých kontaktů</string>
     <string name="pref_large_font">Velké písmo</string>
     <string name="pref_large_font_summary">Zvětšit písmo v chatových bublinách</string>
+    <string name="server_info_bind2">XEP-0386: Bind 2</string>
+    <string name="server_info_sasl2">XEP-0388: Extensible SASL Profile</string>
 </resources>
\ No newline at end of file

From ea48d23a5ca3f8225ac1f8764c4554b51cce3291 Mon Sep 17 00:00:00 2001
From: ffunk <ffunk@users.noreply.translate.codeberg.org>
Date: Sun, 5 Jan 2025 13:25:06 +0000
Subject: [PATCH 305/357] Translated using Weblate (Czech)

Currently translated at 96.5% (1022 of 1058 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/cs/
---
 src/main/res/values-cs/strings.xml | 44 +++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index d1bb6f52b2bee68dfb1100c31e6259542c28037c..86788f029d7ac3d92d723bebfd58523e0a658faf 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -1074,7 +1074,7 @@
     <string name="call_integration_not_available">Integrace hovorů není k dispozici!</string>
     <string name="pref_connection_summary_w_cd">Název hostitele a port, Tor, objevování kanálů</string>
     <string name="pref_connection_summary">Název hostitele a port, Tor</string>
-    <string name="pref_backup_summary">Vytvořit jednou, naplánovat další</string>
+    <string name="pref_backup_summary">Vytvořit jednorázově, naplánovat pravidelné zálohy</string>
     <string name="pref_up_long_summary">Pokud je funkce distribuce UnifiedPush povolena, spolehlivé a na baterii nenáročné XMPP spojení bude využíváno k probouzení jiných aplikací kompatibilních s UnifiedPush, jako jsou např. Tusky, Ltt.rs, FluffyChat a další.</string>
     <string name="pref_category_application">Aplikace</string>
     <string name="pref_category_interaction">Interakce</string>
@@ -1090,4 +1090,46 @@
     <string name="pref_large_font_summary">Zvětšit písmo v chatových bublinách</string>
     <string name="server_info_bind2">XEP-0386: Bind 2</string>
     <string name="server_info_sasl2">XEP-0388: Extensible SASL Profile</string>
+    <string name="add_reaction_title">Přidat reakci</string>
+    <string name="more_reactions">Více reakcí</string>
+    <string name="rtp_state_retracted">Odvolaný hovor</string>
+    <string name="pref_category_receiving">Přijímané</string>
+    <string name="edit_nick">Upravit přezdívku</string>
+    <string name="pref_category_sending">Odesílané</string>
+    <string name="pref_category_server_connection">Připojení k serveru</string>
+    <string name="could_not_modify_call">Nebylo možné upravit hovor</string>
+    <string name="your_avatar_tap_to_select_new_avatar">Váš avatar. Klepnutím vyberte nový avatar z galerie.</string>
+    <string name="video_is_disabled_tap_to_enable">Video je vypnuto. Klepněte pro zapnutí.</string>
+    <string name="pref_category_operating_system">Operační systém</string>
+    <string name="pref_category_engagement_notifications">Oznámení o aktivitě</string>
+    <string name="allow_private_messages">Povolit soukromé zprávy</string>
+    <string name="delete_pgp_key">Smazat OpenPGP klíč</string>
+    <string name="edit_name_and_topic">Upravit název a téma</string>
+    <string name="edit_configuration">Změnit konfiguraci</string>
+    <string name="change_notification_settings">Změnit nastavení upozornění</string>
+    <string name="call_is_using_earpiece">Hovor probíhá přes sluchátko telefonu.</string>
+    <string name="call_is_using_wired_headset">Hovor probíhá přes drátová sluchátka s mikrofonem</string>
+    <string name="call_is_using_speaker_tap_to_switch_to_earpiece">Hovor probíhá přes spodní reproduktor. Klepnutím přepnete na sluchátko telefonu.</string>
+    <string name="call_is_using_speaker">Hovor probíhá přes spodní reproduktor.</string>
+    <string name="call_is_using_bluetooth">Hovor probíhá přes bluetooth.</string>
+    <string name="flip_camera">Změnit kameru</string>
+    <string name="video_is_enabled_tap_to_disable">Video je zapnuto. Klepněte pro vypnutí.</string>
+    <string name="clients_may_not_support_av">XMPP klient vašeho kontaktu nemusí podporovat hlasové a videohovory.</string>
+    <string name="could_not_add_reaction">Nebylo možné přidat reakci</string>
+    <string name="add_reaction">Přidat reakci…</string>
+    <string name="pref_align_start">Zprávy zarovnané doleva</string>
+    <string name="pref_align_start_summary">Zobrazit všechny zprávy, včetně odeslaných, na levé straně pro jednotné rozvržení chatu.</string>
+    <string name="custom_notifications">Vlastní oznámení</string>
+    <string name="custom_notifications_enable">Povolit vlastní oznámení (důležitost, zvuk, vibrace) pro tuto konverzaci?</string>
+    <string name="show_to_contacts_only">Zobrazit pouze kontaktům</string>
+    <string name="pref_show_avatars">Zobrazení avatarů</string>
+    <string name="pref_show_avatars_summary">Kromě skupinových chatů zobrazit avatary také u vašich zpráv a v chatech 1:1.</string>
+    <string name="pref_chat_bubbles">Bubliny chatu</string>
+    <string name="pref_chat_bubbles_summary">Barva pozadí, velikost písma, avatary</string>
+    <string name="pref_title_bubbles">Bubliny chatu</string>
+    <string name="could_not_disable_video">Nebylo možné zakázat video.</string>
+    <string name="call_is_using_earpiece_tap_to_switch_to_speaker">Hovor probíhá přes sluchátko telefonu. Klepnutím přepnete na spodní reproduktor.</string>
+    <string name="pref_call_integration">Integrace hovorů</string>
+    <string name="pref_call_integration_summary">Hovory z této aplikace interagují s běžnými telefonními hovory, například ukončení jednoho hovoru, když začne další.</string>
+    <string name="delete_avatar_message">Chcete smazat svůj avatar? Některé aplikace mohou i nadále zobrazovat uloženou kopii vašeho avataru.</string>
 </resources>
\ No newline at end of file

From 513f7be4a8b1cee007f3f41929481c910de2f22f Mon Sep 17 00:00:00 2001
From: SomeTr <sometr@users.noreply.translate.codeberg.org>
Date: Sun, 5 Jan 2025 21:46:16 +0000
Subject: [PATCH 306/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (80 of 80 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/uk/
---
 fastlane/metadata/android/uk/changelogs/4212904.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/uk/changelogs/4212904.txt

diff --git a/fastlane/metadata/android/uk/changelogs/4212904.txt b/fastlane/metadata/android/uk/changelogs/4212904.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d4a7541096891aa11f77ce1d5cf5753cc440fe46
--- /dev/null
+++ b/fastlane/metadata/android/uk/changelogs/4212904.txt
@@ -0,0 +1,2 @@
+* Виправлено деякі незначні помилки в інтерфейсі
+* Виправлено проблеми з'єднання з доменами .onion на портах не за замовчуванням

From 4067918075aeea9c36948a9c7f900fdaf911b1e7 Mon Sep 17 00:00:00 2001
From: Outbreak2096 <outbreak2096@users.noreply.translate.codeberg.org>
Date: Mon, 6 Jan 2025 01:07:13 +0000
Subject: [PATCH 307/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (80 of 80 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/zh_Hans/
---
 fastlane/metadata/android/zh-CN/changelogs/4212904.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/zh-CN/changelogs/4212904.txt

diff --git a/fastlane/metadata/android/zh-CN/changelogs/4212904.txt b/fastlane/metadata/android/zh-CN/changelogs/4212904.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7b3c86886f697687c5be67e56f6f023fb9ed5893
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/4212904.txt
@@ -0,0 +1,2 @@
+* 修复一些小的 UI 错误
+* 修复非默认端口上 .onion 域的连接问题

From 50fe0121f350691a3a6b4278f70b15f1d1be9fb5 Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Mon, 6 Jan 2025 05:57:36 +0000
Subject: [PATCH 308/357] Translated using Weblate (German)

Currently translated at 100.0% (80 of 80 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/de/
---
 fastlane/metadata/android/de-DE/changelogs/4212904.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/de-DE/changelogs/4212904.txt

diff --git a/fastlane/metadata/android/de-DE/changelogs/4212904.txt b/fastlane/metadata/android/de-DE/changelogs/4212904.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c46d7a1aa6729de631c64a07dff0f129cf9d2f90
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/4212904.txt
@@ -0,0 +1,2 @@
+* Kleine UI-Bugs behoben
+* Verbindungsprobleme mit .onion-Domains auf nicht standardmäßigen Ports behoben

From 67cc3d6dc02d94a17bfa9d72ff44c7796ab22c70 Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Mon, 6 Jan 2025 09:37:57 +0000
Subject: [PATCH 309/357] Translated using Weblate (Polish)

Currently translated at 48.7% (39 of 80 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/pl/
---
 fastlane/metadata/android/pl-PL/changelogs/42060.txt   | 1 +
 fastlane/metadata/android/pl-PL/changelogs/42061.txt   | 1 +
 fastlane/metadata/android/pl-PL/changelogs/42062.txt   | 1 +
 fastlane/metadata/android/pl-PL/changelogs/42065.txt   | 1 +
 fastlane/metadata/android/pl-PL/changelogs/42068.txt   | 2 ++
 fastlane/metadata/android/pl-PL/changelogs/4212904.txt | 2 ++
 6 files changed, 8 insertions(+)
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/42060.txt
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/42061.txt
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/42062.txt
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/42065.txt
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/42068.txt
 create mode 100644 fastlane/metadata/android/pl-PL/changelogs/4212904.txt

diff --git a/fastlane/metadata/android/pl-PL/changelogs/42060.txt b/fastlane/metadata/android/pl-PL/changelogs/42060.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f0b657c3581bf65d5971035eadbc81b86f77c5ca
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/42060.txt
@@ -0,0 +1 @@
+* Naprawienie litery ‚q’ nieprawidłowo rozpoznawanej jako cyrylica
diff --git a/fastlane/metadata/android/pl-PL/changelogs/42061.txt b/fastlane/metadata/android/pl-PL/changelogs/42061.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1c163ae9f8a47950fc0bfd96d9a29715e16859bd
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/42061.txt
@@ -0,0 +1 @@
+* Usunięcie funkcjonalności odkrywania kanałów z wersji dla Google Play
diff --git a/fastlane/metadata/android/pl-PL/changelogs/42062.txt b/fastlane/metadata/android/pl-PL/changelogs/42062.txt
new file mode 100644
index 0000000000000000000000000000000000000000..228de1949bf0465ab3faf157c39ce4c9e7817a0c
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/42062.txt
@@ -0,0 +1 @@
+* Wyłączenie otwierania plików kopii zapasowej (.ceb) z przeglądarki plików
diff --git a/fastlane/metadata/android/pl-PL/changelogs/42065.txt b/fastlane/metadata/android/pl-PL/changelogs/42065.txt
new file mode 100644
index 0000000000000000000000000000000000000000..63ea3eabce6da9e9dbe0bce334cf90f6aaf6009d
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/42065.txt
@@ -0,0 +1 @@
+* Wprowadzenie nowego formatu pliku kopii zapasowej
diff --git a/fastlane/metadata/android/pl-PL/changelogs/42068.txt b/fastlane/metadata/android/pl-PL/changelogs/42068.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fa41c6c7a28958bbc81999aae2e3f2a65ca1d5c2
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/42068.txt
@@ -0,0 +1,2 @@
+* Obsługa ustawień powiadomień dla danej rozmowy
+* Używanie Opus dla wiadomości głosowych w Androidzie 10
diff --git a/fastlane/metadata/android/pl-PL/changelogs/4212904.txt b/fastlane/metadata/android/pl-PL/changelogs/4212904.txt
new file mode 100644
index 0000000000000000000000000000000000000000..4fb3906ada86b03a4e7e9aec87d954519bb4f0cd
--- /dev/null
+++ b/fastlane/metadata/android/pl-PL/changelogs/4212904.txt
@@ -0,0 +1,2 @@
+* Poprawienie drobnych błędów interfejsu użytkownika
+* Poprawienie problemów z połączeniem z domenami .onion na niedomyślnych portach

From e8e4b1d231f58ce3f9f17e19f88e58c54d640026 Mon Sep 17 00:00:00 2001
From: Besnik_b <besnik_b@users.noreply.translate.codeberg.org>
Date: Mon, 6 Jan 2025 10:52:15 +0000
Subject: [PATCH 310/357] Translated using Weblate (Albanian)

Currently translated at 100.0% (80 of 80 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/sq/
---
 fastlane/metadata/android/sq/changelogs/4212804.txt | 3 +++
 fastlane/metadata/android/sq/changelogs/4212904.txt | 2 ++
 2 files changed, 5 insertions(+)
 create mode 100644 fastlane/metadata/android/sq/changelogs/4212804.txt
 create mode 100644 fastlane/metadata/android/sq/changelogs/4212904.txt

diff --git a/fastlane/metadata/android/sq/changelogs/4212804.txt b/fastlane/metadata/android/sq/changelogs/4212804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..240b9af4f1db0a2b7ed1f542e5c4c2e6a6dbad28
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/4212804.txt
@@ -0,0 +1,3 @@
+* Përdorim më i kollajtë i tingujsh vetjakë njoftimesh, përmes hollësish Kontakti -> Menu shtresë përsipër -> Njoftime vetjake)
+* Ndreqje objektivash ndarjeje të drejtpërdrejtë në versione të rinj Android
+* Aftësi për t’u kufizuar kontakteve dukshmëri avatarësh
diff --git a/fastlane/metadata/android/sq/changelogs/4212904.txt b/fastlane/metadata/android/sq/changelogs/4212904.txt
new file mode 100644
index 0000000000000000000000000000000000000000..16144cd645fa489406c81cceb8dc466d97148132
--- /dev/null
+++ b/fastlane/metadata/android/sq/changelogs/4212904.txt
@@ -0,0 +1,2 @@
+* Ndreqje e disa të metave të vockla në UI
+* Ndreqje problemesh lidhjeje me përkatësi .onion në porta jo-parazgjedhje

From 1e72e5c9192869a95f518322324243ef0c945b42 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Mon, 6 Jan 2025 07:43:54 +0000
Subject: [PATCH 311/357] Translated using Weblate (Russian)

Currently translated at 32.5% (26 of 80 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/ru/
---
 fastlane/metadata/android/ru-RU/changelogs/4212904.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/ru-RU/changelogs/4212904.txt

diff --git a/fastlane/metadata/android/ru-RU/changelogs/4212904.txt b/fastlane/metadata/android/ru-RU/changelogs/4212904.txt
new file mode 100644
index 0000000000000000000000000000000000000000..58cf6a44ba27d3a97f3907c153bec0c747415538
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/4212904.txt
@@ -0,0 +1,2 @@
+* Исправлены незначительные ошибки интерфейса
+* Исправлены проблемы с подключением к доменам .onion на нестандартных портах

From cf80cc53d10c7a09495ed90514aba98fa4b8ae4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Mon, 6 Jan 2025 09:14:45 +0000
Subject: [PATCH 312/357] Translated using Weblate (Estonian)

Currently translated at 22.5% (18 of 80 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/et/
---
 fastlane/metadata/android/et/changelogs/4212904.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/et/changelogs/4212904.txt

diff --git a/fastlane/metadata/android/et/changelogs/4212904.txt b/fastlane/metadata/android/et/changelogs/4212904.txt
new file mode 100644
index 0000000000000000000000000000000000000000..97e1fe7fabe3fb0a3511f9f2aa880bc622e31971
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4212904.txt
@@ -0,0 +1,2 @@
+* Parandasime mõned väiksemad kasutajaliidese vead
+* Parandasime .onion domeenide ühenduse vead mittestandardsete portide kasutamisel

From 2e900b8200bca60ede451a77046c7095304eb9a4 Mon Sep 17 00:00:00 2001
From: iNPUTmice <inputmice@noreply.codeberg.org>
Date: Tue, 7 Jan 2025 13:29:45 +0000
Subject: [PATCH 313/357] mention ceb2txt in readme

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 4032f9b2b31fb667fa4298fc759f6df759809c09..f6fcb1f0ec452951b2faad9d8c12069371e889ca 100644
--- a/README.md
+++ b/README.md
@@ -249,6 +249,10 @@ See the dedicated guides for
 - [backups](docs/user/backup.md)
 - [migrations](docs/user/migrating_to_new_device.md)
 
+#### Can I export my chats as plain text files?
+
+There is a tool called [ceb2txt](https://codeberg.org/iNPUTmice/ceb2txt) that can convert backup file (.ceb) into txt files.
+
 #### Conversations is missing a certain feature
 
 I'm open for new feature suggestions. You can use the [issue tracker][https://codeberg.org/iNPUTmice/Conversations/issues]

From 56316125822556b515ee786323f37497d26d0b09 Mon Sep 17 00:00:00 2001
From: p42ity <shopping@fpgas.de>
Date: Thu, 2 Jan 2025 13:20:49 +0100
Subject: [PATCH 314/357] Adjust call integration sounds.

---
 .../services/CallIntegration.java             |  27 ++++--------------
 src/main/res/raw/connected.ogg                | Bin 10581 -> 0 bytes
 2 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 src/main/res/raw/connected.ogg

diff --git a/src/main/java/eu/siacs/conversations/services/CallIntegration.java b/src/main/java/eu/siacs/conversations/services/CallIntegration.java
index ad19af3638d1b19373a0719c29571f68fd028052..505b0decc99f306687b098c558a52d039e9e5833 100644
--- a/src/main/java/eu/siacs/conversations/services/CallIntegration.java
+++ b/src/main/java/eu/siacs/conversations/services/CallIntegration.java
@@ -60,7 +60,6 @@ public class CallIntegration extends Connection {
             Arrays.asList("realme", "oppo", "oneplus");
 
     public static final int DEFAULT_TONE_VOLUME = 60;
-    private static final int DEFAULT_MEDIA_PLAYER_VOLUME = 90;
 
     private final Context context;
 
@@ -375,7 +374,7 @@ public class CallIntegration extends Connection {
             }
         }
         if (state == STATE_ACTIVE) {
-            playConnectedSound();
+            startTone(DEFAULT_TONE_VOLUME, ToneGenerator.TONE_CDMA_ANSWER, 100 );
         } else if (state == STATE_DISCONNECTED) {
             final var audioManager = this.appRTCAudioManager;
             if (audioManager != null) {
@@ -384,26 +383,10 @@ public class CallIntegration extends Connection {
         }
     }
 
-    private void playConnectedSound() {
-        final var audioAttributes =
-                new AudioAttributes.Builder()
-                        .setLegacyStreamType(AudioManager.STREAM_VOICE_CALL)
-                        .build();
-        final var mediaPlayer =
-                MediaPlayer.create(
-                        context,
-                        R.raw.connected,
-                        audioAttributes,
-                        AudioManager.AUDIO_SESSION_ID_GENERATE);
-        mediaPlayer.setVolume(
-                DEFAULT_MEDIA_PLAYER_VOLUME / 100f, DEFAULT_MEDIA_PLAYER_VOLUME / 100f);
-        mediaPlayer.start();
-    }
-
     public void success() {
         Log.d(Config.LOGTAG, "CallIntegration.success()");
-        startTone(DEFAULT_TONE_VOLUME, ToneGenerator.TONE_CDMA_CALLDROP_LITE, 375);
-        this.destroyWithDelay(new DisconnectCause(DisconnectCause.LOCAL, null), 375);
+        startTone(DEFAULT_TONE_VOLUME, ToneGenerator.TONE_CDMA_CONFIRM, 600);
+        this.destroyWithDelay(new DisconnectCause(DisconnectCause.LOCAL, null), 600);
     }
 
     public void accepted() {
@@ -417,8 +400,8 @@ public class CallIntegration extends Connection {
 
     public void error() {
         Log.d(Config.LOGTAG, "CallIntegration.error()");
-        startTone(DEFAULT_TONE_VOLUME, ToneGenerator.TONE_CDMA_CALLDROP_LITE, 375);
-        this.destroyWithDelay(new DisconnectCause(DisconnectCause.ERROR, null), 375);
+        startTone(DEFAULT_TONE_VOLUME, ToneGenerator.TONE_CDMA_CONFIRM, 600);
+        this.destroyWithDelay(new DisconnectCause(DisconnectCause.ERROR, null), 600);
     }
 
     public void retracted() {
diff --git a/src/main/res/raw/connected.ogg b/src/main/res/raw/connected.ogg
deleted file mode 100644
index 29e9fabba379b3d86fcd7205318e8c6039ef60b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10581
zcmb_>c|4SF_y0|{Y)O)2%@WF*eF=l?VeDgzvBX$Hwyb4I42dyzg&9joXtHG~8EbZf
ztRcIkEM@)Pqv!KH&-eGo@AdoRcfanLIoEa0b*^*X=UnHy?t2VeT#Nxy;9pmxP^<@$
z9H(Y3AmJeK_wsRY^(A(YwAc`T0N{xo$?0zii2-rszc1oQBB!UYiT9lP$$ww7Xa4Gu
z1lbm@_wR`q__%PnyE>SiYUk4Ck`R*+6O$2><Pv~7Ir_m}JzcmoJpEmLygWUeJRb-W
z=O7{ftAiJ!W<~<2000YwL5RE@o+#gOksEnA|0SeLu$>*!&t1T)7AudJYG;9K);Y#O
zIv@2XnF7QC7&dc5A8p~KY~KPF^B(VIE|B`h<<jGQmJg&7<(86t62<>=>3sx=a*voa
z<GhPlKnlYKQpH5dL%b&0r&kW77P+24eO^luxhyX9J~Tuvc%r^FqGqI2&G28jQ{mGu
zBvJh-<te_z?E9Li1#GhY?c<Vkya*%#z{@;=xH$oO2G%NSpaTFHRJ@rqpEK!JvULye
z(oxY_l7nCXRG^$z3`Q#sYmw;en#=z%Um!DIsI<zptLjE~)mpvC>2NIoFf?LnyU#><
zI?fRQsO}2H704zoSR`XDb19=@%1D6-03ZY9Xf-RD^tX8Xek%6;`akc#({cd-@L0f+
z<;*`JpyFn|td;|1w5Dc;u$@<9hxDqIU?XP*qxs;2#$~Eh+##Dvd(*+2e?!0k0QO9>
zv5(q$skoyYn69aN7jl8rH(rabpk-dFsYnJ$ZFX>X9XR3?3ed+Et|$fwC<A^8Vo*>m
z!NPQhIKg%{-yZRHu1H#m<(DaU<U29RcjUWx3lgCSK^&8@UgbAtcsY)c?OUNL2uF(J
zS^o3Ia|#3KFayP9$0X3eD5g`TKA=9fzixp{;$mRafbwek@M<RWb|&A@PEqWxCf@qP
z>iQQ=M@&6NcRlQOJ!VFnW_Fz>Mx1QWPE$A!8-k6^sNes-PhF2710oU^K-9roD-okb
zeHxr35`Y1SD3Fbt*8<~_$Y+_%?}~N_LKg*P7C+@U6#)YSq6S_O`KMvywL}-X<`xly
z{pwX*VacmkZkdIy|M#0TkGm8A&H?~?yEmJrH(R?m(W_I0xy}Gw0H9{Xrr~p=Jy}v0
z^l?bNZ`;~P+RxbB<DVdaBE+lRR}s8BK`1~XMNxZ5Qvd()CIU+efXT<!mL3e%Dd|<!
z62Io6fM<J~o<)BVq6ZU}c8q1=FK-_dgd`PY>U1QD$GHh&jj04nu&91<Jf@HU6T-gb
z0E2fPPzP%a6*ry%9xG149myb$=X$_!70(t$3!&gfG3j)2MKMCOpTlV(lpq&+HqVg(
zBFLQzhLn^I{M?8FZ6O1^NdYQIFE^e`9jQvihhc(f2|Cb17PC=3a)MYC0U}tUfmH3t
zPDz%##)le&3Sx1FI*3ySm{@N5<!!7wuEMB67|0lgC6wb>dGK70z1p4GDNr5Pa*(me
zmP!xNVUI%T=m?`xu%7IcK~+s`WD-=H?_Dw!$(K5&qa%(+Ik*eszc`dhfg}Dhgx|4R
zA*D2ts-P-xax8I<5*%n1s7juaFBRo*gAbPuGC)<7+}LEOJ0EroB3S;HG3L;N!;QHK
zl(Z4&z_M5&aqq_5)-i9Hp-(|`9pWnq1Xy_<ibeNya-=w6(xFTaWN7o@lcDj#@2tVe
ziwHg*!XTqZ3U3`;j$0arm6zaPAfuhtw+y#9tqOY1Xa&vzsuIS-)C4O}CvQ8Q+`?CY
zsOn#n<5_&~l#hT6DV!MsRK<c=|EsEI%&i=^YwNp?15=xX5-dR%x>WMGuaiUw0Ki8U
zEK6iR7X}4qV2wgK&_l3H@Luf_lmiGu1{_QtK6tMj6<;)ijy4|_j4mJ61g!6m&HySA
zbeW9tXP8*47y+uY02c!^PJD?Al?>H657CpO;EsYq-GsqVFS11$>gbf4>WPCCsHFs_
zBaY7o%a5QS4h@!LVxJ(EAhGzj4?7H_1WS+(I1vH1MyyDJSj;dCaoUH)pkVRhfBTZ5
z2yrx&I2Hv(2;-qTf<#KUye%Ch!LeW;i!n%nV=LQO;2;D9a4en$q5lsBF9(Y|n=Dw6
zSyZoGHf6RiID3gB;xuKAK%~TD#Xqt5B&v42RPPl(n-SF^r-@BT);^n;N{|rDOHGC?
zfO%%rRg6MITr)6(uzPs`@a7C9_@T+`Pf7(;H~`>L5)=vg2ttF;_N5oZvVdR~vA}!4
zy~r3Tz6fqeL<YDk5gGq%SM-omiZYML;EL)eG8iCWtcqJm0IrtX&p)5N{g|50@+^P>
zS6YV{s0PFu1+FP75GsK-mQzT5=}((5Jj(+{BI@)I0V0q{_Ndb)ivlPNA}8)oj0u+D
zaN`taaRQ7eOaPY&h#Z)+FoaGCjs;$ZBai|u7ubLZYIh6vub6u`-kkbK0kkjxpjp5f
zdT^uUM?E^NJ|#r>h>k}=S+S>aEs@lb1LF#Xc4em+f}sLK53V=R?D9x3I|OmeaLPOs
z3d|ThJw%AuOkh7vAUum2D9j8;;$n#T1cp!el#5%05u2=t&tOtVQ4mqTVx}o8$VziV
z(vc5Hq6Ad9K7o6Y+!K@o@gSfECS5uaZI-`igT{fUhQB8SBIDoZg2aD^;XeWC1?#!c
zeXtU~F>>^M{QTvqk6-`#*bc%AbxVH?qRofthZLj}Lj^)9v5di(fO+3WbQA-Hf)rSz
zi0Oy~AwNw~2PBT@yl|TZy!_PLavTeSju-}aaY81zw!th$RuVFG!Lgu7-J&(<@;eJe
zxfEC?z|dqOdK-%f4nz^(?~MSELP-e}lU;GK(3Zc>MkjKL!xbQc>l5f7arY%|?x&0N
zltMvuFyK=EhY<yW@e*8>RA5we1TX)Kp(B8eVw68+oIPb=AAr^1?^*=qR!&b0e;KGj
zqAD=9r%gWM9RFfKb^bE~<o-89@ZYM4!~Sc8AeLAI{;l9_9?`0QH5va+fqi`c#ejn5
z{#WxKTTc7_TLF|B0OX1B6w4oktV_;!@!VJEZY49h*P#P&fg6_!nfzb4&V#``rDD^G
z(ENq)e|h$gP5-g(|1-q|_+@+rSd{GNX|HR$L>GLBjwvGp2Em072h&@y15*v2zv$o$
z5Xzh=Cbwd~!WeNX?gzxQdS~HFk%s{*q%hth^0N|{YG5S=h2<{IgH;_n>`;nZVncpE
zE!o6;``&o3UmINeFyHS=ly-_>c>vQ-iINj3mXAU^lvNVgLeAf2G1Ac$#%Bh9Ze)Q+
z=?LOs!M$}$*2wd>u*~q+b$c8kA|HRxfqTc^T;#c1RQAXu@x?LUAB~sb$a5b%tbIj3
zvdqVeef-VkUS3COhXnP(LpG&;zYG@tNX3H$zovW#G=76C_BM-M6bVpwo*sy$xy=Z5
zxopPjJ%5(vY7)5iNC0uLW`k!DOcDq-Slj>Cu`~O$k^(>r8F8n(K9*_;!x>EuYuj$C
z&R&prxGAv!6>|2uy8N8gt&(xQpW5>W>1ingE(5><28DtNvqHL5U8Q0>xW4hW@m_@|
zJsx~qlq4Rj-Ng>4<|Z%k?-!3|Dqw|DXF#dlUdhEIiWiGt`wBgar2sRB0pQ}|1zG^r
z543=otO|=9!!i}u{d;EsTJ;XSyM|PB^b#bqBv&CqfR>&iO5}km)p<-jS3IRicJ0<D
zx@!;aMV=o2B7lf<KtvR2Y^<~M>yLA!JZkXBg4X#nyy}j;rvfU#EO?ycCb^oQkx}}l
zwxy$gY<Bs_Z{Y0t%V4qk*F{Q7JX{kWV8Fu|>E8#)2*J}XfcOAO<T5Qxn6bVuw}+#{
zn%vNd)vpTkGm8r=-&Pi4atljpx6#3c9?1bs2dly#cND@`8Y;rRrDh2u$BGOLEYZQ7
zK^q9=!>^jV->0n5Utg3SH;11bPtBB0Z_bn+g5*&c_zCtRWMyTU+cq}VjoaEy!|a-V
zb_MtYDuqjvJ4aKEZjidh%-E|pf3EIsRa))l^==+XyfuF)e>E(1)ctCKxZhfU&e_se
zrtS|G51f=s+uQMR2VTchWwz`JY!}8WpHH-RN4>qFnR9=py*3moPbXaU*+DUb4os1p
zVCv4wO+T&m&rc+He;>A<!)=~ZR&R&w%*Bf~{ho_AZwPE_yR<jAIuIv8?09ccCyOl(
z(w}ImOVkfly8d0_*=x6rg`&Xi-Hok+nv;6PDhbh}<De0RW<Lej-D7>x@<}&b2+VsU
zz-IM$a<HM<`cDAj+t0(_GZV_D;pgZR`5NTI%uuaq%P^&Sx!-axy5uXSBWKw3-SRtI
z&2^e@Wm8^m*CgnIaoEm2-#8IG#dc0Ml$6;pg27tQ)34%BUdm6i+(bkEZ29==LWZX^
z-Rk+CclD(UE1!h)-2@ov8`+om?$q<TmO{VbO7LzN1K+2p53hKFzwd7+?s%L@bx*@e
zf0@gMkbx6q@_CFVgcU}O{~>vn;ONZv?6&7Kj;L4D#dgmsvPwv(1@vVc5DQq|hU`_T
z9~$`XU-TZnzgqXNRcYrP=vB*n72kHimX?*&@UAu-4eV9r=B$(pRA?LscXopBB{s*^
z$$)J%q4ERz&<a_P$Nd~9&#G)}y3ElVoZX)q_Wp{ZJvMmX^Q0k#@oTH<w*iaN(TuE(
z(T<(8NEz1(yFTg~kqW=Cto<5^Z-~$LOT_JGT)PUr80(`8gI5l{+CEV{vm2Oq#o7it
zU9uPrug$tNf}f>f4K<a!-?hG^X|<Zhj;eIFR{K#Q+Vi3j&N=s+U-4&476}kRMV6J2
zZx?)=L9^UlCci8;V%3vux;(bSlh%HTfPH;X*-_sYYIz4&DK{+fnR+(~Ez5tUxl|fK
zdQJ^HGhx6<hIBQc*f1V;!#poXnW=wJed-cudA9voNtblp>OjuMiB(_Ux%nV?L$ekQ
z-IsG$Hs%wC$3$daam+XRfN`x#t9$dSY4T-fM&UyKNd1v@bP4JB$mIiZKx~$EnaeG0
zcGKx;x<&~!2>NS#Y*#a^!}c0;DpLr-AwIzVu|lPCS;xhyC;^6U!CC8io{#`M&j<0$
z2i&~cQw2;SZi+`y>I`*jHlHe8@Uy%uQF=O_(&Lx!CMk&RsbOoaJMdZK;WGVSAIs|a
z3`bqI(3=lOjCiW<oR=>U&}AR`VXD`?%XgV<we^!$X2RNPmdo8Mp`!bL%Fqwo7VpDB
z>(|rI2M6a@+<6mxOQk)8YUreU`||lOtN5?+qlp}9uF~^AA~W_1LK@Rq%@^Q-SFgJ0
z!1;kK=L%Zbm+Q0Bx-{tB-j{E^>kS4F6_qkYJ1Ey%=UOFLqh0V<kRD|N_uhS3@{8Wv
zC)S~bbb|Ps$-N58$h;Tf_9K6Wst?bZqt9J5q&~>;A`}JsKhCiB(hFoPE(`zsen{zh
zTC<zS^El;#wJclZR99n~9ccB#Uxpi@>t5}hS4}Ome~7+@)DU>Bj5Dpi|Nf)7=kybg
zI@fp{y<d@O@et=%`Ku{sfb~jD-Drzae<yvw(xV#lt?hDWK{3gzBGv&VMY)p1LQ9(!
z`DSH}xzq=ux4Nd><yvp1X`?K)I@cHGD{FR#y+GA>CP+fSNoXegh*44h{qj~7Ca@9W
zHGRus#t3G7&|Y0Mu{)-)AdT!sG&>v*TJ9c>{PI2gaZxJd$r11P@IE7V#t56`;ft-;
z1-tWM%OZvqD4ASCJN;UG^-|WYua6-iE9HY3HJzM7pfNywQC+RSW`J}#?}3|VXS^ps
z(PBu?HBf(rRIAJ|;q`JsEszl0GKQsj=`v+@vC)IDJ%YJaGd=xLV`e3N+RD4(70+f>
z6gy{_p<GhmErMjoQ*POjHZz590@XNr_X{73Dc0#{WZAuo;x;dVr(2O72FfV{#}(J*
zi%%qnATO!&FXvMMDp3Nw-bww#%@{c4CB@!HBrFrAa2bh_ZfbXP^N8kxrn)$Ra-7X9
zT9Q*AcP1>Y&UGoWZh~RFuKVkz-h0tUSJn7bI-DubP^__bV7{E~S3mcAosmB*mm+in
zr8zej)?}CGe)7!3(hE8ze;{1R^CGTazA(lI(#t>ZsJpqt(aM+hI3hyb`r+BANP*y)
zG{YzUg32^d3!^51T2<gZ>#MCM0O0xX*wWoPIsOuqv~tf&$%O1>;@7ItdAsc5l;I)|
zvRQber5gxnn8jD^N1V-2BDlxQprv@ES>Ty0-I=331DQPMLMtmFlP8Gtn&e5JjsQR~
z>bjv`{i2dWYjc-{QsCms`{sA$j*V4>g`CCS>hBhvCTdh#MS_X!FM@Qd=A-62hh`}j
zF}u=aUHLM%%Jl%T(4LqyEfUh}ZTu(^vOS7)L;7=1Qm)TS0oE@feikpjR|_4=`pT5v
z!+&k2cnJ1P*;blk?k!0l-q{*7ufX;upsiqwul1G$tS#OqJ{S*Ka;oEqUauk_=d4;B
zmscW(OjDDA?~++xE*yIUKx>4*$%FN|ILUXYSD2Z)7@W&M<-$Xg+G!6v&zNosEvL+H
zd|D-{tO>KnDrbLcflsdyQ#|oTWQfCWrKy)GyaFYi63}l%KYIm`REnykNZJhs|9)rj
zl;;WuI(({s@}7k~tD`w^?aduI(-TJbQW3Z+zk|{j65GYVSpvS|X~B?ux9Icq`UV?m
zo*Skz2F>IbY%h^$PjVUn%O5hMlD*~ufFfdD>1$lsn%gJN)~(volg7!S$sF$q1E&pZ
zZ)2U7F`ekqI|5bAg}uQSah{euI>w(E8qL9@9Z!SxNu1@wU$~W4j_Yhbx6w<^oZ+^&
zSl1RUg4gV}sPiS&xrFtQFpmYrW6k@mCWS!l^H88EHSh=2;gf9(q3ILTYnLVL`mhc4
zQe6$|HDU7=$<w1Iu@;s*N`$0!@5$2E8D1{(79B6Uoc-wv>y2mbXV*TzC@-p^Gb`T4
zL_dc#V3-JdgV^1Xine^LD(=4hVe-nIOw1o@K*ZzSmSbJrVf*pErs+}RZ=c4)8@l*u
z3YpQ=Df#j3z{-`G_<pjx{S)&&W^3QFR02}*v;uD^Ro3Hv@z(>*5M{vD>GvnBIxjWt
z?ziW5oFeuUgGRDx`I`^RrG`~fR9uD0Rm!SAn>MiYS#Er4-D@?+E;VWHg}UYlOchnZ
z?ZTKCA=CpR^mkZoR7Zu(XpJz}Is8hMc#Vz{t+U;PHfOwVmIAZ*qwhjS?Yi3NmQkgi
zYI}|aD;dg2XU#Z;oF6~0-up6X7{N2;&Zp8x`(dlNHPEdwDpd%*E)o`+@(!NqpZ;8i
z37Af;U3qnvI`hsxw7LHvMOpR@g%7<8_luN1#+MtU+jq5Bs3--LG#pC=w}Nado5qLo
zZ{=n(U8*lpG%(qCY=&85h*T}p$Sh8@^1n&ouqm;NuhqTq_<>n&dF7lZa_^nK)6C5f
z>=d(|m1`g6kY{!4eX)v>n7Avdl44EnD2w7hFF9wF^M{(MS4XeCxomYT{HMG|h?iSB
z2};^+Lx9oT-y{bZtWphu-`;;7%@{BP)6unm2rY7%+KW|Br-B?3x*v6H@31Ng|Fk4E
zIfw30F%luCZPh&gVufch_dr*Am_pd8aSNMk9)584tF?a*t3?z4l^WO}PXIG>o4W(1
zt<2|euwrSqsEy02o6c`-^36x(nVjtkA*i&)*c{TWKp7|9wLNBlK!#09DLEZ~-jk>&
zNZcun%pJV3N3KF|g&V^5Q(rKT;?2=f9X-tQexk-vrb61X9aEtI0E+ZLGx(GmCRO`K
z-7k$Sso_S&ttPt|BXnD`RKfUFgKlP%hjmP`M%gUL=36W_LsmZ?{-!KRsj)w)({#kD
zJseqbmcp;Rr;gN1>ngGp-A!@7nIiwrb45obRYafvf)btgG<j%IoYa~S>1BK=++FXu
zdu-vjxp&7~`3B`y>_LO@M9H})N4w_nk7$L|0I@UI^<N9BSMpjTB$epj>tdMSi3(Sq
zp_9H~H~QoS6A-cginPU?6)aOuwSjHf@5x%QH@2UD^gV0iWPy&}qp{aP0s6qVdO!e@
zJv=YEivN5ebs%8q{+s**qj$;8Ggp?(9Ypl<lxm(ltz{T)H|e|BSzmp}b6F7caaUr;
zEH=fjl|1V~Dfxl!Eji7rU!=d~9+<tVfDc|^|7pF|$0I{0seF9pq)ArBmRhCc?%w>h
zPY4Zkk;Hx7z-l8v?ah8&fDJVGOdvDay>0OM9tiWRUFmT)UgkQ0z7Lza)z@ixGu7s}
zvV~uc`JMt0z+QOiEbx8#=JC&X)~STO#WAZOmTWIG%uF1Mcvlu3x1MJzYk}%KTZ-7)
zpI--_L*`6W$M=QADyD8U(wkAQkd0XR@-XH2nHzM#5#EgWYSXjxGsdu1=wV6s{LJ_l
z#7@PyF+yw<sG%#W&>XRP;5|zR2@MI9ex?M>3R5QVH7=Mj17S|J-pSR7d;JS(M|MYr
zX3nNqKHhH{+BUfkq(Zu_BzL!MU_tFPl}8L7AM|B=_VGVAZgXH1bgGYZl5WNg%pFZL
zOcm?NoD^)Pc2TIfllQzEwr5c0*lQ}Y6xkSe4offyIj|Al-Qsjo7`5F?>#I#q7{(j1
zuQ>!|n|>(FVK`SbQ9rNAeBAq<c1)rt?1cdEC6Ni=X<s`QlC3~8Eg87{>He8BofSge
zPcCrDog_v3HKXXc7FMJI+EEN?OWjbKGTVbqW9Pz|OLN)@=+Kl#o-9vmeN-Z~^}44K
z-Xtgfp)*za=$o+ni1HA#Z%DN_<4P8j<*p~9x(aRn#bL+`u2yqi76xW^OB8O0E0|V$
zjUf)s@6u~nv-P#N^z&PRn^~V{RDfLD^v(n+4kS+0Q?wu(`RlX%OS_6QiYF&e&jYu}
z182#sb;<D$<r>YNU9+ySx#OSyYJJw|x$(u9x~&0Lk=tQR1mLY-8L}kX`}x*XH_5Yy
zb_J#<?{CQ3dGnhEuo5c22Xy*xmzU_>jW*ejkLeHFl>CTf$9jYk;CkuDf3!CGoXwRd
z)RBn2lrIcs?%%Qp3%{Fmc22SEP{rT>NLeGo%WsUfF+lH7WZ6*&A2ir@%VOOpcXmX&
z=yw}wxLknpS8K*x$7Hpx=aSQ?^Jjjil<KguZnryW)su1|A`t9fBNnm)wx*8MQi3@5
zoT&Tw<0g3aP&rY4$G70>QmZ|hLc<*{FL!;VqVjz5m=W>_ZJRHPDSCtx$&E5|#p9l8
zgxc19>voxmA2$~oJWhJM_Lsii<dGVG;_dnFp1knat|@K?xcA^Tv)@6u3Hoq+CQEMo
z>iH$uwJrVtgW#d-e$h#1Mt`P?gunXJhUcWYtF_rm7UmK@+;A9M51hVJAmh~_9-x5J
zcM4~~U#eKMH2TVSMTM_%Z~FQNM+V-v9y8Vc`6O7T|KO*Hc!2G#;&Aaydip*78YxS(
zN`pum9z)`X%qU2+$$bHpxW3Pjbs=cLQmeAD>#cU@fl%yCK!*_@Y*1uA@T@)FvJbYq
z)L^C{JJO3De(UjMsVjPfVQ=(!;r$`X^7_dnd@1XbXQSoiY=XA#>aFsoYnJglE7{iE
zMgiQHSE;|$&3nXqk|{cgqdn+rJ)+bZRd}Tn_-7Pa$E=fdVH3d1+gk>}EHfC9Ag|~T
zF%E<F&FL{d8h{Rs;-!x`+N6;PJyF4zW_o-H$zOKAW(y|np&dnCjGv8jywhnQbSyVI
zweKb>3ot<5JEnEGB^*?48^2laL)(gP+@2MtDKJBsORKN(6&d$<DBnZ~l%z~$j$DUH
z6ow?2XZ%vw`T<LLT@c8;dR@z0AY^i^q{2V`Sd8Rl0@?3sSU?%OMQX4wvr>c+35M}n
z|MSpul<5sm68B$<uD()z`pFpprkQFheRn_l+YgxTw&6GiXj+Uz(D&JORf1I)p?B+l
zTQ?3d>AjviU%C!YrO}jWhUN@Zlt_IWE<+0Y-K`P1J?Q>Kw9Aq6Sn(N>dqSe<UiZY}
z&*@F&o%P&s@sOvw%iQeoe}XpJpM-f(+~l9}Oh-qtxQz={s&9)Nt;TdgKbe@d0e6Fw
zMshd4zprJB@EJv%K_Zz?rfSK@XnmY6-zL|S>51kA&6Iu1VuU)c{!`@n+{#dNQ7QQ6
zY9+R?uX32g1nn>QgHE#|2`|zo`)j)SYJd+DX1d5kO}@P2iD{*N5TBy(h7nC4r1X}O
zDtmR_^VU)w`w%g6^)il=f<2$!E_CP4pLC~s$(RRHbaLO<R*EB&Z@QDe@jG7dq@ua#
z>ufsAwX|846=k*h<_Z98`SYQ90KmFDV&`Kq=c<3CD?6CMFX>;C0@Gx&Z|^DniDj!Z
zII+D*qmr}Bs>nntNn%o{OEU8Q@V6GF*NH=s!Rw0cFKZcy8s?H7{h1NtB0Spt;$)Ra
zkz*P4O-awX_@5}0y_I=#Zr%$w``FL9Wm{`i)1^-Sj8kUDucUM`s(SePFk~(TcdDVP
z{LDLSb{pYop+ThmqOoC9M%^$`#N&tWy7}}O-ctag(N@6h%m*@^$0R-PLJsJD1u{kO
z<ygVUxqJQ)F}0YG!j-YL)@1#D5*?qmjxBW!h3dIva33BreU!8@t;eVgE%ueI+pJm$
zuB-@ghuxXpD+scwo9YVeCv>Y8B}6BzOml0S(d;;uvMcI7*)P0XvHLcGg^E_S8gT<_
zGCaW|5F?S-;bJ6ykSiusMF?}1D`!<w2@DZ0K@TP-lZ;K?uD6izpq;SuD6YVl1eB3&
zw!8xNlRK3nVl23j7RbSiLVo>FW8fO4(iC;e1@I6_COaml=H~NN`@zb$J>F2uQ1pVV
zVZC)LNtgPUL&?_e?(c(~{!&MKCY2}mHcX4cvwQsw%5L7wGtPs}x_aC<jubeu+ZBm-
zL^!w9-c)O{XtdGmyl-USHu4#1mh(FCVGQ|v+;iH<*j^rWwuj$KSikwrKj>Jj-JM(y
zuAY`&Q{XY6*8B5t{@Ukz)t167{O=CI;A`pK17?I?U)sszx{_ioE!G>VtiI#afb`A<
zrX?*dCm5n0lcm-D`u^J3O5<8Jl07i05BPG2>pD(1-L(|0BQ@z#cD*~J<Z+DekC4ox
z;;41EaVI0byR22iqW7>N$}5O3hFh2b6K{=Aju`3p-%VM&<0uhXvB&z7j4y&^#g%Mu
z3ucVZN+G%r3kT*b<y&_@<j+69>h5a*7YxkV1cq|uhm0ybe=sGek2kY&t5A`exIB!t
z$*Zq$KMscD{cv$wqtX`{joFqZIc5^cTcTh8Dj3kz&Y|Q~u2K?F4nO+DJ-l=x8Vo*2
z9ZP29_Q$)6*}vGapLDNmu8~EcIqO$LLsrUQL%A!0d}baEo%5c9ulKE^L?q&6c7q2B
z^YI-$N#+v5zp5-BREKZG4;xhJc7z&VS{v58<;7P|(C0jN+iN}xcBJL9nQ~a_aAUk=
zl3#RbE7?G_f)(7v^qG7eY5#=wi$`27>dvdTGYGSBBOKHmuJw5+vMh?RyxGtlRJ#z9
z=}}%p_X{_!$^RmBnRm1?M<MLC$HSYp)t~W%kg4)xXSbMVt)ff&DeSPpllaagCR6Y&
zQd3)c_VTd+U5iF#?j>o{Rd|pbd!pNk**QQZxc*MbLauAfwHFNd4T52~aH1P-67H_l
zp)-E0A;Isl6&@4BF2lFBk#l{a5`C4X+2lrQnSq#|TW=4)S61W>!?fu1?crUxvcZ5N
z<-plL?%{?@*3S6bE;}E;ytSKO@Swt7Xtz-iWg4olPc~pnd0)fwB8=^wOiF2uQp3Ia
zvXM&1x6>w5xo%|}&h8LlXw#M0uW#7fGvq!r+f2!*{-P_3-#H+tWffjqk2%sj(Wpw0
zz4si9(Ds;oSNC9yFTeHvA6T$Q-dwuSz^1Un3VGFgMQoI}2twIE5X#iBq3`D&wg)X&
zV7Z#I!@4H8uxR9ouBaP_VT=!UT>|+%y6+*C6g|7IW*3LHehS>SvR9V3Q|R5O^)|fb
zY+`<3^+yF3(#bp;Yh^7T?|6((ef}vhc(+quO^zE?BKPJOSxJ)qdzns?JzX2RgfGE!
zJcR>SHuJpR&AdpvHOP5#usyGvo9@5rIm%DZF16xgj{DrSIU!L|>jaxaAr32#rNSpX
zWbDJtWtYI$YPbB-*TuZ*u4-BDcduP@LpxcbozNPtKNK+(%X)pu54B^{Tm8>mhzW{T
zIv(w*uo^wU(sP?X|DKHOA71c{yUiDxt=P%yN)KyeNEOdIe$+ADHzt|8JVJZ1H>Bsq
zuR!6aQWGAR8y_|nZTClsSSN@u+fLnyacM~S#^TtZ=<+@I$AQM;y+HpfA1cOYoa5yO
zooSXH%u7!kTXb`7+kGpy6aKQGVDM=+)blycQcw-&EMt-DCcF0RsrRqEL9gi<raN7x
zs~jQ;^N??jq36JgF};xPiR$iWy;1vMdvC@~qr)9t@xyw7tUp7Z=EjUuMc5Np+ury*
zV{xTwSReWX`;kM_UOlERBTKq_D~Yy>@B8Fv<;S}8H#7;i&&L_!r``9cH8ul<;%{-@
z&UMqetG{hv_Bp>tsIQPzZqhhyGR>=zaXyQ;Y4X#pzVPo~KXT3#t7cwFljg%+)GzZb
zI-kB#nwas!b1B2Z*4*Bd264p!F=u!7uoC$g71%ZnoP%?J&C}7YAYCNBc%3G*P^v#D
zKYZ22?7L4Z($pwsu7cP@G8k0k=cxKS%F}im46Wk{u{D~eMRyD`7AxQB80pq(qT5@C
zIz!x+MR*UM(_pp=Y<9epM{pYpy2w4d@{)@Ep+AbIij(($WEbTOuQttnp*%o~mP!)Z
zwGX%8-#o*^ofOMbfB)>RpU^-YCqZ(2UJdXPR$Rlvf9{Ozbn*mT#Am=l_l2>9XCM8t
ltuz#cnlOB}KZk<cBz%}$a{Gn(c@n~<rKy0IinoJ+{{iQOP)h&+


From 9ac77c1458de06b3f0df77fd3a63461e43b99d1d Mon Sep 17 00:00:00 2001
From: iNPUTmice <inputmice@noreply.codeberg.org>
Date: Wed, 8 Jan 2025 10:31:14 +0000
Subject: [PATCH 315/357] Add FAQ entry to README.md: "Conversations is
 consuming a lot of battery, what can I do?"

This commit adds a new FAQ entry to address user concerns about battery consumption attributed to Conversations. The FAQ explains how Android's battery attribution works, provides tips to check for potential issues, and emphasizes evaluating actual battery life impact under comparable conditions. The section aims to help users better understand and contextualize battery usage metrics.
---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index f6fcb1f0ec452951b2faad9d8c12069371e889ca..2bfbaf87e294b7d5b1ab8b75aa047c85b4b39c72 100644
--- a/README.md
+++ b/README.md
@@ -138,8 +138,16 @@ Maybe you attempted to use the Jabber ID `test@b.tld` because `a.tld` doesn’t
 
 In most cases this error is caused by ejabberd advertising support for TLSv1.3 but not properly supporting it. This can happen if the OpenSSL version on the server already supports TLSv1.3 but the fast\_tls wrapper library used by ejabberd not (properly) support it. Upgrading fast\_tls and ejabberd or - theoretically - downgrading OpenSSL should fix the issue. A work around is to explicitly disable TLSv1.3 support in the ejabberd configuration. More information can be found on [this issue on the ejabberd issue tracker](https://github.com/processone/ejabberd/issues/2614).
 
+#### Conversations is consuming a lot of battery, what can I do?
+
+Battery attribution on Android can be misleading. Conversations may appear to consume a lot of battery because it’s active, but this doesn’t necessarily mean it drains your battery significantly faster. For example, if your phone lasts 24 hours with Conversations and 25 hours without it, the impact is only about an hour, which is often negligible for most users who charge their phones nightly.
+
+To check for potential issues, use the account server info screen in Conversations to verify whether server features are consistently available. Additionally, ensure your session age is appropriately long (e.g., several days or since the last time you restarted your phone). A session age of just minutes might indicate a problem unless you recently turned on your phone.
+
+Battery usage percentages can also be deceptive. On low-usage days, Conversations might rank high simply because it’s running, even if its actual impact is minimal compared to something like taking a photo with the camera. Evaluating battery life with and without the app under similar conditions is the best way to assess its true effect.
 
 #### I’m getting this annoying permanent notification
+
 Starting with Conversations 2.3.6 Conversations releases distributed over the Google Play Store will display a permanent notification if you are running it on Android 8 and above. This is a rule that it is essentially enforced by the Google Play Store. (You won’t have the problem  of a *forced* foreground notification if you are getting your app from F-Droid.)
 
 However you can disable the notification via settings of the operating system. (Not settings in Conversations.)

From 3138af664aa31b6ce02c2589210062992cd487f5 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 9 Jan 2025 12:36:27 +0100
Subject: [PATCH 316/357] introduce connection timeout as its own state

---
 .../siacs/conversations/entities/Account.java |  3 +
 .../services/CallIntegration.java             |  4 +-
 .../services/XmppConnectionService.java       | 57 +++++++------------
 .../conversations/xmpp/XmppConnection.java    | 51 ++++++++++-------
 src/main/res/values/strings.xml               |  1 +
 5 files changed, 56 insertions(+), 60 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index b667428e0b72657a696eacb9d4a4edf049ed2f9f..ce13ba9f3594d42242854083496af1d0fb2fab94 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -779,6 +779,7 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
         CONNECTING(false),
         ONLINE(false),
         NO_INTERNET(false),
+        CONNECTION_TIMEOUT,
         UNAUTHORIZED,
         TEMPORARY_AUTH_FAILURE,
         SERVER_NOT_FOUND,
@@ -848,6 +849,8 @@ public class Account extends AbstractEntity implements AvatarService.Avatarable
                     return R.string.account_status_not_found;
                 case NO_INTERNET:
                     return R.string.account_status_no_internet;
+                case CONNECTION_TIMEOUT:
+                    return R.string.account_status_connection_timeout;
                 case REGISTRATION_FAILED:
                     return R.string.account_status_regis_fail;
                 case REGISTRATION_WEB:
diff --git a/src/main/java/eu/siacs/conversations/services/CallIntegration.java b/src/main/java/eu/siacs/conversations/services/CallIntegration.java
index 505b0decc99f306687b098c558a52d039e9e5833..f4d4fae35c70d0e3d9dd861f2883c76df56fc315 100644
--- a/src/main/java/eu/siacs/conversations/services/CallIntegration.java
+++ b/src/main/java/eu/siacs/conversations/services/CallIntegration.java
@@ -2,7 +2,6 @@ package eu.siacs.conversations.services;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.media.AudioAttributes;
 import android.media.AudioManager;
 import android.media.ToneGenerator;
 import android.net.Uri;
@@ -20,7 +19,6 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import eu.siacs.conversations.AppSettings;
 import eu.siacs.conversations.Config;
-import eu.siacs.conversations.R;
 import eu.siacs.conversations.ui.util.MainThreadExecutor;
 import eu.siacs.conversations.xmpp.Jid;
 import eu.siacs.conversations.xmpp.jingle.JingleConnectionManager;
@@ -374,7 +372,7 @@ public class CallIntegration extends Connection {
             }
         }
         if (state == STATE_ACTIVE) {
-            startTone(DEFAULT_TONE_VOLUME, ToneGenerator.TONE_CDMA_ANSWER, 100 );
+            startTone(DEFAULT_TONE_VOLUME, ToneGenerator.TONE_CDMA_ANSWER, 100);
         } else if (state == STATE_DISCONNECTED) {
             final var audioManager = this.appRTCAudioManager;
             if (audioManager != null) {
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 2762f29e0aa0f03156538108d075ed4a1971d9d1..41f7d18ec23f73305ab5a9fd144eae7662fa6c30 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -5,7 +5,6 @@ import static eu.siacs.conversations.utils.Random.SECURE_RANDOM;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.app.AlarmManager;
 import android.app.KeyguardManager;
 import android.app.Notification;
@@ -1036,6 +1035,7 @@ public class XmppConnectionService extends Service {
         if (!account.getStatus().isAttemptReconnect()) {
             return false;
         }
+        final var requestCode = account.getUuid().hashCode();
         if (!hasInternetConnection()) {
             account.setStatus(Account.State.NO_INTERNET);
             statusListener.onStatusChanged(account);
@@ -1065,8 +1065,7 @@ public class XmppConnectionService extends Service {
                             Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": ping timeout");
                             this.reconnectAccount(account, true, interactive);
                         } else {
-                            int secs = (int) (pingTimeoutIn / 1000);
-                            this.scheduleWakeUpCall(secs, account.getUuid().hashCode());
+                            this.scheduleWakeUpCall(pingTimeoutIn, requestCode);
                         }
                     } else {
                         pingCandidates.add(account);
@@ -1081,8 +1080,7 @@ public class XmppConnectionService extends Service {
                         } else if (msToNextPing <= 0) {
                             return true;
                         } else {
-                            this.scheduleWakeUpCall(
-                                    (int) (msToNextPing / 1000), account.getUuid().hashCode());
+                            this.scheduleWakeUpCall(msToNextPing, requestCode);
                             if (mLowPingTimeoutMode.remove(account.getJid().asBareJid())) {
                                 Log.d(
                                         Config.LOGTAG,
@@ -1095,32 +1093,18 @@ public class XmppConnectionService extends Service {
             } else if (account.getStatus() == Account.State.OFFLINE) {
                 reconnectAccount(account, true, interactive);
             } else if (account.getStatus() == Account.State.CONNECTING) {
-                long secondsSinceLastConnect =
-                        (SystemClock.elapsedRealtime()
-                                        - account.getXmppConnection().getLastConnect())
-                                / 1000;
-                long secondsSinceLastDisco =
-                        (SystemClock.elapsedRealtime()
-                                        - account.getXmppConnection().getLastDiscoStarted())
-                                / 1000;
-                long discoTimeout = Config.CONNECT_DISCO_TIMEOUT - secondsSinceLastDisco;
-                long timeout = Config.CONNECT_TIMEOUT - secondsSinceLastConnect;
-                if (timeout < 0) {
-                    Log.d(
-                            Config.LOGTAG,
-                            account.getJid()
-                                    + ": time out during connect reconnecting (secondsSinceLast="
-                                    + secondsSinceLastConnect
-                                    + ")");
-                    account.getXmppConnection().resetAttemptCount(false);
-                    reconnectAccount(account, true, interactive);
+                final var connection = account.getXmppConnection();
+                final var connectionDuration = connection.getConnectionDuration();
+                final var discoDuration = connection.getDiscoDuration();
+                final var connectionTimeout = Config.CONNECT_TIMEOUT * 1000L - connectionDuration;
+                final var discoTimeout = Config.CONNECT_DISCO_TIMEOUT * 1000L - discoDuration;
+                if (connectionTimeout < 0) {
+                    connection.triggerConnectionTimeout();
                 } else if (discoTimeout < 0) {
-                    account.getXmppConnection().sendDiscoTimeout();
-                    scheduleWakeUpCall(
-                            (int) Math.min(timeout, discoTimeout), account.getUuid().hashCode());
+                    connection.sendDiscoTimeout();
+                    scheduleWakeUpCall(discoTimeout, requestCode);
                 } else {
-                    scheduleWakeUpCall(
-                            (int) Math.min(timeout, discoTimeout), account.getUuid().hashCode());
+                    scheduleWakeUpCall(Math.min(connectionTimeout, discoTimeout), requestCode);
                 }
             } else {
                 final boolean aggressive =
@@ -1768,12 +1752,12 @@ public class XmppConnectionService extends Service {
     }
 
     public void scheduleWakeUpCall(final int seconds, final int requestCode) {
-        final long timeToWake =
-                SystemClock.elapsedRealtime() + (seconds < 0 ? 1 : seconds + 1) * 1000L;
-        final AlarmManager alarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
-        if (alarmManager == null) {
-            return;
-        }
+        scheduleWakeUpCall((long) (seconds < 0 ? 1 : seconds + 1), requestCode);
+    }
+
+    private void scheduleWakeUpCall(final long milliSeconds, final int requestCode) {
+        final var timeToWake = SystemClock.elapsedRealtime() + milliSeconds;
+        final var alarmManager = getSystemService(AlarmManager.class);
         final Intent intent = new Intent(this, SystemEventReceiver.class);
         intent.setAction(ACTION_PING);
         try {
@@ -1781,12 +1765,11 @@ public class XmppConnectionService extends Service {
                     PendingIntent.getBroadcast(
                             this, requestCode, intent, PendingIntent.FLAG_IMMUTABLE);
             alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, timeToWake, pendingIntent);
-        } catch (RuntimeException e) {
+        } catch (final RuntimeException e) {
             Log.e(Config.LOGTAG, "unable to schedule alarm for ping", e);
         }
     }
 
-    @TargetApi(Build.VERSION_CODES.M)
     private void scheduleNextIdlePing() {
         final long timeToWake = SystemClock.elapsedRealtime() + (Config.IDLE_PING_INTERVAL * 1000);
         final AlarmManager alarmManager = (AlarmManager) getSystemService(Context.ALARM_SERVICE);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index ba800163258ef9137b922cf788f9fcbaba4ddfe2..9845f4149bf384a45772d053a4034f21ad53890a 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -20,6 +20,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.common.primitives.Ints;
 import eu.siacs.conversations.AppSettings;
 import eu.siacs.conversations.BuildConfig;
 import eu.siacs.conversations.Config;
@@ -166,7 +167,7 @@ public class XmppConnection implements Runnable {
     private int stanzasSentBeforeAuthentication;
     private long lastPacketReceived = 0;
     private long lastPingSent = 0;
-    private long lastConnect = 0;
+    private long lastConnectionStarted = 0;
     private long lastSessionStarted = 0;
     private long lastDiscoStarted = 0;
     private boolean isMamPreferenceAlways = false;
@@ -264,7 +265,7 @@ public class XmppConnection implements Runnable {
     }
 
     public void prepareNewConnection() {
-        this.lastConnect = SystemClock.elapsedRealtime();
+        this.lastConnectionStarted = SystemClock.elapsedRealtime();
         this.lastPingSent = SystemClock.elapsedRealtime();
         this.lastDiscoStarted = Long.MAX_VALUE;
         this.mWaitingForSmCatchup.set(false);
@@ -526,15 +527,17 @@ public class XmppConnection implements Runnable {
         if (Thread.currentThread().isInterrupted()) {
             throw new InterruptedException();
         }
+        // this means we have at least found a socket to connect to. give the connection another 90s
+        this.lastConnectionStarted = SystemClock.elapsedRealtime();
         this.socket = socket;
-        tagReader = new XmlReader();
+        this.tagReader = new XmlReader();
         if (tagWriter != null) {
             tagWriter.forceClose();
         }
-        tagWriter = new TagWriter();
-        tagWriter.setOutputStream(socket.getOutputStream());
-        tagReader.setInputStream(socket.getInputStream());
-        tagWriter.beginDocument();
+        this.tagWriter = new TagWriter();
+        this.tagWriter.setOutputStream(socket.getOutputStream());
+        this.tagReader.setInputStream(socket.getInputStream());
+        this.tagWriter.beginDocument();
         final boolean quickStart;
         if (socket instanceof SSLSocket sslSocket) {
             SSLSockets.log(account, sslSocket);
@@ -2372,7 +2375,7 @@ public class XmppConnection implements Runnable {
         } else if (streamError.hasChild("host-unknown")) {
             throw new StateChangingException(Account.State.HOST_UNKNOWN);
         } else if (streamError.hasChild("policy-violation")) {
-            this.lastConnect = SystemClock.elapsedRealtime();
+            this.lastConnectionStarted = SystemClock.elapsedRealtime();
             final String text = streamError.findChildContent("text");
             Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": policy violation. " + text);
             if (isSecureLoggedIn) {
@@ -2712,8 +2715,7 @@ public class XmppConnection implements Runnable {
     }
 
     public String getMucServer() {
-        List<String> servers = getMucServers();
-        return servers.size() > 0 ? servers.get(0) : null;
+        return Iterables.getFirst(getMucServers(), null);
     }
 
     public int getTimeToNextAttempt(final boolean aggressive) {
@@ -2725,9 +2727,8 @@ public class XmppConnection implements Runnable {
                     account.getLastErrorStatus() == Account.State.POLICY_VIOLATION ? 3 : 0;
             interval = Math.min((int) (25 * Math.pow(1.3, (additionalTime + attempt))), 300);
         }
-        final int secondsSinceLast =
-                (int) ((SystemClock.elapsedRealtime() - this.lastConnect) / 1000);
-        return interval - secondsSinceLast;
+        final var connectionDuration = Ints.saturatedCast(getConnectionDuration() / 1000);
+        return interval - connectionDuration;
     }
 
     public int getAttempt() {
@@ -2743,16 +2744,16 @@ public class XmppConnection implements Runnable {
         return System.currentTimeMillis() - diff;
     }
 
-    public long getLastConnect() {
-        return this.lastConnect;
+    public long getConnectionDuration() {
+        return SystemClock.elapsedRealtime() - this.lastConnectionStarted;
     }
 
-    public long getLastPingSent() {
-        return this.lastPingSent;
+    public long getDiscoDuration() {
+        return SystemClock.elapsedRealtime() - this.lastDiscoStarted;
     }
 
-    public long getLastDiscoStarted() {
-        return this.lastDiscoStarted;
+    public long getLastPingSent() {
+        return this.lastPingSent;
     }
 
     public long getLastPacketReceived() {
@@ -2770,7 +2771,7 @@ public class XmppConnection implements Runnable {
     public void resetAttemptCount(boolean resetConnectTime) {
         this.attempt = 0;
         if (resetConnectTime) {
-            this.lastConnect = 0;
+            this.lastConnectionStarted = 0;
         }
     }
 
@@ -2818,6 +2819,16 @@ public class XmppConnection implements Runnable {
         sendIqPacket(iqPacket, unregisteredIqListener);
     }
 
+    public void triggerConnectionTimeout() {
+        final var duration = getConnectionDuration();
+        Log.d(
+                Config.LOGTAG,
+                account.getJid().asBareJid() + ": connection timeout after " + duration + "ms");
+        this.changeStatus(Account.State.CONNECTION_TIMEOUT);
+        this.interrupt();
+        this.forceCloseSocket();
+    }
+
     private class MyKeyManager implements X509KeyManager {
         @Override
         public String chooseClientAlias(String[] strings, Principal[] principals, Socket socket) {
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f38d7cae16c34bad868b4acc2c94bfca44c19ee8..1045f797f0eb0a3714f1738dea97892798b2f072 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -158,6 +158,7 @@
     <string name="account_status_unauthorized">Unauthorized</string>
     <string name="account_status_not_found">Server not found</string>
     <string name="account_status_no_internet">No connectivity</string>
+    <string name="account_status_connection_timeout">Connection timeout</string>
     <string name="account_status_regis_fail">Registration failed</string>
     <string name="account_status_regis_conflict">Username already in use</string>
     <string name="account_status_regis_success">Registration completed</string>

From 0a7ba0009af77beb85cb162d680830671cb78fb6 Mon Sep 17 00:00:00 2001
From: gallegonovato <gallegonovato@users.noreply.translate.codeberg.org>
Date: Tue, 7 Jan 2025 16:42:34 +0000
Subject: [PATCH 317/357] Translated using Weblate (Spanish)

Currently translated at 100.0% (80 of 80 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/es/
---
 fastlane/metadata/android/es-ES/changelogs/4212904.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/es-ES/changelogs/4212904.txt

diff --git a/fastlane/metadata/android/es-ES/changelogs/4212904.txt b/fastlane/metadata/android/es-ES/changelogs/4212904.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9ceaa20a4b11c60e8157b967d8a2c082d7be5cd1
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/4212904.txt
@@ -0,0 +1,2 @@
+* Se corrigieron algunos errores menores de la interfaz de usuario.
+* Solucionar problemas de conexión con dominios .onion (.cebolla) en puertos no predeterminados

From 34b17698526d444614d647f1e18893cf0ec729e2 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 13 Jan 2025 09:08:45 +0100
Subject: [PATCH 318/357] fixups for connection timeout

---
 .../services/XmppConnectionService.java            |  7 ++++---
 .../siacs/conversations/xmpp/XmppConnection.java   | 14 +++++++++-----
 src/main/res/values/strings.xml                    |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 41f7d18ec23f73305ab5a9fd144eae7662fa6c30..33701215f1d9b42fe34691ec8a13c19d189941b3 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -421,7 +421,8 @@ public class XmppConnectionService extends Service {
                         for (Conversation conversation : pendingJoins) {
                             joinMuc(conversation);
                         }
-                        scheduleWakeUpCall(Config.PING_MAX_INTERVAL, account.getUuid().hashCode());
+                        scheduleWakeUpCall(
+                                Config.PING_MAX_INTERVAL * 1000L, account.getUuid().hashCode());
                     } else if (account.getStatus() == Account.State.OFFLINE
                             || account.getStatus() == Account.State.DISABLED
                             || account.getStatus() == Account.State.LOGGED_OUT) {
@@ -1752,10 +1753,10 @@ public class XmppConnectionService extends Service {
     }
 
     public void scheduleWakeUpCall(final int seconds, final int requestCode) {
-        scheduleWakeUpCall((long) (seconds < 0 ? 1 : seconds + 1), requestCode);
+        scheduleWakeUpCall((seconds < 0 ? 1 : seconds + 1) * 1000L, requestCode);
     }
 
-    private void scheduleWakeUpCall(final long milliSeconds, final int requestCode) {
+    public void scheduleWakeUpCall(final long milliSeconds, final int requestCode) {
         final var timeToWake = SystemClock.elapsedRealtime() + milliSeconds;
         final var alarmManager = getSystemService(AlarmManager.class);
         final Intent intent = new Intent(this, SystemEventReceiver.class);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 9845f4149bf384a45772d053a4034f21ad53890a..eee793b3fe72718511ae0ed6c426b3f19dd90ea8 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -446,12 +446,10 @@ public class XmppConnection implements Runnable {
 
                         localSocket = new Socket();
                         localSocket.connect(addr, Config.SOCKET_TIMEOUT * 1000);
-
+                        localSocket.setSoTimeout(Config.SOCKET_TIMEOUT * 1000);
                         if (features.encryptionEnabled) {
                             localSocket = upgradeSocketToTls(localSocket);
                         }
-
-                        localSocket.setSoTimeout(Config.SOCKET_TIMEOUT * 1000);
                         if (startXmpp(localSocket)) {
                             // reset to 0; once the connection is established we don't want this
                             localSocket.setSoTimeout(0);
@@ -2125,7 +2123,7 @@ public class XmppConnection implements Runnable {
         mWaitForDisco.set(waitForDisco);
         this.lastDiscoStarted = SystemClock.elapsedRealtime();
         mXmppConnectionService.scheduleWakeUpCall(
-                Config.CONNECT_DISCO_TIMEOUT, account.getUuid().hashCode());
+                Config.CONNECT_DISCO_TIMEOUT * 1000L, account.getUuid().hashCode());
         final Element caps = streamFeatures.findChild("c");
         final String hash = caps == null ? null : caps.getAttribute("hash");
         final String ver = caps == null ? null : caps.getAttribute("ver");
@@ -2824,9 +2822,15 @@ public class XmppConnection implements Runnable {
         Log.d(
                 Config.LOGTAG,
                 account.getJid().asBareJid() + ": connection timeout after " + duration + "ms");
-        this.changeStatus(Account.State.CONNECTION_TIMEOUT);
+
+        // last connection time gets reset so time to next attempt is calculated correctly
+        this.lastConnectionStarted = SystemClock.elapsedRealtime();
+
+        // interrupt needs to be called before status change; otherwise we interrupt the newly
+        // created thread
         this.interrupt();
         this.forceCloseSocket();
+        this.changeStatus(Account.State.CONNECTION_TIMEOUT);
     }
 
     private class MyKeyManager implements X509KeyManager {
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 1045f797f0eb0a3714f1738dea97892798b2f072..6454bb9ed928a0fbcdc7fc23f985695f80b346d7 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -470,7 +470,7 @@
     <string name="download_failed_invalid_file">Download failed: Invalid file</string>
     <string name="account_status_tor_unavailable">Tor network unavailable</string>
     <string name="account_status_bind_failure">Bind failure</string>
-    <string name="account_status_host_unknown">The server is not responsible for this domain</string>
+    <string name="account_status_host_unknown">Not responsible for domain</string>
     <string name="server_info_broken">Broken</string>
     <string name="pref_presence_settings">Availability</string>
     <string name="pref_away_when_screen_off">Away when device is locked</string>

From 9d2cafc9ebc8908a8c111c1555a5ecbfa87b7c71 Mon Sep 17 00:00:00 2001
From: Anonymous <anonymous@users.noreply.translate.codeberg.org>
Date: Thu, 9 Jan 2025 11:41:37 +0000
Subject: [PATCH 319/357] Translated using Weblate (French)

Currently translated at 97.8% (1036 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/fr/
---
 src/main/res/values-fr/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 85847b000d14e9957b00862b539b290a50472e31..71be6a990780423010509840bacc3eaebed9a8f1 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -679,7 +679,7 @@
     <string name="mtm_accept_cert">Accepter les certificats inconnus ?</string>
     <string name="mtm_trust_anchor">Le certificat du serveur n\'est pas signé par une Autorité de Certification connue.</string>
     <string name="mtm_accept_servername">Accepter un nom de serveur qui ne correspond pas ?</string>
-    <string name="mtm_hostname_mismatch">Le serveur n\'a pu s\'authentifier en tant que « %s ». Le certificat est valide uniquement pour :</string>
+    <string name="mtm_hostname_mismatch">Le serveur n\'a pu s\'authentifier en tant que « %s ». Le certificat est valide uniquement pour :</string>
     <string name="mtm_connect_anyway">Désirez-vous quand-même vous connecter ?</string>
     <string name="mtm_cert_details">Détails du certificat :</string>
     <string name="once">Une fois</string>

From 8591b3626691e5b911650ccc5802f52c1e8dda93 Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Fri, 10 Jan 2025 03:53:14 +0000
Subject: [PATCH 320/357] Translated using Weblate (Galician)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/gl/
---
 src/main/res/values-gl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 9f1b0fd9d2704028cc0cf18cc3fc12b85d5a0ae2..7c8f0ca0ddc5ef34e27a924db58eebaded15baac 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -1108,4 +1108,5 @@
     <string name="custom_notifications_enable">Activar axustes personalizados para as notificacións (importancia, son, vibración) nesta conversa?</string>
     <string name="delete_avatar_message">Queres eliminar o teu avatar? Algúns clientes poderían continuar mostrando unha copia almacenada do teu avatar.</string>
     <string name="show_to_contacts_only">Mostrar só aos contactos</string>
+    <string name="account_status_connection_timeout">Caducidade da conexión</string>
 </resources>
\ No newline at end of file

From fcfcc8731fcb1ec820d94e1896d9a5ca489f9acb Mon Sep 17 00:00:00 2001
From: Stephan-P <stephan-p@users.noreply.translate.codeberg.org>
Date: Fri, 10 Jan 2025 05:55:20 +0000
Subject: [PATCH 321/357] Translated using Weblate (Dutch)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/nl/
---
 src/main/res/values-nl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 0144b91dab95cc270a1dea7517ac0cca46e7f80a..5fe909625fb2b1bd9975b9e87fc6b0337ef8a335 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -1124,4 +1124,5 @@
     <string name="pref_call_integration_summary">Oproepen van deze app werken samen met gewone telefoongesprekken, zoals het beëindigen van een gesprek wanneer een ander begint.</string>
     <string name="show_to_contacts_only">Alleen weergeven aan contacten</string>
     <string name="delete_avatar_message">Wil je je avatar verwijderen? Sommige clients kunnen nog steeds een kopie van jouw avatar in de cache weergeven.</string>
+    <string name="account_status_connection_timeout">Time-out voor verbinding</string>
 </resources>
\ No newline at end of file

From bf4df09fa3086e6a3bd1e1a9ff36184000031e42 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Thu, 9 Jan 2025 12:10:05 +0000
Subject: [PATCH 322/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index c5bfde08d713b4b36b1c15e51582044f0870edaf..a0f9210012905c683c4dab2094ba9ad6c1cbbffc 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -91,7 +91,7 @@
     <string name="send_unencrypted_message">Отправить сообщение без шифрования</string>
     <string name="send_message">Сообщение</string>
     <string name="send_message_to_x">Сообщение для %s</string>
-    <string name="send_omemo_x509_message">v\\Зашифрованное OMEMO сообщение</string>
+    <string name="send_omemo_x509_message">Зашифрованное vOMEMO сообщение</string>
     <string name="your_nick_has_been_changed">Используется новое имя</string>
     <string name="send_unencrypted">Отправить в незашифрованном виде</string>
     <string name="decryption_failed">Расшифровка невозможна. Вероятно, у вас нет надлежащего ключа.</string>
@@ -1155,4 +1155,5 @@
     <string name="custom_notifications_enable">Использовать индивидуальные настройки уведомлений (важность, звук, вибрация) для этой беседы?</string>
     <string name="delete_avatar_message">Хотите удалить свой аватар? Некоторые клиенты могут продолжать отображать кэшированную копию вашего аватара.</string>
     <string name="show_to_contacts_only">Показывать только контактам</string>
+    <string name="account_status_connection_timeout">Истекло время ожидания подключения</string>
 </resources>
\ No newline at end of file

From 87f3947d8c2b07f152d4e53ad9e795ad8398dde0 Mon Sep 17 00:00:00 2001
From: SomeTr <sometr@users.noreply.translate.codeberg.org>
Date: Thu, 9 Jan 2025 22:36:50 +0000
Subject: [PATCH 323/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/uk/
---
 src/main/res/values-uk/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index c0ab0e047d30cb060a3c80ba7930e350fe910a41..a18353552e4dcf0a0b0c159792fbf96549856b3b 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -671,7 +671,7 @@
     <string name="mtm_accept_cert">Прийняти незнайомий сертифікат?</string>
     <string name="mtm_trust_anchor">Сертифікат сервера не підписано відомим центром сертифікації.</string>
     <string name="mtm_accept_servername">Прийняти сервер з невідповідним ім\'ям?</string>
-    <string name="mtm_hostname_mismatch">Серверу не вдалося авторизуватися як %s. Сертифікат чинний лише для:</string>
+    <string name="mtm_hostname_mismatch">Серверу не вдалося авторизуватися як «%s». Сертифікат чинний лише для:</string>
     <string name="mtm_connect_anyway">Усе одно бажаєте підключитися?</string>
     <string name="mtm_cert_details">Деталі сертифіката:</string>
     <string name="once">Один раз</string>
@@ -1156,4 +1156,5 @@
     <string name="custom_notifications">Індивідуальні сповіщення</string>
     <string name="show_to_contacts_only">Показувати лише контактам</string>
     <string name="delete_avatar_message">Бажаєте видалити свій аватар? Деякі клієнти можуть продовжувати відображати копію Вашого аватара з кешу.</string>
+    <string name="account_status_connection_timeout">Час очікування з\'єднання вичерпано</string>
 </resources>
\ No newline at end of file

From fe7d0d149fd721d45dfe64c44f3b5b3b644a6658 Mon Sep 17 00:00:00 2001
From: Besnik_b <besnik_b@users.noreply.translate.codeberg.org>
Date: Thu, 9 Jan 2025 11:47:14 +0000
Subject: [PATCH 324/357] Translated using Weblate (Albanian)

Currently translated at 99.1% (1050 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sq/
---
 src/main/res/values-sq-rAL/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index 1cac18d45d49c65a99b5c512d75808a615cf6afa..ead7f37e7b9feb0e5037612b235c8f5f7172f1ab 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -928,7 +928,7 @@
     <string name="pref_notifications_from_strangers_summary">Njofto për mesazhe dhe thirrje të mara prej të huajish.</string>
     <string name="pref_validate_hostname_summary">Dëshmi shërbyesi që përmbajnë strehëemrin e vlerësuar, konsiderohen të verifikuara</string>
     <string name="certificate_does_not_contain_jid">Dëshmia s’përmban adresë XMPP</string>
-    <string name="mtm_hostname_mismatch">Shërbyesi s’bëri dot mirëfilltësimin si s. Dëshmia është e vlefshme vetëm për:</string>
+    <string name="mtm_hostname_mismatch">Shërbyesi s’bëri dot mirëfilltësimin si “%s”. Dëshmia është e vlefshme vetëm për:</string>
     <string name="pref_scroll_to_bottom_summary">Pas dërgimit të një mesazhi, rrëshqit poshtë</string>
     <string name="error_trustkey_general">%1$s s’është në gjendje të fshehtëzojë mesazhe te %2$s. Kjo mund të vijë për shkak se kontakti juaj përdor një shërbyes, ose klient të vjetruar, që s’mund të përdorë OMEMO.</string>
     <string name="error_trustkey_hint_mutual">Ndihmëz: Në disa raste, kjo mund të ndreqet duke shtuar listat e kontakteve të njëri-tjetrit.</string>
@@ -1119,4 +1119,5 @@
     <string name="pref_call_integration_summary">Thirrjet prej këtij aplikacioni ndërveprojnë me thirrjet e zakonshme telefonike, fjala vjen, përfundim i një thirrjeje, kur niset një tjetër.</string>
     <string name="show_to_contacts_only">Shfaqja vetëm kontakteve</string>
     <string name="delete_avatar_message">Doni të fshihet avatari jua? Disa klientë mund të vazhdojnë të shfaqin një kopje të ruajtur në fshehtinat e tyre të avatarit tuaj.</string>
+    <string name="account_status_connection_timeout">Mbarim kohe për lidhjen</string>
 </resources>
\ No newline at end of file

From 8baa77162960ed488044d409682dcc5f60aea511 Mon Sep 17 00:00:00 2001
From: Outbreak2096 <outbreak2096@users.noreply.translate.codeberg.org>
Date: Thu, 9 Jan 2025 12:30:29 +0000
Subject: [PATCH 325/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/zh_Hans/
---
 src/main/res/values-zh-rCN/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 6ae84613b9b12168b7e739e3fe66c5cc87b37a3b..e2a204bce8b8f77426905525feb41685ec800456 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -962,7 +962,7 @@
     <string name="invite_to_app">邀请至 Conversations</string>
     <string name="unable_to_parse_invite">无法解析邀请</string>
     <string name="server_does_not_support_easy_onboarding_invites">服务器不支持生成邀请</string>
-    <string name="no_active_accounts_support_this">没有活动账号支持此功能</string>
+    <string name="no_active_accounts_support_this">没有已启用的账号支持此功能</string>
     <string name="backup_started_message">备份已开始。一旦完成，将会收到通知。</string>
     <string name="unable_to_enable_video">无法启用视频。</string>
     <string name="plain_text_document">纯文本文档</string>
@@ -1107,4 +1107,5 @@
     <string name="pref_align_start">左对齐消息</string>
     <string name="delete_avatar_message">是否删除头像？某些客户端可能会继续显示您头像的缓存副本。</string>
     <string name="show_to_contacts_only">仅显示给联系人</string>
+    <string name="account_status_connection_timeout">连接超时</string>
 </resources>
\ No newline at end of file

From 86cdf031614ea1ac26512469e91919d1a739027e Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Fri, 10 Jan 2025 03:54:40 +0000
Subject: [PATCH 326/357] Translated using Weblate (Galician)

Currently translated at 65.0% (52 of 80 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/gl/
---
 fastlane/metadata/android/gl-ES/changelogs/4212904.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/gl-ES/changelogs/4212904.txt

diff --git a/fastlane/metadata/android/gl-ES/changelogs/4212904.txt b/fastlane/metadata/android/gl-ES/changelogs/4212904.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8b89483ca3e58be58f70cbfb8a0fedea1c7375c6
--- /dev/null
+++ b/fastlane/metadata/android/gl-ES/changelogs/4212904.txt
@@ -0,0 +1,2 @@
+* arranxo de problemas menores na interface
+* arranxo de problemas coa conexión a dominios .onion en portos non predeterminados

From 789eccb15435987d3f3e3b4986a6a1396c116286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Fri, 10 Jan 2025 07:39:47 +0000
Subject: [PATCH 327/357] Translated using Weblate (Estonian)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index fc519ee7a562bf577ad8118fd8612d825306e6ab..c184cc6b4255e3b997797bcf24a78ebfd93734f0 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -1128,4 +1128,5 @@
     <string name="pref_call_integration">Kõnede lõimimine</string>
     <string name="delete_avatar_message">Kas sa sooviksid oma tunnuspildi kustutada? Palun arvesta, et mitmed klientrakendused võivad jätkata vana puhverdatud pildi kasutamist.</string>
     <string name="show_to_contacts_only">Näita vaid kontaktidele</string>
+    <string name="account_status_connection_timeout">Ühenduse on aegunud</string>
 </resources>
\ No newline at end of file

From 5c63d4b67fa7275b2ccc9bdfb4b4e0fc0978991a Mon Sep 17 00:00:00 2001
From: nautilusx <translate@disroot.org>
Date: Fri, 10 Jan 2025 10:08:32 +0000
Subject: [PATCH 328/357] Translated using Weblate (German)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/de/
---
 src/main/res/values-de/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 0da02aa64e1edc020d58b8d71ecba6c7066e10f9..db9345403642fccdd0056294239c1a18864b81b0 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -1097,7 +1097,7 @@
     <string name="clients_may_not_support_av">Der XMPP-Client deines Kontakts unterstützt möglicherweise keine Audio-/Videoanrufe.</string>
     <string name="pref_chat_bubbles">Sprechblasen</string>
     <string name="pref_show_avatars">Profilbilder anzeigen</string>
-    <string name="pref_show_avatars_summary">Profilbilder an deinen Nachrichten und in 1:1 Chats statt nur in Gruppenchats anzeigen.</string>
+    <string name="pref_show_avatars_summary">Profilbilder in deinen Nachrichten und in 1:1 Chats statt nur in Gruppenchats anzeigen.</string>
     <string name="pref_chat_bubbles_summary">Hintergrundfarbe, Schriftgröße, Profilbilder</string>
     <string name="pref_title_bubbles">Sprechblasen</string>
     <string name="pref_call_integration">Anrufintegration</string>
@@ -1108,4 +1108,5 @@
     <string name="custom_notifications_enable">Individuelle Benachrichtigungseinstellungen (Wichtigkeit, Ton, Vibration) für diese Unterhaltung aktivieren?</string>
     <string name="delete_avatar_message">Möchtest du deinen Profilbild löschen? Einige Clients zeigen möglicherweise weiterhin eine zwischengespeicherte Kopie deines Profilbildes an.</string>
     <string name="show_to_contacts_only">Nur für Kontakte anzeigen</string>
+    <string name="account_status_connection_timeout">Zeitüberschreitung beim Verbinden</string>
 </resources>
\ No newline at end of file

From cdc6d260feb5c0880bab80c8f35e1fa739c8f456 Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Fri, 10 Jan 2025 09:58:26 +0000
Subject: [PATCH 329/357] Translated using Weblate (Polish)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pl/
---
 src/main/res/values-pl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index da9698687a135b544e03b679620e67159a316267..b08548491d0bbe300ee7bad683cfe04fce5f8861 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -1140,4 +1140,5 @@
     <string name="custom_notifications_enable">Włączyć dedykowane ustawienia powiadomień (ważność, dźwięk, wibracje) dla tej rozmowy?</string>
     <string name="delete_avatar_message">Czy chcesz usunąć swój awatar? Niektórzy klienci mogą nadal pokazywać zachowaną kopię.</string>
     <string name="show_to_contacts_only">Pokazuj wyłącznie kontaktom</string>
+    <string name="account_status_connection_timeout">Limit czasu połączenia</string>
 </resources>
\ No newline at end of file

From dedc1cefbfde72ab1d3c0d45052a3bb1a411514f Mon Sep 17 00:00:00 2001
From: "lucasmz.dev" <git@lucasmz.dev>
Date: Sat, 11 Jan 2025 02:52:08 +0000
Subject: [PATCH 330/357] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pt_BR/
---
 src/main/res/values-pt-rBR/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index f8478e9f8ac937bcd2a9b0a99b81b88b879a8bd8..9af00164d8e882880ed15199c8197246cdcd6571 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -1126,4 +1126,5 @@
     <string name="pref_call_integration_summary">Chamadas deste app interagem com as chamadas comuns do sistema, como quando uma chamada é terminada quando outra começa.</string>
     <string name="show_to_contacts_only">Mostrar somente para contatos</string>
     <string name="delete_avatar_message">Você gostaria de excluir seu avatar? Alguns clientes podem continuar mostrando uma cópia em cache do seu avatar.</string>
+    <string name="account_status_connection_timeout">Conexão demorou muito</string>
 </resources>
\ No newline at end of file

From 5ff0f53c5f746f0b496ef6c6d8450b1838a5c2f8 Mon Sep 17 00:00:00 2001
From: licaon-kter <licaon-kter@users.noreply.translate.codeberg.org>
Date: Fri, 10 Jan 2025 09:51:14 +0000
Subject: [PATCH 331/357] Translated using Weblate (Romanian)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ro/
---
 src/main/res/values-ro-rRO/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 9b4e1a40361847899848519aa15fbb8ab176e794..07c8755d8a464a0b9060463c6a24e57828864ba7 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -1127,4 +1127,5 @@
     <string name="pref_call_integration">Integrarea apelurilor</string>
     <string name="delete_avatar_message">Ați dori să vă ștergeți avatarul? Unii clienți ar putea să continue să arate o copie a avatarului.</string>
     <string name="show_to_contacts_only">Arată doar contactelor</string>
+    <string name="account_status_connection_timeout">Timp limită de conectare expirat</string>
 </resources>
\ No newline at end of file

From 7b5185bab72a8aaab501eaac53760d4e0df65058 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Sun, 12 Jan 2025 06:45:35 +0000
Subject: [PATCH 332/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index a0f9210012905c683c4dab2094ba9ad6c1cbbffc..d0ae9bfe835e3037672c7ddc9dbe1dbe9cea7855 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -1012,7 +1012,7 @@
     <string name="delete_from_server">Удалить аккаунт на сервере</string>
     <string name="pref_autojoin">Синхронизировать закладки</string>
     <string name="pref_autojoin_summary">Устанавливать флаг \"автоприсоединение\" при входе и выходе из MUC, и реагировать на изменения от других клиентов</string>
-    <string name="search_group_chats">Поиск по конференциям</string>
+    <string name="search_group_chats">Поиск конференций</string>
     <string name="download_failed_invalid_file">Загрузка не выполнена: файл испорчен</string>
     <string name="rtp_state_content_add_video">Перейти на видеовызов\?</string>
     <string name="outgoing_call_duration_timestamp">Исходящий вызов (%s) · %s</string>

From 4013dfb7093af249b51b5136e3d1df538f6803ca Mon Sep 17 00:00:00 2001
From: Miguel_PL <miguel_pl@users.noreply.translate.codeberg.org>
Date: Sun, 12 Jan 2025 16:48:51 +0000
Subject: [PATCH 333/357] Translated using Weblate (Spanish)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/es/
---
 src/main/res/values-es/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index b78c949e5184867bdd66ba269a15ac5c168378b3..729c1d934f390848db4419c0bde8c05130601d59 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -1122,4 +1122,5 @@
     <string name="custom_notifications_enable">¿Habilitar los ajustes de notificaciones personalizadas (importancia, sonido, vibración) para esta conversación?</string>
     <string name="delete_avatar_message">¿Quieres eliminar tu imagen de perfil? Algunos clientes podrían seguir mostrando una copia en caché de tu avatar.</string>
     <string name="show_to_contacts_only">Mostrar sólo a contactos</string>
+    <string name="account_status_connection_timeout">Se agotó el tiempo de espera de la conexión</string>
 </resources>
\ No newline at end of file

From 3a613740add002814dec887814ceb1bfe2b7ab12 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Sun, 12 Jan 2025 18:06:08 +0000
Subject: [PATCH 334/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index d0ae9bfe835e3037672c7ddc9dbe1dbe9cea7855..927b66686a36fd1f1739ac3063895710474f823e 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -261,7 +261,7 @@
     <string name="contacts_and_n_more_have_read_up_to_this_point">%1$s + ещё %2$d прочитали досюда</string>
     <string name="everyone_has_read_up_to_this_point">Все прочитали сообщения досюда</string>
     <string name="publish">Опубликовать</string>
-    <string name="touch_to_choose_picture">Нажмите на аватар, чтобы выбрать новую фотографию из галереи</string>
+    <string name="touch_to_choose_picture">Нажмите на аватар, чтобы выбрать изображение из галереи</string>
     <string name="publishing">Установка…</string>
     <string name="error_publish_avatar_server_reject">Сервер отклонил размещение аватара</string>
     <string name="error_publish_avatar_converting">Невозможно преобразовать вашу фотографию</string>

From 5e564d33c8cc6d28236e50a9946424ba08d43c13 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 13 Jan 2025 10:12:33 +0100
Subject: [PATCH 335/357] include origin-id only in mucs and only if stable-id
 is not supported

---
 .../generator/MessageGenerator.java           | 152 ++++++++++++------
 .../android/xmpp/model/unique/OriginId.java   |  10 ++
 2 files changed, 112 insertions(+), 50 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index af4349350a7ca0b437f33c42f1e24feb8effa126..42975cb8f87d393cafe795141432162fedad90a9 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -1,12 +1,5 @@
 package eu.siacs.conversations.generator;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
-
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.crypto.axolotl.AxolotlService;
 import eu.siacs.conversations.crypto.axolotl.XmppAxolotlMessage;
@@ -26,19 +19,31 @@ import eu.siacs.conversations.xmpp.jingle.stanzas.Reason;
 import im.conversations.android.xmpp.model.correction.Replace;
 import im.conversations.android.xmpp.model.reactions.Reaction;
 import im.conversations.android.xmpp.model.reactions.Reactions;
+import im.conversations.android.xmpp.model.unique.OriginId;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
 
 public class MessageGenerator extends AbstractGenerator {
-    private static final String OMEMO_FALLBACK_MESSAGE = "I sent you an OMEMO encrypted message but your client doesn’t seem to support that. Find more information on https://conversations.im/omemo";
-    private static final String PGP_FALLBACK_MESSAGE = "I sent you a PGP encrypted message but your client doesn’t seem to support that.";
+    private static final String OMEMO_FALLBACK_MESSAGE =
+            "I sent you an OMEMO encrypted message but your client doesn’t seem to support that."
+                    + " Find more information on https://conversations.im/omemo";
+    private static final String PGP_FALLBACK_MESSAGE =
+            "I sent you a PGP encrypted message but your client doesn’t seem to support that.";
 
     public MessageGenerator(XmppConnectionService service) {
         super(service);
     }
 
-    private im.conversations.android.xmpp.model.stanza.Message preparePacket(Message message) {
+    private im.conversations.android.xmpp.model.stanza.Message preparePacket(
+            final Message message) {
         Conversation conversation = (Conversation) message.getConversation();
         Account account = conversation.getAccount();
-        im.conversations.android.xmpp.model.stanza.Message packet = new im.conversations.android.xmpp.model.stanza.Message();
+        im.conversations.android.xmpp.model.stanza.Message packet =
+                new im.conversations.android.xmpp.model.stanza.Message();
         final boolean isWithSelf = conversation.getContact().isSelf();
         if (conversation.getMode() == Conversation.MODE_SINGLE) {
             packet.setTo(message.getCounterpart());
@@ -60,8 +65,10 @@ public class MessageGenerator extends AbstractGenerator {
         }
         packet.setFrom(account.getJid());
         packet.setId(message.getUuid());
-        if (conversation.getMode() == Conversational.MODE_SINGLE || message.isPrivateMessage() || !conversation.getMucOptions().stableId()) {
-            packet.addChild("origin-id", Namespace.STANZA_IDS).setAttribute("id", message.getUuid());
+        if (conversation.getMode() == Conversational.MODE_MULTI
+                && !message.isPrivateMessage()
+                && !conversation.getMucOptions().stableId()) {
+            packet.addExtension(new OriginId(message.getUuid()));
         }
         if (message.edited()) {
             packet.addExtension(new Replace(message.getEditedIdWireFormat()));
@@ -69,16 +76,18 @@ public class MessageGenerator extends AbstractGenerator {
         return packet;
     }
 
-    public void addDelay(im.conversations.android.xmpp.model.stanza.Message packet, long timestamp) {
-        final SimpleDateFormat mDateFormat = new SimpleDateFormat(
-                "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
+    public void addDelay(
+            im.conversations.android.xmpp.model.stanza.Message packet, long timestamp) {
+        final SimpleDateFormat mDateFormat =
+                new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
         mDateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
         Element delay = packet.addChild("delay", "urn:xmpp:delay");
         Date date = new Date(timestamp);
         delay.setAttribute("stamp", mDateFormat.format(date));
     }
 
-    public im.conversations.android.xmpp.model.stanza.Message generateAxolotlChat(Message message, XmppAxolotlMessage axolotlMessage) {
+    public im.conversations.android.xmpp.model.stanza.Message generateAxolotlChat(
+            Message message, XmppAxolotlMessage axolotlMessage) {
         im.conversations.android.xmpp.model.stanza.Message packet = preparePacket(message);
         if (axolotlMessage == null) {
             return null;
@@ -92,8 +101,10 @@ public class MessageGenerator extends AbstractGenerator {
         return packet;
     }
 
-    public im.conversations.android.xmpp.model.stanza.Message generateKeyTransportMessage(Jid to, XmppAxolotlMessage axolotlMessage) {
-        im.conversations.android.xmpp.model.stanza.Message packet = new im.conversations.android.xmpp.model.stanza.Message();
+    public im.conversations.android.xmpp.model.stanza.Message generateKeyTransportMessage(
+            Jid to, XmppAxolotlMessage axolotlMessage) {
+        im.conversations.android.xmpp.model.stanza.Message packet =
+                new im.conversations.android.xmpp.model.stanza.Message();
         packet.setType(im.conversations.android.xmpp.model.stanza.Message.Type.CHAT);
         packet.setTo(to);
         packet.setAxolotlMessage(axolotlMessage.toElement());
@@ -137,23 +148,32 @@ public class MessageGenerator extends AbstractGenerator {
         return packet;
     }
 
-    public im.conversations.android.xmpp.model.stanza.Message generateChatState(Conversation conversation) {
+    public im.conversations.android.xmpp.model.stanza.Message generateChatState(
+            Conversation conversation) {
         final Account account = conversation.getAccount();
-        final im.conversations.android.xmpp.model.stanza.Message packet = new im.conversations.android.xmpp.model.stanza.Message();
-        packet.setType(conversation.getMode() == Conversation.MODE_MULTI ? im.conversations.android.xmpp.model.stanza.Message.Type.GROUPCHAT : im.conversations.android.xmpp.model.stanza.Message.Type.CHAT);
+        final im.conversations.android.xmpp.model.stanza.Message packet =
+                new im.conversations.android.xmpp.model.stanza.Message();
+        packet.setType(
+                conversation.getMode() == Conversation.MODE_MULTI
+                        ? im.conversations.android.xmpp.model.stanza.Message.Type.GROUPCHAT
+                        : im.conversations.android.xmpp.model.stanza.Message.Type.CHAT);
         packet.setTo(conversation.getJid().asBareJid());
         packet.setFrom(account.getJid());
         packet.addChild(ChatState.toElement(conversation.getOutgoingChatState()));
         packet.addChild("no-store", "urn:xmpp:hints");
-        packet.addChild("no-storage", "urn:xmpp:hints"); //wrong! don't copy this. Its *store*
+        packet.addChild("no-storage", "urn:xmpp:hints"); // wrong! don't copy this. Its *store*
         return packet;
     }
 
     public im.conversations.android.xmpp.model.stanza.Message confirm(final Message message) {
         final boolean groupChat = message.getConversation().getMode() == Conversational.MODE_MULTI;
         final Jid to = message.getCounterpart();
-        final im.conversations.android.xmpp.model.stanza.Message packet = new im.conversations.android.xmpp.model.stanza.Message();
-        packet.setType(groupChat ? im.conversations.android.xmpp.model.stanza.Message.Type.GROUPCHAT : im.conversations.android.xmpp.model.stanza.Message.Type.CHAT);
+        final im.conversations.android.xmpp.model.stanza.Message packet =
+                new im.conversations.android.xmpp.model.stanza.Message();
+        packet.setType(
+                groupChat
+                        ? im.conversations.android.xmpp.model.stanza.Message.Type.GROUPCHAT
+                        : im.conversations.android.xmpp.model.stanza.Message.Type.CHAT);
         packet.setTo(groupChat ? to.asBareJid() : to);
         final Element displayed = packet.addChild("displayed", "urn:xmpp:chat-markers:0");
         if (groupChat) {
@@ -171,23 +191,32 @@ public class MessageGenerator extends AbstractGenerator {
         return packet;
     }
 
-    public im.conversations.android.xmpp.model.stanza.Message reaction(final Conversational conversation, final String reactingTo, final Collection<String> ourReactions) {
+    public im.conversations.android.xmpp.model.stanza.Message reaction(
+            final Conversational conversation,
+            final String reactingTo,
+            final Collection<String> ourReactions) {
         final boolean groupChat = conversation.getMode() == Conversational.MODE_MULTI;
         final Jid to = conversation.getJid().asBareJid();
-        final im.conversations.android.xmpp.model.stanza.Message packet = new im.conversations.android.xmpp.model.stanza.Message();
-        packet.setType(groupChat ? im.conversations.android.xmpp.model.stanza.Message.Type.GROUPCHAT : im.conversations.android.xmpp.model.stanza.Message.Type.CHAT);
+        final im.conversations.android.xmpp.model.stanza.Message packet =
+                new im.conversations.android.xmpp.model.stanza.Message();
+        packet.setType(
+                groupChat
+                        ? im.conversations.android.xmpp.model.stanza.Message.Type.GROUPCHAT
+                        : im.conversations.android.xmpp.model.stanza.Message.Type.CHAT);
         packet.setTo(to);
         final var reactions = packet.addExtension(new Reactions());
         reactions.setId(reactingTo);
-        for(final String ourReaction : ourReactions) {
+        for (final String ourReaction : ourReactions) {
             reactions.addExtension(new Reaction(ourReaction));
         }
         packet.addChild("store", "urn:xmpp:hints");
         return packet;
     }
 
-    public im.conversations.android.xmpp.model.stanza.Message conferenceSubject(Conversation conversation, String subject) {
-        im.conversations.android.xmpp.model.stanza.Message packet = new im.conversations.android.xmpp.model.stanza.Message();
+    public im.conversations.android.xmpp.model.stanza.Message conferenceSubject(
+            Conversation conversation, String subject) {
+        im.conversations.android.xmpp.model.stanza.Message packet =
+                new im.conversations.android.xmpp.model.stanza.Message();
         packet.setType(im.conversations.android.xmpp.model.stanza.Message.Type.GROUPCHAT);
         packet.setTo(conversation.getJid().asBareJid());
         packet.addChild("subject").setContent(subject);
@@ -195,8 +224,10 @@ public class MessageGenerator extends AbstractGenerator {
         return packet;
     }
 
-    public im.conversations.android.xmpp.model.stanza.Message directInvite(final Conversation conversation, final Jid contact) {
-        im.conversations.android.xmpp.model.stanza.Message packet = new im.conversations.android.xmpp.model.stanza.Message();
+    public im.conversations.android.xmpp.model.stanza.Message directInvite(
+            final Conversation conversation, final Jid contact) {
+        im.conversations.android.xmpp.model.stanza.Message packet =
+                new im.conversations.android.xmpp.model.stanza.Message();
         packet.setType(im.conversations.android.xmpp.model.stanza.Message.Type.NORMAL);
         packet.setTo(contact);
         packet.setFrom(conversation.getAccount().getJid());
@@ -213,7 +244,8 @@ public class MessageGenerator extends AbstractGenerator {
         return packet;
     }
 
-    public im.conversations.android.xmpp.model.stanza.Message invite(final Conversation conversation, final Jid contact) {
+    public im.conversations.android.xmpp.model.stanza.Message invite(
+            final Conversation conversation, final Jid contact) {
         final var packet = new im.conversations.android.xmpp.model.stanza.Message();
         packet.setTo(conversation.getJid().asBareJid());
         packet.setFrom(conversation.getAccount().getJid());
@@ -226,9 +258,13 @@ public class MessageGenerator extends AbstractGenerator {
         return packet;
     }
 
-    public im.conversations.android.xmpp.model.stanza.Message received(Account account, final Jid from, final String id, ArrayList<String> namespaces, im.conversations.android.xmpp.model.stanza.Message.Type type) {
-        final var receivedPacket =
-                new im.conversations.android.xmpp.model.stanza.Message();
+    public im.conversations.android.xmpp.model.stanza.Message received(
+            Account account,
+            final Jid from,
+            final String id,
+            ArrayList<String> namespaces,
+            im.conversations.android.xmpp.model.stanza.Message.Type type) {
+        final var receivedPacket = new im.conversations.android.xmpp.model.stanza.Message();
         receivedPacket.setType(type);
         receivedPacket.setTo(from);
         receivedPacket.setFrom(account.getJid());
@@ -239,8 +275,10 @@ public class MessageGenerator extends AbstractGenerator {
         return receivedPacket;
     }
 
-    public im.conversations.android.xmpp.model.stanza.Message received(Account account, Jid to, String id) {
-        im.conversations.android.xmpp.model.stanza.Message packet = new im.conversations.android.xmpp.model.stanza.Message();
+    public im.conversations.android.xmpp.model.stanza.Message received(
+            Account account, Jid to, String id) {
+        im.conversations.android.xmpp.model.stanza.Message packet =
+                new im.conversations.android.xmpp.model.stanza.Message();
         packet.setFrom(account.getJid());
         packet.setTo(to);
         packet.addChild("received", "urn:xmpp:receipts").setAttribute("id", id);
@@ -250,7 +288,8 @@ public class MessageGenerator extends AbstractGenerator {
 
     public im.conversations.android.xmpp.model.stanza.Message sessionFinish(
             final Jid with, final String sessionId, final Reason reason) {
-        final im.conversations.android.xmpp.model.stanza.Message packet = new im.conversations.android.xmpp.model.stanza.Message();
+        final im.conversations.android.xmpp.model.stanza.Message packet =
+                new im.conversations.android.xmpp.model.stanza.Message();
         packet.setType(im.conversations.android.xmpp.model.stanza.Message.Type.CHAT);
         packet.setTo(with);
         final Element finish = packet.addChild("finish", Namespace.JINGLE_MESSAGE);
@@ -261,24 +300,33 @@ public class MessageGenerator extends AbstractGenerator {
         return packet;
     }
 
-    public im.conversations.android.xmpp.model.stanza.Message sessionProposal(final JingleConnectionManager.RtpSessionProposal proposal) {
-        final im.conversations.android.xmpp.model.stanza.Message packet = new im.conversations.android.xmpp.model.stanza.Message();
-        packet.setType(im.conversations.android.xmpp.model.stanza.Message.Type.CHAT); //we want to carbon copy those
+    public im.conversations.android.xmpp.model.stanza.Message sessionProposal(
+            final JingleConnectionManager.RtpSessionProposal proposal) {
+        final im.conversations.android.xmpp.model.stanza.Message packet =
+                new im.conversations.android.xmpp.model.stanza.Message();
+        packet.setType(
+                im.conversations.android.xmpp.model.stanza.Message.Type
+                        .CHAT); // we want to carbon copy those
         packet.setTo(proposal.with);
         packet.setId(JingleRtpConnection.JINGLE_MESSAGE_PROPOSE_ID_PREFIX + proposal.sessionId);
         final Element propose = packet.addChild("propose", Namespace.JINGLE_MESSAGE);
         propose.setAttribute("id", proposal.sessionId);
         for (final Media media : proposal.media) {
-            propose.addChild("description", Namespace.JINGLE_APPS_RTP).setAttribute("media", media.toString());
+            propose.addChild("description", Namespace.JINGLE_APPS_RTP)
+                    .setAttribute("media", media.toString());
         }
         packet.addChild("request", "urn:xmpp:receipts");
         packet.addChild("store", "urn:xmpp:hints");
         return packet;
     }
 
-    public im.conversations.android.xmpp.model.stanza.Message sessionRetract(final JingleConnectionManager.RtpSessionProposal proposal) {
-        final im.conversations.android.xmpp.model.stanza.Message packet = new im.conversations.android.xmpp.model.stanza.Message();
-        packet.setType(im.conversations.android.xmpp.model.stanza.Message.Type.CHAT); //we want to carbon copy those
+    public im.conversations.android.xmpp.model.stanza.Message sessionRetract(
+            final JingleConnectionManager.RtpSessionProposal proposal) {
+        final im.conversations.android.xmpp.model.stanza.Message packet =
+                new im.conversations.android.xmpp.model.stanza.Message();
+        packet.setType(
+                im.conversations.android.xmpp.model.stanza.Message.Type
+                        .CHAT); // we want to carbon copy those
         packet.setTo(proposal.with);
         final Element propose = packet.addChild("retract", Namespace.JINGLE_MESSAGE);
         propose.setAttribute("id", proposal.sessionId);
@@ -287,9 +335,13 @@ public class MessageGenerator extends AbstractGenerator {
         return packet;
     }
 
-    public im.conversations.android.xmpp.model.stanza.Message sessionReject(final Jid with, final String sessionId) {
-        final im.conversations.android.xmpp.model.stanza.Message packet = new im.conversations.android.xmpp.model.stanza.Message();
-        packet.setType(im.conversations.android.xmpp.model.stanza.Message.Type.CHAT); //we want to carbon copy those
+    public im.conversations.android.xmpp.model.stanza.Message sessionReject(
+            final Jid with, final String sessionId) {
+        final im.conversations.android.xmpp.model.stanza.Message packet =
+                new im.conversations.android.xmpp.model.stanza.Message();
+        packet.setType(
+                im.conversations.android.xmpp.model.stanza.Message.Type
+                        .CHAT); // we want to carbon copy those
         packet.setTo(with);
         final Element propose = packet.addChild("reject", Namespace.JINGLE_MESSAGE);
         propose.setAttribute("id", sessionId);
diff --git a/src/main/java/im/conversations/android/xmpp/model/unique/OriginId.java b/src/main/java/im/conversations/android/xmpp/model/unique/OriginId.java
index 31a93962104ef834cae83978ce89d65946fb61b8..ce2a07a02e6018aaeb643f3c1891846c921c495d 100644
--- a/src/main/java/im/conversations/android/xmpp/model/unique/OriginId.java
+++ b/src/main/java/im/conversations/android/xmpp/model/unique/OriginId.java
@@ -1,5 +1,6 @@
 package im.conversations.android.xmpp.model.unique;
 
+import com.google.common.base.Strings;
 import im.conversations.android.annotation.XmlElement;
 import im.conversations.android.xmpp.model.Extension;
 
@@ -9,4 +10,13 @@ public class OriginId extends Extension {
     public OriginId() {
         super(OriginId.class);
     }
+
+    public OriginId(final String id) {
+        this();
+        this.setAttribute("id", id);
+    }
+
+    public String getId() {
+        return Strings.emptyToNull(this.getAttribute("id"));
+    }
 }

From 67b92427835043c9a8d15f6038dd8dbbab690273 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 14 Jan 2025 10:41:55 +0100
Subject: [PATCH 336/357] refactor ScramMechanism code

---
 .../crypto/sasl/ChannelBinding.java           |  24 +-
 .../crypto/sasl/SaslMechanism.java            |  31 +-
 .../crypto/sasl/ScramMechanism.java           | 345 +++++++++---------
 .../conversations/xmpp/XmppConnection.java    |  19 +-
 .../android/xmpp/model/cb/ChannelBinding.java |  16 +
 .../xmpp/model/cb/SaslChannelBinding.java     |  17 +
 .../android/xmpp/model/cb/package-info.java   |   5 +
 7 files changed, 240 insertions(+), 217 deletions(-)
 create mode 100644 src/main/java/im/conversations/android/xmpp/model/cb/ChannelBinding.java
 create mode 100644 src/main/java/im/conversations/android/xmpp/model/cb/SaslChannelBinding.java
 create mode 100644 src/main/java/im/conversations/android/xmpp/model/cb/package-info.java

diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/ChannelBinding.java b/src/main/java/eu/siacs/conversations/crypto/sasl/ChannelBinding.java
index 3cbaaeeb9ab08b29b0f264ac06ce99240a282446..fbad438b63e64687cbb3b9152656ecc431541f77 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/ChannelBinding.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ChannelBinding.java
@@ -1,20 +1,15 @@
 package eu.siacs.conversations.crypto.sasl;
 
 import android.util.Log;
-
 import com.google.common.base.CaseFormat;
-import com.google.common.base.Preconditions;
 import com.google.common.base.Predicates;
 import com.google.common.base.Strings;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableBiMap;
-
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.utils.SSLSockets;
-import eu.siacs.conversations.xml.Element;
-import eu.siacs.conversations.xml.Namespace;
-
+import im.conversations.android.xmpp.model.cb.SaslChannelBinding;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -35,20 +30,13 @@ public enum ChannelBinding {
         SHORT_NAMES = builder.build();
     }
 
-    public static Collection<ChannelBinding> of(final Element channelBinding) {
-        Preconditions.checkArgument(
-                channelBinding == null
-                        || ("sasl-channel-binding".equals(channelBinding.getName())
-                                && Namespace.CHANNEL_BINDING.equals(channelBinding.getNamespace())),
-                "pass null or a valid channel binding stream feature");
+    public static Collection<ChannelBinding> of(final SaslChannelBinding channelBinding) {
+        if (channelBinding == null) {
+            return Collections.emptyList();
+        }
         return Collections2.filter(
                 Collections2.transform(
-                        Collections2.filter(
-                                channelBinding == null
-                                        ? Collections.emptyList()
-                                        : channelBinding.getChildren(),
-                                c -> c != null && "channel-binding".equals(c.getName())),
-                        c -> c == null ? null : ChannelBinding.of(c.getAttribute("type"))),
+                        channelBinding.getChannelBindings(), cb -> ChannelBinding.of(cb.getType())),
                 Predicates.notNull());
     }
 
diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java b/src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java
index 93c722e372e1204f5759e8e0b30ac6fb13c9b166..40f48a2392d6523ab4a6d573c1b116033b652f7a 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java
@@ -1,20 +1,15 @@
 package eu.siacs.conversations.crypto.sasl;
 
 import android.util.Log;
-
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
-import com.google.common.collect.Collections2;
-
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.utils.SSLSockets;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xml.Namespace;
-
 import java.util.Collection;
 import java.util.Collections;
-
 import javax.net.ssl.SSLSocket;
 
 public abstract class SaslMechanism {
@@ -53,18 +48,7 @@ public abstract class SaslMechanism {
         return "";
     }
 
-    public static Collection<String> mechanisms(final Element authElement) {
-        if (authElement == null) {
-            return Collections.emptyList();
-        }
-        return Collections2.transform(
-                Collections2.filter(
-                        authElement.getChildren(),
-                        c -> c != null && "mechanism".equals(c.getName())),
-                c -> c == null ? null : c.getContent());
-    }
-
-    protected enum State {
+    public enum State {
         INITIAL,
         AUTH_TEXT_SENT,
         RESPONSE_SENT,
@@ -76,14 +60,11 @@ public abstract class SaslMechanism {
         SASL_2;
 
         public static Version of(final Element element) {
-            switch (Strings.nullToEmpty(element.getNamespace())) {
-                case Namespace.SASL:
-                    return SASL;
-                case Namespace.SASL_2:
-                    return SASL_2;
-                default:
-                    throw new IllegalArgumentException("Unrecognized SASL namespace");
-            }
+            return switch (Strings.nullToEmpty(element.getNamespace())) {
+                case Namespace.SASL -> SASL;
+                case Namespace.SASL_2 -> SASL_2;
+                default -> throw new IllegalArgumentException("Unrecognized SASL namespace");
+            };
         }
     }
 
diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java
index e5708e504dedd8a46c4f2f9f1f7dd51e1d1421d8..935f953bd1cc2b5f68645a36b91a09735a6bb361 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java
@@ -1,23 +1,25 @@
 package eu.siacs.conversations.crypto.sasl;
 
-import android.util.Base64;
-
 import com.google.common.base.CaseFormat;
+import com.google.common.base.Joiner;
 import com.google.common.base.Objects;
+import com.google.common.base.Splitter;
+import com.google.common.base.Strings;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.hash.HashFunction;
-
-import java.nio.charset.Charset;
+import com.google.common.io.BaseEncoding;
+import com.google.common.primitives.Ints;
+import eu.siacs.conversations.entities.Account;
+import eu.siacs.conversations.utils.CryptoHelper;
 import java.security.InvalidKeyException;
+import java.util.Arrays;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
-
 import javax.crypto.SecretKey;
 import javax.net.ssl.SSLSocket;
 
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.utils.CryptoHelper;
-
 abstract class ScramMechanism extends SaslMechanism {
 
     public static final SecretKey EMPTY_KEY =
@@ -46,7 +48,7 @@ abstract class ScramMechanism extends SaslMechanism {
     private final String gs2Header;
     private final String clientNonce;
     protected State state = State.INITIAL;
-    private String clientFirstMessageBare;
+    private final String clientFirstMessageBare;
     private byte[] serverSignature = null;
 
     ScramMechanism(final Account account, final ChannelBinding channelBinding) {
@@ -67,28 +69,35 @@ abstract class ScramMechanism extends SaslMechanism {
         }
         // This nonce should be different for each authentication attempt.
         this.clientNonce = CryptoHelper.random(100);
-        clientFirstMessageBare = "";
+        this.clientFirstMessageBare =
+                String.format(
+                        "n=%s,r=%s",
+                        CryptoHelper.saslEscape(CryptoHelper.saslPrep(account.getUsername())),
+                        this.clientNonce);
     }
 
     protected abstract HashFunction getHMac(final byte[] key);
 
     protected abstract HashFunction getDigest();
 
-    private KeyPair getKeyPair(final String password, final String salt, final int iterations)
+    private KeyPair getKeyPair(final String password, final byte[] salt, final int iterations)
             throws ExecutionException {
-        return CACHE.get(
-                new CacheKey(getMechanism(), password, salt, iterations),
-                () -> {
-                    final byte[] saltedPassword, serverKey, clientKey;
-                    saltedPassword =
-                            hi(
-                                    password.getBytes(),
-                                    Base64.decode(salt, Base64.DEFAULT),
-                                    iterations);
-                    serverKey = hmac(saltedPassword, SERVER_KEY_BYTES);
-                    clientKey = hmac(saltedPassword, CLIENT_KEY_BYTES);
-                    return new KeyPair(clientKey, serverKey);
-                });
+        final var key = new CacheKey(getMechanism(), password, salt, iterations);
+        return CACHE.get(key, () -> calculateKeyPair(password, salt, iterations));
+    }
+
+    private KeyPair calculateKeyPair(final String password, final byte[] salt, final int iterations)
+            throws InvalidKeyException {
+        final byte[] saltedPassword, serverKey, clientKey;
+        saltedPassword = hi(password.getBytes(), salt, iterations);
+        serverKey = hmac(saltedPassword, SERVER_KEY_BYTES);
+        clientKey = hmac(saltedPassword, CLIENT_KEY_BYTES);
+        return new KeyPair(clientKey, serverKey);
+    }
+
+    @Override
+    public String getMechanism() {
+        return "";
     }
 
     private byte[] hmac(final byte[] key, final byte[] input) throws InvalidKeyException {
@@ -119,152 +128,155 @@ abstract class ScramMechanism extends SaslMechanism {
 
     @Override
     public String getClientFirstMessage(final SSLSocket sslSocket) {
-        if (clientFirstMessageBare.isEmpty() && state == State.INITIAL) {
-            clientFirstMessageBare =
-                    "n="
-                            + CryptoHelper.saslEscape(CryptoHelper.saslPrep(account.getUsername()))
-                            + ",r="
-                            + this.clientNonce;
-            state = State.AUTH_TEXT_SENT;
+        if (this.state != State.INITIAL) {
+            throw new IllegalArgumentException("Calling getClientFirstMessage from invalid state");
         }
-        return Base64.encodeToString(
-                (gs2Header + clientFirstMessageBare).getBytes(Charset.defaultCharset()),
-                Base64.NO_WRAP);
+        this.state = State.AUTH_TEXT_SENT;
+        final byte[] message = (gs2Header + clientFirstMessageBare).getBytes();
+        return BaseEncoding.base64().encode(message);
     }
 
     @Override
     public String getResponse(final String challenge, final SSLSocket socket)
             throws AuthenticationException {
-        switch (state) {
-            case AUTH_TEXT_SENT:
-                if (challenge == null) {
-                    throw new AuthenticationException("challenge can not be null");
-                }
-                byte[] serverFirstMessage;
-                try {
-                    serverFirstMessage = Base64.decode(challenge, Base64.DEFAULT);
-                } catch (IllegalArgumentException e) {
-                    throw new AuthenticationException("Unable to decode server challenge", e);
-                }
-                final Tokenizer tokenizer = new Tokenizer(serverFirstMessage);
-                String nonce = "";
-                int iterationCount = -1;
-                String salt = "";
-                for (final String token : tokenizer) {
-                    if (token.charAt(1) == '=') {
-                        switch (token.charAt(0)) {
-                            case 'i':
-                                try {
-                                    iterationCount = Integer.parseInt(token.substring(2));
-                                } catch (final NumberFormatException e) {
-                                    throw new AuthenticationException(e);
-                                }
-                                break;
-                            case 's':
-                                salt = token.substring(2);
-                                break;
-                            case 'r':
-                                nonce = token.substring(2);
-                                break;
-                            case 'm':
-                                /*
-                                 * RFC 5802:
-                                 * m: This attribute is reserved for future extensibility.  In this
-                                 * version of SCRAM, its presence in a client or a server message
-                                 * MUST cause authentication failure when the attribute is parsed by
-                                 * the other end.
-                                 */
-                                throw new AuthenticationException(
-                                        "Server sent reserved token: `m'");
-                        }
-                    }
-                }
+        return switch (state) {
+            case AUTH_TEXT_SENT -> processServerFirstMessage(challenge, socket);
+            case RESPONSE_SENT -> processServerFinalMessage(challenge);
+            default -> throw new InvalidStateException(state);
+        };
+    }
 
-                if (iterationCount < 0) {
-                    throw new AuthenticationException("Server did not send iteration count");
-                }
-                if (nonce.isEmpty() || !nonce.startsWith(clientNonce)) {
-                    throw new AuthenticationException(
-                            "Server nonce does not contain client nonce: " + nonce);
-                }
-                if (salt.isEmpty()) {
-                    throw new AuthenticationException("Server sent empty salt");
-                }
+    private String processServerFirstMessage(final String challenge, final SSLSocket socket)
+            throws AuthenticationException {
+        if (Strings.isNullOrEmpty(challenge)) {
+            throw new AuthenticationException("challenge can not be null");
+        }
+        byte[] serverFirstMessage;
+        try {
+            serverFirstMessage = BaseEncoding.base64().decode(challenge);
+        } catch (final IllegalArgumentException e) {
+            throw new AuthenticationException("Unable to decode server challenge", e);
+        }
+        final Map<String, String> attributes;
+        try {
+            attributes = splitToAttributes(new String(serverFirstMessage));
+        } catch (final IllegalArgumentException e) {
+            throw new AuthenticationException("Duplicate attributes");
+        }
+        if (attributes.containsKey("m")) {
+            /*
+             * RFC 5802:
+             * m: This attribute is reserved for future extensibility.  In this
+             * version of SCRAM, its presence in a client or a server message
+             * MUST cause authentication failure when the attribute is parsed by
+             * the other end.
+             */
+            throw new AuthenticationException("Server sent reserved token: 'm'");
+        }
+        final String i = attributes.get("i");
+        final String s = attributes.get("s");
+        final String nonce = attributes.get("r");
+        final String d = attributes.get("d");
+        if (Strings.isNullOrEmpty(s) || Strings.isNullOrEmpty(nonce) || Strings.isNullOrEmpty(i)) {
+            throw new AuthenticationException("Missing attributes from server first message");
+        }
+        final Integer iterationCount = Ints.tryParse(i);
 
-                final byte[] channelBindingData = getChannelBindingData(socket);
-
-                final int gs2Len = this.gs2Header.getBytes().length;
-                final byte[] cMessage = new byte[gs2Len + channelBindingData.length];
-                System.arraycopy(this.gs2Header.getBytes(), 0, cMessage, 0, gs2Len);
-                System.arraycopy(
-                        channelBindingData, 0, cMessage, gs2Len, channelBindingData.length);
-
-                final String clientFinalMessageWithoutProof =
-                        "c=" + Base64.encodeToString(cMessage, Base64.NO_WRAP) + ",r=" + nonce;
-
-                final byte[] authMessage =
-                        (clientFirstMessageBare
-                                        + ','
-                                        + new String(serverFirstMessage)
-                                        + ','
-                                        + clientFinalMessageWithoutProof)
-                                .getBytes();
-
-                final KeyPair keys;
-                try {
-                    keys =
-                            getKeyPair(
-                                    CryptoHelper.saslPrep(account.getPassword()),
-                                    salt,
-                                    iterationCount);
-                } catch (ExecutionException e) {
-                    throw new AuthenticationException("Invalid keys generated");
-                }
-                final byte[] clientSignature;
-                try {
-                    serverSignature = hmac(keys.serverKey, authMessage);
-                    final byte[] storedKey = digest(keys.clientKey);
+        if (iterationCount == null || iterationCount < 0) {
+            throw new AuthenticationException("Server did not send iteration count");
+        }
+        if (!nonce.startsWith(clientNonce)) {
+            throw new AuthenticationException(
+                    "Server nonce does not contain client nonce: " + nonce);
+        }
 
-                    clientSignature = hmac(storedKey, authMessage);
+        final byte[] salt;
 
-                } catch (final InvalidKeyException e) {
-                    throw new AuthenticationException(e);
-                }
+        try {
+            salt = BaseEncoding.base64().decode(s);
+        } catch (final IllegalArgumentException e) {
+            throw new AuthenticationException("Invalid salt in server first message");
+        }
 
-                final byte[] clientProof = new byte[keys.clientKey.length];
+        final byte[] channelBindingData = getChannelBindingData(socket);
 
-                if (clientSignature.length < keys.clientKey.length) {
-                    throw new AuthenticationException(
-                            "client signature was shorter than clientKey");
-                }
+        final int gs2Len = this.gs2Header.getBytes().length;
+        final byte[] cMessage = new byte[gs2Len + channelBindingData.length];
+        System.arraycopy(this.gs2Header.getBytes(), 0, cMessage, 0, gs2Len);
+        System.arraycopy(channelBindingData, 0, cMessage, gs2Len, channelBindingData.length);
 
-                for (int i = 0; i < clientProof.length; i++) {
-                    clientProof[i] = (byte) (keys.clientKey[i] ^ clientSignature[i]);
-                }
+        final String clientFinalMessageWithoutProof =
+                String.format("c=%s,r=%s", BaseEncoding.base64().encode(cMessage), nonce);
 
-                final String clientFinalMessage =
-                        clientFinalMessageWithoutProof
-                                + ",p="
-                                + Base64.encodeToString(clientProof, Base64.NO_WRAP);
-                state = State.RESPONSE_SENT;
-                return Base64.encodeToString(clientFinalMessage.getBytes(), Base64.NO_WRAP);
-            case RESPONSE_SENT:
-                try {
-                    final String clientCalculatedServerFinalMessage =
-                            "v=" + Base64.encodeToString(serverSignature, Base64.NO_WRAP);
-                    if (!clientCalculatedServerFinalMessage.equals(
-                            new String(Base64.decode(challenge, Base64.DEFAULT)))) {
-                        throw new Exception();
-                    }
-                    state = State.VALID_SERVER_RESPONSE;
-                    return "";
-                } catch (Exception e) {
-                    throw new AuthenticationException(
-                            "Server final message does not match calculated final message");
-                }
-            default:
-                throw new InvalidStateException(state);
+        final var authMessage =
+                Joiner.on(',')
+                        .join(
+                                clientFirstMessageBare,
+                                new String(serverFirstMessage),
+                                clientFinalMessageWithoutProof);
+
+        final KeyPair keys;
+        try {
+            keys = getKeyPair(CryptoHelper.saslPrep(account.getPassword()), salt, iterationCount);
+        } catch (final ExecutionException e) {
+            throw new AuthenticationException("Invalid keys generated");
+        }
+        final byte[] clientSignature;
+        try {
+            serverSignature = hmac(keys.serverKey, authMessage.getBytes());
+            final byte[] storedKey = digest(keys.clientKey);
+
+            clientSignature = hmac(storedKey, authMessage.getBytes());
+
+        } catch (final InvalidKeyException e) {
+            throw new AuthenticationException(e);
+        }
+
+        final byte[] clientProof = new byte[keys.clientKey.length];
+
+        if (clientSignature.length < keys.clientKey.length) {
+            throw new AuthenticationException("client signature was shorter than clientKey");
         }
+
+        for (int j = 0; j < clientProof.length; j++) {
+            clientProof[j] = (byte) (keys.clientKey[j] ^ clientSignature[j]);
+        }
+
+        final var clientFinalMessage =
+                String.format(
+                        "%s,p=%s",
+                        clientFinalMessageWithoutProof, BaseEncoding.base64().encode(clientProof));
+        this.state = State.RESPONSE_SENT;
+        return BaseEncoding.base64().encode(clientFinalMessage.getBytes());
+    }
+
+    private Map<String, String> splitToAttributes(final String message) {
+        final ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<>();
+        for (final String token : Splitter.on(',').split(message)) {
+            final var tuple = Splitter.on('=').limit(2).splitToList(token);
+            if (tuple.size() == 2) {
+                builder.put(tuple.get(0), tuple.get(1));
+            }
+        }
+        return builder.buildOrThrow();
+    }
+
+    private String processServerFinalMessage(final String challenge)
+            throws AuthenticationException {
+        final String serverFinalMessage;
+        try {
+            serverFinalMessage = new String(BaseEncoding.base64().decode(challenge));
+        } catch (final IllegalArgumentException e) {
+            throw new AuthenticationException("Invalid base64 in server final message", e);
+        }
+        final var clientCalculatedServerFinalMessage =
+                String.format("v=%s", BaseEncoding.base64().encode(serverSignature));
+        if (clientCalculatedServerFinalMessage.equals(serverFinalMessage)) {
+            this.state = State.VALID_SERVER_RESPONSE;
+            return "";
+        }
+        throw new AuthenticationException(
+                "Server final message does not match calculated final message");
     }
 
     protected byte[] getChannelBindingData(final SSLSocket sslSocket)
@@ -276,12 +288,16 @@ abstract class ScramMechanism extends SaslMechanism {
     }
 
     private static class CacheKey {
-        final String algorithm;
-        final String password;
-        final String salt;
-        final int iterations;
-
-        private CacheKey(String algorithm, String password, String salt, int iterations) {
+        private final String algorithm;
+        private final String password;
+        private final byte[] salt;
+        private final int iterations;
+
+        private CacheKey(
+                final String algorithm,
+                final String password,
+                final byte[] salt,
+                final int iterations) {
             this.algorithm = algorithm;
             this.password = password;
             this.salt = salt;
@@ -289,19 +305,20 @@ abstract class ScramMechanism extends SaslMechanism {
         }
 
         @Override
-        public boolean equals(Object o) {
+        public boolean equals(final Object o) {
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
             CacheKey cacheKey = (CacheKey) o;
             return iterations == cacheKey.iterations
                     && Objects.equal(algorithm, cacheKey.algorithm)
                     && Objects.equal(password, cacheKey.password)
-                    && Objects.equal(salt, cacheKey.salt);
+                    && Arrays.equals(salt, cacheKey.salt);
         }
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(algorithm, password, salt, iterations);
+            final int result = Objects.hashCode(algorithm, password, iterations);
+            return 31 * result + Arrays.hashCode(salt);
         }
     }
 
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index eee793b3fe72718511ae0ed6c426b3f19dd90ea8..c2f799036970208fd9860d3f88757761acabeb34 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -68,6 +68,7 @@ import im.conversations.android.xmpp.model.AuthenticationStreamFeature;
 import im.conversations.android.xmpp.model.StreamElement;
 import im.conversations.android.xmpp.model.bind2.Bind;
 import im.conversations.android.xmpp.model.bind2.Bound;
+import im.conversations.android.xmpp.model.cb.SaslChannelBinding;
 import im.conversations.android.xmpp.model.csi.Active;
 import im.conversations.android.xmpp.model.csi.Inactive;
 import im.conversations.android.xmpp.model.error.Condition;
@@ -917,7 +918,6 @@ public class XmppConnection implements Runnable {
             final Tag tag = tagReader.readTag();
             if (tag != null && tag.isStart("stream", Namespace.STREAMS)) {
                 processStream();
-                return;
             } else {
                 throw new StateChangingException(Account.State.STREAM_OPENING_ERROR);
             }
@@ -1552,9 +1552,8 @@ public class XmppConnection implements Runnable {
             authElement = this.streamFeatures.getExtension(Authentication.class);
         }
         final Collection<String> mechanisms = authElement.getMechanismNames();
-        final Element cbElement =
-                this.streamFeatures.findChild("sasl-channel-binding", Namespace.CHANNEL_BINDING);
-        final Collection<ChannelBinding> channelBindings = ChannelBinding.of(cbElement);
+        final var cbExtension = this.streamFeatures.getExtension(SaslChannelBinding.class);
+        final Collection<ChannelBinding> channelBindings = ChannelBinding.of(cbExtension);
         final SaslMechanism.Factory factory = new SaslMechanism.Factory(account);
         final SaslMechanism saslMechanism =
                 factory.of(mechanisms, channelBindings, version, SSLSockets.version(this.socket));
@@ -2674,11 +2673,11 @@ public class XmppConnection implements Runnable {
     }
 
     public Jid findDiscoItemByFeature(final String feature) {
-        final List<Entry<Jid, ServiceDiscoveryResult>> items = findDiscoItemsByFeature(feature);
-        if (items.size() >= 1) {
-            return items.get(0).getKey();
+        final var items = findDiscoItemsByFeature(feature);
+        if (items.isEmpty()) {
+            return null;
         }
-        return null;
+        return Iterables.getFirst(items, null).getKey();
     }
 
     public boolean r() {
@@ -3096,7 +3095,7 @@ public class XmppConnection implements Runnable {
                         new String[] {Namespace.HTTP_UPLOAD, Namespace.HTTP_UPLOAD_LEGACY}) {
                     List<Entry<Jid, ServiceDiscoveryResult>> items =
                             findDiscoItemsByFeature(namespace);
-                    if (items.size() > 0) {
+                    if (!items.isEmpty()) {
                         try {
                             long maxsize =
                                     Long.parseLong(
@@ -3136,7 +3135,7 @@ public class XmppConnection implements Runnable {
             for (String namespace :
                     new String[] {Namespace.HTTP_UPLOAD, Namespace.HTTP_UPLOAD_LEGACY}) {
                 List<Entry<Jid, ServiceDiscoveryResult>> items = findDiscoItemsByFeature(namespace);
-                if (items.size() > 0) {
+                if (!items.isEmpty()) {
                     try {
                         return Long.parseLong(
                                 items.get(0)
diff --git a/src/main/java/im/conversations/android/xmpp/model/cb/ChannelBinding.java b/src/main/java/im/conversations/android/xmpp/model/cb/ChannelBinding.java
new file mode 100644
index 0000000000000000000000000000000000000000..f4ad2c57072e18afab49596e33d5ffc5098ddd19
--- /dev/null
+++ b/src/main/java/im/conversations/android/xmpp/model/cb/ChannelBinding.java
@@ -0,0 +1,16 @@
+package im.conversations.android.xmpp.model.cb;
+
+import im.conversations.android.annotation.XmlElement;
+import im.conversations.android.xmpp.model.Extension;
+
+@XmlElement
+public class ChannelBinding extends Extension {
+
+    public ChannelBinding() {
+        super(ChannelBinding.class);
+    }
+
+    public String getType() {
+        return this.getAttribute("type");
+    }
+}
diff --git a/src/main/java/im/conversations/android/xmpp/model/cb/SaslChannelBinding.java b/src/main/java/im/conversations/android/xmpp/model/cb/SaslChannelBinding.java
new file mode 100644
index 0000000000000000000000000000000000000000..545655814e77f3704cf465aa3bd382c810b3a2e2
--- /dev/null
+++ b/src/main/java/im/conversations/android/xmpp/model/cb/SaslChannelBinding.java
@@ -0,0 +1,17 @@
+package im.conversations.android.xmpp.model.cb;
+
+import im.conversations.android.annotation.XmlElement;
+import im.conversations.android.xmpp.model.StreamFeature;
+import java.util.Collection;
+
+@XmlElement
+public class SaslChannelBinding extends StreamFeature {
+
+    public SaslChannelBinding() {
+        super(SaslChannelBinding.class);
+    }
+
+    public Collection<ChannelBinding> getChannelBindings() {
+        return this.getExtensions(ChannelBinding.class);
+    }
+}
diff --git a/src/main/java/im/conversations/android/xmpp/model/cb/package-info.java b/src/main/java/im/conversations/android/xmpp/model/cb/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..669c19d2949b37b0b433d622542aa94d546f7f36
--- /dev/null
+++ b/src/main/java/im/conversations/android/xmpp/model/cb/package-info.java
@@ -0,0 +1,5 @@
+@XmlPackage(namespace = Namespace.CHANNEL_BINDING)
+package im.conversations.android.xmpp.model.cb;
+
+import eu.siacs.conversations.xml.Namespace;
+import im.conversations.android.annotation.XmlPackage;

From e135f3268f2defdad7fb1e1fb28539a5644628a8 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 14 Jan 2025 20:43:12 +0100
Subject: [PATCH 337/357] implement XEP-0474: SASL SCRAM Downgrade Protection

---
 conversations.doap                            |  7 ++
 .../crypto/sasl/DowngradeProtection.java      | 98 +++++++++++++++++++
 .../crypto/sasl/ScramMechanism.java           | 28 +++++-
 .../conversations/xmpp/XmppConnection.java    | 12 +++
 .../xmpp/model/cb/SaslChannelBinding.java     |  8 ++
 5 files changed, 149 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/eu/siacs/conversations/crypto/sasl/DowngradeProtection.java

diff --git a/conversations.doap b/conversations.doap
index 653cb9fc7ba55acda35529294365055fb3b7c153..fa2427d14dc28ab819841180ee32dfacfd371a0f 100644
--- a/conversations.doap
+++ b/conversations.doap
@@ -490,6 +490,13 @@
             <xmpp:version>0.1.0</xmpp:version>
         </xmpp:SupportedXep>
     </implements>
+    <implements>
+        <xmpp:SupportedXep>
+            <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0474.html"/>
+            <xmpp:status>complete</xmpp:status>
+            <xmpp:version>0.3.1</xmpp:version>
+        </xmpp:SupportedXep>
+    </implements>
     <implements>
         <xmpp:SupportedXep>
             <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0484.html"/>
diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/DowngradeProtection.java b/src/main/java/eu/siacs/conversations/crypto/sasl/DowngradeProtection.java
new file mode 100644
index 0000000000000000000000000000000000000000..6daaa8809398e6f4aa2c7d311ed894fc0ae05299
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/DowngradeProtection.java
@@ -0,0 +1,98 @@
+package eu.siacs.conversations.crypto.sasl;
+
+import com.google.common.base.CharMatcher;
+import com.google.common.base.Joiner;
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Ordering;
+import java.util.Collection;
+
+public class DowngradeProtection {
+
+    private static final char SEPARATOR = ',';
+    private static final char SEPARATOR_MECHANISM_AND_BINDING = '|';
+
+    public final ImmutableList<String> mechanisms;
+    public final ImmutableList<String> channelBindings;
+
+    public DowngradeProtection(
+            final Collection<String> mechanisms, final Collection<String> channelBindings) {
+        this.mechanisms = Ordering.natural().immutableSortedCopy(mechanisms);
+        this.channelBindings = Ordering.natural().immutableSortedCopy(channelBindings);
+    }
+
+    public DowngradeProtection(final Collection<String> mechanisms) {
+        this.mechanisms = Ordering.natural().immutableSortedCopy(mechanisms);
+        this.channelBindings = null;
+    }
+
+    public String asDString() {
+        ensureSaslMechanismFormat(this.mechanisms);
+        ensureNoSeparators(this.mechanisms);
+        if (this.channelBindings != null) {
+            ensureNoSeparators(this.channelBindings);
+            ensureBindingFormat(this.channelBindings);
+            final var builder = new StringBuilder();
+            Joiner.on(SEPARATOR).appendTo(builder, mechanisms);
+            builder.append(SEPARATOR_MECHANISM_AND_BINDING);
+            Joiner.on(SEPARATOR).appendTo(builder, channelBindings);
+            return builder.toString();
+        } else {
+            return Joiner.on(SEPARATOR).join(mechanisms);
+        }
+    }
+
+    private static void ensureNoSeparators(final Iterable<String> list) {
+        for (final String item : list) {
+            if (item.indexOf(SEPARATOR) >= 0
+                    || item.indexOf(SEPARATOR_MECHANISM_AND_BINDING) >= 0) {
+                throw new SecurityException("illegal chars found in list");
+            }
+        }
+    }
+
+    private static void ensureSaslMechanismFormat(final Iterable<String> names) {
+        for (final String name : names) {
+            ensureSaslMechanismFormat(name);
+        }
+    }
+
+    private static void ensureSaslMechanismFormat(final String name) {
+        if (Strings.isNullOrEmpty(name)) {
+            throw new SecurityException("Empty sasl mechanism names are not permitted");
+        }
+        // https://www.rfc-editor.org/rfc/rfc4422.html#section-3.1
+        if (name.length() <= 20
+                && CharMatcher.inRange('A', 'Z')
+                        .or(CharMatcher.inRange('0', '9'))
+                        .or(CharMatcher.is('-'))
+                        .or(CharMatcher.is('_'))
+                        .matchesAllOf(name)
+                && !Character.isDigit(name.charAt(0))) {
+            return;
+        }
+        throw new SecurityException("Encountered illegal sasl name");
+    }
+
+    private static void ensureBindingFormat(final Iterable<String> names) {
+        for (final String name : names) {
+            ensureBindingFormat(name);
+        }
+    }
+
+    private static void ensureBindingFormat(final String name) {
+        if (Strings.isNullOrEmpty(name)) {
+            throw new SecurityException("Empty binding names are not permitted");
+        }
+        // https://www.rfc-editor.org/rfc/rfc5056.html#section-7d
+        if (CharMatcher.inRange('A', 'Z')
+                .or(CharMatcher.inRange('a', 'z'))
+                .or(CharMatcher.inRange('0', '9'))
+                .or(CharMatcher.is('.'))
+                .or(CharMatcher.is('-'))
+                .matchesAllOf(name)) {
+            return;
+        }
+        throw new SecurityException("Encountered illegal binding name");
+    }
+}
diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java
index 935f953bd1cc2b5f68645a36b91a09735a6bb361..97ae1600ecfe8a95d4d34b7fc8253174110f3b84 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java
@@ -3,6 +3,7 @@ package eu.siacs.conversations.crypto.sasl;
 import com.google.common.base.CaseFormat;
 import com.google.common.base.Joiner;
 import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
 import com.google.common.cache.Cache;
@@ -20,7 +21,7 @@ import java.util.concurrent.ExecutionException;
 import javax.crypto.SecretKey;
 import javax.net.ssl.SSLSocket;
 
-abstract class ScramMechanism extends SaslMechanism {
+public abstract class ScramMechanism extends SaslMechanism {
 
     public static final SecretKey EMPTY_KEY =
             new SecretKey() {
@@ -50,6 +51,7 @@ abstract class ScramMechanism extends SaslMechanism {
     protected State state = State.INITIAL;
     private final String clientFirstMessageBare;
     private byte[] serverSignature = null;
+    private DowngradeProtection downgradeProtection = null;
 
     ScramMechanism(final Account account, final ChannelBinding channelBinding) {
         super(account);
@@ -76,6 +78,12 @@ abstract class ScramMechanism extends SaslMechanism {
                         this.clientNonce);
     }
 
+    public void setDowngradeProtection(final DowngradeProtection downgradeProtection) {
+        Preconditions.checkState(
+                this.state == State.INITIAL, "setting downgrade protection in invalid state");
+        this.downgradeProtection = downgradeProtection;
+    }
+
     protected abstract HashFunction getHMac(final byte[] key);
 
     protected abstract HashFunction getDigest();
@@ -128,9 +136,8 @@ abstract class ScramMechanism extends SaslMechanism {
 
     @Override
     public String getClientFirstMessage(final SSLSocket sslSocket) {
-        if (this.state != State.INITIAL) {
-            throw new IllegalArgumentException("Calling getClientFirstMessage from invalid state");
-        }
+        Preconditions.checkState(
+                this.state == State.INITIAL, "Calling getClientFirstMessage from invalid state");
         this.state = State.AUTH_TEXT_SENT;
         final byte[] message = (gs2Header + clientFirstMessageBare).getBytes();
         return BaseEncoding.base64().encode(message);
@@ -198,6 +205,19 @@ abstract class ScramMechanism extends SaslMechanism {
             throw new AuthenticationException("Invalid salt in server first message");
         }
 
+        if (d != null && this.downgradeProtection != null) {
+            final String asSeenInFeatures;
+            try {
+                asSeenInFeatures = downgradeProtection.asDString();
+            } catch (final SecurityException e) {
+                throw new AuthenticationException(e);
+            }
+            final var hashed = BaseEncoding.base64().encode(digest(asSeenInFeatures.getBytes()));
+            if (!hashed.equals(d)) {
+                throw new AuthenticationException("Mismatch in SSDP");
+            }
+        }
+
         final byte[] channelBindingData = getChannelBindingData(socket);
 
         final int gs2Len = this.gs2Header.getBytes().length;
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index c2f799036970208fd9860d3f88757761acabeb34..6ce05e3784a07f1ca336b22bb7ff776b59187cae 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -29,8 +29,10 @@ import eu.siacs.conversations.crypto.XmppDomainVerifier;
 import eu.siacs.conversations.crypto.axolotl.AxolotlService;
 import eu.siacs.conversations.crypto.sasl.ChannelBinding;
 import eu.siacs.conversations.crypto.sasl.ChannelBindingMechanism;
+import eu.siacs.conversations.crypto.sasl.DowngradeProtection;
 import eu.siacs.conversations.crypto.sasl.HashedToken;
 import eu.siacs.conversations.crypto.sasl.SaslMechanism;
+import eu.siacs.conversations.crypto.sasl.ScramMechanism;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.entities.ServiceDiscoveryResult;
@@ -1558,6 +1560,16 @@ public class XmppConnection implements Runnable {
         final SaslMechanism saslMechanism =
                 factory.of(mechanisms, channelBindings, version, SSLSockets.version(this.socket));
         this.validate(saslMechanism, mechanisms);
+        final DowngradeProtection downgradeProtection;
+        if (cbExtension != null) {
+            downgradeProtection =
+                    new DowngradeProtection(mechanisms, cbExtension.getChannelBindingTypes());
+        } else {
+            downgradeProtection = new DowngradeProtection(mechanisms);
+        }
+        if (saslMechanism instanceof ScramMechanism scramMechanism) {
+            scramMechanism.setDowngradeProtection(downgradeProtection);
+        }
         final boolean quickStartAvailable;
         final String firstMessage =
                 saslMechanism.getClientFirstMessage(sslSocketOrNull(this.socket));
diff --git a/src/main/java/im/conversations/android/xmpp/model/cb/SaslChannelBinding.java b/src/main/java/im/conversations/android/xmpp/model/cb/SaslChannelBinding.java
index 545655814e77f3704cf465aa3bd382c810b3a2e2..c01ce1b9858114b64c96cbad72758d8967bf3d4f 100644
--- a/src/main/java/im/conversations/android/xmpp/model/cb/SaslChannelBinding.java
+++ b/src/main/java/im/conversations/android/xmpp/model/cb/SaslChannelBinding.java
@@ -1,5 +1,7 @@
 package im.conversations.android.xmpp.model.cb;
 
+import com.google.common.base.Predicates;
+import com.google.common.collect.Collections2;
 import im.conversations.android.annotation.XmlElement;
 import im.conversations.android.xmpp.model.StreamFeature;
 import java.util.Collection;
@@ -14,4 +16,10 @@ public class SaslChannelBinding extends StreamFeature {
     public Collection<ChannelBinding> getChannelBindings() {
         return this.getExtensions(ChannelBinding.class);
     }
+
+    public Collection<String> getChannelBindingTypes() {
+        return Collections2.filter(
+                Collections2.transform(getChannelBindings(), ChannelBinding::getType),
+                Predicates.notNull());
+    }
 }

From 232ce11fb09a3f526a617c3e95201f25e1b31cda Mon Sep 17 00:00:00 2001
From: licaon-kter <licaon-kter@users.noreply.translate.codeberg.org>
Date: Mon, 13 Jan 2025 09:03:28 +0000
Subject: [PATCH 338/357] Translated using Weblate (Romanian)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ro/
---
 src/main/res/values-ro-rRO/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 07c8755d8a464a0b9060463c6a24e57828864ba7..ccaca3d230b0240175cad6f77d90bc5b431aeba1 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -463,7 +463,7 @@
     <string name="download_failed_invalid_file">Descărcarea a eșuat: Fișier invalid</string>
     <string name="account_status_tor_unavailable">Rețeaua Tor nu este disponibilă</string>
     <string name="account_status_bind_failure">Eroare de conexiune</string>
-    <string name="account_status_host_unknown">Serverul nu este responsabil pentru acest domeniu</string>
+    <string name="account_status_host_unknown">Nu este responsabil pentru acest domeniu</string>
     <string name="server_info_broken">Deteriorat</string>
     <string name="pref_presence_settings">Setări de disponibilitate</string>
     <string name="pref_away_when_screen_off">Plecat când dispozitivul este blocat</string>

From 706b54158443ab2360ce76d4851f9bef95434b3e Mon Sep 17 00:00:00 2001
From: Besnik_b <besnik_b@users.noreply.translate.codeberg.org>
Date: Mon, 13 Jan 2025 09:18:26 +0000
Subject: [PATCH 339/357] Translated using Weblate (Albanian)

Currently translated at 99.1% (1050 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sq/
---
 src/main/res/values-sq-rAL/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-sq-rAL/strings.xml b/src/main/res/values-sq-rAL/strings.xml
index ead7f37e7b9feb0e5037612b235c8f5f7172f1ab..4dbaba482ea931331449890164621c661876d213 100644
--- a/src/main/res/values-sq-rAL/strings.xml
+++ b/src/main/res/values-sq-rAL/strings.xml
@@ -368,7 +368,7 @@
     <string name="download_failed_invalid_file">Shkarkimi dështoi: Kartelë e pavlefshme</string>
     <string name="account_status_tor_unavailable">Rrjet Tor jo në punë</string>
     <string name="account_status_bind_failure">Dështim lidhjeje</string>
-    <string name="account_status_host_unknown">Shërbyesi s’është përgjegjës për këtë përkatësi</string>
+    <string name="account_status_host_unknown">S’është përgjegjës për përkatësinë</string>
     <string name="server_info_broken">I dëmtuar</string>
     <string name="pref_away_when_screen_off">“I larguar”, kur pajisja është e kyçur</string>
     <string name="pref_away_when_screen_off_summary">Shfaqmë si “I lraguar”, kur pajisja është e kyçur</string>

From ed87713d96e64c2757067aba1af80d3f8444722c Mon Sep 17 00:00:00 2001
From: Outbreak2096 <outbreak2096@users.noreply.translate.codeberg.org>
Date: Mon, 13 Jan 2025 10:22:56 +0000
Subject: [PATCH 340/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/zh_Hans/
---
 src/main/res/values-zh-rCN/strings.xml | 95 +++++++++++++-------------
 1 file changed, 47 insertions(+), 48 deletions(-)

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index e2a204bce8b8f77426905525feb41685ec800456..0993f97735297b148d9d8d80c287dedc6182e3cc 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -29,16 +29,16 @@
         <item quantity="other">%d 个未读对话</item>
     </plurals>
     <string name="sending">正在发送…</string>
-    <string name="message_decrypting">解密消息中。请稍候…</string>
+    <string name="message_decrypting">正在解密消息。请稍候…</string>
     <string name="pgp_message">OpenPGP 加密消息</string>
-    <string name="nick_in_use">此昵称已在使用中</string>
+    <string name="nick_in_use">昵称已被使用</string>
     <string name="invalid_muc_nick">昵称无效</string>
     <string name="admin">管理员</string>
     <string name="owner">所有者</string>
     <string name="moderator">主持人</string>
     <string name="participant">参与者</string>
     <string name="visitor">访客</string>
-    <string name="remove_contact_text">是否从联系人列表中移除 %s？将不会移除与对方的对话。</string>
+    <string name="remove_contact_text">是否从联系人列表移除 %s？将不会移除与对方的对话。</string>
     <string name="block_contact_text">是否屏蔽 %s 向您发送消息？</string>
     <string name="unblock_contact_text">是否取消屏蔽 %s 并允许对方向您发送消息？</string>
     <string name="block_domain_text">屏蔽来自 %s 的所有联系人？</string>
@@ -74,7 +74,7 @@
     <string name="send_failed">发送失败</string>
     <string name="preparing_image">正在准备发送图片</string>
     <string name="preparing_images">正在准备发送图片</string>
-    <string name="sharing_files_please_wait">分享文件中。请稍候…</string>
+    <string name="sharing_files_please_wait">正在分享文件。请稍候…</string>
     <string name="action_clear_history">清空聊天记录</string>
     <string name="clear_conversation_history">清空聊天记录</string>
     <string name="clear_histor_msg">是否要删除此对话中的所有消息？
@@ -154,12 +154,12 @@
     <string name="account_status_online">在线</string>
     <string name="account_status_connecting">正在连接…</string>
     <string name="account_status_offline">离线</string>
-    <string name="account_status_unauthorized">未授权</string>
+    <string name="account_status_unauthorized">未经授权</string>
     <string name="account_status_not_found">服务器未找到</string>
     <string name="account_status_no_internet">未连接</string>
     <string name="account_status_regis_fail">注册失败</string>
-    <string name="account_status_regis_conflict">此用户名已在使用中</string>
-    <string name="account_status_regis_success">注册已完成</string>
+    <string name="account_status_regis_conflict">用户名已被使用</string>
+    <string name="account_status_regis_success">注册完成</string>
     <string name="account_status_regis_not_sup">服务器不支持注册</string>
     <string name="account_status_regis_invalid_token">注册令牌无效</string>
     <string name="account_status_tls_error">TLS 协商失败</string>
@@ -190,9 +190,9 @@
     <string name="password">密码</string>
     <string name="invalid_jid">此 XMPP 地址无效</string>
     <string name="error_out_of_memory">空间不足。图片太大</string>
-    <string name="add_phone_book_text">是否要添加 %s 到您的通讯录中？</string>
+    <string name="add_phone_book_text">是否要添加 %s 到您的通讯录？</string>
     <string name="server_info_show_more">服务器信息</string>
-    <string name="server_info_mam">XEP-0313：消息存档管理</string>
+    <string name="server_info_mam">XEP-0313：消息归档管理</string>
     <string name="server_info_carbon_messages">XEP-0280：消息抄送</string>
     <string name="server_info_csi">XEP-0352：客户端状态指示</string>
     <string name="server_info_blocking">XEP-0191：屏蔽命令</string>
@@ -302,11 +302,11 @@
     <string name="pref_autojoin_summary">在进入或离开群聊时设置“自动加入”标志，并回应其他客户端所做的改变。</string>
     <string name="toast_message_omemo_fingerprint">OMEMO 指纹已复制到剪贴板</string>
     <string name="conference_banned">禁止您进入此群聊</string>
-    <string name="conference_members_only">此群聊仅成员进入</string>
+    <string name="conference_members_only">只有成员才能进入此群聊</string>
     <string name="conference_resource_constraint">资源限制</string>
-    <string name="conference_kicked">已从群聊中踢出了您</string>
+    <string name="conference_kicked">您已被踢出此群聊</string>
     <string name="conference_shutdown">此群聊已关闭</string>
-    <string name="conference_unknown_error">您已不在此群聊中</string>
+    <string name="conference_unknown_error">您已不在此群聊</string>
     <string name="conference_technical_problems">由于技术原因，您离开了群聊</string>
     <string name="using_account">使用账号 %s</string>
     <string name="hosted_on">托管在 %s</string>
@@ -335,10 +335,10 @@
     <string name="pref_create_backup">创建备份</string>
     <string name="pref_create_backup_summary">备份文件将存储在 %s</string>
     <string name="notification_create_backup_title">正在创建备份文件</string>
-    <string name="notification_backup_created_title">已创建备份</string>
+    <string name="notification_backup_created_title">备份已创建</string>
     <string name="notification_backup_created_subtitle">此备份文件已存储在 %s</string>
     <string name="restoring_backup">正在恢复备份</string>
-    <string name="notification_restored_backup_title">已恢复备份</string>
+    <string name="notification_restored_backup_title">备份已恢复</string>
     <string name="notification_restored_backup_subtitle">请勿忘记启用账号。</string>
     <string name="choose_file">选择文件</string>
     <string name="receiving_x_file">正在接收 %1$s（%2$d%% 已完成）</string>
@@ -359,7 +359,7 @@
     <string name="pref_show_dynamic_tags">动态标签</string>
     <string name="pref_show_dynamic_tags_summary">在联系人下方显示动态标签汇总</string>
     <string name="enable_notifications">启用通知</string>
-    <string name="no_conference_server_found">群聊服务器未找到</string>
+    <string name="no_conference_server_found">未找到群聊服务器</string>
     <string name="conference_creation_failed">无法创建群聊</string>
     <string name="account_image_description">账号头像</string>
     <string name="copy_omemo_clipboard_description">复制 OMEMO 指纹到剪贴板</string>
@@ -394,17 +394,17 @@
     <string name="remove_admin_privileges">撤销管理员权限</string>
     <string name="grant_owner_privileges">授予所有者权限</string>
     <string name="remove_owner_privileges">撤销所有者权限</string>
-    <string name="remove_from_room">从群聊中移除</string>
-    <string name="remove_from_channel">从频道中移除</string>
+    <string name="remove_from_room">从群聊移除</string>
+    <string name="remove_from_channel">从频道移除</string>
     <string name="could_not_change_affiliation">无法更改 %s 的从属关系</string>
-    <string name="ban_from_conference">从群聊中封禁</string>
-    <string name="ban_from_channel">从频道中封禁</string>
+    <string name="ban_from_conference">从群聊封禁</string>
+    <string name="ban_from_channel">从频道封禁</string>
     <string name="removing_from_public_conference">您正试图从公开频道中移除 %s。唯一的办法就是永远封禁该用户。</string>
     <string name="ban_now">立即封禁</string>
     <string name="could_not_change_role">无法更改 %s 的角色</string>
     <string name="conference_options">私人群聊配置</string>
     <string name="channel_options">公开频道配置</string>
-    <string name="members_only">私人，仅成员进入</string>
+    <string name="members_only">私人，仅成员</string>
     <string name="non_anonymous">公开用户的 XMPP 地址</string>
     <string name="moderated">开启频道发言审核</string>
     <string name="you_are_not_participating">您未参与</string>
@@ -428,7 +428,7 @@
     <string name="pdf_document">PDF 文档</string>
     <string name="apk">Android 应用</string>
     <string name="vcard">联系人</string>
-    <string name="avatar_has_been_published">已发布头像！</string>
+    <string name="avatar_has_been_published">头像已发布！</string>
     <string name="sending_x_file">正在发送 %s</string>
     <string name="offering_x_file">正在提供 %s</string>
     <string name="hide_offline">隐藏离线</string>
@@ -472,7 +472,7 @@
     <string name="download_failed_invalid_file">下载失败：文件无效</string>
     <string name="account_status_tor_unavailable">Tor 网络不可用</string>
     <string name="account_status_bind_failure">绑定失败</string>
-    <string name="account_status_host_unknown">服务器不能为域名做出响应</string>
+    <string name="account_status_host_unknown">域名未响应</string>
     <string name="server_info_broken">损坏</string>
     <string name="pref_presence_settings">在线状态</string>
     <string name="pref_away_when_screen_off">设备锁定时离开</string>
@@ -486,17 +486,17 @@
     <string name="hostname_example">xmpp.example.com</string>
     <string name="action_add_account_with_certificate">用证书登录</string>
     <string name="unable_to_parse_certificate">无法解析证书</string>
-    <string name="mam_prefs">存档首选项</string>
-    <string name="server_side_mam_prefs">服务器端存档首选项</string>
-    <string name="fetching_mam_prefs">获取存档首选项中。请稍候…</string>
-    <string name="unable_to_fetch_mam_prefs">无法获取存档首选项</string>
+    <string name="mam_prefs">归档首选项</string>
+    <string name="server_side_mam_prefs">服务器端归档首选项</string>
+    <string name="fetching_mam_prefs">正在获取归档首选项。请稍候…</string>
+    <string name="unable_to_fetch_mam_prefs">无法获取归档首选项</string>
     <string name="captcha_required">需要验证码</string>
     <string name="captcha_hint">请按上图输入文本</string>
     <string name="certificate_chain_is_not_trusted">未受信任的证书链</string>
     <string name="jid_does_not_match_certificate">XMPP 地址与证书不匹配</string>
     <string name="action_renew_certificate">续订证书</string>
     <string name="error_fetching_omemo_key">获取 OMEMO 密钥时出错！</string>
-    <string name="verified_omemo_key_with_certificate">已通过证书验证 OMEMO 密钥！</string>
+    <string name="verified_omemo_key_with_certificate">OMEMO 密钥已通过证书验证！</string>
     <string name="device_does_not_support_certificates">设备不支持客户端证书选择！</string>
     <string name="pref_connection_options">连接</string>
     <string name="pref_use_tor">通过 Tor 连接</string>
@@ -536,7 +536,7 @@
     <string name="this_field_is_required">必填字段</string>
     <string name="correct_message">更正消息</string>
     <string name="send_corrected_message">发送更正后的消息</string>
-    <string name="no_keys_just_confirm">您已信任此人的指纹。选择“完成”即表示您确认 %s 是此群聊的一员。</string>
+    <string name="no_keys_just_confirm">您已信任此人的指纹。选择“完成”即表示您确认 %s 是此群聊的成员。</string>
     <string name="this_account_is_disabled">您禁用了此账号</string>
     <string name="security_error_invalid_file_access">安全错误：文件访问无效！</string>
     <string name="no_application_to_share_uri">未找到可以分享 URI 的应用</string>
@@ -555,7 +555,7 @@
     <string name="presence_away">离开</string>
     <string name="presence_xa">没空</string>
     <string name="presence_dnd">忙碌</string>
-    <string name="secure_password_generated">已生成安全密码</string>
+    <string name="secure_password_generated">安全密码已生成</string>
     <string name="device_does_not_support_battery_op">您的设备不支持选择退出电池优化</string>
     <string name="registration_please_wait">注册失败：请稍后重试</string>
     <string name="registration_password_too_weak">注册失败：密码太弱</string>
@@ -575,7 +575,7 @@
     <string name="pref_theme_light">浅色</string>
     <string name="pref_theme_dark">深色</string>
     <string name="unable_to_connect_to_keychain">无法连接到 OpenKeychain</string>
-    <string name="this_device_is_no_longer_in_use">此设备已不再使用</string>
+    <string name="this_device_is_no_longer_in_use">此设备不再使用</string>
     <string name="type_pc">电脑</string>
     <string name="type_phone">手机</string>
     <string name="type_tablet">平板</string>
@@ -587,7 +587,7 @@
     <string name="contact_asks_for_presence_subscription">对方请求在线状态订阅</string>
     <string name="allow">允许</string>
     <string name="no_permission_to_access_x">没有权限访问 %s</string>
-    <string name="remote_server_not_found">远程服务器未找到</string>
+    <string name="remote_server_not_found">未找到远程服务器</string>
     <string name="remote_server_timeout">远程服务器超时</string>
     <string name="unable_to_update_account">无法更新账号</string>
     <string name="report_jid_as_spammer">举报此 XMPP 地址发送垃圾信息。</string>
@@ -597,10 +597,9 @@
     <string name="error_publish_avatar_offline">需要连接到网络才能发布头像。</string>
     <string name="show_error_message">显示出错信息</string>
     <string name="error_message">出错信息</string>
-    <string name="data_saver_enabled">省流量模式已启用</string>
-    <string name="data_saver_enabled_explained">操作系统正限制 %1$s 在后台时访问互联网。要接收新消息通知，应当在“省流量模式”开启时允许 %1$s 无限制访问。
-\n%1$s 仍将在可能的情况下努力节省数据。</string>
-    <string name="device_does_not_support_data_saver">设备不支持对 %1$s 禁用省流量模式。</string>
+    <string name="data_saver_enabled">流量节省程序已启用</string>
+    <string name="data_saver_enabled_explained">操作系统正限制 %1$s 在后台时访问互联网。要接收新消息通知，应当在“流量节省程序”开启时允许 %1$s 无限制访问。 \n在可能的情况下，%1$s 仍会尽可能节省数据。</string>
+    <string name="device_does_not_support_data_saver">设备不支持为 %1$s 禁用流量节省程序。</string>
     <string name="error_unable_to_create_temporary_file">无法创建临时文件</string>
     <string name="this_device_has_been_verified">此设备已经过验证</string>
     <string name="copy_fingerprint">复制指纹</string>
@@ -670,7 +669,7 @@
     <string name="today">今天</string>
     <string name="yesterday">昨天</string>
     <string name="pref_validate_hostname">用 DNSSEC 验证主机名</string>
-    <string name="pref_validate_hostname_summary">将包含主机名的服务器证书视为是已验证的</string>
+    <string name="pref_validate_hostname_summary">将包含已验证主机名的服务器证书视为已验证</string>
     <string name="certificate_does_not_contain_jid">证书不包含 XMPP 地址</string>
     <string name="server_info_partial">部分</string>
     <string name="attach_record_video">录制视频</string>
@@ -730,7 +729,7 @@
     <string name="copy_jabber_id">复制 XMPP 地址</string>
     <string name="p1_s3_filetransfer">用于 S3 的 HTTP 文件共享</string>
     <string name="pref_start_search">直接搜索</string>
-    <string name="pref_start_search_summary">在“新对话”屏幕上打开键盘并将光标放在搜索栏中</string>
+    <string name="pref_start_search_summary">在“新对话”屏幕上打开键盘并将光标放入搜索栏</string>
     <string name="group_chat_avatar">群聊头像</string>
     <string name="host_does_not_support_group_chat_avatars">主机不支持群聊头像</string>
     <string name="only_the_owner_can_change_group_chat_avatar">只有所有者才能更改群聊头像</string>
@@ -770,7 +769,7 @@
     <string name="cancelled">已取消</string>
     <string name="already_drafting_message">您已经在起草一条消息了。</string>
     <string name="feature_not_implemented">功能未实现</string>
-    <string name="invalid_country_code">无效的国家/地区代码</string>
+    <string name="invalid_country_code">国家/地区代码无效</string>
     <string name="choose_a_country">选择国家/地区</string>
     <string name="phone_number">电话号码</string>
     <string name="verify_your_phone_number">验证您的电话号码</string>
@@ -781,8 +780,8 @@
     <string name="search_countries">搜索国家/地区</string>
     <string name="verify_x">验证 %s</string>
     <string name="we_have_sent_you_an_sms_to_x"><![CDATA[我们已向您发送短信至 <b>%s</b>。]]></string>
-    <string name="we_have_sent_you_another_sms">我们已经向您发送了另一条带有 6 位数验证码的短信。</string>
-    <string name="please_enter_pin_below">请在下方输入 6 位 PIN 码。</string>
+    <string name="we_have_sent_you_another_sms">我们已向您发送了另一条带有六位数验证码的短信。</string>
+    <string name="please_enter_pin_below">请在下方输入六位数的 PIN 码。</string>
     <string name="resend_sms">重新发送短信</string>
     <string name="resend_sms_in">重新发送短信 (%s)</string>
     <string name="wait_x">请稍候 (%s)</string>
@@ -904,7 +903,7 @@
     <string name="rtp_state_ringing">正在响铃</string>
     <string name="rtp_state_declined_or_busy">占线</string>
     <string name="rtp_state_connectivity_error">无法连接通话</string>
-    <string name="rtp_state_connectivity_lost_error">连接已中断</string>
+    <string name="rtp_state_connectivity_lost_error">连接中断</string>
     <string name="rtp_state_retracted">已取消通话</string>
     <string name="rtp_state_application_failure">应用错误</string>
     <string name="rtp_state_security_error">验证问题</string>
@@ -962,13 +961,13 @@
     <string name="invite_to_app">邀请至 Conversations</string>
     <string name="unable_to_parse_invite">无法解析邀请</string>
     <string name="server_does_not_support_easy_onboarding_invites">服务器不支持生成邀请</string>
-    <string name="no_active_accounts_support_this">没有已启用的账号支持此功能</string>
+    <string name="no_active_accounts_support_this">没有活动账号支持此功能</string>
     <string name="backup_started_message">备份已开始。一旦完成，将会收到通知。</string>
     <string name="unable_to_enable_video">无法启用视频。</string>
     <string name="plain_text_document">纯文本文档</string>
     <string name="account_registrations_are_not_supported">不支持账号注册</string>
     <string name="no_xmpp_adddress_found">未找到 XMPP 地址</string>
-    <string name="account_status_temporary_auth_failure">验证暂时失败</string>
+    <string name="account_status_temporary_auth_failure">临时身份验证失败</string>
     <string name="delete_avatar">删除头像</string>
     <string name="audio_video_disabled_tor">使用 Tor 时会禁用通话</string>
     <string name="switch_to_video">切换到视频</string>
@@ -1006,9 +1005,9 @@
     <string name="rtp_state_contact_offline">联系人不可用</string>
     <string name="no_permission_to_place_call">没有拨打电话的权限</string>
     <string name="call_integration_not_available">通话集成不可用！</string>
-    <string name="remove_bookmark_and_close">是否移除 %s 的书签并存档对话？</string>
+    <string name="remove_bookmark_and_close">是否移除 %s 的书签并归档对话？</string>
     <string name="remove_bookmark">是否移除 %s 的书签？</string>
-    <string name="delete_and_close">删除并存档对话</string>
+    <string name="delete_and_close">删除并归档对话</string>
     <string name="channel_discover_opt_in_message">频道发现使用称为 &lt;a href=https://search.jabber.network&gt;search.jabber.network&lt;/a&gt; 的第三方服务。&lt;br&gt;&lt;br&gt;使用此功能会将您的 IP 地址和搜索词传输到此服务。请参阅其 &lt;a href=https://search.jabber.network/privacy&gt;隐私政策&lt;/a&gt; 以获取更多信息。</string>
     <string name="start_chat">开始对话</string>
     <string name="title_activity_share_with">分享至…</string>
@@ -1019,12 +1018,12 @@
     <string name="pref_dynamic_colors_summary">系统配色 (Material You)</string>
     <string name="title_activity_new_chat">新对话</string>
     <string name="archive_this_chat">之后删除对话</string>
-    <string name="title_undo_swipe_out_chat">对话已存档</string>
+    <string name="title_undo_swipe_out_chat">对话已归档</string>
     <string name="switch_to_chat">切换到对话</string>
-    <string name="action_archive_chat">存档对话</string>
+    <string name="action_archive_chat">归档对话</string>
     <string name="barcode_does_not_contain_fingerprints_for_this_chat">二维码不包含此对话的指纹。</string>
     <string name="welcome_header">加入对话</string>
-    <string name="corresponding_chats_closed">相应的对话已存档。</string>
+    <string name="corresponding_chats_closed">相应的对话已归档。</string>
     <string name="pref_send_crash_reports">发送崩溃报告</string>
     <string name="pref_title_security">安全</string>
     <string name="notifications">通知</string>

From 44e34bf1e66064aa5cb451bbf15655b5367eece0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Mon, 13 Jan 2025 11:23:04 +0000
Subject: [PATCH 341/357] Translated using Weblate (Estonian)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/et/
---
 src/main/res/values-et/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml
index c184cc6b4255e3b997797bcf24a78ebfd93734f0..6ced340fc2890d092fe33c8f2299cf883eaf7c95 100644
--- a/src/main/res/values-et/strings.xml
+++ b/src/main/res/values-et/strings.xml
@@ -637,7 +637,7 @@
     <string name="pref_presence_settings">Kättesaadavus</string>
     <string name="account_status_tor_unavailable">Tori võrk pole saadaval</string>
     <string name="account_status_bind_failure">Serveriga sidumine ei õnnestunud</string>
-    <string name="account_status_host_unknown">See server ei vastuta antud domeeni eest</string>
+    <string name="account_status_host_unknown">Pole vastutav antud domeeni eest</string>
     <string name="server_info_broken">Katki</string>
     <string name="pref_away_when_screen_off">Seadme lukustumisel, määra olekuks „Eemal“</string>
     <string name="pref_away_when_screen_off_summary">Kui seade on lukus, siis määra oma olekuks „Eemal“</string>

From 070e2db07b3f4736b834e06a14a8604d9e5ab447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Mon, 13 Jan 2025 12:03:44 +0000
Subject: [PATCH 342/357] Translated using Weblate (Estonian)

Currently translated at 100.0% (2 of 2 strings)

Translation: Conversations/App Store Metadata (Conversations)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata-conversations/et/
---
 .../metadata/android/et/full_description.txt  | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 src/conversations/fastlane/metadata/android/et/full_description.txt

diff --git a/src/conversations/fastlane/metadata/android/et/full_description.txt b/src/conversations/fastlane/metadata/android/et/full_description.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c58150c0d86a08c6515b48dcccc2afea0e67e91e
--- /dev/null
+++ b/src/conversations/fastlane/metadata/android/et/full_description.txt
@@ -0,0 +1,39 @@
+Lihtsaltkasutatav, töökindel ja akusõbralik. Piltide, jututubade ja läbiva krüptimise tugi.
+
+Eesmärgid:
+
+* Ilus ja lihtne rakendus ilma kahjustamata turvalisust ja privaatsust
+* Olemasolevate ja toimivate protokollide kasutamine
+* Peab toimima ilma Google kasutajakontota ning mitte vajama Google Cloud Messaging (GCM) teenuseid
+* Peab eeldama nutiseadmes võimalikult vähe õigusi
+
+Funktsionaalsus:
+
+* Läbiv krüptimine kas <a href="http://conversations.im/omemo/">OMEMO</a> või <a href="http://openpgp.org/about/">OpenPGP</a> abil
+* Võimalus saata ja vastu võtta pilte
+* Krüptitud hääl- ja videokõned (DTLS-SRTP)
+* Intuitiivne kasutajaliides, mis lähtub Androidi kujunduspõhimõtetest
+* Kontaktide pildid ja tunnuspildid
+* Sünkroniseerimine töölauakliendiga
+* Konverentsid/jututoad (järjehoidjate toega)
+* Lõimimine aadressiraamatuga
+* Mitme kasutajakonto kasutamise võimalus ühise sisendvooga
+* Üliminimaalne mõju akukasutusele
+
+Conversationsi abil on lihtne lisada kasutajakontot tasuta conversations.im serveris. Aga Conversations toimib hästi kõikide XMPP serveritega. Paljusid XMPP-servereid haldavad vabatahtlikud ning nende kasutamine on tasuta.
+
+XMPP funktsionaalsus:
+
+Conversations toimib igasuguste XMPP-serveritega. Aga XMPP on laiendatav protokoll ning need laiendused on standardiseeritud XEP'idena. Et üldine kasutajakogemus oleks sujuv, toetab Conversations neist paljusid. On võimalus, et sinu XMPP serveris pole mõni konkreetne laiendus kasutusel. Seega parima tulemuse saad siis, kui leiad serveri, mis toetab neist kõiki või paned enda ja oma sõprade jaoks püsti oma XMPP serveri.
+
+Hetkel on toetatud XEP'id:
+
+* XEP-0065: SOCKS5 Bytestreams (või mod_proxy65). On kasutusel failide teisaldamisel, kui kõik vestluse osapooled on tulemüüri taga või asuvad NATitud võrgus.
+* XEP-0163: Personal Eventing Protocol tunnuspiltide kasutamise jaoks.
+* XEP-0191: Blocking Command võimaldab blokeerida spämmereid ja muid mittesoovitud osapooli ilma kontaktiloendi muutmiseta.
+* XEP-0198: Stream Management võimaldab XMPP-ühendusel toimida väikeste võrgukatkestuste ja TCP-ühenduste muutuste puhul.
+* XEP-0280: Message Carbons automaatselt sünkroniseerib sõnumid nutiseadme ja töölauakliendi vahel ning võimaldab sul tõhusalt kasutada neist seda, mida parasjagu vaja.
+* XEP-0237: Roster Versioning võimaldab säästa ribalaiust kehvade sideühenduste puhul.
+* XEP-0313: Message Archive Management sünkroniseerib sõnumite ajalugu serveri ja klientide vahel. See tahab, et saad sõnumid ka sõnumid ajast, mil Conversations polnud võrgus.
+* XEP-0352: Client State Indication võimaldab serveril teada, kas Conversations töötab taustal. Võimaldab serveril jätta saatmata mittevajalikud paketid ja sellega säästa ribalaiust.
+* XEP-0363: HTTP File Upload võimaldab jagada faile jututubades ja vallasrežiimis klientidega. Eeldab täiendava mooduli kasutamist serveris.

From 5b15207b04f70111fc3059d9e99837da58ec24e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Mon, 13 Jan 2025 12:09:05 +0000
Subject: [PATCH 343/357] Translated using Weblate (Estonian)

Currently translated at 30.0% (24 of 80 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/et/
---
 fastlane/metadata/android/et/changelogs/4209404.txt | 1 +
 fastlane/metadata/android/et/changelogs/4210104.txt | 1 +
 fastlane/metadata/android/et/changelogs/4210404.txt | 3 +++
 fastlane/metadata/android/et/changelogs/4210504.txt | 2 ++
 fastlane/metadata/android/et/changelogs/4212604.txt | 2 ++
 fastlane/metadata/android/et/changelogs/4212804.txt | 3 +++
 6 files changed, 12 insertions(+)
 create mode 100644 fastlane/metadata/android/et/changelogs/4209404.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4210104.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4210404.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4210504.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4212604.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4212804.txt

diff --git a/fastlane/metadata/android/et/changelogs/4209404.txt b/fastlane/metadata/android/et/changelogs/4209404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..135b260268ccb4ddcf2e8d4839c75eb8324fab4d
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4209404.txt
@@ -0,0 +1 @@
+* Parandsime väikese regressiooni, mis tekkis versioonis 2.13.1
diff --git a/fastlane/metadata/android/et/changelogs/4210104.txt b/fastlane/metadata/android/et/changelogs/4210104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1ce095bef7cd36ff29703c186e2c2e31c17c71c9
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4210104.txt
@@ -0,0 +1 @@
+* Parandasime hääl- ja videokõnede lõimimise operatsioonisüsteemiga
diff --git a/fastlane/metadata/android/et/changelogs/4210404.txt b/fastlane/metadata/android/et/changelogs/4210404.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5bafb88784cc79f7ae59737fb3094c2d70555937
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4210404.txt
@@ -0,0 +1,3 @@
+* Parandasime hääl- ja videokõned Android 8's
+* Parandasime vea protsesside trügimisega lõimitud kõnede puhul
+* Parandasime vea kui videopakkimine jäi muutmatuks
diff --git a/fastlane/metadata/android/et/changelogs/4210504.txt b/fastlane/metadata/android/et/changelogs/4210504.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cf5f9a364a3775a664c5ae0d9e72ab12dd315966
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4210504.txt
@@ -0,0 +1,2 @@
+* Taastasime Android 6+7 puhul ligipääsu kanalite tuvastamisele
+* Parandasime logimist, kui lõimitud kõned ei toimi
diff --git a/fastlane/metadata/android/et/changelogs/4212604.txt b/fastlane/metadata/android/et/changelogs/4212604.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7f2f67a79d22c56f886bd2fb6764890bb6a5d3bd
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4212604.txt
@@ -0,0 +1,2 @@
+* Tõstsime jutumullid üksteisele lähemale vältides nende meldimist
+* Lisasime võimaluse peita vestlustes tunnuspilte, kui seda tõesti vaja pole (Seadistused -> Kasutajaliides -> Jutumullid -> Näita tunnuspilte)
diff --git a/fastlane/metadata/android/et/changelogs/4212804.txt b/fastlane/metadata/android/et/changelogs/4212804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6296d9a617a142be5eb757832070e239903b2d4a
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4212804.txt
@@ -0,0 +1,3 @@
+* Lihtsam lihipääs sinu seadistatud teavitushelinatele Kontakti üksikasjad -> Jätkumenüü -> Kohandatud teavitused)
+* Parandasime otsejagamise linkide kasutamise uutes Androidi versioonides
+* Võimalus piirata tunnuspildi näitamist kontaktidele

From ccc64a55a671ced334e033b7869162b80bb66d05 Mon Sep 17 00:00:00 2001
From: Dirk <dirk@users.noreply.translate.codeberg.org>
Date: Tue, 14 Jan 2025 05:27:00 +0000
Subject: [PATCH 344/357] Translated using Weblate (German)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/de/
---
 src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index db9345403642fccdd0056294239c1a18864b81b0..8925c0e35094d6a2af6ce7ca8487505e9b1574f9 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -459,7 +459,7 @@
     <string name="download_failed_invalid_file">Download fehlgeschlagen: Ungültige Datei</string>
     <string name="account_status_tor_unavailable">Tor-Netzwerk nicht verfügbar</string>
     <string name="account_status_bind_failure">Verbindungsfehler</string>
-    <string name="account_status_host_unknown">Der Server ist nicht für diese Domain verantwortlich</string>
+    <string name="account_status_host_unknown">Nicht für Domain verantwortlich</string>
     <string name="server_info_broken">Fehlerhaft</string>
     <string name="pref_presence_settings">Status</string>
     <string name="pref_away_when_screen_off">Abwesend bei gesperrtem Gerät</string>

From 8b42c5bb8d7a86e41dde603754e928bd49c7fca4 Mon Sep 17 00:00:00 2001
From: ghose <ghose@users.noreply.translate.codeberg.org>
Date: Tue, 14 Jan 2025 03:40:13 +0000
Subject: [PATCH 345/357] Translated using Weblate (Galician)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/gl/
---
 src/main/res/values-gl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 7c8f0ca0ddc5ef34e27a924db58eebaded15baac..057c9eb5a24179a63574df143b64e84804d6f55f 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -459,7 +459,7 @@
     <string name="download_failed_invalid_file">Fallou a descarga: ficheiro non válido</string>
     <string name="account_status_tor_unavailable">Sen acceso a rede Tor</string>
     <string name="account_status_bind_failure">Fallou a ligazón</string>
-    <string name="account_status_host_unknown">O servidor non corresponde a este dominio</string>
+    <string name="account_status_host_unknown">Non é responsable do dominio</string>
     <string name="server_info_broken">Roto</string>
     <string name="pref_presence_settings">Dispoñibilidade</string>
     <string name="pref_away_when_screen_off">Ausente se bloqueado</string>

From 9ad4fc99121ae81bc6d0ff560a98594953036aa9 Mon Sep 17 00:00:00 2001
From: Stephan-P <stephan-p@users.noreply.translate.codeberg.org>
Date: Mon, 13 Jan 2025 19:30:47 +0000
Subject: [PATCH 346/357] Translated using Weblate (Dutch)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/nl/
---
 src/main/res/values-nl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 5fe909625fb2b1bd9975b9e87fc6b0337ef8a335..48f137cfd19fda1a0675743a6d83c53ccf975795 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -893,7 +893,7 @@
     <string name="pref_enter_is_send_summary">Gebruik de Enter-toets om een bericht te verzenden. Je kunt altijd Ctrl + Enter gebruiken om een bericht te verzenden, zelfs als deze optie is uitgeschakeld.</string>
     <string name="pref_treat_vibrate_as_dnd_summary">Bezet melden als het apparaat op trillen staat</string>
     <string name="clear_other_devices_desc">Weet je zeker dat je alle andere apparaten uit de OMEMO-aankondiging wilt verwijderen? De volgende keer dat je apparaten verbinding maken, zullen ze zichzelf opnieuw aankondigen, maar ontvangen ze mogelijk geen berichten die ondertussen zijn verzonden.</string>
-    <string name="account_status_host_unknown">De server is niet verantwoordelijk voor dit domein</string>
+    <string name="account_status_host_unknown">Niet verantwoordelijk voor domein</string>
     <string name="title_undo_swipe_out_chat">Chat gearchiveerd</string>
     <string name="no_permission_to_place_call">Geen toestemming om te bellen</string>
     <string name="no_keys_just_confirm">Je hebt de vingerafdruk van deze persoon al vertrouwd. Door \"Gereed\" te selecteren, bevestig je alleen dat %s deel uitmaakt van deze groepschat.</string>

From feff214fd6e52830a67e191aa187b63da3430bc9 Mon Sep 17 00:00:00 2001
From: solokot <solokot@users.noreply.translate.codeberg.org>
Date: Tue, 14 Jan 2025 10:39:30 +0000
Subject: [PATCH 347/357] Translated using Weblate (Russian)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/ru/
---
 src/main/res/values-ru/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 927b66686a36fd1f1739ac3063895710474f823e..a3ac3320c402eda6045ca0b3f858e9ef83ce701b 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -471,7 +471,7 @@
     <string name="download_failed_could_not_write_file">Загрузка не выполнена: ошибка записи файла</string>
     <string name="account_status_tor_unavailable">Сеть Tor недоступна</string>
     <string name="account_status_bind_failure">Ошибка связывания</string>
-    <string name="account_status_host_unknown">Сервер не ответственен за этот домен</string>
+    <string name="account_status_host_unknown">Не ответственен за домен</string>
     <string name="server_info_broken">Повреждено</string>
     <string name="pref_presence_settings">Доступность</string>
     <string name="pref_away_when_screen_off">\"Отошёл\" при блокировке экрана</string>

From 8fdcdeb40e73a76673fb113dbd64bdb92b92c146 Mon Sep 17 00:00:00 2001
From: user11 <user11@users.noreply.translate.codeberg.org>
Date: Mon, 13 Jan 2025 20:48:09 +0000
Subject: [PATCH 348/357] Translated using Weblate (Serbian)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/sr/
---
 src/main/res/values-sr/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 5db9b00a4a973c4d619ab850a4f2f53539c88d20..1d014e4063e63d530932e4dba8df2f07412e944b 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -461,7 +461,7 @@
     <string name="download_failed_could_not_write_file">Преузимање није успело: није могуће уписивање фајла</string>
     <string name="account_status_tor_unavailable">Тор мрежа недоступна</string>
     <string name="account_status_bind_failure">Неуспех везивања</string>
-    <string name="account_status_host_unknown">Сервер није одговоран за овај домен</string>
+    <string name="account_status_host_unknown">Није одговоран за домен</string>
     <string name="server_info_broken">Оштећен</string>
     <string name="pref_presence_settings">Присутност</string>
     <string name="pref_away_when_screen_off">Одсутан/на кад је уређај закључан</string>
@@ -1142,4 +1142,5 @@
     <string name="custom_notifications_enable">Укључи посебна подешавања обавештења (важност, звук, вибрација) за ову преписку?</string>
     <string name="delete_avatar_message">Желиш да обришеш свој аватар? Неки клијенти ће можда наставити да приказују кеширану копију твог аватара.</string>
     <string name="show_to_contacts_only">Приказуј само контактима</string>
+    <string name="account_status_connection_timeout">Истекла веза</string>
 </resources>
\ No newline at end of file

From eb4003768cfe4686278751e428f2368e0c2c5efc Mon Sep 17 00:00:00 2001
From: SomeTr <sometr@users.noreply.translate.codeberg.org>
Date: Mon, 13 Jan 2025 13:27:45 +0000
Subject: [PATCH 349/357] Translated using Weblate (Ukrainian)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/uk/
---
 src/main/res/values-uk/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index a18353552e4dcf0a0b0c159792fbf96549856b3b..a1935c2d9f79bbb30874da97580e532ec4561d56 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -455,7 +455,7 @@
     <string name="download_failed_could_not_write_file">Завантаження не вдалося: неможливо записати файл</string>
     <string name="account_status_tor_unavailable">Мережа Tor недоступна</string>
     <string name="account_status_bind_failure">Прив\'язка не спрацювала</string>
-    <string name="account_status_host_unknown">Сервер не відповідає за цей домен</string>
+    <string name="account_status_host_unknown">Не несе відповідальності за домен</string>
     <string name="server_info_broken">Поламано</string>
     <string name="pref_presence_settings">Доступність</string>
     <string name="pref_treat_vibrate_as_silent">Вважати вібро за безшумний режим</string>

From ec8c14d1e1f10a2965db69e1b64a4d6024c08ae0 Mon Sep 17 00:00:00 2001
From: "lucasmz.dev" <git@lucasmz.dev>
Date: Tue, 14 Jan 2025 01:42:54 +0000
Subject: [PATCH 350/357] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pt_BR/
---
 src/main/res/values-pt-rBR/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 9af00164d8e882880ed15199c8197246cdcd6571..d0582ddd8625507099a43d44c98e631b9c5a0e6a 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -465,7 +465,7 @@
     <string name="download_failed_invalid_file">Falha no download: arquivo inválido</string>
     <string name="account_status_tor_unavailable">Rede Tor não disponível</string>
     <string name="account_status_bind_failure">Falha na associação</string>
-    <string name="account_status_host_unknown">O servidor não responde por esse domínio</string>
+    <string name="account_status_host_unknown">Não é responsável por este domínio</string>
     <string name="server_info_broken">Quebrado</string>
     <string name="pref_presence_settings">Disponibilidade</string>
     <string name="pref_away_when_screen_off">\"Afastado\" quando o dispositivo estiver travado</string>

From 9527d3fb49cc1c3de5ada2a0be178c83cf8a130a Mon Sep 17 00:00:00 2001
From: Outbreak2096 <outbreak2096@users.noreply.translate.codeberg.org>
Date: Tue, 14 Jan 2025 02:57:26 +0000
Subject: [PATCH 351/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/zh_Hans/
---
 src/main/res/values-zh-rCN/strings.xml | 98 +++++++++++++-------------
 1 file changed, 48 insertions(+), 50 deletions(-)

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 0993f97735297b148d9d8d80c287dedc6182e3cc..d6cfd1b3f8b194e8a93592c068381601912580ab 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -22,7 +22,7 @@
     <string name="title_activity_choose_contacts">选择联系人</string>
     <string name="title_activity_share_via_account">通过账号分享</string>
     <string name="title_activity_block_list">屏蔽列表</string>
-    <string name="just_now">刚才</string>
+    <string name="just_now">刚刚</string>
     <string name="minute_ago">1 分钟前</string>
     <string name="minutes_ago">%d 分钟前</string>
     <plurals name="x_unread_conversations">
@@ -37,7 +37,7 @@
     <string name="owner">所有者</string>
     <string name="moderator">主持人</string>
     <string name="participant">参与者</string>
-    <string name="visitor">访客</string>
+    <string name="visitor">参观者</string>
     <string name="remove_contact_text">是否从联系人列表移除 %s？将不会移除与对方的对话。</string>
     <string name="block_contact_text">是否屏蔽 %s 向您发送消息？</string>
     <string name="unblock_contact_text">是否取消屏蔽 %s 并允许对方向您发送消息？</string>
@@ -75,8 +75,8 @@
     <string name="preparing_image">正在准备发送图片</string>
     <string name="preparing_images">正在准备发送图片</string>
     <string name="sharing_files_please_wait">正在分享文件。请稍候…</string>
-    <string name="action_clear_history">清空聊天记录</string>
-    <string name="clear_conversation_history">清空聊天记录</string>
+    <string name="action_clear_history">清除历史记录</string>
+    <string name="clear_conversation_history">清除聊天记录</string>
     <string name="clear_histor_msg">是否要删除此对话中的所有消息？
 \n
 \n<b>警告：</b>存储在其他设备或服务器上的消息将不受影响。</string>
@@ -91,7 +91,7 @@
     <string name="send_omemo_x509_message">发送 v\\OMEMO 加密消息</string>
     <string name="your_nick_has_been_changed">正在使用新昵称</string>
     <string name="send_unencrypted">发送未加密</string>
-    <string name="decryption_failed">解密失败。也许您没有正确的私钥。</string>
+    <string name="decryption_failed">解密失败。也许您没有合适的私钥。</string>
     <string name="openkeychain_required">OpenKeychain</string>
     <string name="openkeychain_required_long"><![CDATA[%1$s 使用 <b>OpenKeychain</b> 来加密和解密消息并管理公钥。<br><br>它在 GPLv3+ 许可证下授权并可在 F-Droid 和 Google Play 上获得。<br><br><small>（请之后重启 %1$s。）</small>]]></string>
     <string name="restart">重启</string>
@@ -143,7 +143,7 @@
     <string name="preemptively_grant">预先同意订阅请求</string>
     <string name="error_not_an_image_file">所选文件不是图片</string>
     <string name="error_compressing_image">无法转换图片文件</string>
-    <string name="error_file_not_found">文件未找到</string>
+    <string name="error_file_not_found">未找到文件</string>
     <string name="error_io_exception">常规 I/O 错误。也许存储空间已用完？</string>
     <string name="error_security_exception_during_image_copy">用来选择图片的应用未提供读取文件的足够权限。
 \n
@@ -155,7 +155,7 @@
     <string name="account_status_connecting">正在连接…</string>
     <string name="account_status_offline">离线</string>
     <string name="account_status_unauthorized">未经授权</string>
-    <string name="account_status_not_found">服务器未找到</string>
+    <string name="account_status_not_found">未找到服务器</string>
     <string name="account_status_no_internet">未连接</string>
     <string name="account_status_regis_fail">注册失败</string>
     <string name="account_status_regis_conflict">用户名已被使用</string>
@@ -182,7 +182,7 @@
 \n您的联系人将无法再向您发送 OpenPGP 加密消息。</string>
     <string name="openpgp_has_been_published">OpenPGP 公钥已发布。</string>
     <string name="mgmt_account_enable">启用账号</string>
-    <string name="mgmt_account_delete_confirm_text">是否确定要删除账号？删除账号会擦除全部聊天记录</string>
+    <string name="mgmt_account_delete_confirm_text">是否确定要删除账号？删除账号会清除全部聊天记录</string>
     <string name="attach_record_voice">录制语音</string>
     <string name="account_settings_jabber_id">XMPP 地址</string>
     <string name="block_jabber_id">屏蔽 XMPP 地址</string>
@@ -205,7 +205,7 @@
     <string name="server_info_available">有效</string>
     <string name="server_info_unavailable">无效</string>
     <string name="missing_public_keys">缺少公钥公布</string>
-    <string name="last_seen_now">最后上线于刚才</string>
+    <string name="last_seen_now">最后上线于刚刚</string>
     <string name="last_seen_min">最后上线于 1 分钟前</string>
     <string name="last_seen_mins">最后上线于 %d 分钟前</string>
     <string name="last_seen_hour">最后上线于 1 小时前</string>
@@ -307,7 +307,7 @@
     <string name="conference_kicked">您已被踢出此群聊</string>
     <string name="conference_shutdown">此群聊已关闭</string>
     <string name="conference_unknown_error">您已不在此群聊</string>
-    <string name="conference_technical_problems">由于技术原因，您离开了群聊</string>
+    <string name="conference_technical_problems">由于技术原因，您离开了此群聊</string>
     <string name="using_account">使用账号 %s</string>
     <string name="hosted_on">托管在 %s</string>
     <string name="checking_x">正在 HTTP 主机上检查 %s</string>
@@ -366,13 +366,11 @@
     <string name="regenerate_omemo_key">重新生成 OMEMO 密钥</string>
     <string name="clear_other_devices">清除设备</string>
     <string name="clear_other_devices_desc">是否确定要从 OMEMO 公布中清除所有其他设备？下次连接时，设备将会重新公布，但可能不会收到在此期间发送的消息。</string>
-    <string name="error_no_keys_to_trust_server_error">此联系人没有可用的密钥。
-\n无法从服务器获取新密钥。也许是对方的服务器出了问题？</string>
-    <string name="error_no_keys_to_trust_presence">此联系人没有可用的密钥。
-\n请确保双方都有在线状态订阅。</string>
+    <string name="error_no_keys_to_trust_server_error">此联系人没有可用密钥。 \n无法从服务器获取新密钥。也许是对方的服务器有问题？</string>
+    <string name="error_no_keys_to_trust_presence">此联系人没有可用密钥。 \n请确保双方都有在线状态订阅。</string>
     <string name="error_trustkeys_title">出了点问题</string>
-    <string name="fetching_history_from_server">正在从服务器获取聊天记录</string>
-    <string name="no_more_history_on_server">服务器上没有更多聊天记录</string>
+    <string name="fetching_history_from_server">正在从服务器获取历史记录</string>
+    <string name="no_more_history_on_server">服务器上没有更多历史记录</string>
     <string name="updating">正在更新…</string>
     <string name="password_changed">密码已更改！</string>
     <string name="could_not_change_password">无法更改密码</string>
@@ -383,7 +381,7 @@
     <string name="enable_all_accounts">启用所有账号</string>
     <string name="disable_all_accounts">禁用所有账号</string>
     <string name="perform_action_with">执行操作</string>
-    <string name="no_affiliation">无从属关系</string>
+    <string name="no_affiliation">无</string>
     <string name="no_role">离线</string>
     <string name="outcast">被驱逐者</string>
     <string name="member">成员</string>
@@ -399,20 +397,20 @@
     <string name="could_not_change_affiliation">无法更改 %s 的从属关系</string>
     <string name="ban_from_conference">从群聊封禁</string>
     <string name="ban_from_channel">从频道封禁</string>
-    <string name="removing_from_public_conference">您正试图从公开频道中移除 %s。唯一的办法就是永远封禁该用户。</string>
+    <string name="removing_from_public_conference">您正尝试从公开频道移除 %s。唯一办法是永久封禁该用户。</string>
     <string name="ban_now">立即封禁</string>
     <string name="could_not_change_role">无法更改 %s 的角色</string>
     <string name="conference_options">私人群聊配置</string>
     <string name="channel_options">公开频道配置</string>
     <string name="members_only">私人，仅成员</string>
-    <string name="non_anonymous">公开用户的 XMPP 地址</string>
+    <string name="non_anonymous">对任何人显示 XMPP 地址</string>
     <string name="moderated">开启频道发言审核</string>
-    <string name="you_are_not_participating">您未参与</string>
+    <string name="you_are_not_participating">您没有发言权</string>
     <string name="modified_conference_options">群聊配置修改成功！</string>
     <string name="could_not_modify_conference_options">无法修改群聊配置</string>
     <string name="never">从不</string>
     <string name="until_further_notice">直至另行通知</string>
-    <string name="snooze">稍后提醒</string>
+    <string name="snooze">暂停</string>
     <string name="reply">回复</string>
     <string name="mark_as_read">标记为已读</string>
     <string name="pref_input_options">输入</string>
@@ -465,12 +463,12 @@
     <string name="username">用户名</string>
     <string name="username_hint">用户名</string>
     <string name="invalid_username">此用户名无效</string>
-    <string name="download_failed_server_not_found">下载失败：服务器未找到</string>
-    <string name="download_failed_file_not_found">下载失败：文件未找到</string>
+    <string name="download_failed_server_not_found">下载失败：未找到服务器</string>
+    <string name="download_failed_file_not_found">下载失败：未找到文件</string>
     <string name="download_failed_could_not_connect">下载失败：无法连接到主机</string>
     <string name="download_failed_could_not_write_file">下载失败：无法写入文件</string>
     <string name="download_failed_invalid_file">下载失败：文件无效</string>
-    <string name="account_status_tor_unavailable">Tor 网络不可用</string>
+    <string name="account_status_tor_unavailable">无法连接到 Tor 网络</string>
     <string name="account_status_bind_failure">绑定失败</string>
     <string name="account_status_host_unknown">域名未响应</string>
     <string name="server_info_broken">损坏</string>
@@ -506,7 +504,7 @@
     <string name="hostname_or_onion">服务器或 .onion 地址</string>
     <string name="not_a_valid_port">此端口号无效</string>
     <string name="not_valid_hostname">此主机名无效</string>
-    <string name="connected_accounts">已连接 %2$d 个账号中的 %1$d 个</string>
+    <string name="connected_accounts">已连接 %1$d 个账号（共 %2$d 个）</string>
     <plurals name="x_messages">
         <item quantity="other">%d 条消息</item>
     </plurals>
@@ -586,7 +584,7 @@
     <string name="me">我</string>
     <string name="contact_asks_for_presence_subscription">对方请求在线状态订阅</string>
     <string name="allow">允许</string>
-    <string name="no_permission_to_access_x">没有权限访问 %s</string>
+    <string name="no_permission_to_access_x">没有访问 %s 的权限</string>
     <string name="remote_server_not_found">未找到远程服务器</string>
     <string name="remote_server_timeout">远程服务器超时</string>
     <string name="unable_to_update_account">无法更新账号</string>
@@ -594,7 +592,7 @@
     <string name="pref_delete_omemo_identities">删除 OMEMO 身份</string>
     <string name="pref_delete_omemo_identities_summary">重新生成 OMEMO 密钥。您的所有联系人将必须再次验证您。仅将此作为最后的方法。</string>
     <string name="delete_selected_keys">删除所选密钥</string>
-    <string name="error_publish_avatar_offline">需要连接到网络才能发布头像。</string>
+    <string name="error_publish_avatar_offline">连接后才能发布头像。</string>
     <string name="show_error_message">显示出错信息</string>
     <string name="error_message">出错信息</string>
     <string name="data_saver_enabled">流量节省程序已启用</string>
@@ -611,7 +609,7 @@
     <string name="share_as_uri">以 XMPP URI 形式分享</string>
     <string name="share_as_http">以 HTTP 链接形式分享</string>
     <string name="pref_blind_trust_before_verification">验证前盲目信任</string>
-    <string name="pref_blind_trust_before_verification_summary">信任来自未经验证的联系人的新设备，但对于已验证的联系人，提示手动确认新设备。</string>
+    <string name="pref_blind_trust_before_verification_summary">信任未经验证的联系人的新设备，但提示手动确认已验证的联系人的新设备。</string>
     <string name="blindly_trusted_omemo_keys">盲目信任的 OMEMO 密钥，表示它们可能是其他人或者某人可能冒充别人发送消息。</string>
     <string name="not_trusted">未受信任</string>
     <string name="invalid_barcode">二维码无效</string>
@@ -649,7 +647,7 @@
     <string name="pref_automatically_delete_messages">自动删除消息</string>
     <string name="pref_automatically_delete_messages_description">自动删除此设备上超过配置时限的消息。</string>
     <string name="encrypting_message">正在加密消息</string>
-    <string name="not_fetching_history_retention_period">由于本地保留期限设置，无法获取消息。</string>
+    <string name="not_fetching_history_retention_period">由于本地保留期，无法获取消息。</string>
     <string name="transcoding_video">正在压缩视频</string>
     <string name="contact_blocked_past_tense">联系人已屏蔽。</string>
     <string name="pref_notifications_from_strangers">陌生人的通知</string>
@@ -690,7 +688,7 @@
     <string name="edit_status_message_title">编辑状态信息</string>
     <string name="edit_status_message">编辑状态信息</string>
     <string name="disable_encryption">禁用加密</string>
-    <string name="error_trustkey_general">%1$s 无法发送加密消息到 %2$s。可能是由于您的联系人使用了过时的服务器或者无法处理 OMEMO 的客户端。</string>
+    <string name="error_trustkey_general">%1$s 无法向 %2$s 发送加密消息。可能是由于您的联系人使用了无法处理 OMEMO 的过时服务器或客户端。</string>
     <string name="error_trustkey_device_list">无法获取设备列表</string>
     <string name="error_trustkey_bundle">无法获取密钥</string>
     <string name="error_trustkey_hint_mutual">提示：某些情况下，双方可以添加到联系人列表解决此问题。</string>
@@ -706,7 +704,7 @@
     <string name="default_on">默认开启</string>
     <string name="default_off">默认关闭</string>
     <string name="not_encrypted_for_this_device">未对此设备加密消息。</string>
-    <string name="omemo_decryption_failed">解密 OMEMO 消息失败。</string>
+    <string name="omemo_decryption_failed">无法解密 OMEMO 消息。</string>
     <string name="undo">撤销</string>
     <string name="location_disabled">已禁用位置共享</string>
     <string name="action_fix_to_location">固定位置</string>
@@ -762,8 +760,8 @@
     <string name="group_chat_members">参与者</string>
     <string name="media_browser">媒体浏览器</string>
     <string name="security_violation_not_attaching_file">由于违反安全规定，文件已删除。</string>
-    <string name="pref_video_compression">视频质量</string>
-    <string name="pref_video_compression_summary">质量越低，文件越小</string>
+    <string name="pref_video_compression">视频画质</string>
+    <string name="pref_video_compression_summary">画质越低，文件越小</string>
     <string name="video_360p">360p（中）</string>
     <string name="video_720p">720p（高）</string>
     <string name="cancelled">已取消</string>
@@ -845,15 +843,15 @@
     <string name="channel_already_exists">此频道已存在</string>
     <string name="joined_an_existing_channel">您已加入现有的频道</string>
     <string name="unable_to_set_channel_configuration">无法保存频道配置</string>
-    <string name="allow_participants_to_edit_subject">允许参与者（非访客）编辑话题</string>
-    <string name="allow_participants_to_invite_others">允许任何参与者邀请别人</string>
-    <string name="anyone_can_edit_subject">参与者（非访客）可以编辑话题。</string>
+    <string name="allow_participants_to_edit_subject">允许任何人编辑话题</string>
+    <string name="allow_participants_to_invite_others">允许任何人邀请他人</string>
+    <string name="anyone_can_edit_subject">任何人可以编辑话题。</string>
     <string name="owners_can_edit_subject">所有者可以编辑话题。</string>
     <string name="admins_can_edit_subject">管理员可以编辑话题。</string>
-    <string name="owners_can_invite_others">所有者可以邀请别人。</string>
-    <string name="anyone_can_invite_others">任何参与者可以邀请别人。</string>
-    <string name="jabber_ids_are_visible_to_admins">用户的 XMPP 地址仅管理员可见。</string>
-    <string name="jabber_ids_are_visible_to_anyone">用户的 XMPP 地址对任何人可见。</string>
+    <string name="owners_can_invite_others">所有者可以邀请他人。</string>
+    <string name="anyone_can_invite_others">任何人可以邀请他人。</string>
+    <string name="jabber_ids_are_visible_to_admins">管理员可以看到 XMPP 地址。</string>
+    <string name="jabber_ids_are_visible_to_anyone">任何人可以看到 XMPP 地址。</string>
     <string name="no_users_hint_channel">此公开频道无参与者。邀请联系人或使用分享按钮分发频道的 XMPP 地址。</string>
     <string name="no_users_hint_group_chat">此私人群聊无参与者。</string>
     <string name="manage_permission">管理权限</string>
@@ -908,8 +906,8 @@
     <string name="rtp_state_application_failure">应用错误</string>
     <string name="rtp_state_security_error">验证问题</string>
     <string name="hang_up">挂断</string>
-    <string name="ongoing_call">正在进行的通话</string>
-    <string name="ongoing_video_call">正在进行的视频通话</string>
+    <string name="ongoing_call">正在通话</string>
+    <string name="ongoing_video_call">正在进行视频通话</string>
     <string name="reconnecting_call">正在重新连接通话</string>
     <string name="reconnecting_video_call">正在重新连接视频通话</string>
     <string name="disable_tor_to_make_call">禁用 Tor 以进行通话</string>
@@ -930,8 +928,8 @@
     <string name="video_call">视频通话</string>
     <string name="help">帮助</string>
     <string name="microphone_unavailable">麦克风无法使用</string>
-    <string name="only_one_call_at_a_time">一次只能打一通电话。</string>
-    <string name="return_to_ongoing_call">返回到正在进行的通话</string>
+    <string name="only_one_call_at_a_time">每次只能有一个通话。</string>
+    <string name="return_to_ongoing_call">返回当前通话</string>
     <string name="could_not_switch_camera">无法切换摄像头</string>
     <string name="add_to_favorites">置顶</string>
     <string name="remove_from_favorites">取消置顶</string>
@@ -1001,10 +999,10 @@
     <string name="welcome_header_quicksy">欢迎使用 Quicksy！</string>
     <string name="quicksy_wants_your_consent">Quicksy 请求您同意使用您的数据</string>
     <string name="privacy_policy">隐私政策</string>
-    <string name="contact_list_integration_not_available">联系人列表集成不可用</string>
-    <string name="rtp_state_contact_offline">联系人不可用</string>
-    <string name="no_permission_to_place_call">没有拨打电话的权限</string>
-    <string name="call_integration_not_available">通话集成不可用！</string>
+    <string name="contact_list_integration_not_available">无法使用联系人列表集成功能</string>
+    <string name="rtp_state_contact_offline">联系人已离线</string>
+    <string name="no_permission_to_place_call">没有发起通话的权限</string>
+    <string name="call_integration_not_available">无法使用通话集成功能！</string>
     <string name="remove_bookmark_and_close">是否移除 %s 的书签并归档对话？</string>
     <string name="remove_bookmark">是否移除 %s 的书签？</string>
     <string name="delete_and_close">删除并归档对话</string>
@@ -1027,7 +1025,7 @@
     <string name="pref_send_crash_reports">发送崩溃报告</string>
     <string name="pref_title_security">安全</string>
     <string name="notifications">通知</string>
-    <string name="pref_attachments_summary">文件大小、图片压缩、视频质量</string>
+    <string name="pref_attachments_summary">文件大小、图片压缩、视频画质</string>
     <string name="pref_notifications_summary">静默期、铃声、振动、陌生人</string>
     <string name="pref_automatic_download">自动下载</string>
     <string name="appearance">外观</string>
@@ -1059,7 +1057,7 @@
     <string name="send_encrypted_message">发送加密消息</string>
     <string name="pref_large_font">大字体</string>
     <string name="pref_large_font_summary">增加消息气泡中的字体大小</string>
-    <string name="pref_accept_invites_from_strangers">来自陌生人的邀请</string>
+    <string name="pref_accept_invites_from_strangers">陌生人的邀请</string>
     <string name="pref_accept_invites_from_strangers_summary">接受来自陌生人的群聊邀请</string>
     <string name="pref_create_backup_one_off_summary">创建一次性备份</string>
     <string name="pref_backup_recurring">定期备份</string>

From 34fde6867ab3bd05940f1cebdf200dc3bb7ad19a Mon Sep 17 00:00:00 2001
From: Grzegorz Szymaszek <gs@users.noreply.translate.codeberg.org>
Date: Tue, 14 Jan 2025 15:49:02 +0000
Subject: [PATCH 352/357] Translated using Weblate (Polish)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/pl/
---
 src/main/res/values-pl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index b08548491d0bbe300ee7bad683cfe04fce5f8861..975674a18ebd4a14d599995f4ec5a129b53e601e 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -465,7 +465,7 @@
     <string name="download_failed_invalid_file">Pobieranie nieudane: Nieprawidłowy plik</string>
     <string name="account_status_tor_unavailable">Sieć TOR jest niedostepna</string>
     <string name="account_status_bind_failure">Błąd połączenia (zasób)</string>
-    <string name="account_status_host_unknown">Serwer nie odpowiada domenie</string>
+    <string name="account_status_host_unknown">Nie odpowiada za domenę</string>
     <string name="server_info_broken">Zepsute</string>
     <string name="pref_presence_settings">Dostępność</string>
     <string name="pref_away_when_screen_off">Niedostępny kiedy urządzenie jest zablokowane</string>

From 7eb8d5497a4f42b890c62110df3a06225edbb659 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 20 Jan 2025 17:52:05 +0100
Subject: [PATCH 353/357] send MUC PM reactions to full jid

---
 .../generator/MessageGenerator.java             |  5 ++---
 .../services/XmppConnectionService.java         | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index 42975cb8f87d393cafe795141432162fedad90a9..6ff2337cc2bc3175877ee032f0e3b0e55f138b18 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -192,11 +192,10 @@ public class MessageGenerator extends AbstractGenerator {
     }
 
     public im.conversations.android.xmpp.model.stanza.Message reaction(
-            final Conversational conversation,
+            final Jid to,
+            final boolean groupChat,
             final String reactingTo,
             final Collection<String> ourReactions) {
-        final boolean groupChat = conversation.getMode() == Conversational.MODE_MULTI;
-        final Jid to = conversation.getJid().asBareJid();
         final im.conversations.android.xmpp.model.stanza.Message packet =
                 new im.conversations.android.xmpp.model.stanza.Message();
         packet.setType(
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 33701215f1d9b42fe34691ec8a13c19d189941b3..c9c116c3aaa08c492212d2f0237fd3cb096f2bee 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -5710,9 +5710,12 @@ public class XmppConnectionService extends Service {
 
     public boolean sendReactions(final Message message, final Collection<String> reactions) {
         if (message.getConversation() instanceof Conversation conversation) {
+            final var isPrivateMessage = message.isPrivateMessage();
+            final Jid reactTo;
+            final boolean typeGroupChat;
             final String reactToId;
             final Collection<Reaction> combinedReactions;
-            if (conversation.getMode() == Conversational.MODE_MULTI) {
+            if (conversation.getMode() == Conversational.MODE_MULTI && !isPrivateMessage) {
                 final var mucOptions = conversation.getMucOptions();
                 if (!mucOptions.participating()) {
                     Log.d(Config.LOGTAG, "not participating in MUC");
@@ -5735,6 +5738,8 @@ public class XmppConnectionService extends Service {
                     Log.d(Config.LOGTAG, "modified reactions to existing variants");
                 }
                 reactToId = message.getServerMsgId();
+                reactTo = conversation.getJid().asBareJid();
+                typeGroupChat = true;
                 combinedReactions =
                         Reaction.withOccupantId(
                                 message.getReactions(),
@@ -5749,6 +5754,12 @@ public class XmppConnectionService extends Service {
                 } else {
                     reactToId = message.getUuid();
                 }
+                typeGroupChat = false;
+                if (isPrivateMessage) {
+                    reactTo = message.getCounterpart();
+                } else {
+                    reactTo = conversation.getJid().asBareJid();
+                }
                 combinedReactions =
                         Reaction.withFrom(
                                 message.getReactions(),
@@ -5756,11 +5767,11 @@ public class XmppConnectionService extends Service {
                                 false,
                                 conversation.getAccount().getJid());
             }
-            if (Strings.isNullOrEmpty(reactToId)) {
+            if (reactTo == null || Strings.isNullOrEmpty(reactToId)) {
                 return false;
             }
             final var reactionMessage =
-                    mMessageGenerator.reaction(conversation, reactToId, reactions);
+                    mMessageGenerator.reaction(reactTo, typeGroupChat, reactToId, reactions);
             sendMessagePacket(conversation.getAccount(), reactionMessage);
             message.setReactions(combinedReactions);
             updateMessage(message, false);

From fc6a010420ff8b0a255fe46353ab4fe411eb10ef Mon Sep 17 00:00:00 2001
From: Outbreak2096 <outbreak2096@users.noreply.translate.codeberg.org>
Date: Wed, 15 Jan 2025 15:03:48 +0000
Subject: [PATCH 354/357] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/zh_Hans/
---
 src/main/res/values-zh-rCN/strings.xml | 30 +++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index d6cfd1b3f8b194e8a93592c068381601912580ab..fbe2e682ba3003995dcd94b2399e118fc6a5657b 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -403,7 +403,7 @@
     <string name="conference_options">私人群聊配置</string>
     <string name="channel_options">公开频道配置</string>
     <string name="members_only">私人，仅成员</string>
-    <string name="non_anonymous">对任何人显示 XMPP 地址</string>
+    <string name="non_anonymous">对任何参与者显示用户 XMPP 地址</string>
     <string name="moderated">开启频道发言审核</string>
     <string name="you_are_not_participating">您没有发言权</string>
     <string name="modified_conference_options">群聊配置修改成功！</string>
@@ -610,7 +610,7 @@
     <string name="share_as_http">以 HTTP 链接形式分享</string>
     <string name="pref_blind_trust_before_verification">验证前盲目信任</string>
     <string name="pref_blind_trust_before_verification_summary">信任未经验证的联系人的新设备，但提示手动确认已验证的联系人的新设备。</string>
-    <string name="blindly_trusted_omemo_keys">盲目信任的 OMEMO 密钥，表示它们可能是其他人或者某人可能冒充别人发送消息。</string>
+    <string name="blindly_trusted_omemo_keys">盲目信任的 OMEMO 密钥，这意味着它们可能是别人的，可能会有人窃听。</string>
     <string name="not_trusted">未受信任</string>
     <string name="invalid_barcode">二维码无效</string>
     <string name="pref_clean_cache_summary">清理缓存文件夹（由相机使用）</string>
@@ -706,7 +706,7 @@
     <string name="not_encrypted_for_this_device">未对此设备加密消息。</string>
     <string name="omemo_decryption_failed">无法解密 OMEMO 消息。</string>
     <string name="undo">撤销</string>
-    <string name="location_disabled">已禁用位置共享</string>
+    <string name="location_disabled">已禁用位置分享</string>
     <string name="action_fix_to_location">固定位置</string>
     <string name="action_unfix_from_location">取消固定位置</string>
     <string name="action_copy_location">复制位置</string>
@@ -721,11 +721,11 @@
     <string name="search_messages">搜索消息</string>
     <string name="gif">GIF</string>
     <string name="view_conversation">查看对话</string>
-    <string name="pref_use_share_location_plugin">位置共享插件</string>
-    <string name="pref_use_share_location_plugin_summary">使用位置共享插件代替内置地图</string>
+    <string name="pref_use_share_location_plugin">分享位置插件</string>
+    <string name="pref_use_share_location_plugin_summary">使用分享位置插件代替内置地图</string>
     <string name="copy_link">复制网址</string>
     <string name="copy_jabber_id">复制 XMPP 地址</string>
-    <string name="p1_s3_filetransfer">用于 S3 的 HTTP 文件共享</string>
+    <string name="p1_s3_filetransfer">用于 S3 的 HTTP 文件分享</string>
     <string name="pref_start_search">直接搜索</string>
     <string name="pref_start_search_summary">在“新对话”屏幕上打开键盘并将光标放入搜索栏</string>
     <string name="group_chat_avatar">群聊头像</string>
@@ -843,15 +843,15 @@
     <string name="channel_already_exists">此频道已存在</string>
     <string name="joined_an_existing_channel">您已加入现有的频道</string>
     <string name="unable_to_set_channel_configuration">无法保存频道配置</string>
-    <string name="allow_participants_to_edit_subject">允许任何人编辑话题</string>
-    <string name="allow_participants_to_invite_others">允许任何人邀请他人</string>
-    <string name="anyone_can_edit_subject">任何人可以编辑话题。</string>
+    <string name="allow_participants_to_edit_subject">允许参与者编辑话题</string>
+    <string name="allow_participants_to_invite_others">允许参与者邀请他人</string>
+    <string name="anyone_can_edit_subject">参与者可以编辑话题。</string>
     <string name="owners_can_edit_subject">所有者可以编辑话题。</string>
     <string name="admins_can_edit_subject">管理员可以编辑话题。</string>
     <string name="owners_can_invite_others">所有者可以邀请他人。</string>
-    <string name="anyone_can_invite_others">任何人可以邀请他人。</string>
-    <string name="jabber_ids_are_visible_to_admins">管理员可以看到 XMPP 地址。</string>
-    <string name="jabber_ids_are_visible_to_anyone">任何人可以看到 XMPP 地址。</string>
+    <string name="anyone_can_invite_others">参与者可以邀请他人。</string>
+    <string name="jabber_ids_are_visible_to_admins">管理员可以看到用户 XMPP 地址。</string>
+    <string name="jabber_ids_are_visible_to_anyone">任何参与者可以看到用户 XMPP 地址。</string>
     <string name="no_users_hint_channel">此公开频道无参与者。邀请联系人或使用分享按钮分发频道的 XMPP 地址。</string>
     <string name="no_users_hint_group_chat">此私人群聊无参与者。</string>
     <string name="manage_permission">管理权限</string>
@@ -876,7 +876,7 @@
     <string name="please_enter_password">请输入此账号的密码</string>
     <string name="unable_to_perform_this_action">无法执行此操作</string>
     <string name="open_join_dialog">加入公开频道…</string>
-    <string name="sharing_application_not_grant_permission">共享应用未授予访问此文件的权限。</string>
+    <string name="sharing_application_not_grant_permission">分享应用未授予访问此文件的权限。</string>
     <string name="group_chats_and_channels"><![CDATA[群聊和频道]]></string>
     <string name="jabber_network">jabber.network</string>
     <string name="local_server">本地服务器</string>
@@ -1064,8 +1064,8 @@
     <string name="pref_fullscreen_notification">全屏通知</string>
     <string name="pref_fullscreen_notification_summary">当设备锁定时，允许此应用显示占据全屏的来电通知。</string>
     <string name="unsupported_operation">不支持的操作</string>
-    <string name="pref_backup_summary">创建一次性备份、计划定期备份</string>
-    <string name="allow_private_messages">允许频道内私信</string>
+    <string name="pref_backup_summary">创建一次性备份、设置定期备份</string>
+    <string name="allow_private_messages">允许私信</string>
     <string name="edit_nick">编辑昵称</string>
     <string name="your_avatar_tap_to_select_new_avatar">您的头像。点按即可从图库选择新头像。</string>
     <string name="could_not_disable_video">无法禁用视频。</string>

From d147a9d277228cf9e4de38e27290a29823e2aa51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Wed, 15 Jan 2025 14:47:48 +0000
Subject: [PATCH 355/357] Translated using Weblate (Estonian)

Currently translated at 33.7% (27 of 80 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/et/
---
 fastlane/metadata/android/et/changelogs/4208804.txt | 3 +++
 fastlane/metadata/android/et/changelogs/4209004.txt | 2 ++
 fastlane/metadata/android/et/changelogs/4209204.txt | 2 ++
 3 files changed, 7 insertions(+)
 create mode 100644 fastlane/metadata/android/et/changelogs/4208804.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4209004.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4209204.txt

diff --git a/fastlane/metadata/android/et/changelogs/4208804.txt b/fastlane/metadata/android/et/changelogs/4208804.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c8e553d6bcf6fd5081e35335eaea34b5c43f2fec
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4208804.txt
@@ -0,0 +1,3 @@
+* P2P failide teisaldamise tugi kasutades WebRTC andmekanaleid
+* Parandasime Bind 2.0 ühilduvusvead, kui kasutusel on ejabberd
+* Lisasime rakendusele Let’s Encrypti juursertifikaadid, kui kasutusel on Android <= 7
diff --git a/fastlane/metadata/android/et/changelogs/4209004.txt b/fastlane/metadata/android/et/changelogs/4209004.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fe15f61a903cf0595c3892adb3166b45e700c0bf
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4209004.txt
@@ -0,0 +1,2 @@
+* väikesed veaparandused
+* Quicksy liitumisloogika väikesed kohendused
diff --git a/fastlane/metadata/android/et/changelogs/4209204.txt b/fastlane/metadata/android/et/changelogs/4209204.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cdb8e7cab41b7c30310ba9edd0a6b3558e89acaf
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4209204.txt
@@ -0,0 +1,2 @@
+* Play Store'i versioonis on nüüd lihtsam ligipääs privaatsuspoliitikale (Quicksy ja Conversations)
+* Conversationsi Play Store'i versioonist oleme eemaldanud lõimingu aadressiraamatuga

From 0f57555e52859c34e2c976368b066d01657c7126 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Priit=20J=C3=B5er=C3=BC=C3=BCt?=
 <jrtcdbrg@users.noreply.translate.codeberg.org>
Date: Thu, 16 Jan 2025 08:18:12 +0000
Subject: [PATCH 356/357] Translated using Weblate (Estonian)

Currently translated at 42.5% (34 of 80 strings)

Translation: Conversations/App Store Metadata (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/app-store-metadata/et/
---
 fastlane/metadata/android/et/changelogs/42061.txt   | 1 +
 fastlane/metadata/android/et/changelogs/42062.txt   | 1 +
 fastlane/metadata/android/et/changelogs/42065.txt   | 1 +
 fastlane/metadata/android/et/changelogs/42068.txt   | 2 ++
 fastlane/metadata/android/et/changelogs/42072.txt   | 3 +++
 fastlane/metadata/android/et/changelogs/4207704.txt | 3 +++
 fastlane/metadata/android/et/changelogs/4208104.txt | 4 ++++
 7 files changed, 15 insertions(+)
 create mode 100644 fastlane/metadata/android/et/changelogs/42061.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/42062.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/42065.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/42068.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/42072.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4207704.txt
 create mode 100644 fastlane/metadata/android/et/changelogs/4208104.txt

diff --git a/fastlane/metadata/android/et/changelogs/42061.txt b/fastlane/metadata/android/et/changelogs/42061.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e4bc14e9c428d0541debac6ff6953b5183cf157d
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/42061.txt
@@ -0,0 +1 @@
+* Eemaldasime Google Play versioonist kanalite tuvastuse
diff --git a/fastlane/metadata/android/et/changelogs/42062.txt b/fastlane/metadata/android/et/changelogs/42062.txt
new file mode 100644
index 0000000000000000000000000000000000000000..92312203453d8f62bf87609adf9abf8e039d66d7
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/42062.txt
@@ -0,0 +1 @@
+* Lülitasime välja võimaluse avada failihaldurist varukoopia faile (.ceb)
diff --git a/fastlane/metadata/android/et/changelogs/42065.txt b/fastlane/metadata/android/et/changelogs/42065.txt
new file mode 100644
index 0000000000000000000000000000000000000000..13f81531bf3783f5dc15f4dc89fe8bf087033ba3
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/42065.txt
@@ -0,0 +1 @@
+* Võtsime varukoopiate jaoks kasutusele uue failivormingu
diff --git a/fastlane/metadata/android/et/changelogs/42068.txt b/fastlane/metadata/android/et/changelogs/42068.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ae26bff5dcabdec5eeb736f52a670551e56287be
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/42068.txt
@@ -0,0 +1,2 @@
+* vestlusekohaste teavituste tugi
+* Android 10s kasutame opus-koodekit häälsõnumite jaoks
diff --git a/fastlane/metadata/android/et/changelogs/42072.txt b/fastlane/metadata/android/et/changelogs/42072.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dd7f230e94a8324fd34e0923198391135131695c
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/42072.txt
@@ -0,0 +1,3 @@
+* libwebrtc teek sõltub nüüd versioonist M117 ja uuendasime libvpx teeki
+* Häälsõnumid kasutavad jälle AAC koodekit
+* Rakendustekohaste keeleeelistuste tugi
diff --git a/fastlane/metadata/android/et/changelogs/4207704.txt b/fastlane/metadata/android/et/changelogs/4207704.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6e367918adf52c07501e8143c9a6f9a47efe8582
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4207704.txt
@@ -0,0 +1,3 @@
+* Privaatsete nimeserverite tugi (DNS üle TLSi)
+* Võimalus valida käivitusikooni kujundust
+* Parandasime harvaesineva failide jagamise vea, mis esines Android 11+ puhul
diff --git a/fastlane/metadata/android/et/changelogs/4208104.txt b/fastlane/metadata/android/et/changelogs/4208104.txt
new file mode 100644
index 0000000000000000000000000000000000000000..eaf7f3f98712e3b889b5fbcb76be90bdaf02187a
--- /dev/null
+++ b/fastlane/metadata/android/et/changelogs/4208104.txt
@@ -0,0 +1,4 @@
+* Lihtsam ligipääs valikule „Näita QR-koodi“
+* PEP-järjehoidjate tugi
+* Lisasime SDP pakkumine/vastus mudeli toe (seda kasutavad SIPi lüüsid)
+* Üldine API arvestab nüüd Android 14'ga

From 7bd0c05e4c9b84f637a6c7fd85766820293bdd67 Mon Sep 17 00:00:00 2001
From: Juan M Sevilla <jumase@users.noreply.translate.codeberg.org>
Date: Sat, 18 Jan 2025 13:49:16 +0000
Subject: [PATCH 357/357] Translated using Weblate (Spanish)

Currently translated at 100.0% (1059 of 1059 strings)

Translation: Conversations/Android App (shared)
Translate-URL: https://translate.codeberg.org/projects/conversations/android-app-shared/es/
---
 src/main/res/values-es/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 729c1d934f390848db4419c0bde8c05130601d59..9358b93b4ae39e08e4412759d388f0c1ac011f7b 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -461,7 +461,7 @@
     <string name="download_failed_invalid_file">Error al descargar: Archivo no válido</string>
     <string name="account_status_tor_unavailable">La red Tor no está disponible</string>
     <string name="account_status_bind_failure">Fallo de enlace</string>
-    <string name="account_status_host_unknown">El servidor no es responsable de este dominio</string>
+    <string name="account_status_host_unknown">No responsable del dominio</string>
     <string name="server_info_broken">Error</string>
     <string name="pref_presence_settings">Disponibilidad</string>
     <string name="pref_away_when_screen_off">Ausente cuando el dispositivo esté bloqueado</string>