mobi/seedvault
1
0
Fork 0
Code Pull requests Activity

Only require network for storage backups when storage needs network

Browse source
This commit is contained in:
Torsten Grote 2021-03-04 16:09:58 -03:00 committed by Chirayu Desai
parent b8ac11e724
commit e21207de32
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt
View file

@ -1,6 +1,7 @@
package com.stevesoltys.seedvault.settings package com.stevesoltys.seedvault.settings
import android.app.Application import android.app.Application
import android.app.job.JobInfo.NETWORK_TYPE_NONE
import android.app.job.JobInfo.NETWORK_TYPE_UNMETERED import android.app.job.JobInfo.NETWORK_TYPE_UNMETERED
import android.database.ContentObserver import android.database.ContentObserver
import android.net.ConnectivityManager import android.net.ConnectivityManager
@ -130,7 +131,8 @@ internal class SettingsViewModel(
if (settingsManager.isStorageBackupEnabled()) { if (settingsManager.isStorageBackupEnabled()) {
// disable storage backup if new storage is on USB // disable storage backup if new storage is on USB
if (storage.isUsb) disableStorageBackup() if (storage.isUsb) disableStorageBackup()
// enable it, just in case the previous storage was on USB // enable it, just in case the previous storage was on USB,
// also to update the network requirement of the new storage
else enableStorageBackup() else enableStorageBackup()
} }
@ -205,11 +207,13 @@ internal class SettingsViewModel(
} }
fun enableStorageBackup() { fun enableStorageBackup() {
if (settingsManager.getStorage()?.isUsb == false) BackupJobService.scheduleJob( val storage = settingsManager.getStorage() ?: error("no storage available")
if (!storage.isUsb) BackupJobService.scheduleJob(
context = app, context = app,
jobServiceClass = StorageBackupJobService::class.java, jobServiceClass = StorageBackupJobService::class.java,
periodMillis = HOURS.toMillis(24), periodMillis = HOURS.toMillis(24),
networkType = NETWORK_TYPE_UNMETERED, networkType = if (storage.requiresNetwork) NETWORK_TYPE_UNMETERED
else NETWORK_TYPE_NONE,
deviceIdle = false, deviceIdle = false,
charging = true charging = true
) )