Merge pull request #697 from stakwork/aa/fix/calculate-storage-percen…

…tage Fix calculate store percentage crash on Profile
stakwork · Jan 5, 2024 · c8b2e26 · c8b2e26
2 parents 7566f1b + c8f4845
commit c8b2e26
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...mon/wrappers/wrapper-common/src/main/java/chat/sphinx/wrapper_common/StoragePercentage.kt b/...mon/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/.../java/chat/sphinx/feature_service_notification_firebase/SphinxFirebaseMessagingService.kt b/.../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()