permissionlesstech/bitchat-android
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat-android.git synced 2026-07-25 09:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into wifi-aware

Browse Source 
# Conflicts:
#	app/src/main/res/values-ar/strings.xml
#	app/src/main/res/values-bn/strings.xml
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-es/strings.xml
#	app/src/main/res/values-fa/strings.xml
#	app/src/main/res/values-fil/strings.xml
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-he/strings.xml
#	app/src/main/res/values-hi/strings.xml
#	app/src/main/res/values-id/strings.xml
#	app/src/main/res/values-it/strings.xml
#	app/src/main/res/values-ja/strings.xml
#	app/src/main/res/values-ka/strings.xml
#	app/src/main/res/values-ko/strings.xml
#	app/src/main/res/values-mg/strings.xml
#	app/src/main/res/values-ms/strings.xml
#	app/src/main/res/values-ne/strings.xml
#	app/src/main/res/values-nl/strings.xml
#	app/src/main/res/values-pa-rPK/strings.xml
#	app/src/main/res/values-pl/strings.xml
#	app/src/main/res/values-pt-rBR/strings.xml
#	app/src/main/res/values-pt/strings.xml
#	app/src/main/res/values-ru/strings.xml
#	app/src/main/res/values-sv/strings.xml
#	app/src/main/res/values-ta/strings.xml
#	app/src/main/res/values-th/strings.xml
#	app/src/main/res/values-tr/strings.xml
#	app/src/main/res/values-uk/strings.xml
#	app/src/main/res/values-ur/strings.xml
#	app/src/main/res/values-vi/strings.xml
#	app/src/main/res/values-zh-rCN/strings.xml
#	app/src/main/res/values-zh-rTW/strings.xml
#	app/src/main/res/values-zh/strings.xml
This commit is contained in:
callebtc
2026-01-04 02:37:47 +07:00
parent 35030a05d8 1b9f76be23
commit 23e7e12e9e
35 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/bitchat/android/service/MeshForegroundService.kt
+2 -2
View File
@@ -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)