diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index f653d484..5edad4fd 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -6,6 +6,7 @@
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="ALLOW_TRAILING_COMMA" value="true" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
@@ -137,4 +138,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/stevesoltys/seedvault/PluginTest.kt b/app/src/androidTest/java/com/stevesoltys/seedvault/PluginTest.kt
index 688f01b3..ba7d444c 100644
--- a/app/src/androidTest/java/com/stevesoltys/seedvault/PluginTest.kt
+++ b/app/src/androidTest/java/com/stevesoltys/seedvault/PluginTest.kt
@@ -5,8 +5,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.stevesoltys.seedvault.plugins.LegacyStoragePlugin
 import com.stevesoltys.seedvault.plugins.StoragePlugin
-import com.stevesoltys.seedvault.plugins.saf.DocumentsProviderStoragePlugin
 import com.stevesoltys.seedvault.plugins.saf.DocumentsProviderLegacyPlugin
+import com.stevesoltys.seedvault.plugins.saf.DocumentsProviderStoragePlugin
 import com.stevesoltys.seedvault.plugins.saf.DocumentsStorage
 import com.stevesoltys.seedvault.plugins.saf.FILE_BACKUP_METADATA
 import com.stevesoltys.seedvault.plugins.saf.deleteContents
@@ -36,6 +36,7 @@ class PluginTest : KoinComponent {
     private val storage = DocumentsStorage(context, mockedSettingsManager)
 
     private val storagePlugin: StoragePlugin = DocumentsProviderStoragePlugin(context, storage)
+
     @Suppress("Deprecation")
     private val legacyStoragePlugin: LegacyStoragePlugin =
         DocumentsProviderLegacyPlugin(context, storage)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 79b2ea5b..b47e44cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -72,8 +72,8 @@
 
         <activity
             android:name=".settings.SettingsActivity"
-            android:permission="com.stevesoltys.seedvault.OPEN_SETTINGS"
-            android:exported="true" />
+            android:exported="true"
+            android:permission="com.stevesoltys.seedvault.OPEN_SETTINGS" />
 
         <activity
             android:name=".ui.storage.StorageActivity"
@@ -91,9 +91,9 @@
 
         <activity
             android:name=".restore.RestoreActivity"
-            android:permission="com.stevesoltys.seedvault.RESTORE_BACKUP"
             android:exported="true"
             android:label="@string/restore_title"
+            android:permission="com.stevesoltys.seedvault.RESTORE_BACKUP"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="com.stevesoltys.seedvault.RESTORE_BACKUP" />
@@ -134,7 +134,9 @@
             <intent-filter>
                 <action android:name="android.telephony.action.SECRET_CODE" />
                 <!-- *#*#RESTORE#*#* -->
-                <data android:scheme="android_secret_code" android:host="7378673" />
+                <data
+                    android:host="7378673"
+                    android:scheme="android_secret_code" />
             </intent-filter>
         </receiver>
 
diff --git a/app/src/main/java/com/stevesoltys/seedvault/App.kt b/app/src/main/java/com/stevesoltys/seedvault/App.kt
index b99e87b5..2bfdfc7a 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/App.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/App.kt
@@ -7,7 +7,6 @@ import android.content.Context.BACKUP_SERVICE
 import android.os.Build
 import android.os.ServiceManager.getService
 import android.os.StrictMode
-import org.koin.core.logger.Level
 import com.stevesoltys.seedvault.crypto.cryptoModule
 import com.stevesoltys.seedvault.header.headerModule
 import com.stevesoltys.seedvault.metadata.MetadataManager
@@ -31,6 +30,7 @@ import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.context.startKoin
+import org.koin.core.logger.Level
 import org.koin.dsl.module
 
 /**
diff --git a/app/src/main/java/com/stevesoltys/seedvault/SecretCodeReceiver.kt b/app/src/main/java/com/stevesoltys/seedvault/SecretCodeReceiver.kt
index cd875ac0..0e9350fe 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/SecretCodeReceiver.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/SecretCodeReceiver.kt
@@ -8,13 +8,13 @@ import android.util.Log
 import com.stevesoltys.seedvault.restore.RestoreActivity
 
 private val TAG = BroadcastReceiver::class.java.simpleName
-private val RESTORE_SECRET_CODE = "7378673"
+private const val RESTORE_SECRET_CODE = "7378673"
 
 class SecretCodeReceiver : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
         val host = intent.data.host
-        if (!RESTORE_SECRET_CODE.equals(host)) return
+        if (RESTORE_SECRET_CODE != host) return
         Log.d(TAG, "Restore secret code received.")
         val i = Intent(context, RestoreActivity::class.java).apply {
             flags = FLAG_ACTIVITY_NEW_TASK
diff --git a/app/src/main/java/com/stevesoltys/seedvault/crypto/Crypto.kt b/app/src/main/java/com/stevesoltys/seedvault/crypto/Crypto.kt
index 4d6cf6c5..108bcc85 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/crypto/Crypto.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/crypto/Crypto.kt
@@ -57,7 +57,7 @@ internal interface Crypto {
     @Throws(IOException::class, GeneralSecurityException::class)
     fun newEncryptingStream(
         outputStream: OutputStream,
-        associatedData: ByteArray
+        associatedData: ByteArray,
     ): OutputStream
 
     /**
@@ -67,7 +67,7 @@ internal interface Crypto {
     @Throws(IOException::class, GeneralSecurityException::class)
     fun newDecryptingStream(
         inputStream: InputStream,
-        associatedData: ByteArray
+        associatedData: ByteArray,
     ): InputStream
 
     /**
@@ -78,13 +78,14 @@ internal interface Crypto {
      *
      * @return The read [VersionHeader] present in the beginning of the given [InputStream].
      */
+    @Suppress("Deprecation")
     @Deprecated("Use newDecryptingStream instead")
     @Throws(IOException::class, SecurityException::class)
     fun decryptHeader(
         inputStream: InputStream,
         expectedVersion: Byte,
         expectedPackageName: String,
-        expectedKey: String? = null
+        expectedKey: String? = null,
     ): VersionHeader
 
     /**
@@ -118,7 +119,7 @@ internal const val TYPE_BACKUP_FULL: Byte = 0x02
 internal class CryptoImpl(
     private val keyManager: KeyManager,
     private val cipherFactory: CipherFactory,
-    private val headerReader: HeaderReader
+    private val headerReader: HeaderReader,
 ) : Crypto {
 
     private val key: ByteArray by lazy {
@@ -151,7 +152,7 @@ internal class CryptoImpl(
     @Throws(IOException::class, GeneralSecurityException::class)
     override fun newEncryptingStream(
         outputStream: OutputStream,
-        associatedData: ByteArray
+        associatedData: ByteArray,
     ): OutputStream {
         return StreamCrypto.newEncryptingStream(key, outputStream, associatedData)
     }
@@ -159,18 +160,19 @@ internal class CryptoImpl(
     @Throws(IOException::class, GeneralSecurityException::class)
     override fun newDecryptingStream(
         inputStream: InputStream,
-        associatedData: ByteArray
+        associatedData: ByteArray,
     ): InputStream {
         return StreamCrypto.newDecryptingStream(key, inputStream, associatedData)
     }
 
+    @Suppress("Deprecation")
     @Throws(IOException::class, SecurityException::class)
     @Deprecated("Use newDecryptingStream instead")
     override fun decryptHeader(
         inputStream: InputStream,
         expectedVersion: Byte,
         expectedPackageName: String,
-        expectedKey: String?
+        expectedKey: String?,
     ): VersionHeader {
         val decrypted = decryptSegment(inputStream, MAX_VERSION_HEADER_SIZE)
         val header = headerReader.getVersionHeader(decrypted)
@@ -214,6 +216,7 @@ internal class CryptoImpl(
         }
     }
 
+    @Suppress("Deprecation")
     @Throws(EOFException::class, IOException::class, SecurityException::class)
     private fun decryptSegment(inputStream: InputStream, maxSegmentLength: Int): ByteArray {
         val segmentHeader = headerReader.readSegmentHeader(inputStream)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/crypto/KeyManager.kt b/app/src/main/java/com/stevesoltys/seedvault/crypto/KeyManager.kt
index 35ffaada..794e1529 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/crypto/KeyManager.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/crypto/KeyManager.kt
@@ -63,7 +63,7 @@ interface KeyManager {
 }
 
 internal class KeyManagerImpl(
-    private val keyStore: KeyStore
+    private val keyStore: KeyStore,
 ) : KeyManager {
 
     override fun storeBackupKey(seed: ByteArray) {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/header/Header.kt b/app/src/main/java/com/stevesoltys/seedvault/header/Header.kt
index b09dbc63..17be0016 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/header/Header.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/header/Header.kt
@@ -19,7 +19,7 @@ internal const val MAX_VERSION_HEADER_SIZE =
 internal data class VersionHeader(
     internal val version: Byte = VERSION, //  1 byte
     internal val packageName: String, // ?? bytes (max 255)
-    internal val key: String? = null // ?? bytes
+    internal val key: String? = null, // ?? bytes
 ) {
     init {
         check(packageName.length <= MAX_PACKAGE_LENGTH_SIZE) {
@@ -64,7 +64,7 @@ internal const val SEGMENT_HEADER_SIZE = SEGMENT_LENGTH_SIZE + IV_SIZE
 @Deprecated("Don't do manual segments, use Crypto interface instead.")
 class SegmentHeader(
     internal val segmentLength: Short, //  2 bytes
-    internal val nonce: ByteArray // 12 bytes
+    internal val nonce: ByteArray, // 12 bytes
 ) {
     init {
         check(nonce.size == IV_SIZE) {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/header/HeaderReader.kt b/app/src/main/java/com/stevesoltys/seedvault/header/HeaderReader.kt
index 192aa825..1f6c77fb 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/header/HeaderReader.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/header/HeaderReader.kt
@@ -11,11 +11,13 @@ internal interface HeaderReader {
     @Throws(IOException::class, UnsupportedVersionException::class)
     fun readVersion(inputStream: InputStream, expectedVersion: Byte): Byte
 
-    @Deprecated("")
+    @Suppress("Deprecation")
+    @Deprecated("For restoring v0 backups only")
     @Throws(SecurityException::class)
     fun getVersionHeader(byteArray: ByteArray): VersionHeader
 
-    @Deprecated("")
+    @Suppress("Deprecation")
+    @Deprecated("For restoring v0 backups only")
     @Throws(EOFException::class, IOException::class)
     fun readSegmentHeader(inputStream: InputStream): SegmentHeader
 }
@@ -33,6 +35,7 @@ internal class HeaderReaderImpl : HeaderReader {
         return version
     }
 
+    @Suppress("OverridingDeprecatedMember", "Deprecation")
     override fun getVersionHeader(byteArray: ByteArray): VersionHeader {
         val buffer = ByteBuffer.wrap(byteArray)
         val version = buffer.get()
@@ -65,6 +68,7 @@ internal class HeaderReaderImpl : HeaderReader {
     }
 
     @Throws(EOFException::class, IOException::class)
+    @Suppress("OverridingDeprecatedMember", "Deprecation")
     override fun readSegmentHeader(inputStream: InputStream): SegmentHeader {
         val buffer = ByteArray(SEGMENT_HEADER_SIZE)
         val bytesRead = inputStream.read(buffer)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/metadata/Metadata.kt b/app/src/main/java/com/stevesoltys/seedvault/metadata/Metadata.kt
index 3dacf693..c4808331 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/metadata/Metadata.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/metadata/Metadata.kt
@@ -18,7 +18,7 @@ data class BackupMetadata(
     internal val androidVersion: Int = Build.VERSION.SDK_INT,
     internal val androidIncremental: String = Build.VERSION.INCREMENTAL,
     internal val deviceName: String = "${Build.MANUFACTURER} ${Build.MODEL}",
-    internal val packageMetadataMap: PackageMetadataMap = PackageMetadataMap()
+    internal val packageMetadataMap: PackageMetadataMap = PackageMetadataMap(),
 )
 
 internal const val JSON_METADATA = "@meta@"
@@ -77,7 +77,7 @@ data class PackageMetadata(
     internal val installer: String? = null,
     internal val splits: List<ApkSplit>? = null,
     internal val sha256: String? = null,
-    internal val signatures: List<String>? = null
+    internal val signatures: List<String>? = null,
 ) {
     fun hasApk(): Boolean {
         return version != null && sha256 != null && signatures != null
@@ -86,7 +86,7 @@ data class PackageMetadata(
 
 data class ApkSplit(
     val name: String,
-    val sha256: String
+    val sha256: String,
     // There's also a revisionCode, but it doesn't seem to be used just yet
 )
 
diff --git a/app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataManager.kt b/app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataManager.kt
index 8964faeb..98a57f4a 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataManager.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataManager.kt
@@ -34,7 +34,7 @@ internal class MetadataManager(
     private val clock: Clock,
     private val crypto: Crypto,
     private val metadataWriter: MetadataWriter,
-    private val metadataReader: MetadataReader
+    private val metadataReader: MetadataReader,
 ) {
 
     private val uninitializedMetadata = BackupMetadata(token = 0L, salt = "")
@@ -80,7 +80,7 @@ internal class MetadataManager(
     fun onApkBackedUp(
         packageInfo: PackageInfo,
         packageMetadata: PackageMetadata,
-        metadataOutputStream: OutputStream
+        metadataOutputStream: OutputStream,
     ) {
         val packageName = packageInfo.packageName
         metadata.packageMetadataMap[packageName]?.let {
@@ -129,7 +129,7 @@ internal class MetadataManager(
     fun onPackageBackedUp(
         packageInfo: PackageInfo,
         type: BackupType,
-        metadataOutputStream: OutputStream
+        metadataOutputStream: OutputStream,
     ) {
         val packageName = packageInfo.packageName
         modifyMetadata(metadataOutputStream) {
@@ -162,7 +162,7 @@ internal class MetadataManager(
         packageInfo: PackageInfo,
         packageState: PackageState,
         metadataOutputStream: OutputStream,
-        backupType: BackupType? = null
+        backupType: BackupType? = null,
     ) {
         check(packageState != APK_AND_DATA) { "Backup Error with non-error package state." }
         val packageName = packageInfo.packageName
diff --git a/app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataReader.kt b/app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataReader.kt
index 99598fbe..382a1757 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataReader.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/metadata/MetadataReader.kt
@@ -31,7 +31,7 @@ interface MetadataReader {
     fun decode(
         bytes: ByteArray,
         expectedVersion: Byte? = null,
-        expectedToken: Long? = null
+        expectedToken: Long? = null,
     ): BackupMetadata
 
 }
@@ -64,6 +64,7 @@ internal class MetadataReaderImpl(private val crypto: Crypto) : MetadataReader {
         UnsupportedVersionException::class,
         IOException::class
     )
+    @Suppress("Deprecation")
     private fun readMetadataV0(inputStream: InputStream, expectedToken: Long): BackupMetadata {
         val metadataBytes = try {
             crypto.decryptMultipleSegments(inputStream)
@@ -77,7 +78,7 @@ internal class MetadataReaderImpl(private val crypto: Crypto) : MetadataReader {
     override fun decode(
         bytes: ByteArray,
         expectedVersion: Byte?,
-        expectedToken: Long?
+        expectedToken: Long?,
     ): BackupMetadata {
         // NOTE: We don't do extensive validation of the parsed input here,
         // because it was encrypted with authentication, so we should be able to trust it.
diff --git a/app/src/main/java/com/stevesoltys/seedvault/plugins/LegacyStoragePlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/plugins/LegacyStoragePlugin.kt
index 1dbf797b..8082819b 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/plugins/LegacyStoragePlugin.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/plugins/LegacyStoragePlugin.kt
@@ -34,7 +34,7 @@ interface LegacyStoragePlugin {
     suspend fun getInputStreamForRecord(
         token: Long,
         packageInfo: PackageInfo,
-        key: String
+        key: String,
     ): InputStream
 
     /**
diff --git a/app/src/main/java/com/stevesoltys/seedvault/plugins/saf/DocumentsProviderLegacyPlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/plugins/saf/DocumentsProviderLegacyPlugin.kt
index 8e5d0952..1a1d075f 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/plugins/saf/DocumentsProviderLegacyPlugin.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/plugins/saf/DocumentsProviderLegacyPlugin.kt
@@ -13,7 +13,7 @@ import java.io.InputStream
 @Suppress("BlockingMethodInNonBlockingContext", "Deprecation") // all methods do I/O
 internal class DocumentsProviderLegacyPlugin(
     private val context: Context,
-    private val storage: DocumentsStorage
+    private val storage: DocumentsStorage,
 ) : LegacyStoragePlugin {
 
     private var packageDir: DocumentFile? = null
@@ -50,7 +50,7 @@ internal class DocumentsProviderLegacyPlugin(
     override suspend fun getInputStreamForRecord(
         token: Long,
         packageInfo: PackageInfo,
-        key: String
+        key: String,
     ): InputStream {
         val packageDir = this.packageDir
             ?: throw AssertionError("No cached packageDir for ${packageInfo.packageName}")
@@ -70,7 +70,7 @@ internal class DocumentsProviderLegacyPlugin(
     @Throws(IOException::class)
     override suspend fun getInputStreamForPackage(
         token: Long,
-        packageInfo: PackageInfo
+        packageInfo: PackageInfo,
     ): InputStream {
         val backupDir = storage.getFullBackupDir(token) ?: throw IOException()
         val packageFile =
@@ -82,7 +82,7 @@ internal class DocumentsProviderLegacyPlugin(
     override suspend fun getApkInputStream(
         token: Long,
         packageName: String,
-        suffix: String
+        suffix: String,
     ): InputStream {
         val setDir = storage.getSetDir(token) ?: throw IOException()
         val file = setDir.findFileBlocking(context, "$packageName$suffix.apk")
diff --git a/app/src/main/java/com/stevesoltys/seedvault/plugins/saf/DocumentsProviderStoragePlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/plugins/saf/DocumentsProviderStoragePlugin.kt
index ee150973..3eaebc73 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/plugins/saf/DocumentsProviderStoragePlugin.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/plugins/saf/DocumentsProviderStoragePlugin.kt
@@ -17,7 +17,7 @@ private val TAG = DocumentsProviderStoragePlugin::class.java.simpleName
 @Suppress("BlockingMethodInNonBlockingContext")
 internal class DocumentsProviderStoragePlugin(
     private val context: Context,
-    private val storage: DocumentsStorage
+    private val storage: DocumentsStorage,
 ) : StoragePlugin {
 
     private val packageManager: PackageManager = context.packageManager
diff --git a/app/src/main/java/com/stevesoltys/seedvault/plugins/saf/DocumentsStorage.kt b/app/src/main/java/com/stevesoltys/seedvault/plugins/saf/DocumentsStorage.kt
index 7b9c5698..cfd53f41 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/plugins/saf/DocumentsStorage.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/plugins/saf/DocumentsStorage.kt
@@ -27,8 +27,10 @@ import java.io.OutputStream
 import kotlin.coroutines.resume
 
 const val DIRECTORY_ROOT = ".SeedVaultAndroidBackup"
+
 @Deprecated("")
 const val DIRECTORY_FULL_BACKUP = "full"
+
 @Deprecated("")
 const val DIRECTORY_KEY_VALUE_BACKUP = "kv"
 const val FILE_BACKUP_METADATA = ".backup.metadata"
@@ -39,7 +41,7 @@ private val TAG = DocumentsStorage::class.java.simpleName
 
 internal class DocumentsStorage(
     private val context: Context,
-    private val settingsManager: SettingsManager
+    private val settingsManager: SettingsManager,
 ) {
 
     private val contentResolver = context.contentResolver
@@ -143,7 +145,7 @@ internal class DocumentsStorage(
 internal suspend fun DocumentFile.createOrGetFile(
     context: Context,
     name: String,
-    mimeType: String = MIME_TYPE
+    mimeType: String = MIME_TYPE,
 ): DocumentFile {
     return try {
         findFileBlocking(context, name) ?: createFile(mimeType, name)?.apply {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreActivity.kt
index 9b78d7d3..db4bdc08 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreActivity.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreActivity.kt
@@ -8,7 +8,6 @@ import com.stevesoltys.seedvault.restore.DisplayFragment.RESTORE_BACKUP
 import com.stevesoltys.seedvault.restore.DisplayFragment.RESTORE_FILES
 import com.stevesoltys.seedvault.restore.DisplayFragment.RESTORE_FILES_STARTED
 import com.stevesoltys.seedvault.restore.install.InstallProgressFragment
-import com.stevesoltys.seedvault.ui.LiveEventHandler
 import com.stevesoltys.seedvault.ui.RequireProvisioningActivity
 import com.stevesoltys.seedvault.ui.RequireProvisioningViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
@@ -26,7 +25,7 @@ class RestoreActivity : RequireProvisioningActivity() {
 
         setContentView(R.layout.activity_fragment_container)
 
-        viewModel.displayFragment.observeEvent(this, LiveEventHandler { fragment ->
+        viewModel.displayFragment.observeEvent(this, { fragment ->
             when (fragment) {
                 RESTORE_APPS -> showFragment(InstallProgressFragment())
                 RESTORE_BACKUP -> showFragment(RestoreProgressFragment())
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreErrorBroadcastReceiver.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreErrorBroadcastReceiver.kt
index b3ad72c4..1b6dc87b 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreErrorBroadcastReceiver.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreErrorBroadcastReceiver.kt
@@ -15,9 +15,7 @@ internal const val REQUEST_CODE_UNINSTALL = 4576841
 class RestoreErrorBroadcastReceiver : BroadcastReceiver() {
 
     // using KoinComponent would crash robolectric tests :(
-    private val notificationManager: BackupNotificationManager by lazy {
-        get().get<BackupNotificationManager>()
-    }
+    private val notificationManager: BackupNotificationManager by lazy { get().get() }
 
     override fun onReceive(context: Context, intent: Intent) {
         if (intent.action != ACTION_RESTORE_ERROR_UNINSTALL) return
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt
index 235ce9ab..531ce034 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt
@@ -20,7 +20,7 @@ internal class RestoreFilesFragment : SnapshotFragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         val v = super.onCreateView(inflater, container, savedInstanceState)
 
@@ -50,7 +50,7 @@ internal class RestoreFilesStartedFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         val v: View = inflater.inflate(R.layout.fragment_restore_files_started, container, false)
 
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressAdapter.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressAdapter.kt
index 1df649c7..802004af 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressAdapter.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressAdapter.kt
@@ -38,7 +38,7 @@ internal class RestoreProgressAdapter : Adapter<PackageViewHolder>() {
 
     private class Diff(
         private val oldItems: LinkedList<AppRestoreResult>,
-        private val newItems: LinkedList<AppRestoreResult>
+        private val newItems: LinkedList<AppRestoreResult>,
     ) : DiffUtil.Callback() {
 
         override fun getOldListSize() = oldItems.size
@@ -74,5 +74,5 @@ internal class RestoreProgressAdapter : Adapter<PackageViewHolder>() {
 internal data class AppRestoreResult(
     val packageName: String,
     val name: CharSequence,
-    val state: AppBackupState
+    val state: AppBackupState,
 )
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressFragment.kt
index adc8ced4..5c24f8bb 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressFragment.kt
@@ -11,7 +11,6 @@ import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat.getColor
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager.VERTICAL
@@ -36,7 +35,7 @@ class RestoreProgressFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         val v: View = inflater.inflate(R.layout.fragment_restore_progress, container, false)
 
@@ -66,17 +65,17 @@ class RestoreProgressFragment : Fragment() {
         // decryption will fail when the device is locked, so keep the screen on to prevent locking
         requireActivity().window.addFlags(FLAG_KEEP_SCREEN_ON)
 
-        viewModel.chosenRestorableBackup.observe(viewLifecycleOwner, Observer { restorableBackup ->
+        viewModel.chosenRestorableBackup.observe(viewLifecycleOwner, { restorableBackup ->
             backupNameView.text = restorableBackup.name
             progressBar.max = restorableBackup.packageMetadataMap.size
         })
 
-        viewModel.restoreProgress.observe(viewLifecycleOwner, Observer { list ->
+        viewModel.restoreProgress.observe(viewLifecycleOwner, { list ->
             stayScrolledAtTop { adapter.update(list) }
             progressBar.progress = list.size
         })
 
-        viewModel.restoreBackupResult.observe(viewLifecycleOwner, Observer { finished ->
+        viewModel.restoreBackupResult.observe(viewLifecycleOwner, { finished ->
             button.isEnabled = true
             if (finished.hasError()) {
                 backupNameView.text = finished.errorMsg
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetAdapter.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetAdapter.kt
index 34e00209..f7e7cbb4 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetAdapter.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetAdapter.kt
@@ -14,7 +14,7 @@ import com.stevesoltys.seedvault.restore.RestoreSetAdapter.RestoreSetViewHolder
 
 internal class RestoreSetAdapter(
     private val listener: RestorableBackupClickListener,
-    private val items: List<RestorableBackup>
+    private val items: List<RestorableBackup>,
 ) : Adapter<RestoreSetViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RestoreSetViewHolder {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetFragment.kt
index 9cefe48a..6959565c 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetFragment.kt
@@ -10,7 +10,6 @@ import android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.RecyclerView
 import com.stevesoltys.seedvault.R
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
@@ -27,7 +26,7 @@ class RestoreSetFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         val v: View = inflater.inflate(R.layout.fragment_restore_set, container, false)
 
@@ -45,7 +44,7 @@ class RestoreSetFragment : Fragment() {
         // decryption will fail when the device is locked, so keep the screen on to prevent locking
         requireActivity().window.addFlags(FLAG_KEEP_SCREEN_ON)
 
-        viewModel.restoreSetResults.observe(viewLifecycleOwner, Observer { result ->
+        viewModel.restoreSetResults.observe(viewLifecycleOwner, { result ->
             onRestoreResultsLoaded(result)
         })
 
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreViewModel.kt
index 80a23e0d..59556ad1 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreViewModel.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreViewModel.kt
@@ -75,7 +75,7 @@ internal class RestoreViewModel(
     private val restoreCoordinator: RestoreCoordinator,
     private val apkRestore: ApkRestore,
     storageBackup: StorageBackup,
-    private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO
+    private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
 ) : RequireProvisioningViewModel(app, settingsManager, keyManager),
     RestorableBackupClickListener, SnapshotViewModel {
 
@@ -247,7 +247,7 @@ internal class RestoreViewModel(
     @WorkerThread
     private fun getFailedStatus(
         packageName: String,
-        restorableBackup: RestorableBackup = chosenRestorableBackup.value!!
+        restorableBackup: RestorableBackup = chosenRestorableBackup.value!!,
     ): AppBackupState {
         val metadata = restorableBackup.packageMetadataMap[packageName] ?: return FAILED
         return when (metadata.state) {
@@ -369,7 +369,7 @@ internal class RestoreViewModel(
 
 internal class RestoreSetResult(
     internal val restorableBackups: List<RestorableBackup>,
-    internal val errorMsg: String?
+    internal val errorMsg: String?,
 ) {
 
     internal constructor(restorableBackups: List<RestorableBackup>) : this(restorableBackups, null)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/install/ApkInstaller.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/install/ApkInstaller.kt
index 586786c2..4e51a292 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/install/ApkInstaller.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/install/ApkInstaller.kt
@@ -1,6 +1,7 @@
 package com.stevesoltys.seedvault.restore.install
 
 import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_MUTABLE
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -41,7 +42,7 @@ internal class ApkInstaller(private val context: Context) {
         cachedApks: List<File>,
         packageName: String,
         installerPackageName: String?,
-        installResult: MutableInstallResult
+        installResult: MutableInstallResult,
     ) = suspendCancellableCoroutine<InstallResult> { cont ->
         val broadcastReceiver = object : BroadcastReceiver() {
             override fun onReceive(context: Context, i: Intent) {
@@ -84,8 +85,12 @@ internal class ApkInstaller(private val context: Context) {
             flags = FLAG_RECEIVER_FOREGROUND
             setPackage(context.packageName)
         }
-        val pendingIntent =
-            PendingIntent.getBroadcast(context, 0, broadcastIntent, FLAG_UPDATE_CURRENT)
+        val pendingIntent = PendingIntent.getBroadcast(
+            context,
+            0,
+            broadcastIntent,
+            FLAG_UPDATE_CURRENT or FLAG_MUTABLE, // needs to be mutable, otherwise no extras
+        )
         return pendingIntent.intentSender
     }
 
@@ -93,7 +98,7 @@ internal class ApkInstaller(private val context: Context) {
         i: Intent,
         expectedPackageName: String,
         cachedApks: List<File>,
-        installResult: MutableInstallResult
+        installResult: MutableInstallResult,
     ): InstallResult {
         val packageName = i.getStringExtra(EXTRA_PACKAGE_NAME)!!
         val success = i.getIntExtra(EXTRA_STATUS, -1) == STATUS_SUCCESS
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
index 6ff73c50..4c7a9a1a 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/install/ApkRestore.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/install/ApkRestore.kt
@@ -33,7 +33,7 @@ internal class ApkRestore(
     private val legacyStoragePlugin: LegacyStoragePlugin,
     private val crypto: Crypto,
     private val splitCompatChecker: ApkSplitCompatibilityChecker,
-    private val apkInstaller: ApkInstaller
+    private val apkInstaller: ApkInstaller,
 ) {
 
     private val pm = context.packageManager
@@ -84,7 +84,7 @@ internal class ApkRestore(
         backup: RestorableBackup,
         packageName: String,
         metadata: PackageMetadata,
-        installResult: MutableInstallResult
+        installResult: MutableInstallResult,
     ) {
         // cache the APK and get its hash
         val (cachedApk, sha256) = cacheApk(backup.version, backup.token, backup.salt, packageName)
@@ -169,7 +169,7 @@ internal class ApkRestore(
         backup: RestorableBackup,
         packageName: String,
         cachedApk: File,
-        splits: List<ApkSplit>?
+        splits: List<ApkSplit>?,
     ): List<File>? {
         // if null, there are no splits, so we just have a single base APK to consider
         val splitNames = splits?.map { it.name } ?: return listOf(cachedApk)
@@ -208,7 +208,7 @@ internal class ApkRestore(
         token: Long,
         salt: String,
         packageName: String,
-        suffix: String = ""
+        suffix: String = "",
     ): Pair<File, String> {
         // create a cache file to write the APK into
         val cachedApk = File.createTempFile(packageName + suffix, ".apk", context.cacheDir)
@@ -231,7 +231,7 @@ internal class ApkRestore(
     private fun shouldInstallSystemApp(
         packageName: String,
         metadata: PackageMetadata,
-        installResult: MutableInstallResult
+        installResult: MutableInstallResult,
     ): InstallResult? {
         val installedPackageInfo = try {
             pm.getPackageInfo(packageName, 0)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/install/ApkSplitCompatibilityChecker.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/install/ApkSplitCompatibilityChecker.kt
index 79138d90..a7be09df 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/install/ApkSplitCompatibilityChecker.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/install/ApkSplitCompatibilityChecker.kt
@@ -58,7 +58,7 @@ class ApkSplitCompatibilityChecker(private val deviceInfo: DeviceInfo) {
     private fun isCompatible(
         deviceName: String,
         unknownAllowed: Boolean,
-        splitName: String
+        splitName: String,
     ): Boolean {
         val index = splitName.indexOf(CONFIG_PREFIX)
         // If this is not a standardized config split
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallIntentCreator.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallIntentCreator.kt
index 0f10c746..fb9572b8 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallIntentCreator.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallIntentCreator.kt
@@ -8,7 +8,7 @@ import android.content.pm.PackageManager
 import android.net.Uri
 
 internal class InstallIntentCreator(
-    private val packageManager: PackageManager
+    private val packageManager: PackageManager,
 ) {
 
     private val installerToPackage = mapOf(
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
index 3880951b..40e7ca10 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallProgressAdapter.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallProgressAdapter.kt
@@ -23,12 +23,12 @@ internal interface InstallItemListener {
 }
 
 internal class InstallProgressAdapter(
-    private val listener: InstallItemListener
+    private val listener: InstallItemListener,
 ) : Adapter<InstallProgressAdapter.AppInstallViewHolder>() {
 
     private var finished = false
     private val finishedComparator = FailedFirstComparator()
-    private val items = SortedList<ApkInstallResult>(
+    private val items = SortedList(
         ApkInstallResult::class.java,
         object : SortedListAdapterCallback<ApkInstallResult>(this) {
             override fun areItemsTheSame(item1: ApkInstallResult, item2: ApkInstallResult) =
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallProgressFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallProgressFragment.kt
index a4c2c813..38c2e12d 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallProgressFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallProgressFragment.kt
@@ -12,7 +12,6 @@ import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContract
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager.VERTICAL
@@ -37,8 +36,8 @@ class InstallProgressFragment : Fragment(), InstallItemListener {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
+        savedInstanceState: Bundle?,
+    ): View {
         val v: View = inflater.inflate(R.layout.fragment_restore_progress, container, false)
 
         progressBar = v.findViewById(R.id.progressBar)
@@ -61,15 +60,15 @@ class InstallProgressFragment : Fragment(), InstallItemListener {
         button.setText(R.string.restore_next)
         button.setOnClickListener { viewModel.onNextClickedAfterInstallingApps() }
 
-        viewModel.chosenRestorableBackup.observe(viewLifecycleOwner, Observer { restorableBackup ->
+        viewModel.chosenRestorableBackup.observe(viewLifecycleOwner, { restorableBackup ->
             backupNameView.text = restorableBackup.name
         })
 
-        viewModel.installResult.observe(viewLifecycleOwner, Observer { result ->
+        viewModel.installResult.observe(viewLifecycleOwner, { result ->
             onInstallResult(result)
         })
 
-        viewModel.nextButtonEnabled.observe(viewLifecycleOwner, Observer { enabled ->
+        viewModel.nextButtonEnabled.observe(viewLifecycleOwner, { enabled ->
             button.isEnabled = enabled
         })
     }
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallResult.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallResult.kt
index 1dedd48a..982311e7 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallResult.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallResult.kt
@@ -89,7 +89,7 @@ internal class MutableInstallResult(override val total: Int) : InstallResult {
 
     fun update(
         packageName: String,
-        updateFun: (ApkInstallResult) -> ApkInstallResult
+        updateFun: (ApkInstallResult) -> ApkInstallResult,
     ): MutableInstallResult {
         val result = get(packageName)
         check(result != null) { "ApkRestoreResult for $packageName does not exist." }
@@ -118,7 +118,7 @@ data class ApkInstallResult(
     val state: ApkInstallState,
     val name: CharSequence? = null,
     val icon: Drawable? = null,
-    val installerPackageName: CharSequence? = null
+    val installerPackageName: CharSequence? = null,
 ) : Comparable<ApkInstallResult> {
     override fun compareTo(other: ApkInstallResult): Int {
         return other.progress.compareTo(progress)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/AboutDialogFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/AboutDialogFragment.kt
index c48f9271..7f4bdda9 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/AboutDialogFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/AboutDialogFragment.kt
@@ -28,8 +28,8 @@ class AboutDialogFragment : DialogFragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
+        savedInstanceState: Bundle?,
+    ): View {
         val v: View = inflater.inflate(R.layout.fragment_about, container, false)
 
         versionView = v.findViewById(R.id.versionView)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/AppListRetriever.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/AppListRetriever.kt
index 2e5885d8..cae5c319 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/AppListRetriever.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/AppListRetriever.kt
@@ -39,7 +39,7 @@ data class AppStatus(
     val name: String,
     val time: Long,
     val status: AppBackupState,
-    val isSpecial: Boolean = false
+    val isSpecial: Boolean = false,
 ) : AppListItem()
 
 class AppSectionTitle(@StringRes val titleRes: Int) : AppListItem()
@@ -48,7 +48,7 @@ internal class AppListRetriever(
     private val context: Context,
     private val packageService: PackageService,
     private val settingsManager: SettingsManager,
-    private val metadataManager: MetadataManager
+    private val metadataManager: MetadataManager,
 ) {
 
     private val pm: PackageManager = context.packageManager
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/AppStatusAdapter.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/AppStatusAdapter.kt
index 11dc53ef..5536f6b5 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/AppStatusAdapter.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/AppStatusAdapter.kt
@@ -139,7 +139,7 @@ internal class AppStatusAdapter(private val toggleListener: AppStatusToggleListe
 
 internal class AppStatusDiff(
     private val oldItems: List<AppListItem>,
-    private val newItems: List<AppListItem>
+    private val newItems: List<AppListItem>,
 ) : DiffUtil.Callback() {
 
     override fun getOldListSize() = oldItems.size
@@ -163,5 +163,5 @@ internal class AppStatusDiff(
 
 internal class AppStatusResult(
     val appStatusList: List<AppListItem>,
-    val diff: DiffResult
+    val diff: DiffResult,
 )
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/AppStatusFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/AppStatusFragment.kt
index ec56126d..85c18982 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/AppStatusFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/AppStatusFragment.kt
@@ -11,7 +11,6 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.ProgressBar
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.stevesoltys.seedvault.R
@@ -35,7 +34,7 @@ class AppStatusFragment : Fragment(), AppStatusToggleListener {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         setHasOptionsMenu(true)
         val v: View = inflater.inflate(R.layout.fragment_app_status, container, false)
@@ -57,7 +56,7 @@ class AppStatusFragment : Fragment(), AppStatusToggleListener {
         }
 
         progressBar.visibility = VISIBLE
-        viewModel.appStatusList.observe(viewLifecycleOwner, Observer { result ->
+        viewModel.appStatusList.observe(viewLifecycleOwner, { result ->
             adapter.update(result.appStatusList, result.diff)
             progressBar.visibility = INVISIBLE
         })
@@ -69,7 +68,7 @@ class AppStatusFragment : Fragment(), AppStatusToggleListener {
         appEditMenuItem = menu.findItem(R.id.edit_app_blacklist)
 
         // observe edit mode changes here where we are sure to have the MenuItem
-        viewModel.appEditMode.observe(viewLifecycleOwner, Observer { enabled ->
+        viewModel.appEditMode.observe(viewLifecycleOwner, { enabled ->
             appEditMenuItem.isChecked = enabled
             adapter.setEditMode(enabled)
         })
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsActivity.kt
index 9d6a026a..2dbba5c7 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsActivity.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsActivity.kt
@@ -55,7 +55,7 @@ class SettingsActivity : RequireProvisioningActivity(), OnPreferenceStartFragmen
 
     override fun onPreferenceStartFragment(
         caller: PreferenceFragmentCompat,
-        pref: Preference
+        pref: Preference,
     ): Boolean {
         val fragment =
             supportFragmentManager.fragmentFactory.instantiate(classLoader, pref.fragment)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt
index 2cc8719d..2e1d6fe9 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt
@@ -12,7 +12,6 @@ import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AlertDialog
-import androidx.lifecycle.Observer
 import androidx.preference.Preference
 import androidx.preference.Preference.OnPreferenceChangeListener
 import androidx.preference.PreferenceFragmentCompat
@@ -128,12 +127,12 @@ class SettingsFragment : PreferenceFragmentCompat() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        viewModel.lastBackupTime.observe(viewLifecycleOwner, Observer { time ->
+        viewModel.lastBackupTime.observe(viewLifecycleOwner, { time ->
             setAppBackupStatusSummary(time)
         })
 
         val backupFiles: Preference = findPreference("backup_files")!!
-        viewModel.filesSummary.observe(viewLifecycleOwner, Observer { summary ->
+        viewModel.filesSummary.observe(viewLifecycleOwner, { summary ->
             backupFiles.summary = summary
         })
     }
@@ -158,7 +157,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         if (resources.getBoolean(R.bool.show_restore_in_settings)) {
             menuRestore?.isVisible = true
         }
-        viewModel.backupPossible.observe(viewLifecycleOwner, Observer { possible ->
+        viewModel.backupPossible.observe(viewLifecycleOwner, { possible ->
             menuBackupNow?.isEnabled = possible
             menuRestore?.isEnabled = possible
         })
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsManager.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsManager.kt
index 9640da50..2158d018 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsManager.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsManager.kt
@@ -146,7 +146,7 @@ data class Storage(
     val uri: Uri,
     val name: String,
     val isUsb: Boolean,
-    val requiresNetwork: Boolean
+    val requiresNetwork: Boolean,
 ) {
     fun getDocumentFile(context: Context) = DocumentFile.fromTreeUri(context, uri)
         ?: throw AssertionError("Should only happen on API < 21.")
@@ -171,7 +171,7 @@ data class Storage(
 
     private fun hasUnmeteredInternet(context: Context): Boolean {
         val cm = context.getSystemService(ConnectivityManager::class.java)
-        val isMetered = cm.isActiveNetworkMetered()
+        val isMetered = cm.isActiveNetworkMetered
         val capabilities = cm.getNetworkCapabilities(cm.activeNetwork) ?: return false
         return capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) && !isMetered
     }
@@ -181,7 +181,7 @@ data class FlashDrive(
     val name: String,
     val serialNumber: String?,
     val vendorId: Int,
-    val productId: Int
+    val productId: Int,
 ) {
     companion object {
         fun from(device: UsbDevice) = FlashDrive(
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt
index e393a7df..41bef224 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt
@@ -48,7 +48,7 @@ internal class SettingsViewModel(
     private val notificationManager: BackupNotificationManager,
     private val metadataManager: MetadataManager,
     private val appListRetriever: AppListRetriever,
-    private val storageBackup: StorageBackup
+    private val storageBackup: StorageBackup,
 ) : RequireProvisioningViewModel(app, settingsManager, keyManager) {
 
     private val contentResolver = app.contentResolver
@@ -56,7 +56,7 @@ internal class SettingsViewModel(
 
     override val isRestoreOperation = false
 
-    private val mBackupPossible = MutableLiveData<Boolean>(false)
+    private val mBackupPossible = MutableLiveData(false)
     val backupPossible: LiveData<Boolean> = mBackupPossible
 
     internal val lastBackupTime = metadataManager.lastBackupTime
diff --git a/app/src/main/java/com/stevesoltys/seedvault/storage/SeedvaultStoragePlugin.kt b/app/src/main/java/com/stevesoltys/seedvault/storage/SeedvaultStoragePlugin.kt
index 9f67ca93..9908061a 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/storage/SeedvaultStoragePlugin.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/storage/SeedvaultStoragePlugin.kt
@@ -10,7 +10,7 @@ import javax.crypto.SecretKey
 internal class SeedvaultStoragePlugin(
     context: Context,
     private val storage: DocumentsStorage,
-    private val keyManager: KeyManager
+    private val keyManager: KeyManager,
 ) : SafStoragePlugin(context) {
     override val root: DocumentFile
         get() = storage.rootBackupDir ?: error("No storage set")
diff --git a/app/src/main/java/com/stevesoltys/seedvault/transport/ConfigurableBackupTransport.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/ConfigurableBackupTransport.kt
index c3b51187..d34c35a7 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/transport/ConfigurableBackupTransport.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/transport/ConfigurableBackupTransport.kt
@@ -117,7 +117,7 @@ class ConfigurableBackupTransport internal constructor(private val context: Cont
 
     override fun isAppEligibleForBackup(
         targetPackage: PackageInfo,
-        isFullBackup: Boolean
+        isFullBackup: Boolean,
     ): Boolean {
         return backupCoordinator.isAppEligibleForBackup(targetPackage, isFullBackup)
     }
@@ -145,14 +145,14 @@ class ConfigurableBackupTransport internal constructor(private val context: Cont
     override fun performBackup(
         packageInfo: PackageInfo,
         inFd: ParcelFileDescriptor,
-        flags: Int
+        flags: Int,
     ): Int = runBlocking {
         backupCoordinator.performIncrementalBackup(packageInfo, inFd, flags)
     }
 
     override fun performBackup(
         targetPackage: PackageInfo,
-        fileDescriptor: ParcelFileDescriptor
+        fileDescriptor: ParcelFileDescriptor,
     ): Int {
         Log.w(TAG, "Warning: Legacy performBackup() method called.")
         return performBackup(targetPackage, fileDescriptor, 0)
@@ -173,14 +173,14 @@ class ConfigurableBackupTransport internal constructor(private val context: Cont
     override fun performFullBackup(
         targetPackage: PackageInfo,
         socket: ParcelFileDescriptor,
-        flags: Int
+        flags: Int,
     ): Int = runBlocking {
         backupCoordinator.performFullBackup(targetPackage, socket, flags)
     }
 
     override fun performFullBackup(
         targetPackage: PackageInfo,
-        fileDescriptor: ParcelFileDescriptor
+        fileDescriptor: ParcelFileDescriptor,
     ): Int = runBlocking {
         Log.w(TAG, "Warning: Legacy performFullBackup() method called.")
         backupCoordinator.performFullBackup(targetPackage, fileDescriptor, 0)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/transport/backup/ApkBackup.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/ApkBackup.kt
index 7f27e402..60c9c9aa 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/transport/backup/ApkBackup.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/ApkBackup.kt
@@ -30,7 +30,7 @@ internal class ApkBackup(
     private val pm: PackageManager,
     private val crypto: Crypto,
     private val settingsManager: SettingsManager,
-    private val metadataManager: MetadataManager
+    private val metadataManager: MetadataManager,
 ) {
 
     /**
@@ -46,7 +46,7 @@ internal class ApkBackup(
     suspend fun backupApkIfNecessary(
         packageInfo: PackageInfo,
         packageState: PackageState,
-        streamGetter: suspend (name: String) -> OutputStream
+        streamGetter: suspend (name: String) -> OutputStream,
     ): PackageMetadata? {
         // do not back up @pm@
         val packageName = packageInfo.packageName
@@ -126,7 +126,7 @@ internal class ApkBackup(
 
     private fun signaturesChanged(
         packageMetadata: PackageMetadata,
-        signatures: List<String>
+        signatures: List<String>,
     ): Boolean {
         // no signatures in package metadata counts as them not having changed
         if (packageMetadata.signatures == null) return false
@@ -151,7 +151,7 @@ internal class ApkBackup(
     @Throws(IOException::class)
     private suspend fun backupSplitApks(
         packageInfo: PackageInfo,
-        streamGetter: suspend (name: String) -> OutputStream
+        streamGetter: suspend (name: String) -> OutputStream,
     ): List<ApkSplit> {
         check(packageInfo.splitNames != null)
         val splitSourceDirs = packageInfo.applicationInfo.splitSourceDirs
@@ -178,7 +178,7 @@ internal class ApkBackup(
         packageName: String,
         splitName: String,
         sourceDir: String,
-        streamGetter: suspend (name: String) -> OutputStream
+        streamGetter: suspend (name: String) -> OutputStream,
     ): ApkSplit {
         // Calculate sha256 hash first to determine file name suffix.
         // We could also just use the split name as a suffix, but there is a theoretical risk
diff --git a/app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupCoordinator.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupCoordinator.kt
index d9294d05..ac779830 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupCoordinator.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/BackupCoordinator.kt
@@ -43,7 +43,7 @@ private val TAG = BackupCoordinator::class.java.simpleName
 private class CoordinatorState(
     var calledInitialize: Boolean,
     var calledClearBackupData: Boolean,
-    var cancelReason: PackageState
+    var cancelReason: PackageState,
 ) {
     val expectFinish: Boolean
         get() = calledInitialize || calledClearBackupData
@@ -71,7 +71,7 @@ internal class BackupCoordinator(
     private val packageService: PackageService,
     private val metadataManager: MetadataManager,
     private val settingsManager: SettingsManager,
-    private val nm: BackupNotificationManager
+    private val nm: BackupNotificationManager,
 ) {
 
     private val state = CoordinatorState(
@@ -140,7 +140,7 @@ internal class BackupCoordinator(
 
     fun isAppEligibleForBackup(
         targetPackage: PackageInfo,
-        @Suppress("UNUSED_PARAMETER") isFullBackup: Boolean
+        @Suppress("UNUSED_PARAMETER") isFullBackup: Boolean,
     ): Boolean {
         val packageName = targetPackage.packageName
         // Check that the app is not blacklisted by the user
@@ -230,7 +230,7 @@ internal class BackupCoordinator(
     suspend fun performIncrementalBackup(
         packageInfo: PackageInfo,
         data: ParcelFileDescriptor,
-        flags: Int
+        flags: Int,
     ): Int {
         state.cancelReason = UNKNOWN_ERROR
         if (metadataManager.requiresInit) {
@@ -280,7 +280,7 @@ internal class BackupCoordinator(
     suspend fun performFullBackup(
         targetPackage: PackageInfo,
         fileDescriptor: ParcelFileDescriptor,
-        flags: Int
+        flags: Int,
     ): Int {
         state.cancelReason = UNKNOWN_ERROR
         val token = settingsManager.getToken() ?: error("no token in performFullBackup")
@@ -448,7 +448,7 @@ internal class BackupCoordinator(
      */
     private suspend fun backUpApk(
         packageInfo: PackageInfo,
-        packageState: PackageState = UNKNOWN_ERROR
+        packageState: PackageState = UNKNOWN_ERROR,
     ): Boolean {
         val packageName = packageInfo.packageName
         return try {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/transport/backup/FullBackup.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/FullBackup.kt
index 247de6db..48a42d64 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/transport/backup/FullBackup.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/FullBackup.kt
@@ -23,7 +23,7 @@ private class FullBackupState(
     val packageInfo: PackageInfo,
     val inputFileDescriptor: ParcelFileDescriptor,
     val inputStream: InputStream,
-    var outputStreamInit: (suspend () -> OutputStream)?
+    var outputStreamInit: (suspend () -> OutputStream)?,
 ) {
     /**
      * This is an encrypted stream that can be written to directly.
@@ -42,7 +42,7 @@ internal class FullBackup(
     private val plugin: StoragePlugin,
     private val settingsManager: SettingsManager,
     private val inputFactory: InputFactory,
-    private val crypto: Crypto
+    private val crypto: Crypto,
 ) {
 
     private var state: FullBackupState? = null
@@ -104,7 +104,7 @@ internal class FullBackup(
         socket: ParcelFileDescriptor,
         @Suppress("UNUSED_PARAMETER") flags: Int = 0,
         token: Long,
-        salt: String
+        salt: String,
     ): Int {
         if (state != null) throw AssertionError()
         val packageName = targetPackage.packageName
diff --git a/app/src/main/java/com/stevesoltys/seedvault/transport/backup/KVBackup.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/KVBackup.kt
index 861a57ce..dd89cad8 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/transport/backup/KVBackup.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/KVBackup.kt
@@ -22,7 +22,7 @@ class KVBackupState(
     internal val packageInfo: PackageInfo,
     val token: Long,
     val name: String,
-    val db: KVDb
+    val db: KVDb,
 ) {
     var needsUpload: Boolean = false
 }
@@ -37,7 +37,7 @@ internal class KVBackup(
     private val settingsManager: SettingsManager,
     private val inputFactory: InputFactory,
     private val crypto: Crypto,
-    private val dbManager: KvDbManager
+    private val dbManager: KvDbManager,
 ) {
 
     private var state: KVBackupState? = null
@@ -57,7 +57,7 @@ internal class KVBackup(
         data: ParcelFileDescriptor,
         flags: Int,
         token: Long,
-        salt: String
+        salt: String,
     ): Int {
         val dataNotChanged = flags and FLAG_DATA_NOT_CHANGED != 0
         val isIncremental = flags and FLAG_INCREMENTAL != 0
@@ -235,7 +235,7 @@ internal class KVBackup(
         token: Long,
         name: String,
         packageName: String,
-        db: KVDb
+        db: KVDb,
     ) {
         db.vacuum()
         db.close()
@@ -259,7 +259,7 @@ internal class KVBackup(
         /**
          * value is null when this is a deletion operation
          */
-        val value: ByteArray?
+        val value: ByteArray?,
     )
 
     private sealed class Result<out T> {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/transport/backup/PackageService.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/PackageService.kt
index 3b4e6f3d..fbadc1a4 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/transport/backup/PackageService.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/transport/backup/PackageService.kt
@@ -28,7 +28,7 @@ private const val LOG_MAX_PACKAGES = 100
  */
 internal class PackageService(
     private val context: Context,
-    private val backupManager: IBackupManager
+    private val backupManager: IBackupManager,
 ) {
 
     private val packageManager: PackageManager = context.packageManager
@@ -144,7 +144,7 @@ internal data class ExpectedAppTotals(
     /**
      * The number of non-system apps that has opted-out of backup.
      */
-    val appsOptOut: Int
+    val appsOptOut: Int,
 )
 
 internal fun PackageInfo.isUserVisible(context: Context): Boolean {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/transport/restore/FullRestore.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/FullRestore.kt
index 2828971a..91c83e34 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/transport/restore/FullRestore.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/FullRestore.kt
@@ -25,7 +25,7 @@ private class FullRestoreState(
     val version: Byte,
     val token: Long,
     val name: String,
-    val packageInfo: PackageInfo
+    val packageInfo: PackageInfo,
 ) {
     var inputStream: InputStream? = null
 }
@@ -39,7 +39,7 @@ internal class FullRestore(
     private val legacyPlugin: LegacyStoragePlugin,
     private val outputFactory: OutputFactory,
     private val headerReader: HeaderReader,
-    private val crypto: Crypto
+    private val crypto: Crypto,
 ) {
 
     private var state: FullRestoreState? = null
diff --git a/app/src/main/java/com/stevesoltys/seedvault/transport/restore/KVRestore.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/KVRestore.kt
index 65a6c4d7..c529c0ad 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/transport/restore/KVRestore.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/KVRestore.kt
@@ -34,7 +34,7 @@ private class KVRestoreState(
     /**
      * Optional [PackageInfo] for single package restore, optimizes restore of @pm@
      */
-    val autoRestorePackageInfo: PackageInfo?
+    val autoRestorePackageInfo: PackageInfo?,
 )
 
 private val TAG = KVRestore::class.java.simpleName
@@ -47,7 +47,7 @@ internal class KVRestore(
     private val outputFactory: OutputFactory,
     private val headerReader: HeaderReader,
     private val crypto: Crypto,
-    private val dbManager: KvDbManager
+    private val dbManager: KvDbManager,
 ) {
 
     private var state: KVRestoreState? = null
@@ -76,7 +76,7 @@ internal class KVRestore(
         token: Long,
         name: String,
         packageInfo: PackageInfo,
-        autoRestorePackageInfo: PackageInfo? = null
+        autoRestorePackageInfo: PackageInfo? = null,
     ) {
         state = KVRestoreState(version, token, name, packageInfo, autoRestorePackageInfo)
     }
@@ -238,7 +238,7 @@ internal class KVRestore(
     private suspend fun readAndWriteValueV0(
         state: KVRestoreState,
         dKey: DecodedKey,
-        out: BackupDataOutput
+        out: BackupDataOutput,
     ) = legacyPlugin.getInputStreamForRecord(state.token, state.packageInfo, dKey.base64Key)
         .use { inputStream ->
             val version = headerReader.readVersion(inputStream, state.version)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinator.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinator.kt
index 8a7d2e02..23d8b6a6 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinator.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinator.kt
@@ -33,7 +33,7 @@ private data class RestoreCoordinatorState(
      * Optional [PackageInfo] for single package restore, to reduce data needed to read for @pm@
      */
     val autoRestorePackageInfo: PackageInfo?,
-    val backupMetadata: BackupMetadata
+    val backupMetadata: BackupMetadata,
 ) {
     var currentPackage: String? = null
 }
@@ -50,7 +50,7 @@ internal class RestoreCoordinator(
     private val plugin: StoragePlugin,
     private val kv: KVRestore,
     private val full: FullRestore,
-    private val metadataReader: MetadataReader
+    private val metadataReader: MetadataReader,
 ) {
 
     private var state: RestoreCoordinatorState? = null
@@ -249,7 +249,7 @@ internal class RestoreCoordinator(
     @Suppress("deprecation")
     private suspend fun nextRestorePackageV0(
         state: RestoreCoordinatorState,
-        packageInfo: PackageInfo
+        packageInfo: PackageInfo,
     ): RestoreDescription? {
         val packageName = packageInfo.packageName
         val type = try {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt
index c0a511df..8aceedcf 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt
@@ -49,7 +49,7 @@ abstract class RequireProvisioningActivity : BackupActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        getViewModel().chooseBackupLocation.observeEvent(this, LiveEventHandler { show ->
+        getViewModel().chooseBackupLocation.observeEvent(this, { show ->
             if (show) showStorageActivity()
         })
     }
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningViewModel.kt
index 68b02eec..28064441 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningViewModel.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningViewModel.kt
@@ -9,7 +9,7 @@ import com.stevesoltys.seedvault.ui.storage.StorageViewModel
 abstract class RequireProvisioningViewModel(
     protected val app: Application,
     protected val settingsManager: SettingsManager,
-    protected val keyManager: KeyManager
+    protected val keyManager: KeyManager,
 ) : AndroidViewModel(app) {
 
     abstract val isRestoreOperation: Boolean
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/files/FileSelectionFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/files/FileSelectionFragment.kt
index 54099150..cde9e8dc 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/files/FileSelectionFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/files/FileSelectionFragment.kt
@@ -10,7 +10,7 @@ import org.calyxos.backup.storage.ui.backup.BackupContentFragment
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
-class FileSelectionFragment() : BackupContentFragment() {
+class FileSelectionFragment : BackupContentFragment() {
 
     override val viewModel by viewModel<FileSelectionViewModel>()
     private val settingsViewModel by sharedViewModel<SettingsViewModel>()
@@ -18,7 +18,7 @@ class FileSelectionFragment() : BackupContentFragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         requireActivity().setTitle(R.string.settings_backup_files_title)
         return super.onCreateView(inflater, container, savedInstanceState)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/files/FileSelectionViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/files/FileSelectionViewModel.kt
index 359c9965..0d423a24 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/files/FileSelectionViewModel.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/files/FileSelectionViewModel.kt
@@ -8,7 +8,7 @@ import org.calyxos.backup.storage.ui.backup.BackupContentViewModel
 
 class FileSelectionViewModel(
     app: Application,
-    override val storageBackup: StorageBackup
+    override val storageBackup: StorageBackup,
 ) : BackupContentViewModel(app) {
 
     init {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/notification/BackupNotificationManager.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/notification/BackupNotificationManager.kt
index 574d4c81..b7b03733 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/notification/BackupNotificationManager.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/notification/BackupNotificationManager.kt
@@ -70,7 +70,7 @@ internal class BackupNotificationManager(private val context: Context) {
      */
     fun onBackupStarted(
         expectedPackages: Int,
-        appTotals: ExpectedAppTotals
+        appTotals: ExpectedAppTotals,
     ) {
         updateBackupNotification(
             infoText = "", // This passes quickly, no need to show something here
@@ -112,7 +112,7 @@ internal class BackupNotificationManager(private val context: Context) {
     private fun updateBackupNotification(
         infoText: CharSequence,
         transferred: Int,
-        expected: Int
+        expected: Int,
     ) {
         @Suppress("MagicNumber")
         val percentage = (transferred.toFloat() / expected) * 100
@@ -223,7 +223,7 @@ internal class BackupNotificationManager(private val context: Context) {
             setPackage(context.packageName)
             putExtra(EXTRA_PACKAGE_NAME, packageName)
         }
-        val flags = FLAG_UPDATE_CURRENT and FLAG_IMMUTABLE
+        val flags = FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
         val pendingIntent =
             PendingIntent.getBroadcast(context, REQUEST_CODE_UNINSTALL, intent, flags)
         val actionText = context.getString(R.string.notification_restore_error_action)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/notification/NotificationBackupObserver.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/notification/NotificationBackupObserver.kt
index 2fdc262b..6eb60079 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/notification/NotificationBackupObserver.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/notification/NotificationBackupObserver.kt
@@ -19,7 +19,7 @@ private val TAG = NotificationBackupObserver::class.java.simpleName
 internal class NotificationBackupObserver(
     private val context: Context,
     private val expectedPackages: Int,
-    appTotals: ExpectedAppTotals
+    appTotals: ExpectedAppTotals,
 ) : IBackupObserver.Stub(), KoinComponent {
 
     private val nm: BackupNotificationManager by inject()
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt
index 63b45a67..d851b688 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt
@@ -7,7 +7,6 @@ import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.ui.BackupActivity
 import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_RESTORE
 import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_SETUP_WIZARD
-import com.stevesoltys.seedvault.ui.LiveEventHandler
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 class RecoveryCodeActivity : BackupActivity() {
@@ -23,10 +22,10 @@ class RecoveryCodeActivity : BackupActivity() {
         setContentView(R.layout.activity_recovery_code)
 
         viewModel.isRestore = isRestore()
-        viewModel.confirmButtonClicked.observeEvent(this, LiveEventHandler { clicked ->
+        viewModel.confirmButtonClicked.observeEvent(this, { clicked ->
             if (clicked) showInput(true)
         })
-        viewModel.recoveryCodeSaved.observeEvent(this, LiveEventHandler { saved ->
+        viewModel.recoveryCodeSaved.observeEvent(this, { saved ->
             if (saved) {
                 setResult(RESULT_OK)
                 finishAfterTransition()
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt
index 4aa09635..f6b15105 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt
@@ -34,7 +34,6 @@ import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.textfield.TextInputLayout
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.isDebugBuild
-import com.stevesoltys.seedvault.ui.LiveEventHandler
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import java.util.Locale
 
@@ -70,7 +69,7 @@ class RecoveryCodeInputFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         val v: View = inflater.inflate(R.layout.fragment_recovery_code_input, container, false)
 
@@ -127,9 +126,9 @@ class RecoveryCodeInputFragment : Fragment() {
         newCodeButton.visibility = if (forStoringNewCode) GONE else VISIBLE
         newCodeButton.setOnClickListener { generateNewCode() }
 
-        viewModel.existingCodeChecked.observeEvent(viewLifecycleOwner,
-            LiveEventHandler { verified -> onExistingCodeChecked(verified) }
-        )
+        viewModel.existingCodeChecked.observeEvent(viewLifecycleOwner, { verified ->
+            onExistingCodeChecked(verified)
+        })
 
         if (forStoringNewCode && isDebugBuild() && !viewModel.isRestore) debugPreFill()
     }
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeOutputFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeOutputFragment.kt
index d8b3a5ef..9cb65d47 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeOutputFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeOutputFragment.kt
@@ -22,7 +22,7 @@ class RecoveryCodeOutputFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         val v: View = inflater.inflate(R.layout.fragment_recovery_code_output, container, false)
 
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeViewModel.kt
index c1bf6e33..02c69915 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeViewModel.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeViewModel.kt
@@ -34,7 +34,7 @@ internal class RecoveryCodeViewModel(
     private val backupManager: IBackupManager,
     private val backupCoordinator: BackupCoordinator,
     private val notificationManager: BackupNotificationManager,
-    private val storageBackup: StorageBackup
+    private val storageBackup: StorageBackup,
 ) : AndroidViewModel(app) {
 
     internal val wordList: List<CharArray> by lazy {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/BackupStorageViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/BackupStorageViewModel.kt
index 91a68b7e..27015263 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/BackupStorageViewModel.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/BackupStorageViewModel.kt
@@ -26,7 +26,7 @@ internal class BackupStorageViewModel(
     private val backupManager: IBackupManager,
     private val backupCoordinator: BackupCoordinator,
     private val storageBackup: StorageBackup,
-    settingsManager: SettingsManager
+    settingsManager: SettingsManager,
 ) : StorageViewModel(app, settingsManager) {
 
     override val isRestoreOperation = false
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/RestoreStorageViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/RestoreStorageViewModel.kt
index 05b17dbb..6bd88464 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/RestoreStorageViewModel.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/RestoreStorageViewModel.kt
@@ -5,9 +5,9 @@ import android.net.Uri
 import android.util.Log
 import androidx.lifecycle.viewModelScope
 import com.stevesoltys.seedvault.R
+import com.stevesoltys.seedvault.plugins.StoragePlugin
 import com.stevesoltys.seedvault.plugins.saf.DIRECTORY_ROOT
 import com.stevesoltys.seedvault.settings.SettingsManager
-import com.stevesoltys.seedvault.plugins.StoragePlugin
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import java.io.IOException
@@ -17,7 +17,7 @@ private val TAG = RestoreStorageViewModel::class.java.simpleName
 internal class RestoreStorageViewModel(
     private val app: Application,
     private val storagePlugin: StoragePlugin,
-    settingsManager: SettingsManager
+    settingsManager: SettingsManager,
 ) : StorageViewModel(app, settingsManager) {
 
     override val isRestoreOperation = true
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt
index 873bd7d2..08472ea8 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt
@@ -17,7 +17,6 @@ import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.ui.BackupActivity
 import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_RESTORE
 import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_SETUP_WIZARD
-import com.stevesoltys.seedvault.ui.LiveEventHandler
 import org.koin.androidx.viewmodel.ext.android.getViewModel
 
 private val TAG = StorageActivity::class.java.name
@@ -59,11 +58,11 @@ class StorageActivity : BackupActivity() {
         }
         viewModel.isSetupWizard = isSetupWizard()
 
-        viewModel.locationSet.observeEvent(this, LiveEventHandler {
+        viewModel.locationSet.observeEvent(this, {
             showFragment(StorageCheckFragment.newInstance(getCheckFragmentTitle()), true)
         })
 
-        viewModel.locationChecked.observeEvent(this, LiveEventHandler { result ->
+        viewModel.locationChecked.observeEvent(this, { result ->
             val errorMsg = result.errorMsg
             if (errorMsg == null) {
                 setResult(RESULT_OK)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageCheckFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageCheckFragment.kt
index 566d03fd..fe45f4ce 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageCheckFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageCheckFragment.kt
@@ -37,7 +37,7 @@ class StorageCheckFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         val v: View = inflater.inflate(R.layout.fragment_storage_check, container, false)
 
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootAdapter.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootAdapter.kt
index 0ec955cf..135630ad 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootAdapter.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootAdapter.kt
@@ -17,7 +17,7 @@ import com.stevesoltys.seedvault.ui.storage.StorageRootAdapter.StorageRootViewHo
 
 internal class StorageRootAdapter(
     private val isRestore: Boolean,
-    private val listener: StorageRootClickedListener
+    private val listener: StorageRootClickedListener,
 ) : Adapter<StorageRootViewHolder>() {
 
     private val items = ArrayList<StorageRoot>()
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootFetcher.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootFetcher.kt
index 50027a6b..d11756c6 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootFetcher.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootFetcher.kt
@@ -41,7 +41,7 @@ data class StorageRoot(
     internal val isUsb: Boolean,
     internal val requiresNetwork: Boolean,
     internal val enabled: Boolean = true,
-    internal val overrideClickListener: (() -> Unit)? = null
+    internal val overrideClickListener: (() -> Unit)? = null,
 ) {
 
     internal val uri: Uri by lazy {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootsFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootsFragment.kt
index b50b24de..f2e852ea 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootsFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootsFragment.kt
@@ -20,7 +20,6 @@ import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts.OpenDocumentTree
 import androidx.annotation.RequiresPermission
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.recyclerview.widget.RecyclerView
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_RESTORE
@@ -53,8 +52,8 @@ internal class StorageRootsFragment : Fragment(), StorageRootClickedListener {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
+        savedInstanceState: Bundle?,
+    ): View {
         val v: View = inflater.inflate(R.layout.fragment_storage_root, container, false)
 
         titleView = v.findViewById(R.id.titleView)
@@ -92,7 +91,7 @@ internal class StorageRootsFragment : Fragment(), StorageRootClickedListener {
 
         listView.adapter = adapter
 
-        viewModel.storageRoots.observe(viewLifecycleOwner, Observer { roots ->
+        viewModel.storageRoots.observe(viewLifecycleOwner, { roots ->
             onRootsLoaded(roots)
         })
     }
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageViewModel.kt
index f04eaa8d..a9b59230 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageViewModel.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageViewModel.kt
@@ -25,7 +25,7 @@ private val TAG = StorageViewModel::class.java.simpleName
 
 internal abstract class StorageViewModel(
     private val app: Application,
-    protected val settingsManager: SettingsManager
+    protected val settingsManager: SettingsManager,
 ) : AndroidViewModel(app), RemovableStorageListener {
 
     private val mStorageRoots = MutableLiveData<List<StorageRoot>>()
@@ -48,7 +48,7 @@ internal abstract class StorageViewModel(
     companion object {
         internal fun validLocationIsSet(
             context: Context,
-            settingsManager: SettingsManager
+            settingsManager: SettingsManager,
         ): Boolean {
             val storage = settingsManager.getStorage() ?: return false
             if (storage.isUsb) return true
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b2f95493..c5b22ded 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,7 +5,8 @@
     <color name="primaryDark">@*android:color/primary_dark_device_default_settings_light</color>
     <color name="background">@*android:color/background_device_default_light</color>
     <color name="actionBarPrimary">@*android:color/primary_device_default_light</color>
-    <color name="statusBarColor">@*android:color/primary_dark_material_light_light_status_bar</color>
+    <color name="statusBarColor">@*android:color/primary_dark_material_light_light_status_bar
+    </color>
     <color name="red">@*android:color/error_color_device_default_dark</color>
     <color name="divider">#20ffffff</color>
     <color name="green">#558B2F</color>
diff --git a/app/src/sharedTest/java/com/stevesoltys/seedvault/TestUtils.kt b/app/src/sharedTest/java/com/stevesoltys/seedvault/TestUtils.kt
index ef5cea1a..70d1ca7e 100644
--- a/app/src/sharedTest/java/com/stevesoltys/seedvault/TestUtils.kt
+++ b/app/src/sharedTest/java/com/stevesoltys/seedvault/TestUtils.kt
@@ -48,14 +48,6 @@ fun ByteArray.toHexString(spacer: String = " "): String {
 
 fun String.toByteArrayFromHex() = chunked(2).map { it.toInt(16).toByte() }.toByteArray()
 
-fun ByteArray.toIntString(): String {
-    var str = ""
-    for (b in this) {
-        str += String.format("%02d ", b)
-    }
-    return str
-}
-
 fun OutputStream.writeAndClose(data: ByteArray) = use {
     it.write(data)
 }
diff --git a/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataReadWriteTest.kt b/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataReadWriteTest.kt
index f0afbb86..fdd6aff8 100644
--- a/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataReadWriteTest.kt
+++ b/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataReadWriteTest.kt
@@ -51,7 +51,7 @@ internal class MetadataReadWriteTest {
     }
 
     private fun getMetadata(
-        packageMetadata: HashMap<String, PackageMetadata> = HashMap()
+        packageMetadata: HashMap<String, PackageMetadata> = HashMap(),
     ): BackupMetadata {
         return BackupMetadata(
             version = VERSION,
diff --git a/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataReaderTest.kt b/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataReaderTest.kt
index 8b9216a8..140d5915 100644
--- a/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataReaderTest.kt
+++ b/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataReaderTest.kt
@@ -169,7 +169,7 @@ class MetadataReaderTest {
     }
 
     private fun getMetadata(
-        packageMetadata: PackageMetadataMap = PackageMetadataMap()
+        packageMetadata: PackageMetadataMap = PackageMetadataMap(),
     ): BackupMetadata {
         return BackupMetadata(
             version = 1.toByte(),
diff --git a/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataV0ReadTest.kt b/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataV0ReadTest.kt
index d5796ae3..d0e11aca 100644
--- a/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataV0ReadTest.kt
+++ b/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataV0ReadTest.kt
@@ -50,7 +50,7 @@ internal class MetadataV0ReadTest {
     }
 
     private fun getMetadata(
-        packageMetadata: HashMap<String, PackageMetadata> = HashMap()
+        packageMetadata: HashMap<String, PackageMetadata> = HashMap(),
     ) = BackupMetadata(
         version = 0x00,
         token = 1337L,
diff --git a/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataWriterDecoderTest.kt b/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataWriterDecoderTest.kt
index aa1c23f0..4712551a 100644
--- a/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataWriterDecoderTest.kt
+++ b/app/src/test/java/com/stevesoltys/seedvault/metadata/MetadataWriterDecoderTest.kt
@@ -120,7 +120,7 @@ internal class MetadataWriterDecoderTest {
     }
 
     private fun getMetadata(
-        packageMetadata: HashMap<String, PackageMetadata> = HashMap()
+        packageMetadata: HashMap<String, PackageMetadata> = HashMap(),
     ): BackupMetadata {
         return BackupMetadata(
             version = Random.nextBytes(1)[0],
diff --git a/app/src/test/java/com/stevesoltys/seedvault/restore/install/ApkBackupRestoreTest.kt b/app/src/test/java/com/stevesoltys/seedvault/restore/install/ApkBackupRestoreTest.kt
index 7f3bbf4f..d384e6ac 100644
--- a/app/src/test/java/com/stevesoltys/seedvault/restore/install/ApkBackupRestoreTest.kt
+++ b/app/src/test/java/com/stevesoltys/seedvault/restore/install/ApkBackupRestoreTest.kt
@@ -46,6 +46,7 @@ internal class ApkBackupRestoreTest : TransportTest() {
     private val strictContext: Context = mockk<Context>().apply {
         every { packageManager } returns pm
     }
+
     @Suppress("Deprecation")
     private val legacyStoragePlugin: LegacyStoragePlugin = mockk()
     private val storagePlugin: StoragePlugin = mockk()
diff --git a/app/src/test/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinatorTest.kt b/app/src/test/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinatorTest.kt
index 9f4dffa2..c7c11dd8 100644
--- a/app/src/test/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinatorTest.kt
+++ b/app/src/test/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinatorTest.kt
@@ -14,10 +14,10 @@ import com.stevesoltys.seedvault.header.VERSION
 import com.stevesoltys.seedvault.metadata.BackupType
 import com.stevesoltys.seedvault.metadata.MetadataReader
 import com.stevesoltys.seedvault.metadata.PackageMetadata
+import com.stevesoltys.seedvault.plugins.EncryptedMetadata
+import com.stevesoltys.seedvault.plugins.StoragePlugin
 import com.stevesoltys.seedvault.settings.Storage
 import com.stevesoltys.seedvault.transport.TransportTest
-import com.stevesoltys.seedvault.plugins.StoragePlugin
-import com.stevesoltys.seedvault.plugins.EncryptedMetadata
 import com.stevesoltys.seedvault.ui.notification.BackupNotificationManager
 import io.mockk.Runs
 import io.mockk.coEvery
diff --git a/app/src/test/java/com/stevesoltys/seedvault/transport/restore/RestoreV0IntegrationTest.kt b/app/src/test/java/com/stevesoltys/seedvault/transport/restore/RestoreV0IntegrationTest.kt
index 85e8d610..07df8f34 100644
--- a/app/src/test/java/com/stevesoltys/seedvault/transport/restore/RestoreV0IntegrationTest.kt
+++ b/app/src/test/java/com/stevesoltys/seedvault/transport/restore/RestoreV0IntegrationTest.kt
@@ -14,10 +14,10 @@ import com.stevesoltys.seedvault.encodeBase64
 import com.stevesoltys.seedvault.header.HeaderReaderImpl
 import com.stevesoltys.seedvault.metadata.MetadataReaderImpl
 import com.stevesoltys.seedvault.plugins.LegacyStoragePlugin
+import com.stevesoltys.seedvault.plugins.StoragePlugin
 import com.stevesoltys.seedvault.toByteArrayFromHex
 import com.stevesoltys.seedvault.transport.TransportTest
 import com.stevesoltys.seedvault.transport.backup.KvDbManager
-import com.stevesoltys.seedvault.plugins.StoragePlugin
 import com.stevesoltys.seedvault.ui.notification.BackupNotificationManager
 import io.mockk.coEvery
 import io.mockk.every
diff --git a/contactsbackup/src/main/AndroidManifest.xml b/contactsbackup/src/main/AndroidManifest.xml
index 4a446e2e..590c0859 100644
--- a/contactsbackup/src/main/AndroidManifest.xml
+++ b/contactsbackup/src/main/AndroidManifest.xml
@@ -24,7 +24,7 @@
         android:usesCleartextTraffic="false"
         tools:ignore="AllowBackup,MissingApplicationIcon">
 
-        <!-- We are using the receiver to not get FLAG_STOPPED with which we won't get backed up  -->
+        <!-- We are using the receiver to not get FLAG_STOPPED with which we won't get backed up -->
         <receiver
             android:name=".StartBroadcastReceiver"
             android:exported="false">
diff --git a/contactsbackup/src/main/java/org/calyxos/backup/contacts/ContactsBackupAgent.java b/contactsbackup/src/main/java/org/calyxos/backup/contacts/ContactsBackupAgent.java
index 7ebf0a9d..17fa59ce 100644
--- a/contactsbackup/src/main/java/org/calyxos/backup/contacts/ContactsBackupAgent.java
+++ b/contactsbackup/src/main/java/org/calyxos/backup/contacts/ContactsBackupAgent.java
@@ -1,5 +1,9 @@
 package org.calyxos.backup.contacts;
 
+import static android.Manifest.permission.READ_CONTACTS;
+import static android.Manifest.permission.WRITE_CONTACTS;
+import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+
 import android.app.backup.BackupAgent;
 import android.app.backup.BackupDataInput;
 import android.app.backup.BackupDataOutput;
@@ -16,10 +20,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Optional;
 
-import static android.Manifest.permission.READ_CONTACTS;
-import static android.Manifest.permission.WRITE_CONTACTS;
-import static android.content.pm.PackageManager.PERMISSION_GRANTED;
-
 public class ContactsBackupAgent extends BackupAgent implements FullBackupFileHandler {
 
     private final static String TAG = "ContactsBackupAgent";
diff --git a/storage/demo/src/main/java/de/grobox/storagebackuptester/LogFragment.kt b/storage/demo/src/main/java/de/grobox/storagebackuptester/LogFragment.kt
index d60c220d..fda4194b 100644
--- a/storage/demo/src/main/java/de/grobox/storagebackuptester/LogFragment.kt
+++ b/storage/demo/src/main/java/de/grobox/storagebackuptester/LogFragment.kt
@@ -53,7 +53,7 @@ open class LogFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         setHasOptionsMenu(true)
         val v = inflater.inflate(R.layout.fragment_log, container, false)
diff --git a/storage/demo/src/main/java/de/grobox/storagebackuptester/backup/BackupStats.kt b/storage/demo/src/main/java/de/grobox/storagebackuptester/backup/BackupStats.kt
index 31468272..44aeb8a9 100644
--- a/storage/demo/src/main/java/de/grobox/storagebackuptester/backup/BackupStats.kt
+++ b/storage/demo/src/main/java/de/grobox/storagebackuptester/backup/BackupStats.kt
@@ -37,7 +37,7 @@ internal class BackupStats(
         totalSize: Long,
         numFiles: Int,
         numSmallFiles: Int,
-        numLargeFiles: Int
+        numLargeFiles: Int,
     ) {
         super.onBackupStart(totalSize, numFiles, numSmallFiles, numLargeFiles)
 
@@ -46,7 +46,7 @@ internal class BackupStats(
 
         val totalSizeStr = Formatter.formatShortFileSize(context, totalSize)
         val text = "Backing up $totalFiles file(s) $totalSizeStr...\n" +
-                "  ($numSmallFiles small, $numLargeFiles large)\n"
+            "  ($numSmallFiles small, $numLargeFiles large)\n"
         liveData.postValue(BackupProgress(filesProcessed, totalFiles, text))
     }
 
diff --git a/storage/demo/src/main/java/de/grobox/storagebackuptester/restore/DemoSnapshotFragment.kt b/storage/demo/src/main/java/de/grobox/storagebackuptester/restore/DemoSnapshotFragment.kt
index 66990226..b7caa3da 100644
--- a/storage/demo/src/main/java/de/grobox/storagebackuptester/restore/DemoSnapshotFragment.kt
+++ b/storage/demo/src/main/java/de/grobox/storagebackuptester/restore/DemoSnapshotFragment.kt
@@ -19,7 +19,7 @@ class DemoSnapshotFragment : SnapshotFragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         val v = super.onCreateView(inflater, container, savedInstanceState)
         val bottomStub: ViewStub = v.findViewById(R.id.bottomStub)
diff --git a/storage/demo/src/main/java/de/grobox/storagebackuptester/restore/RestoreFragment.kt b/storage/demo/src/main/java/de/grobox/storagebackuptester/restore/RestoreFragment.kt
index c4eb831c..563fa2c2 100644
--- a/storage/demo/src/main/java/de/grobox/storagebackuptester/restore/RestoreFragment.kt
+++ b/storage/demo/src/main/java/de/grobox/storagebackuptester/restore/RestoreFragment.kt
@@ -33,7 +33,7 @@ class RestoreFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         setHasOptionsMenu(true)
         val v = inflater.inflate(R.layout.fragment_log, container, false)
diff --git a/storage/demo/src/main/java/de/grobox/storagebackuptester/scanner/DocumentScanner.kt b/storage/demo/src/main/java/de/grobox/storagebackuptester/scanner/DocumentScanner.kt
index 7552520b..0a1b8726 100644
--- a/storage/demo/src/main/java/de/grobox/storagebackuptester/scanner/DocumentScanner.kt
+++ b/storage/demo/src/main/java/de/grobox/storagebackuptester/scanner/DocumentScanner.kt
@@ -29,7 +29,7 @@ private val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
 fun scanDocument(
     context: Context,
     documentFiles: List<BackupFile>,
-    sb: StringBuilder? = null
+    sb: StringBuilder? = null,
 ): ScanResult {
     var totalSize = 0L
     val warnings = StringBuilder()
diff --git a/storage/demo/src/main/java/de/grobox/storagebackuptester/scanner/MediaScanFragment.kt b/storage/demo/src/main/java/de/grobox/storagebackuptester/scanner/MediaScanFragment.kt
index 1bd82dac..b64e265d 100644
--- a/storage/demo/src/main/java/de/grobox/storagebackuptester/scanner/MediaScanFragment.kt
+++ b/storage/demo/src/main/java/de/grobox/storagebackuptester/scanner/MediaScanFragment.kt
@@ -46,7 +46,7 @@ open class MediaScanFragment : Fragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         setHasOptionsMenu(true)
         requireActivity().title = arguments?.getString("name")
diff --git a/storage/demo/src/main/java/de/grobox/storagebackuptester/scanner/MediaScanner.kt b/storage/demo/src/main/java/de/grobox/storagebackuptester/scanner/MediaScanner.kt
index 88a5e9d0..d6376b5e 100644
--- a/storage/demo/src/main/java/de/grobox/storagebackuptester/scanner/MediaScanner.kt
+++ b/storage/demo/src/main/java/de/grobox/storagebackuptester/scanner/MediaScanner.kt
@@ -14,7 +14,7 @@ import kotlin.time.measureTimedValue
 
 data class ScanResult(
     var itemsFound: Long,
-    var totalSize: Long
+    var totalSize: Long,
 ) {
     operator fun plusAssign(other: ScanResult) {
         itemsFound += other.itemsFound
@@ -57,7 +57,7 @@ fun appendStats(
     context: Context,
     sb: StringBuilder,
     timedResult: TimedValue<ScanResult>,
-    title: String? = null
+    title: String? = null,
 ): String {
     val result = timedResult.value
     if (title != null || sb.isNotEmpty()) {
diff --git a/storage/demo/src/main/java/de/grobox/storagebackuptester/settings/SettingsFragment.kt b/storage/demo/src/main/java/de/grobox/storagebackuptester/settings/SettingsFragment.kt
index 989b4c42..40abc081 100644
--- a/storage/demo/src/main/java/de/grobox/storagebackuptester/settings/SettingsFragment.kt
+++ b/storage/demo/src/main/java/de/grobox/storagebackuptester/settings/SettingsFragment.kt
@@ -42,7 +42,7 @@ class SettingsFragment : BackupContentFragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         setHasOptionsMenu(true)
         requireActivity().title = "Settings"
diff --git a/storage/demo/src/main/res/drawable/ic_info.xml b/storage/demo/src/main/res/drawable/ic_info.xml
index 17255b7a..7396ebcb 100644
--- a/storage/demo/src/main/res/drawable/ic_info.xml
+++ b/storage/demo/src/main/res/drawable/ic_info.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z" />
 </vector>
diff --git a/storage/demo/src/main/res/drawable/ic_settings.xml b/storage/demo/src/main/res/drawable/ic_settings.xml
index 41a82ede..d99a8ae4 100644
--- a/storage/demo/src/main/res/drawable/ic_settings.xml
+++ b/storage/demo/src/main/res/drawable/ic_settings.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" />
 </vector>
diff --git a/storage/demo/src/main/res/menu/fragment_scan.xml b/storage/demo/src/main/res/menu/fragment_scan.xml
index babd3f12..c0e5c1c1 100644
--- a/storage/demo/src/main/res/menu/fragment_scan.xml
+++ b/storage/demo/src/main/res/menu/fragment_scan.xml
@@ -6,12 +6,12 @@
         android:id="@+id/refresh"
         android:icon="@drawable/ic_refresh"
         android:title="Refresh"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
 
     <item
         android:id="@+id/share"
         android:icon="@drawable/ic_share"
         android:title="Share"
-        app:showAsAction="always"/>
+        app:showAsAction="always" />
 
 </menu>
diff --git a/storage/demo/src/main/res/values/themes.xml b/storage/demo/src/main/res/values/themes.xml
index d1bd3df3..1b913a62 100644
--- a/storage/demo/src/main/res/values/themes.xml
+++ b/storage/demo/src/main/res/values/themes.xml
@@ -1,4 +1,5 @@
 <resources>
+
     <style name="Theme.StorageBackupTester" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <item name="colorPrimary">@color/matrix</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/api/BackupContentType.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/api/BackupContentType.kt
index 15decb6a..0d8dae20 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/api/BackupContentType.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/api/BackupContentType.kt
@@ -28,7 +28,7 @@ public val mediaUris: List<Uri> = listOf(
 
 public sealed class BackupContentType(
     @DrawableRes
-    public val drawableRes: Int
+    public val drawableRes: Int,
 ) {
     public object Custom : BackupContentType(R.drawable.ic_folder) {
         public fun getName(uri: Uri): String {
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/backup/Backup.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/backup/Backup.kt
index 50ccbb70..48c74c2e 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/backup/Backup.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/backup/Backup.kt
@@ -119,7 +119,7 @@ internal class Backup(
     private suspend fun backupFiles(
         filesResult: FileScannerResult,
         availableChunkIds: HashSet<String>,
-        backupObserver: BackupObserver?
+        backupObserver: BackupObserver?,
     ) {
         val startTime = System.currentTimeMillis()
         val numSmallFiles = filesResult.smallFiles.size
@@ -132,7 +132,7 @@ internal class Backup(
         }
         val result = largeResult + smallResult
         val backupSize = result.backupMediaFiles.sumOf { it.size } +
-                result.backupDocumentFiles.sumOf { it.size }
+            result.backupDocumentFiles.sumOf { it.size }
         val endTime = System.currentTimeMillis()
 
         val backupSnapshot: BackupSnapshot
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/backup/ChunkWriter.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/backup/ChunkWriter.kt
index 76bc91fa..38e0a482 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/backup/ChunkWriter.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/backup/ChunkWriter.kt
@@ -36,7 +36,7 @@ internal class ChunkWriter(
     fun writeChunk(
         inputStream: InputStream,
         chunks: List<Chunk>,
-        missingChunkIds: List<String>
+        missingChunkIds: List<String>,
     ): ChunkWriterResult {
         var writtenChunks = 0
         var writtenBytes = 0L
@@ -77,7 +77,7 @@ internal class ChunkWriter(
     private fun copyChunkFromInputStream(
         inputStream: InputStream,
         chunk: Chunk,
-        outputStream: OutputStream
+        outputStream: OutputStream,
     ) {
         var totalBytesRead = 0L
         do {
@@ -101,7 +101,7 @@ internal class ChunkWriter(
     fun writeZipChunk(
         chunk: ZipChunk,
         zip: ByteArrayOutputStream,
-        missingChunkIds: List<String>
+        missingChunkIds: List<String>,
     ): Boolean {
         val cachedChunk = chunksCache.get(chunk.id)
         val isMissing = chunk.id in missingChunkIds
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/backup/Chunker.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/backup/Chunker.kt
index 8d257445..03000c13 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/backup/Chunker.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/backup/Chunker.kt
@@ -10,7 +10,7 @@ import kotlin.math.min
 internal data class Chunk(
     val id: String,
     val offset: Long,
-    val size: Long
+    val size: Long,
 ) {
     fun toCachedChunk() = CachedChunk(id, 0, size)
 }
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/backup/ChunksCacheRepopulater.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/backup/ChunksCacheRepopulater.kt
index 5e7afc06..764e994f 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/backup/ChunksCacheRepopulater.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/backup/ChunksCacheRepopulater.kt
@@ -35,7 +35,7 @@ internal class ChunksCacheRepopulater(
     @OptIn(ExperimentalTime::class)
     private suspend fun repopulateInternal(
         streamKey: ByteArray,
-        availableChunkIds: HashSet<String>
+        availableChunkIds: HashSet<String>,
     ) {
         val start = System.currentTimeMillis()
         val snapshots = storagePlugin.getCurrentBackupSnapshots().mapNotNull { storedSnapshot ->
@@ -85,7 +85,7 @@ internal class ChunksCacheRepopulater(
         snapshotTimeStamp: Long,
         availableChunks: HashSet<String>,
         chunkMap: HashMap<String, CachedChunk>,
-        chunksInSnapshot: HashSet<String>
+        chunksInSnapshot: HashSet<String>,
     ) = chunksInSnapshot.forEach { chunkId ->
         if (!availableChunks.contains(chunkId)) {
             Log.w(TAG, "ChunkId $chunkId referenced in $snapshotTimeStamp, but not in storage.")
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/backup/FileBackup.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/backup/FileBackup.kt
index 4235ff25..83858271 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/backup/FileBackup.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/backup/FileBackup.kt
@@ -27,7 +27,7 @@ internal class FileBackup(
     suspend fun backupFiles(
         files: List<ContentFile>,
         availableChunkIds: HashSet<String>,
-        backupObserver: BackupObserver?
+        backupObserver: BackupObserver?,
     ): BackupResult {
         val chunkIds = HashSet<String>()
         val backupMediaFiles = ArrayList<BackupMediaFile>()
@@ -71,7 +71,7 @@ internal class FileBackup(
     @Throws(IOException::class, GeneralSecurityException::class)
     private fun backupFile(
         file: ContentFile,
-        availableChunkIds: HashSet<String>
+        availableChunkIds: HashSet<String>,
     ): FileBackupResult {
         val cachedFile = filesCache.getByUri(file.uri)
         val missingChunkIds = cachedFile?.chunks?.minus(availableChunkIds) ?: emptyList()
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/backup/NotificationBackupObserver.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/backup/NotificationBackupObserver.kt
index 82d6b81d..2c0762d1 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/backup/NotificationBackupObserver.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/backup/NotificationBackupObserver.kt
@@ -25,7 +25,7 @@ public open class NotificationBackupObserver internal constructor(private val n:
         totalSize: Long,
         numFiles: Int,
         numSmallFiles: Int,
-        numLargeFiles: Int
+        numLargeFiles: Int,
     ) {
         totalFiles = numFiles
         n.updateBackupNotification(
@@ -40,7 +40,7 @@ public open class NotificationBackupObserver internal constructor(private val n:
         wasUploaded: Boolean,
         reusedChunks: Int,
         bytesWritten: Long,
-        tag: String
+        tag: String,
     ) {
         filesBackedUp++
         n.updateBackupNotification(
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/backup/SmallFileBackup.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/backup/SmallFileBackup.kt
index a7c90523..208fc5f9 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/backup/SmallFileBackup.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/backup/SmallFileBackup.kt
@@ -27,7 +27,7 @@ internal class SmallFileBackup(
     suspend fun backupFiles(
         files: List<ContentFile>,
         availableChunkIds: HashSet<String>,
-        backupObserver: BackupObserver?
+        backupObserver: BackupObserver?,
     ): BackupResult {
         val chunkIds = HashSet<String>()
         val missingChunkIds = ArrayList<String>()
@@ -105,7 +105,7 @@ internal class SmallFileBackup(
     @Throws(IOException::class, GeneralSecurityException::class)
     private fun makeZipChunk(
         window: List<ContentFile>,
-        missingChunkIds: List<String>
+        missingChunkIds: List<String>,
     ): SmallFileBackupResult? {
         val file = window[0]
         val nextFile = window.getOrNull(1)
@@ -124,7 +124,7 @@ internal class SmallFileBackup(
     @Throws(IOException::class, GeneralSecurityException::class)
     private fun finalizeAndReset(
         zipChunker: ZipChunker,
-        missingChunkIds: List<String>
+        missingChunkIds: List<String>,
     ): SmallFileBackupResult {
         val zipChunk = zipChunker.finalizeAndReset(missingChunkIds)
         val chunkIds = listOf(zipChunk.id)
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/content/ContentFile.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/content/ContentFile.kt
index d7ba22a8..5252c956 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/content/ContentFile.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/content/ContentFile.kt
@@ -81,7 +81,7 @@ internal data class MediaFile(
         if (generationMod) {
             Log.e(
                 "TEST", "$path has changed, because generation was " +
-                        "${cachedFile.generationModified}, now is $generationModified."
+                    "${cachedFile.generationModified}, now is $generationModified."
             )
         }
         return super.hasNotChanged(cachedFile) && !generationMod
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/crypto/ChunkCrypto.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/crypto/ChunkCrypto.kt
index 9af11ac2..bb303672 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/crypto/ChunkCrypto.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/crypto/ChunkCrypto.kt
@@ -21,7 +21,7 @@ internal object ChunkCrypto {
     @Throws(GeneralSecurityException::class)
     fun deriveChunkIdKey(
         masterKey: SecretKey,
-        info: ByteArray = INFO_CHUNK_ID.toByteArray()
+        info: ByteArray = INFO_CHUNK_ID.toByteArray(),
     ): ByteArray = Hkdf.expand(
         secretKey = masterKey,
         info = info,
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/crypto/StreamCrypto.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/crypto/StreamCrypto.kt
index 15ebea3f..339d02bb 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/crypto/StreamCrypto.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/crypto/StreamCrypto.kt
@@ -22,7 +22,7 @@ public object StreamCrypto {
     @Throws(GeneralSecurityException::class)
     public fun deriveStreamKey(
         masterKey: SecretKey,
-        info: ByteArray = INFO_STREAM_KEY.toByteArray()
+        info: ByteArray = INFO_STREAM_KEY.toByteArray(),
     ): ByteArray = Hkdf.expand(
         secretKey = masterKey,
         info = info,
@@ -51,7 +51,7 @@ public object StreamCrypto {
     public fun newEncryptingStream(
         secret: ByteArray,
         outputStream: OutputStream,
-        associatedData: ByteArray = ByteArray(0)
+        associatedData: ByteArray = ByteArray(0),
     ): OutputStream {
         return AesGcmHkdfStreaming(
             secret,
@@ -66,7 +66,7 @@ public object StreamCrypto {
     public fun newDecryptingStream(
         secret: ByteArray,
         inputStream: InputStream,
-        associatedData: ByteArray = ByteArray(0)
+        associatedData: ByteArray = ByteArray(0),
     ): InputStream {
         return AesGcmHkdfStreaming(
             secret,
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/db/FilesCache.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/db/FilesCache.kt
index 99d8eba3..9765b894 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/db/FilesCache.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/db/FilesCache.kt
@@ -23,7 +23,7 @@ internal data class CachedFile(
      */
     @ColumnInfo(name = "zip_index") val zipIndex: Int? = null,
     // TODO also purge files from the cache from time to time
-    @ColumnInfo(name = "last_seen") val lastSeen: Long
+    @ColumnInfo(name = "last_seen") val lastSeen: Long,
 )
 
 @Dao
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/plugin/saf/DocumentFileExt.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/plugin/saf/DocumentFileExt.kt
index 9e6431c4..7383a4c9 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/plugin/saf/DocumentFileExt.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/plugin/saf/DocumentFileExt.kt
@@ -108,7 +108,7 @@ public object DocumentFileExt {
     public fun getTreeDocumentFile(
         parent: DocumentFile,
         context: Context,
-        uri: Uri
+        uri: Uri,
     ): DocumentFile {
         @SuppressWarnings("MagicNumber")
         val constructor = parent.javaClass.declaredConstructors.find {
@@ -128,7 +128,7 @@ public object DocumentFileExt {
      */
     public suspend fun DocumentFile.findFileBlocking(
         context: Context,
-        displayName: String
+        displayName: String,
     ): DocumentFile? {
         val files = try {
             listFilesBlocking(context)
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/plugin/saf/SafStoragePlugin.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/plugin/saf/SafStoragePlugin.kt
index 9d4b3168..249c733c 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/plugin/saf/SafStoragePlugin.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/plugin/saf/SafStoragePlugin.kt
@@ -84,7 +84,7 @@ public abstract class SafStoragePlugin(
     private suspend fun populateChunkFolders(
         folder: DocumentFile,
         chunkFolders: HashMap<String, DocumentFile>,
-        fileOp: ((DocumentFile, String) -> Unit)? = null
+        fileOp: ((DocumentFile, String) -> Unit)? = null,
     ) {
         val expectedChunkFolders = (0x00..0xff).map {
             Integer.toHexString(it).padStart(2, '0')
@@ -121,7 +121,7 @@ public abstract class SafStoragePlugin(
     private fun createMissingChunkFolders(
         root: DocumentFile,
         chunkFolders: HashMap<String, DocumentFile>,
-        expectedChunkFolders: Set<String>
+        expectedChunkFolders: Set<String>,
     ) {
         val s = expectedChunkFolders.size
         val duration = measure {
@@ -194,7 +194,7 @@ public abstract class SafStoragePlugin(
     @Throws(IOException::class)
     override suspend fun getChunkInputStream(
         snapshot: StoredSnapshot,
-        chunkId: String
+        chunkId: String,
     ): InputStream {
         if (cache.restoreChunkFolders.size < CHUNK_FOLDER_COUNT) {
             populateChunkFolders(getFolder(snapshot), cache.restoreChunkFolders)
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/prune/Pruner.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/prune/Pruner.kt
index 9426cf5e..17350158 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/prune/Pruner.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/prune/Pruner.kt
@@ -53,7 +53,7 @@ internal class Pruner(
     @Throws(IOException::class, GeneralSecurityException::class)
     private suspend fun pruneSnapshot(
         storedSnapshot: StoredSnapshot,
-        backupObserver: BackupObserver?
+        backupObserver: BackupObserver?,
     ) {
         val snapshot = snapshotRetriever.getSnapshot(streamKey, storedSnapshot)
         val chunks = HashSet<String>()
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/restore/FileSplitter.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/restore/FileSplitter.kt
index 301f0f00..b5a90703 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/restore/FileSplitter.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/restore/FileSplitter.kt
@@ -6,7 +6,7 @@ import org.calyxos.backup.storage.backup.BackupMediaFile
 import org.calyxos.backup.storage.backup.BackupSnapshot
 
 internal data class RestorableChunk(
-    val chunkId: String
+    val chunkId: String,
 ) {
     val files: ArrayList<RestorableFile> = ArrayList()
     val isSingle: Boolean get() = files.size == 1 && files[0].chunkIdsCount == 1
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/restore/MultiChunkRestore.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/restore/MultiChunkRestore.kt
index 372f91d7..6694df75 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/restore/MultiChunkRestore.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/restore/MultiChunkRestore.kt
@@ -22,7 +22,7 @@ internal class MultiChunkRestore(
     storagePlugin: StoragePlugin,
     fileRestore: FileRestore,
     streamCrypto: StreamCrypto,
-    streamKey: ByteArray
+    streamKey: ByteArray,
 ) : AbstractChunkRestore(storagePlugin, fileRestore, streamCrypto, streamKey) {
 
     suspend fun restore(
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/restore/SingleChunkRestore.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/restore/SingleChunkRestore.kt
index f6e23806..9501912c 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/restore/SingleChunkRestore.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/restore/SingleChunkRestore.kt
@@ -13,14 +13,14 @@ internal class SingleChunkRestore(
     storagePlugin: StoragePlugin,
     fileRestore: FileRestore,
     streamCrypto: StreamCrypto,
-    streamKey: ByteArray
+    streamKey: ByteArray,
 ) : AbstractChunkRestore(storagePlugin, fileRestore, streamCrypto, streamKey) {
 
     suspend fun restore(
         version: Int,
         storedSnapshot: StoredSnapshot,
         chunks: Collection<RestorableChunk>,
-        observer: RestoreObserver?
+        observer: RestoreObserver?,
     ): Int {
         var restoredFiles = 0
         chunks.forEach { chunk ->
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/restore/ZipChunkRestore.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/restore/ZipChunkRestore.kt
index b937bc85..e1582932 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/restore/ZipChunkRestore.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/restore/ZipChunkRestore.kt
@@ -17,7 +17,7 @@ internal class ZipChunkRestore(
     storagePlugin: StoragePlugin,
     fileRestore: FileRestore,
     streamCrypto: StreamCrypto,
-    streamKey: ByteArray
+    streamKey: ByteArray,
 ) : AbstractChunkRestore(storagePlugin, fileRestore, streamCrypto, streamKey) {
 
     /**
@@ -27,7 +27,7 @@ internal class ZipChunkRestore(
         version: Int,
         storedSnapshot: StoredSnapshot,
         zipChunks: Collection<RestorableChunk>,
-        observer: RestoreObserver?
+        observer: RestoreObserver?,
     ): Int {
         var restoredFiles = 0
         zipChunks.forEach { zipChunk ->
@@ -51,7 +51,7 @@ internal class ZipChunkRestore(
     private suspend fun restoreZipChunk(
         zipChunk: RestorableChunk,
         decryptedStream: InputStream,
-        observer: RestoreObserver?
+        observer: RestoreObserver?,
     ): Int {
         var restoredFiles = 0
         ZipInputStream(decryptedStream).use { zip ->
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/scanner/DocumentScanner.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/scanner/DocumentScanner.kt
index 3751a9dc..a44a8db8 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/scanner/DocumentScanner.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/scanner/DocumentScanner.kt
@@ -40,7 +40,7 @@ public class DocumentScanner(context: Context) {
     internal fun scanDocumentUri(
         uri: Uri,
         dir: String = uri.getDocumentPath() ?: "",
-        maxSize: Long = Long.MAX_VALUE
+        maxSize: Long = Long.MAX_VALUE,
     ): List<DocFile> {
         // http://aosp.opersys.com/xref/android-11.0.0_r8/xref/frameworks/base/core/java/com/android/internal/content/FileSystemProvider.java
         // http://aosp.opersys.com/xref/android-11.0.0_r8/xref/frameworks/base/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/ui/Notifications.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/Notifications.kt
index bac3e04e..977d2df3 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/ui/Notifications.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/Notifications.kt
@@ -111,7 +111,7 @@ internal class Notifications(private val context: Context) {
     internal fun showRestoreCompleteNotification(
         restored: Int,
         total: Int,
-        intent: PendingIntent?
+        intent: PendingIntent?,
     ) {
         val title = context.getString(R.string.notification_restore_complete_title, restored, total)
         val notification = NotificationCompat.Builder(context, CHANNEL_ID_BACKUP).apply {
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/ui/backup/BackupContentFragment.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/backup/BackupContentFragment.kt
index 35c70adf..dae0ed1c 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/ui/backup/BackupContentFragment.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/backup/BackupContentFragment.kt
@@ -33,7 +33,7 @@ public class OpenTree : OpenDocumentTree() {
         return super.createIntent(context, input).apply {
             addFlags(
                 FLAG_GRANT_READ_URI_PERMISSION or FLAG_GRANT_WRITE_URI_PERMISSION or
-                        FLAG_GRANT_PERSISTABLE_URI_PERMISSION
+                    FLAG_GRANT_PERSISTABLE_URI_PERMISSION
             )
         }
     }
@@ -50,7 +50,7 @@ public abstract class BackupContentFragment : Fragment(), ContentClickListener {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         val v = inflater.inflate(R.layout.fragment_backup_content, container, false)
         val list: RecyclerView = v.findViewById(R.id.list)
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/ui/backup/BackupContentItem.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/backup/BackupContentItem.kt
index 7a4d15d5..6864ee74 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/ui/backup/BackupContentItem.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/backup/BackupContentItem.kt
@@ -8,7 +8,7 @@ import org.calyxos.backup.storage.api.MediaType
 public data class BackupContentItem(
     val uri: Uri,
     val contentType: BackupContentType,
-    val enabled: Boolean
+    val enabled: Boolean,
 ) {
     public fun getName(context: Context): String = when (contentType) {
         is BackupContentType.Custom -> BackupContentType.Custom.getName(uri)
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/ui/restore/SnapshotAdapter.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/restore/SnapshotAdapter.kt
index d46d3382..ca0f617e 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/ui/restore/SnapshotAdapter.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/restore/SnapshotAdapter.kt
@@ -23,7 +23,7 @@ private class SnapshotItemCallback : DiffUtil.ItemCallback<SnapshotItem>() {
         val newSnapshot = newItem.snapshot
         val oldSnapshot = oldItem.snapshot
         return newSnapshot?.name == oldSnapshot?.name &&
-                newSnapshot?.size == oldSnapshot?.size
+            newSnapshot?.size == oldSnapshot?.size
     }
 }
 
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/ui/restore/SnapshotFragment.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/restore/SnapshotFragment.kt
index 22335ea0..3034e0bf 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/ui/restore/SnapshotFragment.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/restore/SnapshotFragment.kt
@@ -30,7 +30,7 @@ public abstract class SnapshotFragment : Fragment(), SnapshotClickListener {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View {
         requireActivity().setTitle(R.string.snapshots_title)
 
diff --git a/storage/lib/src/test/java/org/calyxos/backup/storage/backup/SmallFileBackupTest.kt b/storage/lib/src/test/java/org/calyxos/backup/storage/backup/SmallFileBackupTest.kt
index cf5832c5..d48ece04 100644
--- a/storage/lib/src/test/java/org/calyxos/backup/storage/backup/SmallFileBackupTest.kt
+++ b/storage/lib/src/test/java/org/calyxos/backup/storage/backup/SmallFileBackupTest.kt
@@ -84,7 +84,7 @@ internal class SmallFileBackupTest {
     private suspend fun singleFileBackup(
         files: List<DocFile>,
         cachedFile: CachedFile?,
-        availableChunkIds: HashSet<String>
+        availableChunkIds: HashSet<String>,
     ) {
         val file = files[0]
         val zipChunk = ZipChunk(getRandomString(6), listOf(file), Random.nextLong(), true)