From ec2d6d798ffb03812774669166b754135297a357 Mon Sep 17 00:00:00 2001 From: callebtc <93376500+callebtc@users.noreply.github.com> Date: Sun, 4 Jan 2026 16:11:16 +0700 Subject: [PATCH] Fix build errors: Escape ampersands in strings and restore missing methods in ChatViewModel --- .../com/bitchat/android/ui/ChatViewModel.kt | 34 +++++++++++++++++-- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-bn/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 6 ++-- app/src/main/res/values-fa/strings.xml | 2 +- app/src/main/res/values-fil/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 6 ++-- app/src/main/res/values-he/strings.xml | 2 +- app/src/main/res/values-hi/strings.xml | 4 +-- app/src/main/res/values-id/strings.xml | 6 ++-- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 4 +-- app/src/main/res/values-ka/strings.xml | 6 ++-- app/src/main/res/values-ko/strings.xml | 6 ++-- app/src/main/res/values-mg/strings.xml | 6 ++-- app/src/main/res/values-ms/strings.xml | 2 +- app/src/main/res/values-ne/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 8 ++--- app/src/main/res/values-pa-rPK/strings.xml | 6 ++-- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 4 +-- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-ta/strings.xml | 2 +- app/src/main/res/values-th/strings.xml | 6 ++-- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-ur/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 6 ++-- app/src/main/res/values/strings.xml | 2 +- 29 files changed, 84 insertions(+), 54 deletions(-) diff --git a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt index 3ab41344..58d5c77f 100644 --- a/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt +++ b/app/src/main/java/com/bitchat/android/ui/ChatViewModel.kt @@ -744,6 +744,38 @@ class ChatViewModel( return verificationHandler.beginQRVerification(qr) } + // MARK: - Debug and Troubleshooting + + fun getDebugStatus(): String { + return meshService.getDebugStatus() + } + + fun setAppBackgroundState(inBackground: Boolean) { + notificationManager.setAppBackgroundState(inBackground) + } + + fun setCurrentPrivateChatPeer(peerID: String?) { + notificationManager.setCurrentPrivateChatPeer(peerID) + } + + fun setCurrentGeohash(geohash: String?) { + notificationManager.setCurrentGeohash(geohash) + } + + fun clearNotificationsForSender(peerID: String) { + notificationManager.clearNotificationsForSender(peerID) + } + + fun clearNotificationsForGeohash(geohash: String) { + notificationManager.clearNotificationsForGeohash(geohash) + } + + fun clearMeshMentionNotifications() { + notificationManager.clearMeshMentionNotifications() + } + + private var reopenSidebarAfterVerification = false + fun showVerificationSheet(fromSidebar: Boolean = false) { if (fromSidebar) { reopenSidebarAfterVerification = true @@ -1061,8 +1093,6 @@ class ChatViewModel( */ fun colorForNostrPubkey(pubkeyHex: String, isDark: Boolean): androidx.compose.ui.graphics.Color { return geohashViewModel.colorForNostrPubkey(pubkeyHex, isDark) - } - } } diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 56fbeee8..7ddae251 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -381,7 +381,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 0a243e78..24f94630 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -368,7 +368,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5991ac75..c02bbb37 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -70,7 +70,7 @@ Aus Favoriten entfernen Lesezeichen hinzufügen - + zurück Kanal: %1$s verlassen @@ -170,7 +170,7 @@ Online‑Geohash‑Kanäle Ende‑zu‑Ende‑Verschlüsselung - + Bild %1$d von %2$d Bild nicht verfügbar Bild in "Downloads" gespeichert @@ -382,7 +382,7 @@ dein fingerabdruck handshake ausstehend privatchat öffnen - verschlüsselt & verifiziert + verschlüsselt & verifiziert verschlüsselt handshake handshake fehlgeschlagen diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 99526f32..1473c5fd 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -368,7 +368,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml index 74aa8bd3..0a7dc2e3 100644 --- a/app/src/main/res/values-fil/strings.xml +++ b/app/src/main/res/values-fil/strings.xml @@ -381,7 +381,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1ae7ac60..01f480d2 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -70,7 +70,7 @@ Retirer des favoris Ajouter un signet - + retour canal : %1$s quitter @@ -165,7 +165,7 @@ Canaux Geohash en ligne Chiffrement de bout en bout - + Image %1$d sur %2$d Image indisponible Image enregistrée dans "Téléchargements" @@ -395,7 +395,7 @@ votre empreinte négociation en cours ouvrir un chat privé - chiffré & vérifié + chiffré & vérifié chiffré négociation échec négociation diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index eb5b7503..deb22711 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -33,7 +33,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index a81bac0e..acaa54b6 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -70,7 +70,7 @@ पसंदीदा से हटाएँ बुकमार्क जोड़ें - + वापस चैनल: %1$s छोड़ें @@ -381,7 +381,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 97f90728..18c85a5b 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -70,7 +70,7 @@ Hapus dari favorit Tambah bookmark - + kembali Channel: %1$s keluar @@ -170,7 +170,7 @@ Channel Geohash Online Enkripsi end-to-end - + Gambar %1$d dari %2$d Gambar tidak tersedia Gambar disimpan ke \"Downloads\" @@ -381,7 +381,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 175bf521..07fb5a76 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -415,7 +415,7 @@ tua impronta handshake in corso apri chat privata - criptato & verificato + criptato & verificato criptato handshake handshake fallito diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 00222907..f9c4fd64 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -70,7 +70,7 @@ お気に入りから削除 ブックマークに追加 - + 戻る チャンネル: %1$s 退出 @@ -170,7 +170,7 @@ オンライン Geohash チャンネル エンドツーエンド暗号化 - + 画像 %1$d / %2$d 画像は利用できません 画像を「ダウンロード」に保存しました diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml index c0251a52..db24c8a9 100644 --- a/app/src/main/res/values-ka/strings.xml +++ b/app/src/main/res/values-ka/strings.xml @@ -70,7 +70,7 @@ რჩეულებიდან წაშლა სანიშნეს დამატება - + უკან არხი: %1$s გასვლა @@ -170,7 +170,7 @@ ონლაინ geohash არხები ბოლო-მდე დაშიფვრა - + სურათი %1$d %2$d-დან სურათი მიუწვდომელია სურათი შენახულია "ჩამოტვირთვებში" @@ -368,7 +368,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index d93c8eec..0510fb7d 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -70,7 +70,7 @@ 즐겨찾기에서 제거 북마크 추가 - + 뒤로 채널: %1$s 나가기 @@ -170,7 +170,7 @@ 온라인 geohash 채널 종단간 암호화 - + 이미지 %1$d / %2$d 이미지를 사용할 수 없음 이미지가 \"Downloads\"에 저장됨 @@ -381,7 +381,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-mg/strings.xml b/app/src/main/res/values-mg/strings.xml index f945c9eb..5fc53577 100644 --- a/app/src/main/res/values-mg/strings.xml +++ b/app/src/main/res/values-mg/strings.xml @@ -70,7 +70,7 @@ Hanesorana amin\'ny ankafizina Hanampy bookmark - + miverina fantsona: %1$s hiala @@ -170,7 +170,7 @@ Fantsona Geohash an-tserasera Fandokoana Farany amin\'ny Farany - + Sary %1$d amin\'ny %2$d Tsy misy sary Sary voatahiry ao amin\'ny Downloads @@ -395,7 +395,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index eeba16dd..0e6dd945 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -20,7 +20,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 3f78683d..6632f0dc 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -381,7 +381,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 5b88aedb..7d19b52a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -70,7 +70,7 @@ Verwijderen uit favorieten Bladwijzer toevoegen - + terug kanaal: %1$s verlaten @@ -170,7 +170,7 @@ Online geohash-kanalen End-to-end-versleuteling - + Afbeelding %1$d van %2$d Afbeelding niet beschikbaar Afbeelding opgeslagen in Downloads @@ -338,7 +338,7 @@ Deelnemen Annuleren - + @ bitchat/ · ⧉ @@ -413,7 +413,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-pa-rPK/strings.xml b/app/src/main/res/values-pa-rPK/strings.xml index 55bf16b4..3f08aa32 100644 --- a/app/src/main/res/values-pa-rPK/strings.xml +++ b/app/src/main/res/values-pa-rPK/strings.xml @@ -70,7 +70,7 @@ پسندیدہ توں ہٹاؤ بُک مارک پاؤ - + واپس چینل: %1$s باہر آؤ @@ -170,7 +170,7 @@ آن لائن geohash چینل اینڈ ٹو اینڈ انکرپشن - + تصویر %1$d وچوں %2$d تصویر دستیاب نئیں تصویر \"Downloads\" وچ سیو ہو گئی @@ -368,7 +368,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 7ea11c7b..56cd087a 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -33,7 +33,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 004bd340..e9686f99 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -70,7 +70,7 @@ Remover dos favoritos Adicionar favorito - + voltar Canal: %1$s sair @@ -170,7 +170,7 @@ Canais geohash online Criptografia de ponta a ponta - + Imagem %1$d de %2$d Imagem indisponível Imagem salva em "Downloads" diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 56cb768d..ef3307e3 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -369,7 +369,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 1292e355..98ceef9c 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -20,7 +20,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 83e59391..343f6885 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -70,7 +70,7 @@ เอาออกจากรายการโปรด เพิ่มที่คั่นหน้า - + กลับ ช่อง: %1$s ออก @@ -170,7 +170,7 @@ ช่อง geohash ออนไลน์ การเข้ารหัสแบบปลายทางถึงปลายทาง - + รูปภาพ %1$d จาก %2$d ไม่สามารถใช้รูปภาพได้ บันทึกรูปภาพไว้ใน "ดาวน์โหลด" แล้ว @@ -368,7 +368,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 289525b3..1209074c 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -369,7 +369,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index a1d385da..5545b546 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -20,7 +20,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index ef21c423..1626a041 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -381,7 +381,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 09fb2b19..afc227b6 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -70,7 +70,7 @@ Xóa khỏi yêu thích Thêm bookmark - + quay lại Kênh: %1$s rời khỏi @@ -170,7 +170,7 @@ Kênh Geohash trực tuyến Mã hóa đầu cuối - + Hình ảnh %1$d trong %2$d Hình ảnh không có sẵn Hình ảnh đã lưu vào \"Downloads\" @@ -368,7 +368,7 @@ your fingerprint handshake pending open a private chat to view fingerprints - encrypted & verified + encrypted & verified encrypted handshaking handshake failed diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c9b2fced..6fe23b49 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -71,7 +71,7 @@ Remove from favorites Add bookmark - + back channel: %1$s leave