Clean up code after refactorings

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

app/src/androidTest/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()

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(),
             )
         }

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)

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 -> {

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)

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()) }
 }

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,
 ) {
 

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)
 }

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,
 ) {

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>()

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 -> {

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,

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

@@ -38,13 +38,11 @@ import androidx.work.WorkManager
 import com.stevesoltys.seedvault.BackupStateManager
 import com.stevesoltys.seedvault.R
 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) {
 

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

app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupCoordinator.kt

@@ -20,7 +20,6 @@ import android.content.pm.PackageInfo
 import android.os.ParcelFileDescriptor
 import android.util.Log
 import androidx.annotation.WorkerThread
-import com.stevesoltys.seedvault.Clock
 import com.stevesoltys.seedvault.backend.BackendManager
 import com.stevesoltys.seedvault.metadata.BackupType
 import com.stevesoltys.seedvault.metadata.MetadataManager
@@ -64,14 +63,12 @@ internal class BackupCoordinator(
     private val appBackupManager: AppBackupManager,
     private val kv: KVBackup,
     private val full: FullBackup,
-    private val clock: Clock,
     private val packageService: PackageService,
     private val metadataManager: MetadataManager,
     private val settingsManager: SettingsManager,
     private val nm: BackupNotificationManager,
 ) {
 
-    private val backend get() = backendManager.backend
     private val snapshotCreator
         get() = appBackupManager.snapshotCreator ?: error("No SnapshotCreator")
     private val state = CoordinatorState(

app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupModule.kt

@@ -41,7 +41,6 @@ val backupModule = module {
             appBackupManager = get(),
             kv = get(),
             full = get(),
-            clock = get(),
             packageService = get(),
             metadataManager = get(),
             settingsManager = get(),

app/src/main/java/com/stevesoltys/seedvault/transport/backup/PackageService.kt

@@ -125,11 +125,6 @@ internal class PackageService(
                 packageInfo.allowsBackup()
         }
 
-    /**
-     * A list of apps that do not allow backup.
-     */
-    val userNotAllowedApps: List<PackageInfo> = emptyList()
-
     val launchableSystemApps: List<ResolveInfo>
         @WorkerThread
         get() {

app/src/main/java/com/stevesoltys/seedvault/ui/notification/NotificationBackupObserver.kt

@@ -18,7 +18,6 @@ import android.util.Log.isLoggable
 import com.stevesoltys.seedvault.ERROR_BACKUP_CANCELLED
 import com.stevesoltys.seedvault.MAGIC_PACKAGE_MANAGER
 import com.stevesoltys.seedvault.R
-import com.stevesoltys.seedvault.metadata.MetadataManager
 import com.stevesoltys.seedvault.settings.SettingsManager
 import com.stevesoltys.seedvault.repo.AppBackupManager
 import com.stevesoltys.seedvault.transport.backup.PackageService
@@ -38,7 +37,6 @@ internal class NotificationBackupObserver(
 ) : IBackupObserver.Stub(), KoinComponent {
 
     private val nm: BackupNotificationManager by inject()
-    private val metadataManager: MetadataManager by inject()
     private val packageService: PackageService by inject()
     private val settingsManager: SettingsManager by inject()
     private val appBackupManager: AppBackupManager by inject()

app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt

@@ -24,8 +24,6 @@ import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_RESTORE
 import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_SETUP_WIZARD
 import org.koin.androidx.viewmodel.ext.android.getViewModel
 
-private val TAG = StorageActivity::class.java.name
-
 class StorageActivity : BackupActivity() {
 
     private lateinit var viewModel: StorageViewModel

app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageViewModel.kt

@@ -48,8 +48,6 @@ internal abstract class StorageViewModel(
     private var safOption: SafOption? = null
 
     internal var isSetupWizard: Boolean = false
-    internal val hasStorageSet: Boolean
-        get() = backendManager.backendProperties != null
     abstract val isRestoreOperation: Boolean
 
     internal fun loadStorageRoots() {

app/src/test/java/com/stevesoltys/seedvault/crypto/KeyManagerImplTest.kt

@@ -11,8 +11,8 @@ import io.mockk.every
 import io.mockk.just
 import io.mockk.mockk
 import io.mockk.slot
-import junit.framework.Assert.assertTrue
-import org.junit.Assert.assertArrayEquals
+import org.junit.jupiter.api.Assertions.assertArrayEquals
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.TestInstance.Lifecycle.PER_METHOD

app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataManagerTest.kt

@@ -21,7 +21,6 @@ import com.stevesoltys.seedvault.metadata.PackageState.APK_AND_DATA
 import com.stevesoltys.seedvault.metadata.PackageState.NOT_ALLOWED
 import com.stevesoltys.seedvault.metadata.PackageState.NO_DATA
 import com.stevesoltys.seedvault.metadata.PackageState.WAS_STOPPED
-import com.stevesoltys.seedvault.settings.SettingsManager
 import io.mockk.Runs
 import io.mockk.every
 import io.mockk.just
@@ -49,7 +48,6 @@ class MetadataManagerTest {
     private val clock: Clock = mockk()
     private val metadataWriter: MetadataWriter = mockk()
     private val metadataReader: MetadataReader = mockk()
-    private val settingsManager: SettingsManager = mockk()
 
     private val manager = MetadataManager(
         context = context,

app/src/test/java/com/stevesoltys/seedvault/repo/BackupReceiverTest.kt

@@ -86,7 +86,7 @@ internal class BackupReceiverTest : TransportTest() {
     }
 
     @Test
-    fun `readFromStream`() = runBlocking {
+    fun readFromStream() = runBlocking {
         val bytes = getRandomByteArray()
         val chunkBytes1 = getRandomByteArray()
         val chunkBytes2 = getRandomByteArray()

app/src/test/java/com/stevesoltys/seedvault/repo/SnapshotCreatorTest.kt

@@ -38,8 +38,7 @@ internal class SnapshotCreatorTest : TransportTest() {
 
     private val ctx: Context = ApplicationProvider.getApplicationContext()
     private val packageService: PackageService = mockk()
-    private val snapshotCreator =
-        SnapshotCreator(ctx, clock, packageService, settingsManager, metadataManager)
+    private val snapshotCreator = SnapshotCreator(ctx, clock, packageService, metadataManager)
 
     @Test
     fun `test onApkBackedUp`() {

app/src/test/java/com/stevesoltys/seedvault/restore/install/ApkSplitCompatibilityCheckerTest.kt

@@ -9,9 +9,9 @@ import com.stevesoltys.seedvault.getRandomString
 import com.stevesoltys.seedvault.transport.TransportTest
 import io.mockk.every
 import io.mockk.mockk
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertFalse
-import org.junit.Assert.assertTrue
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import kotlin.random.Random