Clean up code after refactorings

seedvault-app · Sep 23, 2024 · ddf8983 · ddf8983
1 parent a513c07
commit ddf8983
Show file tree

Hide file tree

Showing 59 changed files with 83 additions and 239 deletions.
diff --git a/app/src/androidTest/java/com/stevesoltys/seedvault/PluginTest.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/PluginTest.kt
@@ -10,7 +10,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import androidx.test.platform.app.InstrumentationRegistry
 import com.stevesoltys.seedvault.backend.LegacyStoragePlugin
-import com.stevesoltys.seedvault.backend.getAvailableBackupFileHandles
 import com.stevesoltys.seedvault.backend.saf.DocumentsProviderLegacyPlugin
 import com.stevesoltys.seedvault.backend.saf.DocumentsStorage
 import com.stevesoltys.seedvault.settings.SettingsManager

diff --git a/...ndroidTest/java/com/stevesoltys/seedvault/transport/backup/KvBackupInstrumentationTest.kt b/...ndroidTest/java/com/stevesoltys/seedvault/transport/backup/KvBackupInstrumentationTest.kt
@@ -13,7 +13,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import com.stevesoltys.seedvault.repo.BackupData
 import com.stevesoltys.seedvault.repo.BackupReceiver
-import com.stevesoltys.seedvault.settings.SettingsManager
 import io.mockk.CapturingSlot
 import io.mockk.Runs
 import io.mockk.coEvery
@@ -34,7 +33,6 @@ import kotlin.test.assertEquals
 @MediumTest
 class KvBackupInstrumentationTest : KoinComponent {
 
-    private val settingsManager: SettingsManager by inject()
     private val backupReceiver: BackupReceiver = mockk()
     private val inputFactory: InputFactory = mockk()
     private val dbManager: KvDbManager by inject()

diff --git a/app/src/androidTest/java/com/stevesoltys/seedvault/worker/IconManagerTest.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/worker/IconManagerTest.kt
@@ -13,9 +13,9 @@ import com.stevesoltys.seedvault.proto.SnapshotKt.blob
 import com.stevesoltys.seedvault.repo.AppBackupManager
 import com.stevesoltys.seedvault.repo.BackupData
 import com.stevesoltys.seedvault.repo.BackupReceiver
-import com.stevesoltys.seedvault.transport.backup.PackageService
-import com.stevesoltys.seedvault.repo.SnapshotCreatorFactory
 import com.stevesoltys.seedvault.repo.Loader
+import com.stevesoltys.seedvault.repo.SnapshotCreatorFactory
+import com.stevesoltys.seedvault.transport.backup.PackageService
 import io.mockk.Runs
 import io.mockk.coEvery
 import io.mockk.every

diff --git a/app/src/main/java/com/stevesoltys/seedvault/App.kt b/app/src/main/java/com/stevesoltys/seedvault/App.kt
@@ -86,11 +86,9 @@ open class App : Application() {
                 settingsManager = get(),
                 keyManager = get(),
                 backendManager = get(),
-                metadataManager = get(),
                 appListRetriever = get(),
                 storageBackup = get(),
                 backupManager = get(),
-                backupInitializer = get(),
                 backupStateManager = get(),
             )
         }

diff --git a/app/src/main/java/com/stevesoltys/seedvault/backend/BackendManager.kt b/app/src/main/java/com/stevesoltys/seedvault/backend/BackendManager.kt
@@ -10,9 +10,9 @@ import android.util.Log
 import androidx.annotation.WorkerThread
 import com.stevesoltys.seedvault.getStorageContext
 import com.stevesoltys.seedvault.permitDiskReads
+import com.stevesoltys.seedvault.repo.BlobCache
 import com.stevesoltys.seedvault.settings.SettingsManager
 import com.stevesoltys.seedvault.settings.StoragePluginType
-import com.stevesoltys.seedvault.repo.BlobCache
 import org.calyxos.seedvault.core.backends.Backend
 import org.calyxos.seedvault.core.backends.BackendFactory
 import org.calyxos.seedvault.core.backends.BackendProperties
@@ -89,6 +89,7 @@ class BackendManager(
         mBackend = backend
         mBackendProperties = storageProperties
         blobCache.clearLocalCache()
+        // TODO not critical, but nice to have: clear also local snapshot cache
     }
 
     /**

diff --git a/app/src/main/java/com/stevesoltys/seedvault/backend/saf/DocumentsStorage.kt b/app/src/main/java/com/stevesoltys/seedvault/backend/saf/DocumentsStorage.kt
@@ -29,7 +29,6 @@ import org.calyxos.seedvault.core.backends.saf.SafProperties
 import org.calyxos.seedvault.core.backends.saf.getTreeDocumentFile
 import java.io.IOException
 import java.io.InputStream
-import java.io.OutputStream
 import kotlin.coroutines.resume
 
 @Deprecated("")
@@ -51,7 +50,7 @@ internal class DocumentsStorage(
     private val context: Context get() = appContext.getStorageContext { safStorage.isUsb }
     private val contentResolver: ContentResolver get() = context.contentResolver
 
-    internal var rootBackupDir: DocumentFile? = null
+    private var rootBackupDir: DocumentFile? = null
         get() = runBlocking {
             if (field == null) {
                 val parent = safStorage.getDocumentFile(context)
@@ -94,16 +93,6 @@ internal class DocumentsStorage(
         }
     }
 
-    @Throws(IOException::class)
-    fun getOutputStream(file: DocumentFile): OutputStream {
-        return try {
-            contentResolver.openOutputStream(file.uri, "wt") ?: throw IOException()
-        } catch (e: Exception) {
-            // SAF can throw all sorts of exceptions, so wrap it in IOException
-            throw IOException(e)
-        }
-    }
-
 }
 
 /**
@@ -192,7 +181,7 @@ suspend fun DocumentFile.findFileBlocking(context: Context, displayName: String)
 @Throws(IOException::class, TimeoutCancellationException::class)
 internal suspend fun getLoadedCursor(timeout: Long = 15_000, query: () -> Cursor?) =
     withTimeout(timeout) {
-        suspendCancellableCoroutine<Cursor> { cont ->
+        suspendCancellableCoroutine { cont ->
             val cursor = query() ?: throw IOException()
             cont.invokeOnCancellation { cursor.close() }
             val loading = cursor.extras.getBoolean(EXTRA_LOADING, false)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/backend/saf/StorageRootResolver.kt b/app/src/main/java/com/stevesoltys/seedvault/backend/saf/StorageRootResolver.kt
@@ -139,17 +139,6 @@ internal object StorageRootResolver {
         return if (index != -1) getInt(index) else 0
     }
 
-    private fun Cursor.getLong(columnName: String): Long? {
-        val index = getColumnIndex(columnName)
-        if (index == -1) return null
-        val value = getString(index) ?: return null
-        return try {
-            java.lang.Long.parseLong(value)
-        } catch (e: NumberFormatException) {
-            null
-        }
-    }
-
     fun getIcon(context: Context, authority: String, rootId: String, icon: Int): Drawable? {
         return getPackageIcon(context, authority, icon) ?: when {
             authority == AUTHORITY_STORAGE && rootId == ROOT_ID_DEVICE -> {

diff --git a/app/src/main/java/com/stevesoltys/seedvault/crypto/Crypto.kt b/app/src/main/java/com/stevesoltys/seedvault/crypto/Crypto.kt
@@ -102,17 +102,6 @@ internal interface Crypto {
     @Deprecated("only for v1")
     fun getNameForApk(salt: String, packageName: String, suffix: String = ""): String
 
-    /**
-     * Returns a [AesGcmHkdfStreaming] encrypting stream
-     * that gets encrypted and authenticated the given associated data.
-     */
-    @Deprecated("only for v1")
-    @Throws(IOException::class, GeneralSecurityException::class)
-    fun newEncryptingStreamV1(
-        outputStream: OutputStream,
-        associatedData: ByteArray,
-    ): OutputStream
-
     /**
      * Returns a [AesGcmHkdfStreaming] decrypting stream
      * that gets decrypted and authenticated the given associated data.
@@ -245,13 +234,6 @@ internal class CryptoImpl(
         return messageDigest.digest()
     }
 
-    @Deprecated("only for v1")
-    @Throws(IOException::class, GeneralSecurityException::class)
-    override fun newEncryptingStreamV1(
-        outputStream: OutputStream,
-        associatedData: ByteArray,
-    ): OutputStream = CoreCrypto.newEncryptingStream(keyV1, outputStream, associatedData)
-
     @Deprecated("only for v1")
     @Throws(IOException::class, GeneralSecurityException::class)
     override fun newDecryptingStreamV1(

diff --git a/app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataWriter.kt b/app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataWriter.kt
@@ -33,12 +33,6 @@ internal class MetadataWriterImpl : MetadataWriter {
                 if (packageMetadata.size != null) {
                     put(JSON_PACKAGE_SIZE, packageMetadata.size)
                 }
-                if (packageMetadata.system) {
-                    put(JSON_PACKAGE_SYSTEM, true)
-                }
-                if (packageMetadata.isLaunchableSystemApp) {
-                    put(JSON_PACKAGE_SYSTEM_LAUNCHER, true)
-                }
             })
         }
         return json.toString().toByteArray(Utf8)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/AppBackupManager.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/AppBackupManager.kt
@@ -144,6 +144,7 @@ internal class AppBackupManager(
     @Throws(IOException::class)
     suspend fun removeBackupRepo() {
         blobCache.clearLocalCache()
+        // TODO not critical, but nice to have: clear also local snapshot cache
         backendManager.backend.remove(TopLevelFolder(crypto.repoId))
     }
 

diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt
@@ -19,6 +19,6 @@ val repoModule = module {
         val snapshotFolder = File(androidContext().filesDir, FOLDER_SNAPSHOTS)
         SnapshotManager(snapshotFolder, get(), get(), get())
     }
-    factory { SnapshotCreatorFactory(androidContext(), get(), get(), get(), get()) }
+    factory { SnapshotCreatorFactory(androidContext(), get(), get(), get()) }
     factory { Pruner(get(), get(), get()) }
 }
diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/SnapshotCreator.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/SnapshotCreator.kt
@@ -23,7 +23,6 @@ import com.stevesoltys.seedvault.proto.Snapshot
 import com.stevesoltys.seedvault.proto.Snapshot.Apk
 import com.stevesoltys.seedvault.proto.Snapshot.App
 import com.stevesoltys.seedvault.proto.Snapshot.Blob
-import com.stevesoltys.seedvault.settings.SettingsManager
 import com.stevesoltys.seedvault.transport.backup.PackageService
 import com.stevesoltys.seedvault.transport.backup.isSystemApp
 import io.github.oshai.kotlinlogging.KotlinLogging
@@ -38,7 +37,6 @@ internal class SnapshotCreator(
     private val context: Context,
     private val clock: Clock,
     private val packageService: PackageService,
-    private val settingsManager: SettingsManager,
     private val metadataManager: MetadataManager,
 ) {
 

diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/SnapshotCreatorFactory.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/SnapshotCreatorFactory.kt
@@ -8,7 +8,6 @@ package com.stevesoltys.seedvault.repo
 import android.content.Context
 import com.stevesoltys.seedvault.Clock
 import com.stevesoltys.seedvault.metadata.MetadataManager
-import com.stevesoltys.seedvault.settings.SettingsManager
 import com.stevesoltys.seedvault.transport.backup.PackageService
 
 /**
@@ -18,9 +17,8 @@ internal class SnapshotCreatorFactory(
     private val context: Context,
     private val clock: Clock,
     private val packageService: PackageService,
-    private val settingsManager: SettingsManager,
     private val metadataManager: MetadataManager,
 ) {
     fun createSnapshotCreator() =
-        SnapshotCreator(context, clock, packageService, settingsManager, metadataManager)
+        SnapshotCreator(context, clock, packageService, metadataManager)
 }
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/AppDataRestoreManager.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/AppDataRestoreManager.kt
@@ -27,7 +27,6 @@ import com.stevesoltys.seedvault.backend.BackendManager
 import com.stevesoltys.seedvault.metadata.PackageMetadataMap
 import com.stevesoltys.seedvault.metadata.PackageState
 import com.stevesoltys.seedvault.restore.install.isInstalled
-import com.stevesoltys.seedvault.settings.SettingsManager
 import com.stevesoltys.seedvault.transport.TRANSPORT_ID
 import com.stevesoltys.seedvault.transport.restore.RestorableBackup
 import com.stevesoltys.seedvault.transport.restore.RestoreCoordinator
@@ -55,7 +54,6 @@ internal data class AppRestoreResult(
 internal class AppDataRestoreManager(
     private val context: Context,
     private val backupManager: IBackupManager,
-    private val settingsManager: SettingsManager,
     private val restoreCoordinator: RestoreCoordinator,
     private val backendManager: BackendManager,
 ) {

diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/AppSelectionManager.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/AppSelectionManager.kt
@@ -96,7 +96,7 @@ internal class AppSelectionManager(
                     val backend = backendManager.backend
                     val token = restorableBackup.token
                     backend.load(LegacyAppBackupFile.IconsFile(token)).use {
-                        iconManager.downloadIconsV1(restorableBackup.version, token, it)
+                        iconManager.downloadIconsV1(token, it)
                     }
                 } else if (restorableBackup.version >= 2) {
                     val repoId = restorableBackup.repoId ?: error("No repoId in v2 backup")

diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreViewModel.kt
@@ -83,7 +83,7 @@ internal class RestoreViewModel(
     private val appSelectionManager =
         AppSelectionManager(app, backendManager, iconManager, viewModelScope)
     private val appDataRestoreManager = AppDataRestoreManager(
-        app, backupManager, settingsManager, restoreCoordinator, backendManager
+        app, backupManager, restoreCoordinator, backendManager
     )
 
     private val mDisplayFragment = MutableLiveEvent<DisplayFragment>()

diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/install/ApkRestore.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/install/ApkRestore.kt
@@ -21,15 +21,15 @@ import com.stevesoltys.seedvault.crypto.Crypto
 import com.stevesoltys.seedvault.encodeBase64
 import com.stevesoltys.seedvault.metadata.ApkSplit
 import com.stevesoltys.seedvault.metadata.PackageMetadata
+import com.stevesoltys.seedvault.repo.Loader
+import com.stevesoltys.seedvault.repo.getBlobHandles
 import com.stevesoltys.seedvault.restore.RestoreService
 import com.stevesoltys.seedvault.restore.install.ApkInstallState.FAILED
 import com.stevesoltys.seedvault.restore.install.ApkInstallState.FAILED_SYSTEM_APP
 import com.stevesoltys.seedvault.restore.install.ApkInstallState.IN_PROGRESS
 import com.stevesoltys.seedvault.restore.install.ApkInstallState.QUEUED
 import com.stevesoltys.seedvault.restore.install.ApkInstallState.SUCCEEDED
-import com.stevesoltys.seedvault.repo.getBlobHandles
 import com.stevesoltys.seedvault.transport.backup.isSystemApp
-import com.stevesoltys.seedvault.repo.Loader
 import com.stevesoltys.seedvault.transport.restore.RestorableBackup
 import com.stevesoltys.seedvault.worker.hashSignature
 import kotlinx.coroutines.TimeoutCancellationException

diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallProgressAdapter.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallProgressAdapter.kt
@@ -84,7 +84,7 @@ internal class InstallProgressAdapter(
             if (item.icon == null) iconJob = scope.launch {
                 iconLoader(item, appIcon::setImageDrawable)
             } else appIcon.setImageDrawable(item.icon)
-            appName.text = item.name ?: getAppName(v.context, item.packageName.toString())
+            appName.text = item.name ?: getAppName(v.context, item.packageName)
             appInfo.visibility = GONE
             when (item.state) {
                 IN_PROGRESS -> {

diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/AppListRetriever.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/AppListRetriever.kt
@@ -80,8 +80,7 @@ internal class AppListRetriever(
             AppStatus(
                 packageName = packageName,
                 enabled = settingsManager.isBackupEnabled(packageName),
-                icon = data.iconRes?.let { getDrawable(context, it) }
-                    ?: getIconFromPackageManager(packageName),
+                icon = getDrawable(context, data.iconRes) ?: getIconFromPackageManager(packageName),
                 name = context.getString(data.nameRes),
                 time = metadata?.time ?: 0,
                 size = metadata?.size,

diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SchedulingFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SchedulingFragment.kt
@@ -16,8 +16,8 @@ import androidx.preference.PreferenceManager
 import androidx.work.ExistingPeriodicWorkPolicy.CANCEL_AND_REENQUEUE
 import androidx.work.ExistingPeriodicWorkPolicy.UPDATE
 import com.stevesoltys.seedvault.R
-import com.stevesoltys.seedvault.permitDiskReads
 import com.stevesoltys.seedvault.backend.BackendManager
+import com.stevesoltys.seedvault.permitDiskReads
 import com.stevesoltys.seedvault.settings.preference.M3ListPreference
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel

diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt
@@ -37,14 +37,12 @@ import androidx.work.ExistingPeriodicWorkPolicy.CANCEL_AND_REENQUEUE
 import androidx.work.WorkManager
 import com.stevesoltys.seedvault.BackupStateManager
 import com.stevesoltys.seedvault.R
+import com.stevesoltys.seedvault.backend.BackendManager
 import com.stevesoltys.seedvault.crypto.KeyManager
-import com.stevesoltys.seedvault.metadata.MetadataManager
 import com.stevesoltys.seedvault.permitDiskReads
-import com.stevesoltys.seedvault.backend.BackendManager
 import com.stevesoltys.seedvault.storage.StorageBackupJobService
 import com.stevesoltys.seedvault.storage.StorageBackupService
 import com.stevesoltys.seedvault.storage.StorageBackupService.Companion.EXTRA_START_APP_BACKUP
-import com.stevesoltys.seedvault.transport.backup.BackupInitializer
 import com.stevesoltys.seedvault.ui.LiveEvent
 import com.stevesoltys.seedvault.ui.MutableLiveEvent
 import com.stevesoltys.seedvault.ui.RequireProvisioningViewModel
@@ -71,11 +69,9 @@ internal class SettingsViewModel(
     settingsManager: SettingsManager,
     keyManager: KeyManager,
     backendManager: BackendManager,
-    private val metadataManager: MetadataManager,
     private val appListRetriever: AppListRetriever,
     private val storageBackup: StorageBackup,
     private val backupManager: IBackupManager,
-    private val backupInitializer: BackupInitializer,
     backupStateManager: BackupStateManager,
 ) : RequireProvisioningViewModel(app, settingsManager, keyManager, backendManager) {
 

diff --git a/app/src/main/java/com/stevesoltys/seedvault/storage/StorageModule.kt b/app/src/main/java/com/stevesoltys/seedvault/storage/StorageModule.kt
@@ -5,8 +5,8 @@
 
 package com.stevesoltys.seedvault.storage
 
-import com.stevesoltys.seedvault.crypto.KeyManager
 import com.stevesoltys.seedvault.backend.BackendManager
+import com.stevesoltys.seedvault.crypto.KeyManager
 import org.calyxos.backup.storage.api.StorageBackup
 import org.koin.dsl.module
 

diff --git a/app/src/main/java/com/stevesoltys/seedvault/transport/ConfigurableBackupTransport.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/ConfigurableBackupTransport.kt
@@ -17,7 +17,6 @@ import android.os.ParcelFileDescriptor
 import android.util.Log
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.settings.SettingsActivity
-import com.stevesoltys.seedvault.settings.SettingsManager
 import com.stevesoltys.seedvault.transport.backup.BackupCoordinator
 import com.stevesoltys.seedvault.transport.restore.RestoreCoordinator
 import kotlinx.coroutines.runBlocking
@@ -43,7 +42,6 @@ class ConfigurableBackupTransport internal constructor(private val context: Cont
 
     private val backupCoordinator by inject<BackupCoordinator>()
     private val restoreCoordinator by inject<RestoreCoordinator>()
-    private val settingsManager by inject<SettingsManager>()
 
     override fun transportDirName(): String {
         return TRANSPORT_DIRECTORY_NAME