diff --git a/sphinx/application/common/wrappers/wrapper-common/src/main/java/chat/sphinx/wrapper_common/StoragePercentage.kt b/sphinx/application/common/wrappers/wrapper-common/src/main/java/chat/sphinx/wrapper_common/StoragePercentage.kt index 64d5b85a9c..81bab0011e 100644 --- a/sphinx/application/common/wrappers/wrapper-common/src/main/java/chat/sphinx/wrapper_common/StoragePercentage.kt +++ b/sphinx/application/common/wrappers/wrapper-common/src/main/java/chat/sphinx/wrapper_common/StoragePercentage.kt @@ -1,5 +1,7 @@ package chat.sphinx.wrapper_common +import java.util.Locale + fun calculateStoragePercentage(storageData: StorageData): StoragePercentage { val freeStorage = storageData.freeStorage?.value ?: 0L @@ -8,11 +10,11 @@ fun calculateStoragePercentage(storageData: StorageData): StoragePercentage { storageData.files.totalSize.value return StoragePercentage( - freeStorage = String.format("%.3f", freeStorage.toFloat() / totalStorage).toFloat(), - image = String.format("%.3f", storageData.images.totalSize.value.toFloat() / totalStorage).toFloat(), - video = String.format("%.3f", storageData.video.totalSize.value.toFloat() / totalStorage).toFloat(), - audio = String.format("%.3f", storageData.audio.totalSize.value.toFloat() / totalStorage).toFloat(), - files = String.format("%.3f", storageData.files.totalSize.value.toFloat() / totalStorage).toFloat() + freeStorage = String.format(Locale.ENGLISH, "%.3f", freeStorage.toFloat() / totalStorage).toFloat(), + image = String.format(Locale.ENGLISH, "%.3f", storageData.images.totalSize.value.toFloat() / totalStorage).toFloat(), + video = String.format(Locale.ENGLISH, "%.3f", storageData.video.totalSize.value.toFloat() / totalStorage).toFloat(), + audio = String.format(Locale.ENGLISH, "%.3f", storageData.audio.totalSize.value.toFloat() / totalStorage).toFloat(), + files = String.format(Locale.ENGLISH, "%.3f", storageData.files.totalSize.value.toFloat() / totalStorage).toFloat() ) } diff --git a/sphinx/service/features/notifications/feature-service-notification-firebase/src/main/java/chat/sphinx/feature_service_notification_firebase/SphinxFirebaseMessagingService.kt b/sphinx/service/features/notifications/feature-service-notification-firebase/src/main/java/chat/sphinx/feature_service_notification_firebase/SphinxFirebaseMessagingService.kt index 596a7fee7e..51e8b4d1a2 100644 --- a/sphinx/service/features/notifications/feature-service-notification-firebase/src/main/java/chat/sphinx/feature_service_notification_firebase/SphinxFirebaseMessagingService.kt +++ b/sphinx/service/features/notifications/feature-service-notification-firebase/src/main/java/chat/sphinx/feature_service_notification_firebase/SphinxFirebaseMessagingService.kt @@ -59,7 +59,7 @@ internal class SphinxFirebaseMessagingService: FirebaseMessagingService() { // Extract data from the message // Extract data from the message - val title: String = p0.data["message"] ?: "" + val title: String = p0.data["title"] ?: "" val messageBody: String = p0.data["body"] ?: "" val chatId: Long? = (p0.data["chat_id"] ?: "").toLongOrNull()