kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-22 03:54:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

#1473 fix crash in storageCalculator

Browse Source
This commit is contained in:
Sean Mac Gillicuddy 2019-09-16 11:17:31 +01:00
parent 5ec0135531
commit 930b0fbfe4
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/kiwix/kiwixmobile/settings/StorageCalculator.kt
View File

@ -35,10 +35,14 @@ class StorageCalculator @Inject constructor(private val storageManager: StorageM
@SuppressLint("NewApi")
fun availableBytes(file: File) =
if (KiwixBuildConfig.SDK_INT >= VERSION_CODES.O)
storageManager.getAllocatableBytes(storageManager.getUuidForPath(file))
else
file.freeSpace
if (file.exists()) {
if (KiwixBuildConfig.SDK_INT >= VERSION_CODES.O)
storageManager.getAllocatableBytes(storageManager.getUuidForPath(file))
else
file.freeSpace
} else {
0L
}
private fun totalBytes(file: File) = file.totalSpace
private fun totalBytes(file: File) = if (file.exists()) file.totalSpace else 0L
}

21
app/src/test/java/org/kiwix/kiwixmobile/settings/StorageCalculatorTest.kt
View File

@ -39,24 +39,39 @@ internal class StorageCalculatorTest {
}
@Test
fun calculateAvailableSpace() {
fun `calculate available space with existing file`() {
every { KiwixBuildConfig.SDK_INT } returns 25
every { file.freeSpace } returns 1
every { file.exists() } returns true
assertThat(storageCalculator.calculateAvailableSpace(file)).isEqualTo("1 Bytes")
}
@Test
fun calculateTotalSpace() {
fun `calculate total space of existing file`() {
every { file.totalSpace } returns 1
every { file.exists() } returns true
assertThat(storageCalculator.calculateTotalSpace(file)).isEqualTo("1 Bytes")
}
@Test
fun availableBytes() {
fun `calculate total space of non existing file`() {
every { file.exists() } returns false
assertThat(storageCalculator.calculateTotalSpace(file)).isEqualTo("0 Bytes")
}
@Test
fun `available bytes of existing file API 26`() {
val uuid: UUID = mockk()
every { KiwixBuildConfig.SDK_INT } returns 26
every { storageManager.getUuidForPath(file) } returns uuid
every { storageManager.getAllocatableBytes(uuid) } returns 1
every { file.exists() } returns true
assertThat(storageCalculator.availableBytes(file)).isEqualTo(1L)
}
@Test
fun `available bytes of non existing file`() {
every { file.exists() } returns false
assertThat(storageCalculator.availableBytes(file)).isEqualTo(0L)
}
}