Skip to content

Commit 6392d0e

Browse files
committed
feat: Change default storage path
* overwriting may fail on /data/media/* for some devices Change-Id: I4d5c31952020a3743d19fa57df11a2f724f8205e
1 parent eb80477 commit 6392d0e

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

source/core/data/src/main/kotlin/com/xayah/core/data/repository/DirectoryRepository.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ import com.xayah.core.util.command.PreparationUtil
1818
import dagger.hilt.android.qualifiers.ApplicationContext
1919
import kotlinx.coroutines.flow.distinctUntilChanged
2020
import kotlinx.coroutines.flow.first
21-
import java.nio.file.Paths
2221
import javax.inject.Inject
23-
import kotlin.io.path.name
24-
import kotlin.io.path.pathString
2522

2623
class DirectoryRepository @Inject constructor(
2724
@ApplicationContext private val context: Context,
@@ -81,7 +78,7 @@ class DirectoryRepository @Inject constructor(
8178
directoryDao.updateActive(active = false)
8279

8380
// Internal storage
84-
val internalList = rootService.listFilePaths(PathUtil.getDataMediaDir(), listFiles = false)
81+
val internalList = rootService.listFilePaths(ConstantUtil.STORAGE_EMULATED_PATH, listFiles = false)
8582
.filter { it.substring(it.lastIndexOf("/") + 1).toIntOrNull() != null } // Just select 0 10 999 etc.
8683
val internalDirs = mutableListOf<DirectoryUpsertEntity>()
8784
for (storageItem in internalList) {

source/core/datastore/src/main/kotlin/com/xayah/core/datastore/ConstantUtil.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.xayah.core.datastore
22

33
object ConstantUtil {
4-
private const val DATA_MEDIA_PATH = "/data/media"
4+
const val STORAGE_EMULATED_PATH = "/storage/emulated"
55
private const val DEFAULT_USER_ID = 0
6-
const val DEFAULT_PATH_PARENT = "${DATA_MEDIA_PATH}/${DEFAULT_USER_ID}"
6+
const val DEFAULT_PATH_PARENT = "${STORAGE_EMULATED_PATH}/${DEFAULT_USER_ID}"
77
const val DEFAULT_PATH_CHILD = "DataBackup"
88
const val DEFAULT_PATH = "${DEFAULT_PATH_PARENT}/${DEFAULT_PATH_CHILD}"
99
const val DEFAULT_IDLE_TIMEOUT = -1

source/gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ zip4j = "2.11.5"
3232
kotlinx-coroutines-core-jvm = "1.8.0"
3333
room = "2.6.1"
3434
coil-compose = "2.4.0"
35-
dotlottie-android = "0.6.1"
35+
dotlottie-android = "0.9.2"
3636
palette = "1.0.0"
3737
google-services = "4.3.15" # Pinned: https://github.com/firebase/firebase-android-sdk/issues/4693#issuecomment-1765778239
3838
firebase-crashlytics-gradle = "2.9.9" # Pinned for module usage, workaround: https://github.com/xamarin/GooglePlayServicesComponents/issues/642#issuecomment-1221520982

0 commit comments

Comments
 (0)