Move fallback download dir to ~/Download/VendettaManager

vendetta-mod · Jan 8, 2024 · cca008c · cca008c
1 parent 88ea1a1
commit cca008c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/src/main/java/dev/beefers/vendetta/manager/ui/viewmodel/installer/InstallerViewModel.kt b/app/src/main/java/dev/beefers/vendetta/manager/ui/viewmodel/installer/InstallerViewModel.kt
@@ -3,6 +3,7 @@ package dev.beefers.vendetta.manager.ui.viewmodel.installer
 import android.content.Context
 import android.content.Intent
 import android.os.Build
+import android.os.Environment
 import android.util.Log
 import androidx.annotation.StringRes
 import androidx.compose.runtime.Stable
@@ -55,7 +56,7 @@ class InstallerViewModel(
     var failedOnDownload by mutableStateOf(false)
 
     private val installationRunning = AtomicBoolean(false)
-    private val cacheDir = context.externalCacheDir ?: context.cacheDir
+    private val cacheDir = context.externalCacheDir ?: File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_DOWNLOADS).resolve("VendettaManager").also { it.mkdirs() }
     private var debugInfo = """
             Vendetta Manager v${BuildConfig.VERSION_NAME}
             Built from commit ${BuildConfig.GIT_COMMIT} on ${BuildConfig.GIT_BRANCH} ${if (BuildConfig.GIT_LOCAL_CHANGES || BuildConfig.GIT_LOCAL_COMMITS) "(Changes Present)" else ""}

diff --git a/app/src/main/java/dev/beefers/vendetta/manager/ui/viewmodel/main/MainViewModel.kt b/app/src/main/java/dev/beefers/vendetta/manager/ui/viewmodel/main/MainViewModel.kt
@@ -1,6 +1,7 @@
 package dev.beefers.vendetta.manager.ui.viewmodel.main
 
 import android.content.Context
+import android.os.Environment
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -27,7 +28,7 @@ class MainViewModel(
     private val preferenceManager: PreferenceManager,
     private val context: Context
 ) : ScreenModel {
-    private val cacheDir = context.externalCacheDir ?: context.cacheDir
+    private val cacheDir = context.externalCacheDir ?: File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_DOWNLOADS).resolve("VendettaManager").also { it.mkdirs() }
     var release by mutableStateOf<Release?>(null)
         private set
 

diff --git a/app/src/main/java/dev/beefers/vendetta/manager/ui/viewmodel/settings/SettingsViewModel.kt b/app/src/main/java/dev/beefers/vendetta/manager/ui/viewmodel/settings/SettingsViewModel.kt
@@ -1,6 +1,7 @@
 package dev.beefers.vendetta.manager.ui.viewmodel.settings
 
 import android.content.Context
+import android.os.Environment
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
@@ -9,11 +10,12 @@ import dev.beefers.vendetta.manager.R
 import dev.beefers.vendetta.manager.domain.manager.UpdateCheckerDuration
 import dev.beefers.vendetta.manager.updatechecker.worker.UpdateWorker
 import dev.beefers.vendetta.manager.utils.showToast
+import java.io.File
 
 class SettingsViewModel(
     private val context: Context
 ) : ScreenModel {
-    private val cacheDir = context.externalCacheDir!!
+    private val cacheDir = context.externalCacheDir ?: File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_DOWNLOADS).resolve("VendettaManager").also { it.mkdirs() }
 
     fun clearCache() {
         cacheDir.deleteRecursively()