Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-20 11:08:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential platform-specific storage crash.

Browse Source 
Fixes #14448
This commit is contained in:
Greyson Parrelli
2025-11-21 11:45:51 -05:00
parent ac3fced0b4
commit 180dcb3a41
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core-util/src/main/java/org/signal/core/util/DiskUtil.kt
View File

@@ -11,9 +11,12 @@ import android.os.Build
import android.os.StatFs import android.os.StatFs
import android.os.storage.StorageManager import android.os.storage.StorageManager
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import org.signal.core.util.logging.Log
object DiskUtil { object DiskUtil {
private val TAG = Log.tag(DiskUtil::class)
/** /**
* Gets the remaining storage usable by the application. * Gets the remaining storage usable by the application.
* *
@@ -48,7 +51,12 @@ object DiskUtil {
val storageStatsManager = context.getSystemService(Context.STORAGE_STATS_SERVICE) as StorageStatsManager val storageStatsManager = context.getSystemService(Context.STORAGE_STATS_SERVICE) as StorageStatsManager
val appStorageUuid = storageManager.getUuidForPath(context.filesDir) val appStorageUuid = storageManager.getUuidForPath(context.filesDir)
return storageStatsManager.getFreeBytes(appStorageUuid) return try {
storageStatsManager.getFreeBytes(appStorageUuid)
} catch (e: Throwable) {
Log.w(TAG, "Hit a weird platform bug! Falling back to legacy.", e)
getAvailableStorageBytesLegacy(context)
}
} }
private fun getAvailableStorageBytesLegacy(context: Context): Long { private fun getAvailableStorageBytesLegacy(context: Context): Long {
@@ -62,7 +70,12 @@ object DiskUtil {
val storageStatsManager = context.getSystemService(Context.STORAGE_STATS_SERVICE) as StorageStatsManager val storageStatsManager = context.getSystemService(Context.STORAGE_STATS_SERVICE) as StorageStatsManager
val appStorageUuid = storageManager.getUuidForPath(context.filesDir) val appStorageUuid = storageManager.getUuidForPath(context.filesDir)
return storageStatsManager.getTotalBytes(appStorageUuid) return try {
storageStatsManager.getTotalBytes(appStorageUuid)
} catch (e: Throwable) {
Log.w(TAG, "Hit a weird platform bug! Falling back to legacy.", e)
getTotalDiskSizeLegacy(context)
}
} }
private fun getTotalDiskSizeLegacy(context: Context): Long { private fun getTotalDiskSizeLegacy(context: Context): Long {