Fix notification user try 2 (#541)

* count peers in notification * cleanup
2026-07-24 22:45:20 +00:00 · 2026-01-04 02:35:06 +07:00
parent fa1978d587
commit 1b9f76be23
35 changed files with 36 additions and 3 deletions
@@ -276,7 +276,7 @@ class MeshForegroundService : Service() {
        } else true
    }

-    private fun buildNotification(activeUsers: Int): Notification {
+    private fun buildNotification(activePeers: Int): Notification {
        val openIntent = Intent(this, MainActivity::class.java)
        val pendingIntent = PendingIntent.getActivity(
            this, 0, openIntent,
@@ -291,7 +291,7 @@ class MeshForegroundService : Service() {
        )

        val title = getString(R.string.app_name)
-        val content = getString(R.string.mesh_service_notification_content, activeUsers)
+        val content = getString(R.string.mesh_service_notification_content, activePeers)

        return NotificationCompat.Builder(this, CHANNEL_ID)
            .setContentTitle(title)
@@ -362,4 +362,5 @@
  <string name="location_notes_empty_desc">كن أول من يضيف ملاحظة لهذا المكان.</string>
  <string name="dismiss">إغلاق</string>
  <string name="location_notes_input_placeholder">أضف ملاحظة لهذا المكان</string>
+    <string name="mesh_service_notification_content">الشبكة تعمل — %1$d أقران</string>
 </resources>
@@ -349,4 +349,5 @@
        <item quantity="other">%d জন</item>
    </plurals>

+    <string name="mesh_service_notification_content">মেশ চলছে — %1$d পিয়ার</string>
 </resources>
@@ -363,4 +363,5 @@
  <string name="location_notes_empty_desc">sei der Erste, der hier eine Notiz hinterlässt.</string>
  <string name="dismiss">schließen</string>
  <string name="location_notes_input_placeholder">füge eine Notiz zu diesem Ort hinzu</string>
+    <string name="mesh_service_notification_content">Mesh läuft — %1$d Peers</string>
 </resources>
@@ -362,4 +362,5 @@
  <string name="location_notes_empty_desc">sé el primero en añadir una para este sitio.</string>
  <string name="dismiss">cerrar</string>
  <string name="location_notes_input_placeholder">agrega una nota para este lugar</string>
+    <string name="mesh_service_notification_content">Mesh en ejecución — %1$d pares</string>
 </resources>
@@ -349,4 +349,5 @@
        <item quantity="other">%d نفر</item>
    </plurals>

+    <string name="mesh_service_notification_content">مش در حال اجرا — %1$d همتا</string>
 </resources>
@@ -362,4 +362,5 @@
        <item quantity="other">%d tao</item>
    </plurals>

+    <string name="mesh_service_notification_content">Tumatakbo ang Mesh — %1$d na peer</string>
 </resources>
@@ -376,4 +376,5 @@
  <string name="location_notes_empty_desc">soyez le premier à en ajouter pour cet endroit.</string>
  <string name="dismiss">fermer</string>
  <string name="location_notes_input_placeholder">ajoutez une note pour cet endroit</string>
+    <string name="mesh_service_notification_content">Mesh actif — %1$d pairs</string>
 </resources>
@@ -14,5 +14,6 @@
  <string name="location_notes_empty_desc">היה הראשון להוסיף הערה למקום זה.</string>
  <string name="dismiss">סגור</string>
  <string name="location_notes_input_placeholder">הוסף הערה למקום זה</string>
+    <string name="mesh_service_notification_content">רשת Mesh פועלת — %1$d עמיתים</string>
 </resources>

@@ -362,4 +362,5 @@
  <string name="location_notes_empty_desc">इस स्थान के लिए पहला नोट जोड़ें।</string>
  <string name="dismiss">बंद करें</string>
  <string name="location_notes_input_placeholder">इस स्थान के लिए एक नोट जोड़ें</string>
+    <string name="mesh_service_notification_content">मेश चल रहा है — %1$d पीयर्स</string>
 </resources>
@@ -362,4 +362,5 @@
  <string name="location_notes_empty_desc">jadilah yang pertama menambahkan catatan untuk tempat ini.</string>
  <string name="dismiss">tutup</string>
  <string name="location_notes_input_placeholder">tambahkan catatan untuk tempat ini</string>
+    <string name="mesh_service_notification_content">Mesh berjalan — %1$d peer</string>
 </resources>
@@ -396,4 +396,5 @@
  <string name="location_notes_empty_desc">sii il primo ad aggiungerne una per questo posto.</string>
  <string name="dismiss">chiudi</string>
  <string name="location_notes_input_placeholder">aggiungi una nota per questo luogo</string>
+    <string name="mesh_service_notification_content">Mesh in esecuzione — %1$d peer</string>
 </resources>
@@ -362,4 +362,5 @@
  <string name="location_notes_empty_desc">この場所の最初のメモを追加しましょう。</string>
  <string name="dismiss">閉じる</string>
  <string name="location_notes_input_placeholder">この場所へのメモを追加</string>
+    <string name="mesh_service_notification_content">メッシュ実行中 — %1$d ピア</string>
 </resources>
@@ -349,4 +349,5 @@
        <item quantity="other">%d ადამიანი</item>
    </plurals>

+    <string name="mesh_service_notification_content">Mesh გაშვებულია — %1$d პირები</string>
 </resources>
@@ -362,4 +362,5 @@
  <string name="location_notes_empty_desc">이 장소에 첫 번째 노트를 추가해 보세요.</string>
  <string name="dismiss">닫기</string>
  <string name="location_notes_input_placeholder">이 장소에 노트 추가</string>
+    <string name="mesh_service_notification_content">메시 실행 중 — %1$d 피어</string>
 </resources>
@@ -376,4 +376,5 @@
        <item quantity="other">Olona %d</item>
    </plurals>

+    <string name="mesh_service_notification_content">Mandeha ny Mesh — %1$d peers</string>
 </resources>
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- TODO: Malay translations -->
+    <string name="mesh_service_notification_content">Mesh sedang berjalan — %1$d rakan</string>
 </resources>

@@ -362,4 +362,5 @@
        <item quantity="other">%d जना</item>
    </plurals>

+    <string name="mesh_service_notification_content">मेश चलिरहेको छ — %1$d पियर्स</string>
 </resources>
@@ -394,4 +394,5 @@
  <string name="location_notes_empty_desc">wees de eerste die een notitie voor deze plek toevoegt.</string>
  <string name="dismiss">sluiten</string>
  <string name="location_notes_input_placeholder">voeg een notitie toe voor deze plek</string>
+    <string name="mesh_service_notification_content">Mesh actief — %1$d peers</string>
 </resources>
@@ -349,4 +349,5 @@
        <item quantity="other">%d بندے</item>
    </plurals>

+    <string name="mesh_service_notification_content">میش چل رہا ہے — %1$d ساتھی</string>
 </resources>
@@ -14,5 +14,6 @@
  <string name="location_notes_empty_desc">bądź pierwszy, który doda notatkę dla tego miejsca.</string>
  <string name="dismiss">zamknij</string>
  <string name="location_notes_input_placeholder">dodaj notatkę dla tego miejsca</string>
+    <string name="mesh_service_notification_content">Mesh działa — %1$d peerów</string>
 </resources>

@@ -362,4 +362,5 @@
  <string name="location_notes_empty_desc">seja o primeiro a adicionar uma para este local.</string>
  <string name="dismiss">fechar</string>
  <string name="location_notes_input_placeholder">adicione uma nota para este local</string>
+    <string name="mesh_service_notification_content">Mesh rodando — %1$d pares</string>
 </resources>
@@ -362,4 +362,5 @@
  <string name="location_notes_empty_desc">seja o primeiro a adicionar uma para este local.</string>
  <string name="dismiss">fechar</string>
  <string name="location_notes_input_placeholder">adicione uma nota para este local</string>
+    <string name="mesh_service_notification_content">Mesh em execução — %1$d pares</string>
 </resources>
@@ -352,4 +352,5 @@
  <string name="location_notes_empty_desc">станьте первым, кто добавит заметку для этого места.</string>
  <string name="dismiss">закрыть</string>
  <string name="location_notes_input_placeholder">добавьте заметку для этого места</string>
+    <string name="mesh_service_notification_content">Mesh запущен — %1$d пиров</string>
 </resources>
@@ -350,4 +350,5 @@
  <string name="location_notes_empty_desc">var först med att lägga till en anteckning för den här platsen.</string>
  <string name="dismiss">stäng</string>
  <string name="location_notes_input_placeholder">lägg till en anteckning för den här platsen</string>
+    <string name="mesh_service_notification_content">Mesh körs — %1$d peers</string>
 </resources>
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- TODO: Tamil translations -->
+    <string name="mesh_service_notification_content">மெஷ் இயங்குகிறது — %1$d பியர்ஸ்</string>
 </resources>

@@ -349,4 +349,5 @@
        <item quantity="other">%d คน</item>
    </plurals>

+    <string name="mesh_service_notification_content">Mesh กำลังทำงาน — %1$d เพื่อน</string>
 </resources>
@@ -350,4 +350,5 @@
  <string name="location_notes_empty_desc">bu yer için ilk notu ekleyen siz olun.</string>
  <string name="dismiss">kapat</string>
  <string name="location_notes_input_placeholder">bu yer için bir not ekleyin</string>
+    <string name="mesh_service_notification_content">Mesh çalışıyor — %1$d eş</string>
 </resources>
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!-- TODO: Ukrainian translations -->
+    <string name="mesh_service_notification_content">Mesh працює — %1$d пірів</string>
 </resources>

@@ -362,4 +362,5 @@
  <string name="location_notes_empty_desc">اس جگہ کے لیے پہلا نوٹ شامل کریں۔</string>
  <string name="dismiss">بند کریں</string>
  <string name="location_notes_input_placeholder">اس جگہ کے لیے ایک نوٹ شامل کریں</string>
+    <string name="mesh_service_notification_content">میش چل رہا ہے — %1$d ساتھی</string>
 </resources>
@@ -349,4 +349,5 @@
        <item quantity="other">%d người</item>
    </plurals>

+    <string name="mesh_service_notification_content">Mesh đang chạy — %1$d ngang hàng</string>
 </resources>
@@ -14,5 +14,6 @@
  <string name="location_notes_empty_desc">成为第一个为此地点添加笔记的人。</string>
  <string name="dismiss">关闭</string>
  <string name="location_notes_input_placeholder">为此地点添加一条笔记</string>
+    <string name="mesh_service_notification_content">Mesh 运行中 — %1$d 个节点</string>
 </resources>

@@ -14,5 +14,6 @@
  <string name="location_notes_empty_desc">成為第一個為此地點新增筆記的人。</string>
  <string name="dismiss">關閉</string>
  <string name="location_notes_input_placeholder">為此地點新增一則筆記</string>
+    <string name="mesh_service_notification_content">Mesh 運行中 — %1$d 個節點</string>
 </resources>

@@ -375,4 +375,5 @@
  <string name="location_notes_empty_desc">成为第一个为此地点添加笔记的人。</string>
  <string name="dismiss">关闭</string>
  <string name="location_notes_input_placeholder">为此地点添加一条笔记</string>
+    <string name="mesh_service_notification_content">Mesh 运行中 — %1$d 个节点</string>
 </resources>
@@ -64,7 +64,7 @@
  <!-- Mesh Service Foreground Notification -->
  <string name="mesh_service_channel_name">Mesh Background Service</string>
  <string name="mesh_service_channel_desc">Keeps the Bluetooth mesh running in the background</string>
-  <string name="mesh_service_notification_content">Mesh running — %1$d users connected</string>
+    <string name="mesh_service_notification_content">Mesh running — %1$d peers</string>

  <!-- Favorites accessibility -->
  <string name="cd_add_favorite">Add to favorites</string>