From a375f18913969e3bf97541d8e8d6acb63b037a60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Sun, 3 Nov 2024 00:24:06 -0400
Subject: [PATCH] JamiApplication: avoid overriding token with empty string on
startup
Change-Id: Ie4e3c4ef753f28462db2442fef35d4a8ebb3d6bf
---
.../app/src/main/java/cx/ring/application/JamiApplication.kt | 2 +-
.../src/main/kotlin/net/jami/services/PreferencesService.kt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jami-android/app/src/main/java/cx/ring/application/JamiApplication.kt b/jami-android/app/src/main/java/cx/ring/application/JamiApplication.kt
index eb304bbeb..a771405b0 100644
--- a/jami-android/app/src/main/java/cx/ring/application/JamiApplication.kt
+++ b/jami-android/app/src/main/java/cx/ring/application/JamiApplication.kt
@@ -159,7 +159,7 @@ abstract class JamiApplication : Application() {
// load accounts from Daemon
mAccountService.loadAccountsFromDaemon(mPreferencesService.hasNetworkConnected())
if (mPreferencesService.settings.enablePushNotifications) {
- pushToken.let { token -> JamiService.setPushNotificationToken(token) }
+ pushToken.let { token -> if (!token.isEmpty()) JamiService.setPushNotificationToken(token) }
} else {
JamiService.setPushNotificationToken("")
}
diff --git a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/PreferencesService.kt b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/PreferencesService.kt
index 0de66034c..e4382d727 100644
--- a/jami-android/libjamiclient/src/main/kotlin/net/jami/services/PreferencesService.kt
+++ b/jami-android/libjamiclient/src/main/kotlin/net/jami/services/PreferencesService.kt
@@ -42,7 +42,7 @@ abstract class PreferencesService(
val allowPush = settings.enablePushNotifications
val previousSettings = userSettings
if (previousSettings == null || previousSettings.enablePushNotifications != allowPush) {
- mAccountService.setPushNotificationToken(if (allowPush) mDeviceService.pushToken ?: "" else "")
+ mAccountService.setPushNotificationToken(if (allowPush) mDeviceService.pushToken else "")
mAccountService.setProxyEnabled(allowPush)
}
userSettings = settings
--
GitLab