From f67c1d5544d1452e4c2a83ac7945190fb680c10f Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 14 Oct 2024 10:32:50 -0300
Subject: [PATCH 01/20] Replace deprecated sharedViewModel by activityViewModel

---
 .../com/stevesoltys/seedvault/restore/AppSelectionFragment.kt | 4 ++--
 .../stevesoltys/seedvault/restore/FilesSelectionFragment.kt   | 4 ++--
 .../stevesoltys/seedvault/restore/RecycleBackupFragment.kt    | 4 ++--
 .../com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt | 4 ++--
 .../stevesoltys/seedvault/restore/RestoreProgressFragment.kt  | 4 ++--
 .../com/stevesoltys/seedvault/restore/RestoreSetFragment.kt   | 4 ++--
 .../seedvault/restore/install/InstallProgressFragment.kt      | 4 ++--
 .../com/stevesoltys/seedvault/settings/AppStatusFragment.kt   | 4 ++--
 .../stevesoltys/seedvault/settings/ExpertSettingsFragment.kt  | 4 ++--
 .../com/stevesoltys/seedvault/settings/SchedulingFragment.kt  | 4 ++--
 .../com/stevesoltys/seedvault/settings/SettingsFragment.kt    | 4 ++--
 .../seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt    | 4 ++--
 .../seedvault/ui/recoverycode/RecoveryCodeOutputFragment.kt   | 4 ++--
 13 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/AppSelectionFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/AppSelectionFragment.kt
index d19cbacd..fcf2be16 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/AppSelectionFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/AppSelectionFragment.kt
@@ -13,11 +13,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.checkbox.MaterialCheckBox
 import com.stevesoltys.seedvault.R
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class AppSelectionFragment : Fragment() {
 
-    private val viewModel: RestoreViewModel by sharedViewModel()
+    private val viewModel: RestoreViewModel by activityViewModel()
 
     private val layoutManager = LinearLayoutManager(context)
     private val adapter = AppSelectionAdapter(lifecycleScope, this::loadIcon) { item ->
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/FilesSelectionFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/FilesSelectionFragment.kt
index 656be0a9..5fd3923b 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/FilesSelectionFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/FilesSelectionFragment.kt
@@ -14,11 +14,11 @@ import android.widget.Button
 import com.stevesoltys.seedvault.R
 import org.calyxos.backup.storage.ui.restore.FileSelectionFragment
 import org.calyxos.backup.storage.ui.restore.FilesItem
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 internal class FilesSelectionFragment : FileSelectionFragment() {
 
-    override val viewModel: RestoreViewModel by sharedViewModel()
+    override val viewModel: RestoreViewModel by activityViewModel()
     private lateinit var button: Button
 
     override fun onCreateView(
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RecycleBackupFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RecycleBackupFragment.kt
index cf054368..8c85f144 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RecycleBackupFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RecycleBackupFragment.kt
@@ -13,11 +13,11 @@ import android.widget.Button
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import com.stevesoltys.seedvault.R
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class RecycleBackupFragment : Fragment() {
 
-    private val viewModel: RestoreViewModel by sharedViewModel()
+    private val viewModel: RestoreViewModel by activityViewModel()
 
     override fun onCreateView(
         inflater: LayoutInflater,
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 e3e9187b..a35cae7f 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt
@@ -17,10 +17,10 @@ import androidx.fragment.app.Fragment
 import com.stevesoltys.seedvault.R
 import org.calyxos.backup.storage.api.SnapshotItem
 import org.calyxos.backup.storage.ui.restore.SnapshotFragment
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 internal class RestoreFilesFragment : SnapshotFragment() {
-    override val viewModel: RestoreViewModel by sharedViewModel()
+    override val viewModel: RestoreViewModel by activityViewModel()
 
     override fun onCreateView(
         inflater: LayoutInflater,
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 1f32eb76..32f7b3ff 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressFragment.kt
@@ -22,11 +22,11 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.ui.AppBackupState.FAILED_NOT_INSTALLED
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class RestoreProgressFragment : Fragment() {
 
-    private val viewModel: RestoreViewModel by sharedViewModel()
+    private val viewModel: RestoreViewModel by activityViewModel()
 
     private val layoutManager = LinearLayoutManager(context)
     private val adapter = RestoreProgressAdapter(lifecycleScope, this::loadIcon)
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 c445125f..f7701302 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetFragment.kt
@@ -18,11 +18,11 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.transport.restore.RestorableBackup
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class RestoreSetFragment : Fragment() {
 
-    private val viewModel: RestoreViewModel by sharedViewModel()
+    private val viewModel: RestoreViewModel by activityViewModel()
 
     private lateinit var listView: RecyclerView
     private lateinit var progressBar: ProgressBar
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 014f198c..829c4b0b 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
@@ -26,11 +26,11 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.restore.RestoreViewModel
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class InstallProgressFragment : Fragment(), InstallItemListener {
 
-    private val viewModel: RestoreViewModel by sharedViewModel()
+    private val viewModel: RestoreViewModel by activityViewModel()
 
     private val layoutManager = LinearLayoutManager(context)
     private val adapter = InstallProgressAdapter(lifecycleScope, this::loadIcon, this)
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 dc91cb96..8b8126c8 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/AppStatusFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/AppStatusFragment.kt
@@ -18,7 +18,7 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.stevesoltys.seedvault.R
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 internal interface AppStatusToggleListener {
     fun onAppStatusToggled(status: AppStatus)
@@ -26,7 +26,7 @@ internal interface AppStatusToggleListener {
 
 class AppStatusFragment : Fragment(), AppStatusToggleListener {
 
-    private val viewModel: SettingsViewModel by sharedViewModel()
+    private val viewModel: SettingsViewModel by activityViewModel()
 
     private val layoutManager = LinearLayoutManager(context)
     private val adapter = AppStatusAdapter(this)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/ExpertSettingsFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/ExpertSettingsFragment.kt
index 8a3f1de7..879a5acf 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/ExpertSettingsFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/ExpertSettingsFragment.kt
@@ -20,11 +20,11 @@ import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.permitDiskReads
 import com.stevesoltys.seedvault.transport.backup.PackageService
 import org.koin.android.ext.android.inject
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class ExpertSettingsFragment : PreferenceFragmentCompat() {
 
-    private val viewModel: SettingsViewModel by sharedViewModel()
+    private val viewModel: SettingsViewModel by activityViewModel()
     private val packageService: PackageService by inject()
     private val backupManager: IBackupManager by inject()
 
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SchedulingFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SchedulingFragment.kt
index e30556e6..3ebe7e41 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/SchedulingFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SchedulingFragment.kt
@@ -21,12 +21,12 @@ import com.stevesoltys.seedvault.backend.BackendManager
 import com.stevesoltys.seedvault.permitDiskReads
 import com.stevesoltys.seedvault.settings.preference.M3ListPreference
 import org.koin.android.ext.android.inject
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class SchedulingFragment : PreferenceFragmentCompat(),
     SharedPreferences.OnSharedPreferenceChangeListener {
 
-    private val viewModel: SettingsViewModel by sharedViewModel()
+    private val viewModel: SettingsViewModel by activityViewModel()
     private val settingsManager: SettingsManager by inject()
     private val backendManager: BackendManager by inject()
 
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 c33a47d3..26d2bc52 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt
@@ -31,14 +31,14 @@ import com.stevesoltys.seedvault.ui.notification.BackupNotificationManager
 import com.stevesoltys.seedvault.ui.toRelativeTime
 import org.calyxos.seedvault.core.backends.BackendProperties
 import org.koin.android.ext.android.inject
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 import java.util.concurrent.TimeUnit
 
 private val TAG = SettingsFragment::class.java.name
 
 class SettingsFragment : PreferenceFragmentCompat() {
 
-    private val viewModel: SettingsViewModel by sharedViewModel()
+    private val viewModel: SettingsViewModel by activityViewModel()
     private val backendManager: BackendManager by inject()
     private val backupStateManager: BackupStateManager by inject()
     private val backupManager: IBackupManager by inject()
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 77ec609d..72f8a62b 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
@@ -39,14 +39,14 @@ import com.google.android.material.textfield.MaterialAutoCompleteTextView
 import com.google.android.material.textfield.TextInputLayout
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.isDebugBuild
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 import java.util.Locale
 
 internal const val ARG_FOR_NEW_CODE = "forStoringNewCode"
 
 class RecoveryCodeInputFragment : Fragment() {
 
-    private val viewModel: RecoveryCodeViewModel by sharedViewModel()
+    private val viewModel: RecoveryCodeViewModel by activityViewModel()
 
     private lateinit var introText: TextView
     private lateinit var doneButton: Button
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 9c8263ce..c618a164 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
@@ -18,11 +18,11 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.isDebugBuild
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 class RecoveryCodeOutputFragment : Fragment() {
 
-    private val viewModel: RecoveryCodeViewModel by sharedViewModel()
+    private val viewModel: RecoveryCodeViewModel by activityViewModel()
 
     private lateinit var wordList: RecyclerView
     private lateinit var confirmCodeButton: Button

From 060bb425da7ce15c1c5eab5b642450d37ef7cb01 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 15 Oct 2024 15:52:40 -0300
Subject: [PATCH 02/20] UI for checking app backups

---
 .../java/com/stevesoltys/seedvault/App.kt     |   1 +
 .../com/stevesoltys/seedvault/repo/Checker.kt |  39 +++++++
 .../stevesoltys/seedvault/repo/RepoModule.kt  |   1 +
 .../seedvault/settings/AppCheckFragment.kt    |  87 +++++++++++++++
 .../seedvault/settings/SettingsViewModel.kt   |  11 ++
 app/src/main/res/drawable/ic_cloud_search.xml |  10 ++
 .../main/res/layout/fragment_app_check.xml    | 104 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   8 ++
 app/src/main/res/xml/settings.xml             |   7 ++
 9 files changed, 268 insertions(+)
 create mode 100644 app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
 create mode 100644 app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt
 create mode 100644 app/src/main/res/drawable/ic_cloud_search.xml
 create mode 100644 app/src/main/res/layout/fragment_app_check.xml

diff --git a/app/src/main/java/com/stevesoltys/seedvault/App.kt b/app/src/main/java/com/stevesoltys/seedvault/App.kt
index eac57f83..02b31b0c 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/App.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/App.kt
@@ -90,6 +90,7 @@ open class App : Application() {
                 storageBackup = get(),
                 backupManager = get(),
                 backupStateManager = get(),
+                checker = get(),
             )
         }
         viewModel {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
new file mode 100644
index 00000000..ffcdf627
--- /dev/null
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
@@ -0,0 +1,39 @@
+/*
+ * SPDX-FileCopyrightText: 2024 The Calyx Institute
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.stevesoltys.seedvault.repo
+
+import androidx.annotation.WorkerThread
+import com.stevesoltys.seedvault.backend.BackendManager
+import com.stevesoltys.seedvault.crypto.Crypto
+import org.calyxos.seedvault.core.backends.AppBackupFileType
+import org.calyxos.seedvault.core.backends.TopLevelFolder
+
+@WorkerThread
+internal class Checker(
+    private val crypto: Crypto,
+    private val backendManager: BackendManager,
+    private val snapshotManager: SnapshotManager,
+) {
+
+    suspend fun getBackupSize(): Long {
+        // get all snapshots
+        val folder = TopLevelFolder(crypto.repoId)
+        val handles = mutableListOf<AppBackupFileType.Snapshot>()
+        backendManager.backend.list(folder, AppBackupFileType.Snapshot::class) { fileInfo ->
+            handles.add(fileInfo.fileHandle as AppBackupFileType.Snapshot)
+        }
+        val snapshots = snapshotManager.onSnapshotsLoaded(handles)
+
+        // get total disk space used by snapshots
+        val sizeMap = mutableMapOf<String, Int>()
+        snapshots.forEach { snapshot ->
+            // add sizes to a map first, so we don't double count
+            snapshot.blobsMap.forEach { (chunkId, blob) -> sizeMap[chunkId] = blob.length }
+        }
+        return sizeMap.values.sumOf { it.toLong() }
+    }
+
+}
diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt
index 8aa72064..bf1dca9f 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt
@@ -21,4 +21,5 @@ val repoModule = module {
     }
     factory { SnapshotCreatorFactory(androidContext(), get(), get(), get()) }
     factory { Pruner(get(), get(), get()) }
+    single { Checker(get(), get(), get()) }
 }
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt
new file mode 100644
index 00000000..076e8a3f
--- /dev/null
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt
@@ -0,0 +1,87 @@
+/*
+ * SPDX-FileCopyrightText: 2024 The Calyx Institute
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.stevesoltys.seedvault.settings
+
+import android.os.Bundle
+import android.text.format.Formatter.formatShortFileSize
+import android.view.LayoutInflater
+import android.view.View
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.ScrollView
+import android.widget.TextView
+import androidx.fragment.app.Fragment
+import com.google.android.material.slider.LabelFormatter.LABEL_VISIBLE
+import com.google.android.material.slider.Slider
+import com.stevesoltys.seedvault.R
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
+
+private const val WARN_PERCENT = 25
+private const val WARN_BYTES = 1024 * 1024 * 1024 // 1 GB
+
+class AppCheckFragment : Fragment() {
+
+    private val viewModel: SettingsViewModel by activityViewModel()
+    private lateinit var sliderLabel: TextView
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?,
+    ): View {
+        val v = inflater.inflate(R.layout.fragment_app_check, container, false) as ScrollView
+
+        val slider = v.requireViewById<Slider>(R.id.slider)
+        sliderLabel = v.requireViewById(R.id.sliderLabel)
+
+        // label not scrolling will be fixed in material-components 1.12.0 (next update)
+        slider.setLabelFormatter { value ->
+            viewModel.backupSize.value?.let {
+                formatShortFileSize(context, (it * value / 100).toLong())
+            } ?: "${value.toInt()}%"
+        }
+        slider.addOnChangeListener { _, value, _ ->
+            onSliderChanged(value)
+        }
+
+        viewModel.backupSize.observe(viewLifecycleOwner) {
+            slider.labelBehavior = LABEL_VISIBLE
+            slider.invalidate()
+            onSliderChanged(slider.value)
+            // we can stop observing as the loaded size won't change again
+            viewModel.backupSize.removeObservers(viewLifecycleOwner)
+        }
+
+        v.requireViewById<Button>(R.id.startButton).setOnClickListener {
+
+        }
+        return v
+    }
+
+    override fun onStart() {
+        super.onStart()
+        activity?.setTitle(null)
+        viewModel.loadBackupSize()
+    }
+
+    private fun onSliderChanged(value: Float) {
+        val size = viewModel.backupSize.value
+        // when size is unknown, we show warning based on percent
+        val showWarning = if (size == null) {
+            value > WARN_PERCENT
+        } else {
+            size * value / 100 > WARN_BYTES
+        }
+        // only update label visibility when different from before
+        val newVisibility = if (showWarning) VISIBLE else GONE
+        if (sliderLabel.visibility != newVisibility) {
+            sliderLabel.visibility = newVisibility
+        }
+    }
+
+}
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 872804a4..2f4fb348 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt
@@ -38,6 +38,7 @@ import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.backend.BackendManager
 import com.stevesoltys.seedvault.crypto.KeyManager
 import com.stevesoltys.seedvault.permitDiskReads
+import com.stevesoltys.seedvault.repo.Checker
 import com.stevesoltys.seedvault.storage.StorageBackupJobService
 import com.stevesoltys.seedvault.ui.LiveEvent
 import com.stevesoltys.seedvault.ui.MutableLiveEvent
@@ -69,6 +70,7 @@ internal class SettingsViewModel(
     private val appListRetriever: AppListRetriever,
     private val storageBackup: StorageBackup,
     private val backupManager: IBackupManager,
+    private val checker: Checker,
     backupStateManager: BackupStateManager,
 ) : RequireProvisioningViewModel(app, settingsManager, keyManager, backendManager) {
 
@@ -84,6 +86,9 @@ internal class SettingsViewModel(
     private val mBackupPossible = MutableLiveData(false)
     val backupPossible: LiveData<Boolean> = mBackupPossible
 
+    private val mBackupSize = MutableLiveData<Long>()
+    val backupSize: LiveData<Long> = mBackupSize
+
     internal val lastBackupTime = settingsManager.lastBackupTime
     internal val appBackupWorkInfo =
         workManager.getWorkInfosForUniqueWorkLiveData(UNIQUE_WORK_NAME).map {
@@ -308,6 +313,12 @@ internal class SettingsViewModel(
         BackupJobService.cancelJob(app)
     }
 
+    fun loadBackupSize() {
+        viewModelScope.launch(Dispatchers.IO) {
+            mBackupSize.postValue(checker.getBackupSize())
+        }
+    }
+
     fun onLogcatUriReceived(uri: Uri?) = viewModelScope.launch(Dispatchers.IO) {
         if (uri == null) {
             onLogcatError()
diff --git a/app/src/main/res/drawable/ic_cloud_search.xml b/app/src/main/res/drawable/ic_cloud_search.xml
new file mode 100644
index 00000000..55e31bfe
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cloud_search.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?android:attr/textColorSecondary"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M21.86 12.5C21.1 11.63 20.15 11.13 19 11C19 9.05 18.32 7.4 16.96 6.04C15.6 4.68 13.95 4 12 4C10.42 4 9 4.47 7.75 5.43S5.67 7.62 5.25 9.15C4 9.43 2.96 10.08 2.17 11.1S1 13.28 1 14.58C1 16.09 1.54 17.38 2.61 18.43C3.69 19.5 5 20 6.5 20H18.5C19.75 20 20.81 19.56 21.69 18.69C22.56 17.81 23 16.75 23 15.5C23 14.35 22.62 13.35 21.86 12.5M16.57 18L14 15.43C13.43 15.79 12.74 16 12 16C9.79 16 8 14.21 8 12S9.79 8 12 8 16 9.79 16 12C16 12.74 15.79 13.43 15.43 14L18 16.57L16.57 18M14 12C14 13.11 13.11 14 12 14S10 13.11 10 12 10.9 10 12 10 14 10.9 14 12Z" />
+</vector>
diff --git a/app/src/main/res/layout/fragment_app_check.xml b/app/src/main/res/layout/fragment_app_check.xml
new file mode 100644
index 00000000..8c3ee78e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_app_check.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  SPDX-FileCopyrightText: 2024 The Calyx Institute
+  SPDX-License-Identifier: Apache-2.0
+  -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/imageView"
+            style="@style/SudHeaderIcon"
+            android:importantForAccessibility="no"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_cloud_search"
+            app:tint="?android:colorAccent" />
+
+        <TextView
+            android:id="@+id/titleView"
+            style="@style/SudHeaderTitle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_app_check_title"
+            android:textColor="?android:textColorSecondary"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/imageView" />
+
+        <TextView
+            android:id="@+id/descriptionView"
+            style="@style/SudContent"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_app_check_text"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/titleView" />
+
+        <TextView
+            android:id="@+id/introView"
+            style="@style/SudContent"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_app_check_text2"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/descriptionView" />
+
+        <com.google.android.material.slider.Slider
+            android:id="@+id/slider"
+            style="@style/SudContent"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:stepSize="5.0"
+            android:value="10.0"
+            android:valueFrom="5.0"
+            android:valueTo="100.0"
+            app:labelBehavior="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/introView"
+            app:tickVisible="false"
+            tools:labelBehavior="visible" />
+
+        <TextView
+            android:id="@+id/sliderLabel"
+            style="@style/SudContent"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/settings_app_check_warning"
+            android:textColor="?colorError"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/slider"
+            tools:visibility="visible" />
+
+        <Button
+            android:id="@+id/startButton"
+            style="@style/SudPrimaryButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="40dp"
+            android:text="@string/settings_app_check_button"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/sliderLabel"
+            app:layout_constraintVertical_bias="1.0" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 43329d4e..0781f344 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -41,6 +41,8 @@
     <string name="settings_backup_status_next_backup_past">once conditions are fulfilled</string>
     <string name="settings_backup_status_next_backup_usb">Backups will happen automatically when you plug in your USB drive</string>
     <string name="settings_backup_scheduling_title">Backup scheduling</string>
+    <string name="settings_backup_app_check_title">Check integrity</string>
+    <string name="settings_backup_app_check_summary">Ensure that backup is working for restore</string>
     <string name="settings_backup_exclude_apps">Exclude apps</string>
     <string name="settings_backup_now">Backup now</string>
     <string name="settings_category_storage">Storage backup (beta)</string>
@@ -66,6 +68,12 @@
     <string name="settings_scheduling_metered_title">Back up when using mobile data</string>
     <string name="settings_scheduling_charging_title">Back up only when charging</string>
 
+    <string name="settings_app_check_title">Verify app backup integrity</string>
+    <string name="settings_app_check_text">Each backup process will automatically check the backup integrity. However, to save time, actual app data will not be downloaded and verified.</string>
+    <string name="settings_app_check_text2">Here you can run a one-time check to verify your app backup. Select how much of the app data should be downloaded for the check. The more you select, the longer it will take, yet the more reliable the check will be. This will run in the background and show a notification once the check is done.</string>
+    <string name="settings_app_check_warning">Warning: Downloading large amounts of data can take a long time.</string>
+    <string name="settings_app_check_button">Check backup</string>
+
     <string name="settings_expert_title">Expert settings</string>
     <string name="settings_expert_logcat_title">Save app log</string>
     <string name="settings_expert_logcat_summary">Developers can diagnose bugs with these logs.\n\nWarning: The log file might contain personally identifiable information. Review before and delete after sharing!</string>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 3cf42ea8..7b283fd9 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -50,6 +50,13 @@
             app:title="@string/settings_backup_scheduling_title"
             tools:summary="Next backup: Never" />
 
+        <androidx.preference.Preference
+            app:fragment="com.stevesoltys.seedvault.settings.AppCheckFragment"
+            app:icon="@drawable/ic_cloud_search"
+            app:key="backup_scheduling"
+            app:summary="@string/settings_backup_app_check_summary"
+            app:title="@string/settings_backup_app_check_title" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/settings_category_storage">

From 85ce587b14b9c2f5c5eb58c9ee0e05ee1f90797e Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 18 Oct 2024 11:55:45 -0300
Subject: [PATCH 03/20] Create AppCheckerWorker and wire it up

---
 .../com/stevesoltys/seedvault/repo/Checker.kt |  6 ++
 .../seedvault/settings/AppCheckFragment.kt    |  3 +-
 .../seedvault/settings/SettingsViewModel.kt   |  5 ++
 .../notification/BackupNotificationManager.kt | 22 ++++-
 .../seedvault/worker/AppCheckerWorker.kt      | 82 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  3 +
 6 files changed, 118 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/com/stevesoltys/seedvault/worker/AppCheckerWorker.kt

diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
index ffcdf627..9dbb4c1a 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
@@ -8,6 +8,7 @@ package com.stevesoltys.seedvault.repo
 import androidx.annotation.WorkerThread
 import com.stevesoltys.seedvault.backend.BackendManager
 import com.stevesoltys.seedvault.crypto.Crypto
+import kotlinx.coroutines.delay
 import org.calyxos.seedvault.core.backends.AppBackupFileType
 import org.calyxos.seedvault.core.backends.TopLevelFolder
 
@@ -36,4 +37,9 @@ internal class Checker(
         return sizeMap.values.sumOf { it.toLong() }
     }
 
+    suspend fun check(percent: Int) {
+        check(percent in 0..100) { "Percent $percent out of bounds." }
+        delay(20_000)
+    }
+
 }
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt
index 076e8a3f..6512b1cd 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt
@@ -58,7 +58,8 @@ class AppCheckFragment : Fragment() {
         }
 
         v.requireViewById<Button>(R.id.startButton).setOnClickListener {
-
+            viewModel.checkAppBackups(slider.value.toInt())
+            requireActivity().onBackPressedDispatcher.onBackPressed()
         }
         return v
     }
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 2f4fb348..8fc07fbc 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt
@@ -45,6 +45,7 @@ import com.stevesoltys.seedvault.ui.MutableLiveEvent
 import com.stevesoltys.seedvault.ui.RequireProvisioningViewModel
 import com.stevesoltys.seedvault.worker.AppBackupWorker
 import com.stevesoltys.seedvault.worker.AppBackupWorker.Companion.UNIQUE_WORK_NAME
+import com.stevesoltys.seedvault.worker.AppCheckerWorker
 import com.stevesoltys.seedvault.worker.BackupRequester.Companion.requestFilesAndAppBackup
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.SharingStarted
@@ -319,6 +320,10 @@ internal class SettingsViewModel(
         }
     }
 
+    fun checkAppBackups(percent: Int) {
+        AppCheckerWorker.scheduleNow(app, percent)
+    }
+
     fun onLogcatUriReceived(uri: Uri?) = viewModelScope.launch(Dispatchers.IO) {
         if (uri == null) {
             onLogcatError()
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 868995fd..3cf1230c 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
@@ -42,6 +42,7 @@ private const val CHANNEL_ID_ERROR = "NotificationError"
 private const val CHANNEL_ID_RESTORE = "NotificationRestore"
 private const val CHANNEL_ID_RESTORE_ERROR = "NotificationRestoreError"
 private const val CHANNEL_ID_PRUNING = "NotificationPruning"
+private const val CHANNEL_ID_CHECKING = "NotificationChecking"
 internal const val NOTIFICATION_ID_OBSERVER = 1
 private const val NOTIFICATION_ID_SUCCESS = 2
 private const val NOTIFICATION_ID_ERROR = 3
@@ -49,7 +50,8 @@ private const val NOTIFICATION_ID_SPACE_ERROR = 4
 internal const val NOTIFICATION_ID_RESTORE = 5
 private const val NOTIFICATION_ID_RESTORE_ERROR = 6
 internal const val NOTIFICATION_ID_PRUNING = 7
-private const val NOTIFICATION_ID_NO_MAIN_KEY_ERROR = 8
+internal const val NOTIFICATION_ID_CHECKING = 8
+private const val NOTIFICATION_ID_NO_MAIN_KEY_ERROR = 9
 
 private val TAG = BackupNotificationManager::class.java.simpleName
 
@@ -62,6 +64,7 @@ internal class BackupNotificationManager(private val context: Context) {
         createNotificationChannel(getRestoreChannel())
         createNotificationChannel(getRestoreErrorChannel())
         createNotificationChannel(getPruningChannel())
+        createNotificationChannel(getCheckingChannel())
     }
 
     private fun getObserverChannel(): NotificationChannel {
@@ -98,6 +101,11 @@ internal class BackupNotificationManager(private val context: Context) {
         return NotificationChannel(CHANNEL_ID_PRUNING, title, IMPORTANCE_LOW)
     }
 
+    private fun getCheckingChannel(): NotificationChannel {
+        val title = context.getString(R.string.notification_checking_channel_title)
+        return NotificationChannel(CHANNEL_ID_CHECKING, title, IMPORTANCE_LOW)
+    }
+
     /**
      * This should get called for each APK we are backing up.
      */
@@ -314,7 +322,7 @@ internal class BackupNotificationManager(private val context: Context) {
     }
 
     fun getPruningNotification(): Notification {
-        return Builder(context, CHANNEL_ID_OBSERVER).apply {
+        return Builder(context, CHANNEL_ID_PRUNING).apply {
             setSmallIcon(R.drawable.ic_auto_delete)
             setContentTitle(context.getString(R.string.notification_pruning_title))
             setOngoing(true)
@@ -324,6 +332,16 @@ internal class BackupNotificationManager(private val context: Context) {
         }.build()
     }
 
+    fun getCheckNotification(): Notification {
+        return Builder(context, CHANNEL_ID_CHECKING).apply {
+            setSmallIcon(R.drawable.ic_cloud_search)
+            setContentTitle(context.getString(R.string.notification_checking_title))
+            setOngoing(true)
+            setShowWhen(false)
+            foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
+        }.build()
+    }
+
     @SuppressLint("RestrictedApi")
     fun onNoMainKeyError() {
         val intent = Intent(context, SettingsActivity::class.java)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/worker/AppCheckerWorker.kt b/app/src/main/java/com/stevesoltys/seedvault/worker/AppCheckerWorker.kt
new file mode 100644
index 00000000..cc2e1a0b
--- /dev/null
+++ b/app/src/main/java/com/stevesoltys/seedvault/worker/AppCheckerWorker.kt
@@ -0,0 +1,82 @@
+/*
+ * SPDX-FileCopyrightText: 2024 The Calyx Institute
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.stevesoltys.seedvault.worker
+
+import android.content.Context
+import android.content.pm.ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC
+import android.util.Log
+import androidx.work.BackoffPolicy.EXPONENTIAL
+import androidx.work.CoroutineWorker
+import androidx.work.Data
+import androidx.work.ExistingWorkPolicy.REPLACE
+import androidx.work.ForegroundInfo
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST
+import androidx.work.WorkManager
+import androidx.work.WorkerParameters
+import com.stevesoltys.seedvault.repo.Checker
+import com.stevesoltys.seedvault.ui.notification.BackupNotificationManager
+import com.stevesoltys.seedvault.ui.notification.NOTIFICATION_ID_CHECKING
+import io.github.oshai.kotlinlogging.KotlinLogging
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import java.time.Duration
+
+class AppCheckerWorker(
+    appContext: Context,
+    workerParams: WorkerParameters,
+) : CoroutineWorker(appContext, workerParams), KoinComponent {
+
+    companion object {
+        private val TAG = AppCheckerWorker::class.simpleName
+        private const val PERCENT = "percent"
+        internal const val UNIQUE_WORK_NAME = "com.stevesoltys.seedvault.APP_BACKUP_CHECK"
+
+        fun scheduleNow(context: Context, percent: Int) {
+            check(percent in 0..100) { "Percent $percent out of bounds." }
+            val data = Data.Builder().putInt(PERCENT, percent).build()
+            val workRequest = OneTimeWorkRequestBuilder<AppCheckerWorker>()
+                .setExpedited(RUN_AS_NON_EXPEDITED_WORK_REQUEST)
+                .setBackoffCriteria(EXPONENTIAL, Duration.ofSeconds(10))
+                .setInputData(data)
+                .build()
+            val workManager = WorkManager.getInstance(context)
+            Log.i(TAG, "Asking to check $percent% of app backups now...")
+            workManager.enqueueUniqueWork(UNIQUE_WORK_NAME, REPLACE, workRequest)
+        }
+    }
+
+    private val log = KotlinLogging.logger {}
+    private val checker: Checker by inject()
+    private val nm: BackupNotificationManager by inject()
+
+    override suspend fun doWork(): Result {
+        // TODO don't let backup/restore happen while we check
+        log.info { "Start worker $this ($id)" }
+        try {
+            setForeground(createForegroundInfo())
+        } catch (e: Exception) {
+            log.error(e) { "Error while running setForeground: " }
+        }
+        val percent = inputData.getInt(PERCENT, -1)
+        check(percent in 0..100) { "Percent $percent out of bounds." }
+
+        return try {
+            checker.check(percent)
+            Result.success()
+        } catch (e: Exception) {
+            // TODO maybe show error notification
+            log.error(e) { "Error while checking data: " }
+            Result.retry()
+        }
+    }
+
+    private fun createForegroundInfo() = ForegroundInfo(
+        NOTIFICATION_ID_CHECKING,
+        nm.getCheckNotification(),
+        FOREGROUND_SERVICE_TYPE_DATA_SYNC,
+    )
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0781f344..8612f614 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -187,6 +187,9 @@
     <string name="notification_pruning_channel_title">Removing old backups notification</string>
     <string name="notification_pruning_title">Removing old backups…</string>
 
+    <string name="notification_checking_channel_title">App backup integrity check</string>
+    <string name="notification_checking_title">Checking app backups…</string>
+
     <!-- App Backup and Restore State -->
 
     <string name="backup_section_system">System data</string>

From 591dfe0bd6a15c3851c50b4627494409310b2f2c Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 22 Oct 2024 17:30:09 -0300
Subject: [PATCH 04/20] Implement actual checking

---
 .../com/stevesoltys/seedvault/repo/Checker.kt | 95 ++++++++++++++++++-
 .../stevesoltys/seedvault/repo/RepoModule.kt  |  2 +-
 2 files changed, 94 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
index 9dbb4c1a..4c077f3a 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
@@ -8,16 +8,31 @@ package com.stevesoltys.seedvault.repo
 import androidx.annotation.WorkerThread
 import com.stevesoltys.seedvault.backend.BackendManager
 import com.stevesoltys.seedvault.crypto.Crypto
-import kotlinx.coroutines.delay
+import com.stevesoltys.seedvault.proto.Snapshot
+import com.stevesoltys.seedvault.proto.Snapshot.Blob
+import io.github.oshai.kotlinlogging.KotlinLogging
 import org.calyxos.seedvault.core.backends.AppBackupFileType
 import org.calyxos.seedvault.core.backends.TopLevelFolder
+import org.calyxos.seedvault.core.toHexString
+import org.koin.core.time.measureTimedValue
+import java.security.DigestInputStream
+import java.security.GeneralSecurityException
+import java.security.MessageDigest
+import kotlin.math.min
+import kotlin.math.roundToInt
+import kotlin.math.roundToLong
+import kotlin.time.Duration.Companion.milliseconds
 
 @WorkerThread
 internal class Checker(
     private val crypto: Crypto,
     private val backendManager: BackendManager,
     private val snapshotManager: SnapshotManager,
+    private val loader: Loader,
 ) {
+    private val log = KotlinLogging.logger { }
+
+    private var snapshots: List<Snapshot>? = null
 
     suspend fun getBackupSize(): Long {
         // get all snapshots
@@ -27,6 +42,7 @@ internal class Checker(
             handles.add(fileInfo.fileHandle as AppBackupFileType.Snapshot)
         }
         val snapshots = snapshotManager.onSnapshotsLoaded(handles)
+        this.snapshots = snapshots // remember loaded snapshots
 
         // get total disk space used by snapshots
         val sizeMap = mutableMapOf<String, Int>()
@@ -39,7 +55,82 @@ internal class Checker(
 
     suspend fun check(percent: Int) {
         check(percent in 0..100) { "Percent $percent out of bounds." }
-        delay(20_000)
+
+        if (snapshots == null) getBackupSize() // just get size again to be sure we get snapshots
+        val snapshots = snapshots ?: error("Snapshots still null")
+
+        val messageDigest = MessageDigest.getInstance("SHA-256")
+        val (checkedSize, time) = measureTimedValue {
+            checkBlobs(snapshots, percent) { chunkId, blob ->
+                val storageId = blob.id.hexFromProto()
+                log.info { "Checking blob $storageId..." }
+                val handle = AppBackupFileType.Blob(crypto.repoId, storageId)
+                loader.loadFile(handle, null).close()
+                val readChunkId = loader.loadFile(handle, null).use { inputStream ->
+                    DigestInputStream(inputStream, messageDigest).use { digestStream ->
+                        digestStream.readAllBytes()
+                        digestStream.messageDigest.digest().toHexString()
+                    }
+                }
+                if (readChunkId != chunkId) throw GeneralSecurityException("ChunkId doesn't match")
+            }
+        }
+        val bandwidth = (checkedSize / 1024 / (time / 1000)).roundToInt()
+        log.info { "Took ${time.milliseconds} for $checkedSize bytes, $bandwidth KB/s" }
     }
 
+    private suspend fun checkBlobs(
+        snapshots: List<Snapshot>,
+        percent: Int,
+        blobChecker: suspend (String, Blob) -> Unit,
+    ): Long {
+        // split up blobs for app data and for APKs
+        val appBlobs = mutableMapOf<String, Blob>()
+        val apkBlobs = mutableMapOf<String, Blob>()
+        snapshots.forEach { snapshot ->
+            val appChunkIds = snapshot.appsMap.flatMap { it.value.chunkIdsList.hexFromProto() }
+            val apkChunkIds = snapshot.appsMap.flatMap {
+                it.value.apk.splitsList.flatMap { split -> split.chunkIdsList.hexFromProto() }
+            }
+            appChunkIds.forEach { chunkId ->
+                appBlobs[chunkId] = snapshot.blobsMap[chunkId] ?: error("No Blob for chunkId")
+            }
+            apkChunkIds.forEach { chunkId ->
+                apkBlobs[chunkId] = snapshot.blobsMap[chunkId] ?: error("No Blob for chunkId")
+            }
+        }
+        // calculate sizes
+        val appSize = appBlobs.values.sumOf { it.length.toLong() }
+        val apkSize = apkBlobs.values.sumOf { it.length.toLong() }
+        // let's assume it is unlikely that app data and APKs have blobs in common
+        val totalSize = appSize + apkSize
+        log.info { "Got ${appBlobs.size + apkBlobs.size} blobs worth $totalSize bytes to check." }
+
+        // calculate target sizes (how much do we want to check)
+        val targetSize = (totalSize * (percent.toDouble() / 100)).roundToLong()
+        val appTargetSize = min((targetSize * 0.75).roundToLong(), appSize) // 75% of targetSize
+        log.info { "Sampling $targetSize bytes of which $appTargetSize bytes for apps." }
+
+        var currentSize = 0L
+        // check apps first until we reach their target size
+        val appIterator = appBlobs.keys.shuffled().iterator() // random app blob iterator
+        while (currentSize < appTargetSize && appIterator.hasNext()) {
+            val randomChunkId = appIterator.next()
+            val blob = appBlobs[randomChunkId] ?: error("No blob")
+            blobChecker(randomChunkId, blob)
+            currentSize += blob.length
+            // TODO do progress reporting via system notification instead
+            log.info { "  ${((currentSize.toDouble() / targetSize) * 100).roundToInt()}%" }
+        }
+        // now check APKs until we reach total targetSize
+        val apkIterator = apkBlobs.keys.shuffled().iterator() // random APK blob iterator
+        while (currentSize < targetSize && apkIterator.hasNext()) {
+            val randomChunkId = apkIterator.next()
+            val blob = apkBlobs[randomChunkId] ?: error("No blob")
+            blobChecker(randomChunkId, blob)
+            currentSize += blob.length
+            log.info { "  ${((currentSize.toDouble() / targetSize) * 100).roundToInt()}%" }
+        }
+        return currentSize
+    }
 }
diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt
index bf1dca9f..e265433f 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt
@@ -21,5 +21,5 @@ val repoModule = module {
     }
     factory { SnapshotCreatorFactory(androidContext(), get(), get(), get()) }
     factory { Pruner(get(), get(), get()) }
-    single { Checker(get(), get(), get()) }
+    single { Checker(get(), get(), get(), get()) }
 }

From 51a6355205da4037139a0123ecb551543275911f Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 23 Oct 2024 16:29:36 -0300
Subject: [PATCH 05/20] Do parallel checking and update notification with
 progress

---
 .../com/stevesoltys/seedvault/repo/Checker.kt | 88 +++++++++++++------
 .../stevesoltys/seedvault/repo/RepoModule.kt  |  2 +-
 .../notification/BackupNotificationManager.kt | 22 +++--
 .../seedvault/worker/AppCheckerWorker.kt      |  2 +-
 4 files changed, 77 insertions(+), 37 deletions(-)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
index 4c077f3a..374d497a 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
@@ -10,18 +10,22 @@ import com.stevesoltys.seedvault.backend.BackendManager
 import com.stevesoltys.seedvault.crypto.Crypto
 import com.stevesoltys.seedvault.proto.Snapshot
 import com.stevesoltys.seedvault.proto.Snapshot.Blob
+import com.stevesoltys.seedvault.ui.notification.BackupNotificationManager
 import io.github.oshai.kotlinlogging.KotlinLogging
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Semaphore
+import kotlinx.coroutines.sync.withPermit
 import org.calyxos.seedvault.core.backends.AppBackupFileType
 import org.calyxos.seedvault.core.backends.TopLevelFolder
 import org.calyxos.seedvault.core.toHexString
-import org.koin.core.time.measureTimedValue
 import java.security.DigestInputStream
 import java.security.GeneralSecurityException
 import java.security.MessageDigest
+import java.util.concurrent.atomic.AtomicLong
 import kotlin.math.min
 import kotlin.math.roundToInt
 import kotlin.math.roundToLong
-import kotlin.time.Duration.Companion.milliseconds
 
 @WorkerThread
 internal class Checker(
@@ -29,10 +33,16 @@ internal class Checker(
     private val backendManager: BackendManager,
     private val snapshotManager: SnapshotManager,
     private val loader: Loader,
+    private val nm: BackupNotificationManager,
 ) {
     private val log = KotlinLogging.logger { }
 
     private var snapshots: List<Snapshot>? = null
+    private val concurrencyLimit: Int
+        get() {
+            // TODO determine also based on backendManager
+            return Runtime.getRuntime().availableProcessors()
+        }
 
     suspend fun getBackupSize(): Long {
         // get all snapshots
@@ -58,32 +68,45 @@ internal class Checker(
 
         if (snapshots == null) getBackupSize() // just get size again to be sure we get snapshots
         val snapshots = snapshots ?: error("Snapshots still null")
+        val blobSample = getBlobSample(snapshots, percent)
+        val sampleSize = blobSample.values.sumOf { it.length.toLong() }
+        log.info { "Blob sample has ${blobSample.size} blobs worth $sampleSize bytes." }
 
-        val messageDigest = MessageDigest.getInstance("SHA-256")
-        val (checkedSize, time) = measureTimedValue {
-            checkBlobs(snapshots, percent) { chunkId, blob ->
-                val storageId = blob.id.hexFromProto()
-                log.info { "Checking blob $storageId..." }
-                val handle = AppBackupFileType.Blob(crypto.repoId, storageId)
-                loader.loadFile(handle, null).close()
-                val readChunkId = loader.loadFile(handle, null).use { inputStream ->
-                    DigestInputStream(inputStream, messageDigest).use { digestStream ->
-                        digestStream.readAllBytes()
-                        digestStream.messageDigest.digest().toHexString()
+        // check blobs concurrently
+        val semaphore = Semaphore(concurrencyLimit)
+        val size = AtomicLong()
+        val lastNotification = AtomicLong()
+        val startTime = System.currentTimeMillis()
+        coroutineScope {
+            blobSample.forEach { (chunkId, blob) ->
+                // launch a new co-routine for each blob to check
+                launch {
+                    // suspend here until we get a permit from the semaphore (there's free workers)
+                    semaphore.withPermit {
+                        // TODO record errors
+                        checkBlob(chunkId, blob)
+                    }
+                    // keep track of how much we checked and for how long
+                    val newSize = size.addAndGet(blob.length.toLong())
+                    val passedTime = System.currentTimeMillis() - startTime
+                    // only log/show notification after some time has passed (throttling)
+                    if (passedTime > lastNotification.get() + 500) {
+                        lastNotification.set(passedTime)
+                        val bandwidth =
+                            (newSize / 1024 / (passedTime.toDouble() / 1000)).roundToInt()
+                        val thousandth = ((newSize.toDouble() / sampleSize) * 1000).roundToInt()
+                        log.debug { "$thousandth‰ - $bandwidth KB/sec - $newSize bytes" }
+                        nm.showCheckNotification("$bandwidth KB/sec", thousandth)
                     }
                 }
-                if (readChunkId != chunkId) throw GeneralSecurityException("ChunkId doesn't match")
             }
         }
-        val bandwidth = (checkedSize / 1024 / (time / 1000)).roundToInt()
-        log.info { "Took ${time.milliseconds} for $checkedSize bytes, $bandwidth KB/s" }
+        if (sampleSize != size.get()) log.error {
+            "Checked ${size.get()} bytes, but expected $sampleSize"
+        }
     }
 
-    private suspend fun checkBlobs(
-        snapshots: List<Snapshot>,
-        percent: Int,
-        blobChecker: suspend (String, Blob) -> Unit,
-    ): Long {
+    private fun getBlobSample(snapshots: List<Snapshot>, percent: Int): Map<String, Blob> {
         // split up blobs for app data and for APKs
         val appBlobs = mutableMapOf<String, Blob>()
         val apkBlobs = mutableMapOf<String, Blob>()
@@ -111,26 +134,37 @@ internal class Checker(
         val appTargetSize = min((targetSize * 0.75).roundToLong(), appSize) // 75% of targetSize
         log.info { "Sampling $targetSize bytes of which $appTargetSize bytes for apps." }
 
+        val blobSample = mutableMapOf<String, Blob>()
         var currentSize = 0L
         // check apps first until we reach their target size
         val appIterator = appBlobs.keys.shuffled().iterator() // random app blob iterator
         while (currentSize < appTargetSize && appIterator.hasNext()) {
             val randomChunkId = appIterator.next()
             val blob = appBlobs[randomChunkId] ?: error("No blob")
-            blobChecker(randomChunkId, blob)
+            blobSample[randomChunkId] = blob
             currentSize += blob.length
-            // TODO do progress reporting via system notification instead
-            log.info { "  ${((currentSize.toDouble() / targetSize) * 100).roundToInt()}%" }
         }
         // now check APKs until we reach total targetSize
         val apkIterator = apkBlobs.keys.shuffled().iterator() // random APK blob iterator
         while (currentSize < targetSize && apkIterator.hasNext()) {
             val randomChunkId = apkIterator.next()
             val blob = apkBlobs[randomChunkId] ?: error("No blob")
-            blobChecker(randomChunkId, blob)
+            blobSample[randomChunkId] = blob
             currentSize += blob.length
-            log.info { "  ${((currentSize.toDouble() / targetSize) * 100).roundToInt()}%" }
         }
-        return currentSize
+        return blobSample
+    }
+
+    private suspend fun checkBlob(chunkId: String, blob: Blob) {
+        val messageDigest = MessageDigest.getInstance("SHA-256")
+        val storageId = blob.id.hexFromProto()
+        val handle = AppBackupFileType.Blob(crypto.repoId, storageId)
+        val readChunkId = loader.loadFile(handle, null).use { inputStream ->
+            DigestInputStream(inputStream, messageDigest).use { digestStream ->
+                digestStream.readAllBytes()
+                digestStream.messageDigest.digest().toHexString()
+            }
+        }
+        if (readChunkId != chunkId) throw GeneralSecurityException("ChunkId doesn't match")
     }
 }
diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt
index e265433f..5c8ac73b 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt
@@ -21,5 +21,5 @@ val repoModule = module {
     }
     factory { SnapshotCreatorFactory(androidContext(), get(), get(), get()) }
     factory { Pruner(get(), get(), get()) }
-    single { Checker(get(), get(), get(), get()) }
+    single { Checker(get(), get(), get(), get(), get()) }
 }
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 3cf1230c..7234a564 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
@@ -332,14 +332,20 @@ internal class BackupNotificationManager(private val context: Context) {
         }.build()
     }
 
-    fun getCheckNotification(): Notification {
-        return Builder(context, CHANNEL_ID_CHECKING).apply {
-            setSmallIcon(R.drawable.ic_cloud_search)
-            setContentTitle(context.getString(R.string.notification_checking_title))
-            setOngoing(true)
-            setShowWhen(false)
-            foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
-        }.build()
+    fun getCheckNotification() = Builder(context, CHANNEL_ID_CHECKING).apply {
+        setSmallIcon(R.drawable.ic_cloud_search)
+        setContentTitle(context.getString(R.string.notification_checking_title))
+        setOngoing(true)
+        setShowWhen(false)
+        foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
+    }
+
+    fun showCheckNotification(text: String, thousandth: Int) {
+        val notification = getCheckNotification()
+            .setContentText(text)
+            .setProgress(1000, thousandth, false)
+            .build()
+        nm.notify(NOTIFICATION_ID_CHECKING, notification)
     }
 
     @SuppressLint("RestrictedApi")
diff --git a/app/src/main/java/com/stevesoltys/seedvault/worker/AppCheckerWorker.kt b/app/src/main/java/com/stevesoltys/seedvault/worker/AppCheckerWorker.kt
index cc2e1a0b..e6fe566a 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/worker/AppCheckerWorker.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/worker/AppCheckerWorker.kt
@@ -76,7 +76,7 @@ class AppCheckerWorker(
 
     private fun createForegroundInfo() = ForegroundInfo(
         NOTIFICATION_ID_CHECKING,
-        nm.getCheckNotification(),
+        nm.getCheckNotification().build(),
         FOREGROUND_SERVICE_TYPE_DATA_SYNC,
     )
 }

From 96f9a8d01775810d05228fe8695067444eb7f741 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 23 Oct 2024 17:44:37 -0300
Subject: [PATCH 06/20] Show app backup check success notification

---
 .../com/stevesoltys/seedvault/repo/Checker.kt |  8 +++---
 .../notification/BackupNotificationManager.kt | 25 ++++++++++++++++---
 app/src/main/res/values/strings.xml           |  2 ++
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
index 374d497a..2ff2c21e 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
@@ -92,11 +92,10 @@ internal class Checker(
                     // only log/show notification after some time has passed (throttling)
                     if (passedTime > lastNotification.get() + 500) {
                         lastNotification.set(passedTime)
-                        val bandwidth =
-                            (newSize / 1024 / (passedTime.toDouble() / 1000)).roundToInt()
+                        val bandwidth = (newSize / (passedTime.toDouble() / 1000)).roundToLong()
                         val thousandth = ((newSize.toDouble() / sampleSize) * 1000).roundToInt()
                         log.debug { "$thousandth‰ - $bandwidth KB/sec - $newSize bytes" }
-                        nm.showCheckNotification("$bandwidth KB/sec", thousandth)
+                        nm.showCheckNotification(bandwidth, thousandth)
                     }
                 }
             }
@@ -104,6 +103,9 @@ internal class Checker(
         if (sampleSize != size.get()) log.error {
             "Checked ${size.get()} bytes, but expected $sampleSize"
         }
+        val passedTime = System.currentTimeMillis() - startTime
+        val bandwidth = size.get() / (passedTime.toDouble() / 1000).roundToLong()
+        nm.onCheckComplete(size.get(), bandwidth)
     }
 
     private fun getBlobSample(snapshots: List<Snapshot>, percent: Int): Map<String, Blob> {
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 7234a564..8aaf5ec0 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
@@ -18,7 +18,7 @@ import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager.NameNotFoundException
-import android.text.format.Formatter
+import android.text.format.Formatter.formatShortFileSize
 import android.util.Log
 import androidx.core.app.NotificationCompat.Action
 import androidx.core.app.NotificationCompat.Builder
@@ -51,7 +51,8 @@ internal const val NOTIFICATION_ID_RESTORE = 5
 private const val NOTIFICATION_ID_RESTORE_ERROR = 6
 internal const val NOTIFICATION_ID_PRUNING = 7
 internal const val NOTIFICATION_ID_CHECKING = 8
-private const val NOTIFICATION_ID_NO_MAIN_KEY_ERROR = 9
+internal const val NOTIFICATION_ID_CHECK_FINISHED = 9
+private const val NOTIFICATION_ID_NO_MAIN_KEY_ERROR = 10
 
 private val TAG = BackupNotificationManager::class.java.simpleName
 
@@ -195,7 +196,7 @@ internal class BackupNotificationManager(private val context: Context) {
     }
 
     fun onBackupSuccess(numBackedUp: Int, total: Int, size: Long) {
-        val sizeStr = Formatter.formatShortFileSize(context, size)
+        val sizeStr = formatShortFileSize(context, size)
         val contentText =
             context.getString(R.string.notification_success_text, numBackedUp, total, sizeStr)
         val intent = Intent(context, SettingsActivity::class.java).apply {
@@ -340,7 +341,8 @@ internal class BackupNotificationManager(private val context: Context) {
         foregroundServiceBehavior = FOREGROUND_SERVICE_IMMEDIATE
     }
 
-    fun showCheckNotification(text: String, thousandth: Int) {
+    fun showCheckNotification(speed: Long, thousandth: Int) {
+        val text = "${formatShortFileSize(context, speed)}/s"
         val notification = getCheckNotification()
             .setContentText(text)
             .setProgress(1000, thousandth, false)
@@ -348,6 +350,21 @@ internal class BackupNotificationManager(private val context: Context) {
         nm.notify(NOTIFICATION_ID_CHECKING, notification)
     }
 
+    fun onCheckComplete(size: Long, speed: Long) {
+        val text = context.getString(
+            R.string.notification_checking_finished_text,
+            formatShortFileSize(context, size),
+            "${formatShortFileSize(context, speed)}/s",
+        )
+        val notification = Builder(context, CHANNEL_ID_CHECKING)
+            .setContentTitle(context.getString(R.string.notification_checking_finished_title))
+            .setContentText(text)
+            .setSmallIcon(R.drawable.ic_cloud_done)
+            .build()
+        nm.cancel(NOTIFICATION_ID_CHECKING)
+        nm.notify(NOTIFICATION_ID_CHECK_FINISHED, notification)
+    }
+
     @SuppressLint("RestrictedApi")
     fun onNoMainKeyError() {
         val intent = Intent(context, SettingsActivity::class.java)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8612f614..ef80eda9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -189,6 +189,8 @@
 
     <string name="notification_checking_channel_title">App backup integrity check</string>
     <string name="notification_checking_title">Checking app backups…</string>
+    <string name="notification_checking_finished_title">App backup integrity confirmed</string>
+    <string name="notification_checking_finished_text">Successfully checked %1$s at an average speed of %2$s.</string>
 
     <!-- App Backup and Restore State -->
 

From 26063a8ef01f04da2418e2cd0873aec626444207 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 24 Oct 2024 17:06:56 -0300
Subject: [PATCH 07/20] Show app backup check success screen

---
 app/src/main/AndroidManifest.xml              |  5 ++
 .../com/stevesoltys/seedvault/repo/Checker.kt | 13 ++-
 .../seedvault/repo/CheckerResult.kt           | 23 +++++
 .../seedvault/restore/RestoreSetAdapter.kt    |  6 +-
 .../ui/check/AppCheckResultActivity.kt        | 87 +++++++++++++++++++
 .../notification/BackupNotificationManager.kt | 43 +++++++--
 .../res/layout/activity_check_success.xml     | 77 ++++++++++++++++
 app/src/main/res/values/strings.xml           |  7 +-
 8 files changed, 252 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/java/com/stevesoltys/seedvault/repo/CheckerResult.kt
 create mode 100644 app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckResultActivity.kt
 create mode 100644 app/src/main/res/layout/activity_check_success.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f83eb06e..8784f83a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -131,6 +131,11 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".ui.check.AppCheckResultActivity"
+            android:label="@string/notification_checking_finished_title"
+            android:launchMode="singleTask"/>
+
         <service
             android:name=".transport.ConfigurableBackupTransportService"
             android:exported="false">
diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
index 2ff2c21e..d793addf 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
@@ -27,7 +27,6 @@ import kotlin.math.min
 import kotlin.math.roundToInt
 import kotlin.math.roundToLong
 
-@WorkerThread
 internal class Checker(
     private val crypto: Crypto,
     private val backendManager: BackendManager,
@@ -43,7 +42,10 @@ internal class Checker(
             // TODO determine also based on backendManager
             return Runtime.getRuntime().availableProcessors()
         }
+    var checkerResult: CheckerResult? = null
+        private set
 
+    @WorkerThread
     suspend fun getBackupSize(): Long {
         // get all snapshots
         val folder = TopLevelFolder(crypto.repoId)
@@ -63,6 +65,7 @@ internal class Checker(
         return sizeMap.values.sumOf { it.toLong() }
     }
 
+    @WorkerThread
     suspend fun check(percent: Int) {
         check(percent in 0..100) { "Percent $percent out of bounds." }
 
@@ -106,6 +109,14 @@ internal class Checker(
         val passedTime = System.currentTimeMillis() - startTime
         val bandwidth = size.get() / (passedTime.toDouble() / 1000).roundToLong()
         nm.onCheckComplete(size.get(), bandwidth)
+        checkerResult = CheckerResult.Success(snapshots, percent, size.get())
+        this.snapshots = null
+    }
+
+    fun clear() {
+        log.info { "Clearing..." }
+        snapshots = null
+        checkerResult = null
     }
 
     private fun getBlobSample(snapshots: List<Snapshot>, percent: Int): Map<String, Blob> {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/CheckerResult.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/CheckerResult.kt
new file mode 100644
index 00000000..56b9b0b3
--- /dev/null
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/CheckerResult.kt
@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: 2024 The Calyx Institute
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.stevesoltys.seedvault.repo
+
+import com.stevesoltys.seedvault.proto.Snapshot
+
+sealed class CheckerResult {
+    data class Success(
+        val snapshots: List<Snapshot>,
+        val percent: Int,
+        val size: Long,
+    ) : CheckerResult()
+
+    data class Error(
+        val snapshots: List<Snapshot>,
+        val errors: Map<String, Exception>,
+    ) : CheckerResult()
+
+    data class GeneralError(val e: Exception) : CheckerResult()
+}
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 bf89c92e..05e4476e 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetAdapter.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetAdapter.kt
@@ -22,7 +22,7 @@ import com.stevesoltys.seedvault.restore.RestoreSetAdapter.RestoreSetViewHolder
 import com.stevesoltys.seedvault.transport.restore.RestorableBackup
 
 internal class RestoreSetAdapter(
-    private val listener: RestorableBackupClickListener,
+    private val listener: RestorableBackupClickListener?,
     private val items: List<RestorableBackup>,
 ) : Adapter<RestoreSetViewHolder>() {
 
@@ -46,7 +46,9 @@ internal class RestoreSetAdapter(
         private val timeView = v.requireViewById<TextView>(R.id.timeView)
 
         internal fun bind(item: RestorableBackup) {
-            v.setOnClickListener { listener.onRestorableBackupClicked(item) }
+            if (listener != null) {
+                v.setOnClickListener { listener.onRestorableBackupClicked(item) }
+            }
             titleView.text = item.name
 
             appView.text = if (item.sizeAppData > 0) {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckResultActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckResultActivity.kt
new file mode 100644
index 00000000..700d81f3
--- /dev/null
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckResultActivity.kt
@@ -0,0 +1,87 @@
+/*
+ * SPDX-FileCopyrightText: 2024 The Calyx Institute
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.stevesoltys.seedvault.ui.check
+
+import android.os.Bundle
+import android.text.format.Formatter.formatShortFileSize
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.stevesoltys.seedvault.R
+import com.stevesoltys.seedvault.repo.Checker
+import com.stevesoltys.seedvault.repo.CheckerResult
+import com.stevesoltys.seedvault.restore.RestoreSetAdapter
+import com.stevesoltys.seedvault.transport.restore.RestorableBackup
+import com.stevesoltys.seedvault.ui.BackupActivity
+import com.stevesoltys.seedvault.ui.notification.BackupNotificationManager
+import io.github.oshai.kotlinlogging.KotlinLogging
+import org.koin.android.ext.android.inject
+
+internal const val ACTION_FINISHED = "FINISHED"
+internal const val ACTION_SHOW = "SHOW"
+
+class AppCheckResultActivity : BackupActivity() {
+
+    private val log = KotlinLogging.logger { }
+
+    private val checker: Checker by inject()
+    private val notificationManager: BackupNotificationManager by inject()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (savedInstanceState == null) when (intent.action) {
+            ACTION_FINISHED -> {
+                notificationManager.onCheckCompleteNotificationSeen()
+                checker.clear()
+                finish()
+            }
+            ACTION_SHOW -> {
+                notificationManager.onCheckCompleteNotificationSeen()
+                onActionReceived()
+            }
+            else -> {
+                log.error { "Unknown action: ${intent.action}" }
+                finish()
+            }
+        }
+    }
+
+    private fun onActionReceived() {
+        when (val result = checker.checkerResult) {
+            is CheckerResult.Success -> onSuccess(result)
+            is CheckerResult.Error -> {
+                // TODO
+                log.info { "snapshots: ${result.snapshots.size}, errors: ${result.errors.size}" }
+            }
+            is CheckerResult.GeneralError, null -> {
+                // TODO
+                if (result == null) log.error { "No more result" }
+                else log.info((result as CheckerResult.GeneralError).e) { "Error: " }
+            }
+        }
+        checker.clear()
+    }
+
+    private fun onSuccess(result: CheckerResult.Success) {
+        setContentView(R.layout.activity_check_success)
+        val intro = getString(
+            R.string.backup_app_check_success_intro,
+            result.snapshots.size,
+            result.percent,
+            formatShortFileSize(this, result.size),
+        )
+        requireViewById<TextView>(R.id.introView).text = intro
+
+        val listView = requireViewById<RecyclerView>(R.id.listView)
+        listView.adapter = RestoreSetAdapter(
+            listener = null,
+            items = result.snapshots.map { snapshot ->
+                RestorableBackup("", snapshot)
+            }.sortedByDescending { it.time },
+        )
+    }
+
+}
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 8aaf5ec0..4a83f5b6 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
@@ -6,6 +6,8 @@
 package com.stevesoltys.seedvault.ui.notification
 
 import android.annotation.SuppressLint
+import android.app.ActivityOptions
+import android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
@@ -15,8 +17,10 @@ import android.app.NotificationManager.IMPORTANCE_LOW
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_IMMUTABLE
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
+import android.app.PendingIntent.getActivity
 import android.content.Context
 import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
 import android.content.pm.PackageManager.NameNotFoundException
 import android.text.format.Formatter.formatShortFileSize
 import android.util.Log
@@ -34,6 +38,9 @@ import com.stevesoltys.seedvault.restore.REQUEST_CODE_UNINSTALL
 import com.stevesoltys.seedvault.restore.RestoreActivity
 import com.stevesoltys.seedvault.settings.ACTION_APP_STATUS_LIST
 import com.stevesoltys.seedvault.settings.SettingsActivity
+import com.stevesoltys.seedvault.ui.check.ACTION_FINISHED
+import com.stevesoltys.seedvault.ui.check.ACTION_SHOW
+import com.stevesoltys.seedvault.ui.check.AppCheckResultActivity
 import kotlin.math.min
 
 private const val CHANNEL_ID_OBSERVER = "NotificationBackupObserver"
@@ -202,7 +209,7 @@ internal class BackupNotificationManager(private val context: Context) {
         val intent = Intent(context, SettingsActivity::class.java).apply {
             action = ACTION_APP_STATUS_LIST
         }
-        val pendingIntent = PendingIntent.getActivity(context, 0, intent, FLAG_IMMUTABLE)
+        val pendingIntent = getActivity(context, 0, intent, FLAG_IMMUTABLE)
         val notification = Builder(context, CHANNEL_ID_SUCCESS).apply {
             setSmallIcon(R.drawable.ic_cloud_done)
             setContentTitle(context.getString(R.string.notification_success_title))
@@ -221,7 +228,7 @@ internal class BackupNotificationManager(private val context: Context) {
 
     fun onBackupError() {
         val intent = Intent(context, SettingsActivity::class.java)
-        val pendingIntent = PendingIntent.getActivity(context, 0, intent, FLAG_IMMUTABLE)
+        val pendingIntent = getActivity(context, 0, intent, FLAG_IMMUTABLE)
         val notification = Builder(context, CHANNEL_ID_ERROR).apply {
             setSmallIcon(R.drawable.ic_cloud_error)
             setContentTitle(context.getString(R.string.notification_failed_title))
@@ -241,7 +248,7 @@ internal class BackupNotificationManager(private val context: Context) {
     @SuppressLint("RestrictedApi")
     fun onFixableBackupError() {
         val intent = Intent(context, SettingsActivity::class.java)
-        val pendingIntent = PendingIntent.getActivity(context, 0, intent, FLAG_IMMUTABLE)
+        val pendingIntent = getActivity(context, 0, intent, FLAG_IMMUTABLE)
         val actionText = context.getString(R.string.notification_error_action)
         val action = Action(R.drawable.ic_storage, actionText, pendingIntent)
         val notification = Builder(context, CHANNEL_ID_ERROR).apply {
@@ -276,7 +283,7 @@ internal class BackupNotificationManager(private val context: Context) {
 
     fun getRestoreNotification() = Notification.Builder(context, CHANNEL_ID_RESTORE).apply {
         val intent = Intent(context, RestoreActivity::class.java)
-        val pendingIntent = PendingIntent.getActivity(context, 0, intent, FLAG_IMMUTABLE)
+        val pendingIntent = getActivity(context, 0, intent, FLAG_IMMUTABLE)
         setContentIntent(pendingIntent)
         setSmallIcon(R.drawable.ic_cloud_restore)
         setContentTitle(context.getString(R.string.notification_restore_title))
@@ -356,19 +363,45 @@ internal class BackupNotificationManager(private val context: Context) {
             formatShortFileSize(context, size),
             "${formatShortFileSize(context, speed)}/s",
         )
+        // the background activity launch (BAL) gets restricted for setDeleteIntent()
+        // if we don't use these special ActivityOptions, may cause issues in future SDKs
+        val options = ActivityOptions.makeBasic()
+            .setPendingIntentCreatorBackgroundActivityStartMode(
+                MODE_BACKGROUND_ACTIVITY_START_ALLOWED
+            ).toBundle()
+        val cIntent = Intent(context, AppCheckResultActivity::class.java).apply {
+            addFlags(FLAG_ACTIVITY_NEW_TASK)
+            setAction(ACTION_SHOW)
+        }
+        val dIntent = Intent(context, AppCheckResultActivity::class.java).apply {
+            addFlags(FLAG_ACTIVITY_NEW_TASK)
+            setAction(ACTION_FINISHED)
+        }
+        val contentIntent = getActivity(context, 1, cIntent, FLAG_IMMUTABLE, options)
+        val deleteIntent = getActivity(context, 2, dIntent, FLAG_IMMUTABLE, options)
+        val actionTitle = context.getString(R.string.notification_checking_action)
+        val action = Action.Builder(null, actionTitle, contentIntent).build()
         val notification = Builder(context, CHANNEL_ID_CHECKING)
             .setContentTitle(context.getString(R.string.notification_checking_finished_title))
             .setContentText(text)
             .setSmallIcon(R.drawable.ic_cloud_done)
+            .setContentIntent(contentIntent)
+            .addAction(action)
+            .setDeleteIntent(deleteIntent)
+            .setAutoCancel(true)
             .build()
         nm.cancel(NOTIFICATION_ID_CHECKING)
         nm.notify(NOTIFICATION_ID_CHECK_FINISHED, notification)
     }
 
+    fun onCheckCompleteNotificationSeen() {
+        nm.cancel(NOTIFICATION_ID_CHECK_FINISHED)
+    }
+
     @SuppressLint("RestrictedApi")
     fun onNoMainKeyError() {
         val intent = Intent(context, SettingsActivity::class.java)
-        val pendingIntent = PendingIntent.getActivity(context, 0, intent, FLAG_IMMUTABLE)
+        val pendingIntent = getActivity(context, 0, intent, FLAG_IMMUTABLE)
         val actionText = context.getString(R.string.notification_error_action)
         val action = Action(0, actionText, pendingIntent)
         val notification = Builder(context, CHANNEL_ID_ERROR).apply {
diff --git a/app/src/main/res/layout/activity_check_success.xml b/app/src/main/res/layout/activity_check_success.xml
new file mode 100644
index 00000000..c72f2494
--- /dev/null
+++ b/app/src/main/res/layout/activity_check_success.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  SPDX-FileCopyrightText: 2020 The Calyx Institute
+  SPDX-License-Identifier: Apache-2.0
+  -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/imageView"
+            style="@style/SudHeaderIcon"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_cloud_done"
+            app:tint="?android:colorAccent"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:id="@+id/titleView"
+            style="@style/SudHeaderTitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:text="@string/notification_checking_finished_title"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/imageView" />
+
+        <TextView
+            android:id="@+id/introView"
+            style="@style/SudDescription"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/backup_app_check_success_intro"
+            android:textSize="16sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/titleView" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/listView"
+            style="@style/SudContent"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="0dp"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            app:layout_constraintBottom_toTopOf="@+id/disclaimerView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/introView"
+            tools:itemCount="4"
+            tools:listitem="@layout/list_item_restore_set" />
+
+        <TextView
+            android:id="@+id/disclaimerView"
+            style="@style/SudDescription"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/backup_app_check_success_disclaimer"
+            android:textColor="?colorError"
+            android:textSize="16sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/listView" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ef80eda9..f084a1ba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -189,8 +189,13 @@
 
     <string name="notification_checking_channel_title">App backup integrity check</string>
     <string name="notification_checking_title">Checking app backups…</string>
-    <string name="notification_checking_finished_title">App backup integrity confirmed</string>
+    <string name="notification_checking_finished_title">App backup integrity verified</string>
     <string name="notification_checking_finished_text">Successfully checked %1$s at an average speed of %2$s.</string>
+    <string name="notification_checking_action">Details</string>
+
+    <string name="backup_app_check_success_intro">%1$d snapshots were found and %2$d%% of their data (%3$s) successfully verified:</string>
+    <string name="backup_app_check_success_disclaimer">Note: We can not verify whether apps include all of their data in the backup.</string>
+    <string name="backup_app_check_error_no_snapshots">We could not find any backup. Please run a successful backup first and then try checking again.</string>
 
     <!-- App Backup and Restore State -->
 

From 83974b4121a2368d7155080db5509e822990952a Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 28 Oct 2024 15:07:02 -0300
Subject: [PATCH 08/20] Show app backup check error screen

and error notification
---
 .../com/stevesoltys/seedvault/repo/Checker.kt | 29 ++++++++++--
 .../seedvault/repo/CheckerResult.kt           | 26 +++++++++-
 .../seedvault/restore/RestoreSetAdapter.kt    | 20 +++++++-
 .../transport/restore/RestorableBackup.kt     |  4 +-
 .../ui/check/AppCheckResultActivity.kt        | 47 +++++++++++++++++--
 .../notification/BackupNotificationManager.kt | 33 ++++++++++---
 ..._success.xml => activity_check_result.xml} |  5 +-
 app/src/main/res/values/strings.xml           |  7 +++
 8 files changed, 147 insertions(+), 24 deletions(-)
 rename app/src/main/res/layout/{activity_check_success.xml => activity_check_result.xml} (94%)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
index d793addf..e336f5b7 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
@@ -22,7 +22,9 @@ import org.calyxos.seedvault.core.toHexString
 import java.security.DigestInputStream
 import java.security.GeneralSecurityException
 import java.security.MessageDigest
+import java.util.concurrent.ConcurrentSkipListSet
 import java.util.concurrent.atomic.AtomicLong
+import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
 import kotlin.math.roundToLong
@@ -36,6 +38,7 @@ internal class Checker(
 ) {
     private val log = KotlinLogging.logger { }
 
+    private var handleSize: Int? = null
     private var snapshots: List<Snapshot>? = null
     private val concurrencyLimit: Int
         get() {
@@ -55,6 +58,7 @@ internal class Checker(
         }
         val snapshots = snapshotManager.onSnapshotsLoaded(handles)
         this.snapshots = snapshots // remember loaded snapshots
+        this.handleSize = handles.size // remember number of snapshot handles we had
 
         // get total disk space used by snapshots
         val sizeMap = mutableMapOf<String, Int>()
@@ -71,6 +75,10 @@ internal class Checker(
 
         if (snapshots == null) getBackupSize() // just get size again to be sure we get snapshots
         val snapshots = snapshots ?: error("Snapshots still null")
+        val handleSize = handleSize ?: error("Handle size still null")
+        check(handleSize >= snapshots.size) {
+            "Got $handleSize handles, but ${snapshots.size} snapshots."
+        }
         val blobSample = getBlobSample(snapshots, percent)
         val sampleSize = blobSample.values.sumOf { it.length.toLong() }
         log.info { "Blob sample has ${blobSample.size} blobs worth $sampleSize bytes." }
@@ -78,6 +86,7 @@ internal class Checker(
         // check blobs concurrently
         val semaphore = Semaphore(concurrencyLimit)
         val size = AtomicLong()
+        val badChunks = ConcurrentSkipListSet<String>()
         val lastNotification = AtomicLong()
         val startTime = System.currentTimeMillis()
         coroutineScope {
@@ -86,8 +95,13 @@ internal class Checker(
                 launch {
                     // suspend here until we get a permit from the semaphore (there's free workers)
                     semaphore.withPermit {
-                        // TODO record errors
-                        checkBlob(chunkId, blob)
+                        try {
+                            checkBlob(chunkId, blob)
+                        } catch (e: Exception) {
+                            log.error(e) { "Error loading chunk $chunkId: " }
+                            // TODO we could try differentiating transient backend issues
+                            badChunks.add(chunkId)
+                        }
                     }
                     // keep track of how much we checked and for how long
                     val newSize = size.addAndGet(blob.length.toLong())
@@ -106,10 +120,15 @@ internal class Checker(
         if (sampleSize != size.get()) log.error {
             "Checked ${size.get()} bytes, but expected $sampleSize"
         }
-        val passedTime = System.currentTimeMillis() - startTime
+        val passedTime = max(System.currentTimeMillis() - startTime, 1000) // no div by zero
         val bandwidth = size.get() / (passedTime.toDouble() / 1000).roundToLong()
-        nm.onCheckComplete(size.get(), bandwidth)
-        checkerResult = CheckerResult.Success(snapshots, percent, size.get())
+        checkerResult = if (badChunks.isEmpty() && handleSize == snapshots.size && handleSize > 0) {
+            nm.onCheckComplete(size.get(), bandwidth)
+            CheckerResult.Success(snapshots, percent, size.get())
+        } else {
+            nm.onCheckFinishedWithError(size.get(), bandwidth)
+            CheckerResult.Error(handleSize, snapshots, badChunks)
+        }
         this.snapshots = null
     }
 
diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/CheckerResult.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/CheckerResult.kt
index 56b9b0b3..a2d5ecdf 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/CheckerResult.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/CheckerResult.kt
@@ -15,9 +15,31 @@ sealed class CheckerResult {
     ) : CheckerResult()
 
     data class Error(
+        /**
+         * This number is greater than the size of [snapshots],
+         * if we could not read/decrypt one or more snapshots.
+         */
+        val existingSnapshots: Int,
         val snapshots: List<Snapshot>,
-        val errors: Map<String, Exception>,
-    ) : CheckerResult()
+        /**
+         * The list of chunkIDs that had errors.
+         */
+        val errorChunkIds: Set<String>,
+    ) : CheckerResult() {
+        val goodSnapshots: List<Snapshot>
+        val badSnapshots: List<Snapshot>
+
+        init {
+            val good = mutableListOf<Snapshot>()
+            val bad = mutableListOf<Snapshot>()
+            snapshots.forEach { snapshot ->
+                val isGood = snapshot.blobsMap.keys.intersect(errorChunkIds).isEmpty()
+                if (isGood) good.add(snapshot) else bad.add(snapshot)
+            }
+            goodSnapshots = good
+            badSnapshots = bad
+        }
+    }
 
     data class GeneralError(val e: Exception) : CheckerResult()
 }
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 05e4476e..6f7461db 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetAdapter.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetAdapter.kt
@@ -14,9 +14,11 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView.Adapter
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.google.android.material.color.MaterialColors
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.restore.RestoreSetAdapter.RestoreSetViewHolder
 import com.stevesoltys.seedvault.transport.restore.RestorableBackup
@@ -40,6 +42,7 @@ internal class RestoreSetAdapter(
 
     inner class RestoreSetViewHolder(private val v: View) : ViewHolder(v) {
 
+        private val imageView = v.requireViewById<ImageView>(R.id.imageView)
         private val titleView = v.requireViewById<TextView>(R.id.titleView)
         private val appView = v.requireViewById<TextView>(R.id.appView)
         private val apkView = v.requireViewById<TextView>(R.id.apkView)
@@ -49,6 +52,11 @@ internal class RestoreSetAdapter(
             if (listener != null) {
                 v.setOnClickListener { listener.onRestorableBackupClicked(item) }
             }
+            if (item.canBeRestored) {
+                imageView.setImageResource(R.drawable.ic_phone_android)
+            } else {
+                imageView.setImageResource(R.drawable.ic_error_red)
+            }
             titleView.text = item.name
 
             appView.text = if (item.sizeAppData > 0) {
@@ -61,7 +69,9 @@ internal class RestoreSetAdapter(
                 v.context.getString(R.string.restore_restore_set_apps_no_size, item.numAppData)
             }
             appView.visibility = if (item.numAppData > 0) VISIBLE else GONE
-            apkView.text = if (item.sizeApks > 0) {
+            apkView.text = if (!item.canBeRestored) {
+                v.context.getString(R.string.restore_restore_set_can_not_get_restored)
+            } else if (item.sizeApks > 0) {
                 v.context.getString(
                     R.string.restore_restore_set_apks,
                     item.numApks,
@@ -70,7 +80,13 @@ internal class RestoreSetAdapter(
             } else {
                 v.context.getString(R.string.restore_restore_set_apks_no_size, item.numApks)
             }
-            apkView.visibility = if (item.numApks > 0) VISIBLE else GONE
+            apkView.visibility = if (item.numApks > 0 || !item.canBeRestored) VISIBLE else GONE
+            val apkTextColor = if (item.canBeRestored) {
+                appView.currentTextColor
+            } else {
+                MaterialColors.getColor(apkView, R.attr.colorError)
+            }
+            apkView.setTextColor(apkTextColor)
             timeView.text = getRelativeTime(item.time)
         }
 
diff --git a/app/src/main/java/com/stevesoltys/seedvault/transport/restore/RestorableBackup.kt b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/RestorableBackup.kt
index 2dc7de45..054b75bd 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/transport/restore/RestorableBackup.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/transport/restore/RestorableBackup.kt
@@ -19,12 +19,14 @@ data class RestorableBackup(
     val backupMetadata: BackupMetadata,
     val repoId: String? = null,
     val snapshot: Snapshot? = null,
+    val canBeRestored: Boolean = true,
 ) {
 
-    constructor(repoId: String, snapshot: Snapshot) : this(
+    constructor(repoId: String, snapshot: Snapshot, canBeRestored: Boolean = true) : this(
         backupMetadata = BackupMetadata.fromSnapshot(snapshot),
         repoId = repoId,
         snapshot = snapshot,
+        canBeRestored = canBeRestored,
     )
 
     val name: String
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckResultActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckResultActivity.kt
index 700d81f3..922ba469 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckResultActivity.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckResultActivity.kt
@@ -7,6 +7,8 @@ package com.stevesoltys.seedvault.ui.check
 
 import android.os.Bundle
 import android.text.format.Formatter.formatShortFileSize
+import android.view.View.GONE
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.stevesoltys.seedvault.R
@@ -52,10 +54,7 @@ class AppCheckResultActivity : BackupActivity() {
     private fun onActionReceived() {
         when (val result = checker.checkerResult) {
             is CheckerResult.Success -> onSuccess(result)
-            is CheckerResult.Error -> {
-                // TODO
-                log.info { "snapshots: ${result.snapshots.size}, errors: ${result.errors.size}" }
-            }
+            is CheckerResult.Error -> onError(result)
             is CheckerResult.GeneralError, null -> {
                 // TODO
                 if (result == null) log.error { "No more result" }
@@ -66,7 +65,7 @@ class AppCheckResultActivity : BackupActivity() {
     }
 
     private fun onSuccess(result: CheckerResult.Success) {
-        setContentView(R.layout.activity_check_success)
+        setContentView(R.layout.activity_check_result)
         val intro = getString(
             R.string.backup_app_check_success_intro,
             result.snapshots.size,
@@ -84,4 +83,42 @@ class AppCheckResultActivity : BackupActivity() {
         )
     }
 
+    private fun onError(result: CheckerResult.Error) {
+        setContentView(R.layout.activity_check_result)
+        requireViewById<ImageView>(R.id.imageView).setImageResource(R.drawable.ic_cloud_error)
+        requireViewById<TextView>(R.id.titleView).setText(R.string.backup_app_check_error_title)
+        val disclaimerView = requireViewById<TextView>(R.id.disclaimerView)
+
+        val intro = if (result.existingSnapshots == 0) {
+            disclaimerView.visibility = GONE
+            getString(R.string.backup_app_check_error_no_snapshots)
+        } else if (result.snapshots.isEmpty()) {
+            disclaimerView.visibility = GONE
+            getString(
+                R.string.backup_app_check_error_only_broken_snapshots,
+                result.existingSnapshots,
+            )
+        } else if (result.existingSnapshots > result.snapshots.size) {
+            getString(
+                R.string.backup_app_check_error_some_snapshots,
+                result.existingSnapshots,
+                result.snapshots.size,
+            )
+        } else {
+            getString(R.string.backup_app_check_error_read_all_snapshots, result.snapshots.size)
+        }
+        requireViewById<TextView>(R.id.introView).text = intro
+
+        val items = (result.goodSnapshots.map { snapshot ->
+            RestorableBackup("", snapshot)
+        } + result.badSnapshots.map { snapshot ->
+            RestorableBackup("", snapshot, false)
+        }).sortedByDescending { it.time }
+        val listView = requireViewById<RecyclerView>(R.id.listView)
+        listView.adapter = RestoreSetAdapter(
+            listener = null,
+            items = items,
+        )
+    }
+
 }
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 4a83f5b6..255a75b8 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
@@ -363,6 +363,31 @@ internal class BackupNotificationManager(private val context: Context) {
             formatShortFileSize(context, size),
             "${formatShortFileSize(context, speed)}/s",
         )
+        val notification = getOnCheckFinishedBuilder()
+            .setContentTitle(context.getString(R.string.notification_checking_finished_title))
+            .setContentText(text)
+            .setSmallIcon(R.drawable.ic_cloud_done)
+            .build()
+        nm.cancel(NOTIFICATION_ID_CHECKING)
+        nm.notify(NOTIFICATION_ID_CHECK_FINISHED, notification)
+    }
+
+    fun onCheckFinishedWithError(size: Long, speed: Long) {
+        val text = context.getString(
+            R.string.notification_checking_error_text,
+            formatShortFileSize(context, size),
+            "${formatShortFileSize(context, speed)}/s",
+        )
+        val notification = getOnCheckFinishedBuilder()
+            .setContentTitle(context.getString(R.string.notification_checking_error_title))
+            .setContentText(text)
+            .setSmallIcon(R.drawable.ic_cloud_error)
+            .build()
+        nm.cancel(NOTIFICATION_ID_CHECKING)
+        nm.notify(NOTIFICATION_ID_CHECK_FINISHED, notification)
+    }
+
+    private fun getOnCheckFinishedBuilder(): Builder {
         // the background activity launch (BAL) gets restricted for setDeleteIntent()
         // if we don't use these special ActivityOptions, may cause issues in future SDKs
         val options = ActivityOptions.makeBasic()
@@ -381,17 +406,11 @@ internal class BackupNotificationManager(private val context: Context) {
         val deleteIntent = getActivity(context, 2, dIntent, FLAG_IMMUTABLE, options)
         val actionTitle = context.getString(R.string.notification_checking_action)
         val action = Action.Builder(null, actionTitle, contentIntent).build()
-        val notification = Builder(context, CHANNEL_ID_CHECKING)
-            .setContentTitle(context.getString(R.string.notification_checking_finished_title))
-            .setContentText(text)
-            .setSmallIcon(R.drawable.ic_cloud_done)
+        return Builder(context, CHANNEL_ID_CHECKING)
             .setContentIntent(contentIntent)
             .addAction(action)
             .setDeleteIntent(deleteIntent)
             .setAutoCancel(true)
-            .build()
-        nm.cancel(NOTIFICATION_ID_CHECKING)
-        nm.notify(NOTIFICATION_ID_CHECK_FINISHED, notification)
     }
 
     fun onCheckCompleteNotificationSeen() {
diff --git a/app/src/main/res/layout/activity_check_success.xml b/app/src/main/res/layout/activity_check_result.xml
similarity index 94%
rename from app/src/main/res/layout/activity_check_success.xml
rename to app/src/main/res/layout/activity_check_result.xml
index c72f2494..f3a0a3a3 100644
--- a/app/src/main/res/layout/activity_check_success.xml
+++ b/app/src/main/res/layout/activity_check_result.xml
@@ -51,10 +51,10 @@
             android:layout_height="wrap_content"
             android:layout_margin="0dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintBottom_toTopOf="@+id/disclaimerView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/introView"
+            app:layout_constraintVertical_bias="0.0"
             tools:itemCount="4"
             tools:listitem="@layout/list_item_restore_set" />
 
@@ -70,7 +70,8 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/listView" />
+            app:layout_constraintTop_toBottomOf="@+id/listView"
+            app:layout_constraintVertical_bias="0.0" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f084a1ba..e11e0eb9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -191,11 +191,17 @@
     <string name="notification_checking_title">Checking app backups…</string>
     <string name="notification_checking_finished_title">App backup integrity verified</string>
     <string name="notification_checking_finished_text">Successfully checked %1$s at an average speed of %2$s.</string>
+    <string name="notification_checking_error_title">Backup errors found</string>
+    <string name="notification_checking_error_text">Tap for details. We checked %1$s at an average speed of %2$s.</string>
     <string name="notification_checking_action">Details</string>
 
     <string name="backup_app_check_success_intro">%1$d snapshots were found and %2$d%% of their data (%3$s) successfully verified:</string>
     <string name="backup_app_check_success_disclaimer">Note: We can not verify whether apps include all of their data in the backup.</string>
+    <string name="backup_app_check_error_title">@string/notification_checking_error_title</string>
     <string name="backup_app_check_error_no_snapshots">We could not find any backup. Please run a successful backup first and then try checking again.</string>
+    <string name="backup_app_check_error_only_broken_snapshots">We found %1$d backup snapshots. However, all of them were corrupted. Please run a successful backup and then try checking again.</string>
+    <string name="backup_app_check_error_some_snapshots">We found %1$d backup snapshots. However, we could only read the following %2$d snapshots.</string>
+    <string name="backup_app_check_error_read_all_snapshots">We found %1$d backup snapshots. However, some had errors and can not be fully restored.</string>
 
     <!-- App Backup and Restore State -->
 
@@ -229,6 +235,7 @@
     <string name="restore_restore_set_apps_no_size">Has user data for <xliff:g example="42" id="apps">%1$d</xliff:g> apps</string>
     <string name="restore_restore_set_apks">Contains <xliff:g example="42" id="apps">%1$d</xliff:g> apps (<xliff:g example="1 GB" id="size">%2$s</xliff:g>)</string>
     <string name="restore_restore_set_apks_no_size">Contains <xliff:g example="42" id="apps">%1$d</xliff:g> apps</string>
+    <string name="restore_restore_set_can_not_get_restored">Can not be (fully) restored.</string>
     <string name="restore_skip">Don\'t restore</string>
     <string name="restore_skip_apps">Skip restoring apps</string>
     <string name="restore_invalid_location_title">No backups found</string>

From 06191a1fc39ad9a3cfe0a1379e5a3c65f60584ad Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 28 Oct 2024 15:32:39 -0300
Subject: [PATCH 09/20] Catch error when loading snapshots for app checking

---
 .../com/stevesoltys/seedvault/repo/Checker.kt | 28 +++++++++++------
 .../seedvault/settings/AppCheckFragment.kt    |  8 +++--
 .../ui/check/AppCheckResultActivity.kt        | 31 +++++++++++++------
 app/src/main/res/values/strings.xml           |  8 ++---
 4 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
index e336f5b7..8832fe19 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
@@ -49,20 +49,25 @@ internal class Checker(
         private set
 
     @WorkerThread
-    suspend fun getBackupSize(): Long {
+    suspend fun getBackupSize(): Long? {
         // get all snapshots
         val folder = TopLevelFolder(crypto.repoId)
         val handles = mutableListOf<AppBackupFileType.Snapshot>()
-        backendManager.backend.list(folder, AppBackupFileType.Snapshot::class) { fileInfo ->
-            handles.add(fileInfo.fileHandle as AppBackupFileType.Snapshot)
+        try {
+            backendManager.backend.list(folder, AppBackupFileType.Snapshot::class) { fileInfo ->
+                handles.add(fileInfo.fileHandle as AppBackupFileType.Snapshot)
+            }
+            val snapshots = snapshotManager.onSnapshotsLoaded(handles)
+            this.snapshots = snapshots // remember loaded snapshots
+            this.handleSize = handles.size // remember number of snapshot handles we had
+        } catch (e: Exception) {
+            log.error(e) { "Error loading snapshots: " }
+            // we swallow this exception, because an error will be shown in the next step
+            return null
         }
-        val snapshots = snapshotManager.onSnapshotsLoaded(handles)
-        this.snapshots = snapshots // remember loaded snapshots
-        this.handleSize = handles.size // remember number of snapshot handles we had
-
         // get total disk space used by snapshots
         val sizeMap = mutableMapOf<String, Int>()
-        snapshots.forEach { snapshot ->
+        snapshots?.forEach { snapshot ->
             // add sizes to a map first, so we don't double count
             snapshot.blobsMap.forEach { (chunkId, blob) -> sizeMap[chunkId] = blob.length }
         }
@@ -73,7 +78,12 @@ internal class Checker(
     suspend fun check(percent: Int) {
         check(percent in 0..100) { "Percent $percent out of bounds." }
 
-        if (snapshots == null) getBackupSize() // just get size again to be sure we get snapshots
+        if (snapshots == null) try {
+            getBackupSize() // just get size again to be sure we get snapshots
+        } catch (e: Exception) {
+            nm.onCheckFinishedWithError(0, 0)
+            checkerResult = CheckerResult.GeneralError(e)
+        }
         val snapshots = snapshots ?: error("Snapshots still null")
         val handleSize = handleSize ?: error("Handle size still null")
         check(handleSize >= snapshots.size) {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt
index 6512b1cd..cea46c86 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt
@@ -50,9 +50,11 @@ class AppCheckFragment : Fragment() {
         }
 
         viewModel.backupSize.observe(viewLifecycleOwner) {
-            slider.labelBehavior = LABEL_VISIBLE
-            slider.invalidate()
-            onSliderChanged(slider.value)
+            if (it != null) {
+                slider.labelBehavior = LABEL_VISIBLE
+                slider.invalidate()
+                onSliderChanged(slider.value)
+            }
             // we can stop observing as the loaded size won't change again
             viewModel.backupSize.removeObservers(viewLifecycleOwner)
         }
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckResultActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckResultActivity.kt
index 922ba469..a1ac94cc 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckResultActivity.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckResultActivity.kt
@@ -56,9 +56,14 @@ class AppCheckResultActivity : BackupActivity() {
             is CheckerResult.Success -> onSuccess(result)
             is CheckerResult.Error -> onError(result)
             is CheckerResult.GeneralError, null -> {
-                // TODO
-                if (result == null) log.error { "No more result" }
-                else log.info((result as CheckerResult.GeneralError).e) { "Error: " }
+                if (result == null) {
+                    val str = getString(R.string.backup_app_check_error_no_result)
+                    val e = NullPointerException(str)
+                    val r = CheckerResult.GeneralError(e)
+                    onGeneralError(r)
+                } else {
+                    onGeneralError(result as CheckerResult.GeneralError)
+                }
             }
         }
         checker.clear()
@@ -98,14 +103,8 @@ class AppCheckResultActivity : BackupActivity() {
                 R.string.backup_app_check_error_only_broken_snapshots,
                 result.existingSnapshots,
             )
-        } else if (result.existingSnapshots > result.snapshots.size) {
-            getString(
-                R.string.backup_app_check_error_some_snapshots,
-                result.existingSnapshots,
-                result.snapshots.size,
-            )
         } else {
-            getString(R.string.backup_app_check_error_read_all_snapshots, result.snapshots.size)
+            getString(R.string.backup_app_check_error_has_snapshots, result.existingSnapshots)
         }
         requireViewById<TextView>(R.id.introView).text = intro
 
@@ -121,4 +120,16 @@ class AppCheckResultActivity : BackupActivity() {
         )
     }
 
+    private fun onGeneralError(result: CheckerResult.GeneralError) {
+        setContentView(R.layout.activity_check_result)
+        requireViewById<ImageView>(R.id.imageView).setImageResource(R.drawable.ic_cloud_error)
+        requireViewById<TextView>(R.id.titleView).setText(R.string.backup_app_check_error_title)
+
+        requireViewById<TextView>(R.id.introView).text =
+            getString(R.string.backup_app_check_error_no_snapshots)
+
+        requireViewById<TextView>(R.id.disclaimerView).text =
+            "${result.e.localizedMessage}\n\n${result.e}"
+    }
+
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e11e0eb9..5e66f82a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -196,12 +196,12 @@
     <string name="notification_checking_action">Details</string>
 
     <string name="backup_app_check_success_intro">%1$d snapshots were found and %2$d%% of their data (%3$s) successfully verified:</string>
-    <string name="backup_app_check_success_disclaimer">Note: We can not verify whether apps include all of their data in the backup.</string>
+    <string name="backup_app_check_success_disclaimer">Note: we cannot verify whether individual apps include all of their user data in the backup.</string>
     <string name="backup_app_check_error_title">@string/notification_checking_error_title</string>
     <string name="backup_app_check_error_no_snapshots">We could not find any backup. Please run a successful backup first and then try checking again.</string>
     <string name="backup_app_check_error_only_broken_snapshots">We found %1$d backup snapshots. However, all of them were corrupted. Please run a successful backup and then try checking again.</string>
-    <string name="backup_app_check_error_some_snapshots">We found %1$d backup snapshots. However, we could only read the following %2$d snapshots.</string>
-    <string name="backup_app_check_error_read_all_snapshots">We found %1$d backup snapshots. However, some had errors and can not be fully restored.</string>
+    <string name="backup_app_check_error_has_snapshots">We found %1$d backup snapshots, some of them are corrupt or have errors. Below are the backups that could be restored.</string>
+    <string name="backup_app_check_error_no_result">We lost the detailed results. Did a long time pass since running the check? Try running again.</string>
 
     <!-- App Backup and Restore State -->
 
@@ -235,7 +235,7 @@
     <string name="restore_restore_set_apps_no_size">Has user data for <xliff:g example="42" id="apps">%1$d</xliff:g> apps</string>
     <string name="restore_restore_set_apks">Contains <xliff:g example="42" id="apps">%1$d</xliff:g> apps (<xliff:g example="1 GB" id="size">%2$s</xliff:g>)</string>
     <string name="restore_restore_set_apks_no_size">Contains <xliff:g example="42" id="apps">%1$d</xliff:g> apps</string>
-    <string name="restore_restore_set_can_not_get_restored">Can not be (fully) restored.</string>
+    <string name="restore_restore_set_can_not_get_restored">This backup has some errors. You may be able to restore it partly.</string>
     <string name="restore_skip">Don\'t restore</string>
     <string name="restore_skip_apps">Skip restoring apps</string>
     <string name="restore_invalid_location_title">No backups found</string>

From beedafd0424d6f75c91475df5b95b3b9c3f87ccd Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 28 Oct 2024 15:33:42 -0300
Subject: [PATCH 10/20] Move AppCheckFragment into check package

---
 .../{settings => ui/check}/AppCheckFragment.kt    | 15 +++++++--------
 app/src/main/res/xml/settings.xml                 |  2 +-
 2 files changed, 8 insertions(+), 9 deletions(-)
 rename app/src/main/java/com/stevesoltys/seedvault/{settings => ui/check}/AppCheckFragment.kt (86%)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckFragment.kt
similarity index 86%
rename from app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt
rename to app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckFragment.kt
index cea46c86..f6988b80 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckFragment.kt
@@ -3,22 +3,21 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package com.stevesoltys.seedvault.settings
+package com.stevesoltys.seedvault.ui.check
 
 import android.os.Bundle
-import android.text.format.Formatter.formatShortFileSize
+import android.text.format.Formatter
 import android.view.LayoutInflater
 import android.view.View
-import android.view.View.GONE
-import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ScrollView
 import android.widget.TextView
 import androidx.fragment.app.Fragment
-import com.google.android.material.slider.LabelFormatter.LABEL_VISIBLE
+import com.google.android.material.slider.LabelFormatter
 import com.google.android.material.slider.Slider
 import com.stevesoltys.seedvault.R
+import com.stevesoltys.seedvault.settings.SettingsViewModel
 import org.koin.androidx.viewmodel.ext.android.activityViewModel
 
 private const val WARN_PERCENT = 25
@@ -42,7 +41,7 @@ class AppCheckFragment : Fragment() {
         // label not scrolling will be fixed in material-components 1.12.0 (next update)
         slider.setLabelFormatter { value ->
             viewModel.backupSize.value?.let {
-                formatShortFileSize(context, (it * value / 100).toLong())
+                Formatter.formatShortFileSize(context, (it * value / 100).toLong())
             } ?: "${value.toInt()}%"
         }
         slider.addOnChangeListener { _, value, _ ->
@@ -51,7 +50,7 @@ class AppCheckFragment : Fragment() {
 
         viewModel.backupSize.observe(viewLifecycleOwner) {
             if (it != null) {
-                slider.labelBehavior = LABEL_VISIBLE
+                slider.labelBehavior = LabelFormatter.LABEL_VISIBLE
                 slider.invalidate()
                 onSliderChanged(slider.value)
             }
@@ -81,7 +80,7 @@ class AppCheckFragment : Fragment() {
             size * value / 100 > WARN_BYTES
         }
         // only update label visibility when different from before
-        val newVisibility = if (showWarning) VISIBLE else GONE
+        val newVisibility = if (showWarning) View.VISIBLE else View.GONE
         if (sliderLabel.visibility != newVisibility) {
             sliderLabel.visibility = newVisibility
         }
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 7b283fd9..0ab94037 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -51,7 +51,7 @@
             tools:summary="Next backup: Never" />
 
         <androidx.preference.Preference
-            app:fragment="com.stevesoltys.seedvault.settings.AppCheckFragment"
+            app:fragment="com.stevesoltys.seedvault.ui.check.AppCheckFragment"
             app:icon="@drawable/ic_cloud_search"
             app:key="backup_scheduling"
             app:summary="@string/settings_backup_app_check_summary"

From 166f81b3a8d902c63694a0c1b7efa156099eae8f Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 29 Oct 2024 15:20:55 -0300
Subject: [PATCH 11/20] Add unit tests for Checker

---
 .../com/stevesoltys/seedvault/repo/Checker.kt |  32 +-
 .../stevesoltys/seedvault/repo/CheckerTest.kt | 299 ++++++++++++++++++
 2 files changed, 318 insertions(+), 13 deletions(-)
 create mode 100644 app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt

diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
index 8832fe19..9943545e 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
@@ -50,24 +50,29 @@ internal class Checker(
 
     @WorkerThread
     suspend fun getBackupSize(): Long? {
-        // get all snapshots
-        val folder = TopLevelFolder(crypto.repoId)
-        val handles = mutableListOf<AppBackupFileType.Snapshot>()
-        try {
-            backendManager.backend.list(folder, AppBackupFileType.Snapshot::class) { fileInfo ->
-                handles.add(fileInfo.fileHandle as AppBackupFileType.Snapshot)
-            }
-            val snapshots = snapshotManager.onSnapshotsLoaded(handles)
-            this.snapshots = snapshots // remember loaded snapshots
-            this.handleSize = handles.size // remember number of snapshot handles we had
+        return try {
+            getBackupSizeInt()
         } catch (e: Exception) {
             log.error(e) { "Error loading snapshots: " }
             // we swallow this exception, because an error will be shown in the next step
-            return null
+            null
         }
+    }
+
+    private suspend fun getBackupSizeInt(): Long {
+        // get all snapshots
+        val folder = TopLevelFolder(crypto.repoId)
+        val handles = mutableListOf<AppBackupFileType.Snapshot>()
+        backendManager.backend.list(folder, AppBackupFileType.Snapshot::class) { fileInfo ->
+            handles.add(fileInfo.fileHandle as AppBackupFileType.Snapshot)
+        }
+        val snapshots = snapshotManager.onSnapshotsLoaded(handles)
+        this.snapshots = snapshots // remember loaded snapshots
+        this.handleSize = handles.size // remember number of snapshot handles we had
+
         // get total disk space used by snapshots
         val sizeMap = mutableMapOf<String, Int>()
-        snapshots?.forEach { snapshot ->
+        snapshots.forEach { snapshot ->
             // add sizes to a map first, so we don't double count
             snapshot.blobsMap.forEach { (chunkId, blob) -> sizeMap[chunkId] = blob.length }
         }
@@ -79,10 +84,11 @@ internal class Checker(
         check(percent in 0..100) { "Percent $percent out of bounds." }
 
         if (snapshots == null) try {
-            getBackupSize() // just get size again to be sure we get snapshots
+            getBackupSizeInt() // just get size again to be sure we get snapshots
         } catch (e: Exception) {
             nm.onCheckFinishedWithError(0, 0)
             checkerResult = CheckerResult.GeneralError(e)
+            return
         }
         val snapshots = snapshots ?: error("Snapshots still null")
         val handleSize = handleSize ?: error("Handle size still null")
diff --git a/app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt b/app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt
new file mode 100644
index 00000000..85dc3709
--- /dev/null
+++ b/app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt
@@ -0,0 +1,299 @@
+/*
+ * SPDX-FileCopyrightText: 2024 The Calyx Institute
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.stevesoltys.seedvault.repo
+
+import com.google.protobuf.ByteString
+import com.stevesoltys.seedvault.backend.BackendManager
+import com.stevesoltys.seedvault.getRandomByteArray
+import com.stevesoltys.seedvault.proto.Snapshot
+import com.stevesoltys.seedvault.proto.SnapshotKt.blob
+import com.stevesoltys.seedvault.proto.copy
+import com.stevesoltys.seedvault.transport.TransportTest
+import com.stevesoltys.seedvault.ui.notification.BackupNotificationManager
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
+import io.mockk.verify
+import kotlinx.coroutines.runBlocking
+import org.calyxos.seedvault.core.backends.AppBackupFileType
+import org.calyxos.seedvault.core.backends.Backend
+import org.calyxos.seedvault.core.backends.FileInfo
+import org.calyxos.seedvault.core.backends.TopLevelFolder
+import org.calyxos.seedvault.core.toHexString
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertInstanceOf
+import org.junit.jupiter.api.Assertions.assertNull
+import org.junit.jupiter.api.Test
+import java.io.ByteArrayInputStream
+import java.io.IOException
+import java.security.GeneralSecurityException
+import java.security.MessageDigest
+import kotlin.random.Random
+
+internal class CheckerTest : TransportTest() {
+
+    private val backendManager: BackendManager = mockk()
+    private val snapshotManager: SnapshotManager = mockk()
+    private val loader: Loader = mockk()
+    private val nm: BackupNotificationManager = mockk()
+    private val backend: Backend = mockk()
+
+    private val checker = Checker(crypto, backendManager, snapshotManager, loader, nm)
+    private val folder = TopLevelFolder(repoId)
+
+    private val snapshotHandle1 =
+        AppBackupFileType.Snapshot(repoId, getRandomByteArray(32).toHexString())
+    private val snapshotHandle2 =
+        AppBackupFileType.Snapshot(repoId, getRandomByteArray(32).toHexString())
+
+    @Test
+    fun `getBackupSize returns 0 for no data`() = runBlocking {
+        expectLoadingSnapshots(emptyMap())
+
+        assertEquals(0, checker.getBackupSize())
+    }
+
+    @Test
+    fun `getBackupSize returns null on error`() = runBlocking {
+        every { crypto.repoId } returns repoId
+        every { backendManager.backend } returns backend
+        coEvery {
+            backend.list(folder, AppBackupFileType.Snapshot::class, callback = captureLambda())
+        } throws IOException()
+
+        assertNull(checker.getBackupSize())
+    }
+
+    @Test
+    fun `getBackupSize returns size without double counting blobs`() = runBlocking {
+        val snapshotMap = mapOf(
+            snapshotHandle1 to snapshot.copy { token = 1 },
+            snapshotHandle2 to snapshot.copy { token = 2 },
+        )
+        val expectedSize = blob1.length.toLong() + blob2.length.toLong()
+        expectLoadingSnapshots(snapshotMap)
+
+        assertEquals(expectedSize, checker.getBackupSize())
+    }
+
+    @Test
+    fun `check works even with no backup data`() = runBlocking {
+        expectLoadingSnapshots(emptyMap())
+
+        every { nm.onCheckFinishedWithError(0, 0) } just Runs
+
+        assertNull(checker.checkerResult)
+        checker.check(100)
+        assertInstanceOf(CheckerResult.Error::class.java, checker.checkerResult)
+        val result = checker.checkerResult as CheckerResult.Error
+        assertEquals(emptyList<Snapshot>(), result.snapshots)
+        assertEquals(0, result.existingSnapshots)
+    }
+
+    @Test
+    fun `check returns error when loading snapshots fails`() = runBlocking {
+        every { crypto.repoId } returns repoId
+        every { backendManager.backend } returns backend
+        coEvery {
+            backend.list(folder, AppBackupFileType.Snapshot::class, callback = captureLambda())
+        } throws IOException("foo")
+        every { nm.onCheckFinishedWithError(0, 0) } just Runs
+
+        assertNull(checker.checkerResult)
+        checker.check(100)
+        // assert the right exception gets passed on in error result
+        assertInstanceOf(CheckerResult.GeneralError::class.java, checker.checkerResult)
+        val result = checker.checkerResult as CheckerResult.GeneralError
+        assertInstanceOf(IOException::class.java, result.e)
+        assertEquals("foo", result.e.message)
+    }
+
+    @Test
+    fun `check raises error for wrong chunkIDs`() = runBlocking {
+        val snapshotMap = mapOf(
+            snapshotHandle1 to snapshot.copy { token = 1 },
+            snapshotHandle2 to snapshot.copy { token = 2 },
+        )
+        expectLoadingSnapshots(snapshotMap)
+
+        val data = ByteArray(0)
+        coEvery { loader.loadFile(blobHandle1, null) } returns ByteArrayInputStream(data)
+        coEvery { loader.loadFile(blobHandle2, null) } returns ByteArrayInputStream(data)
+
+        every { nm.onCheckFinishedWithError(any(), any()) } just Runs
+
+        assertNull(checker.checkerResult)
+        checker.check(100)
+        assertInstanceOf(CheckerResult.Error::class.java, checker.checkerResult)
+        val result = checker.checkerResult as CheckerResult.Error
+        assertEquals(snapshotMap.values.toSet(), result.snapshots.toSet())
+        assertEquals(snapshotMap.values.toSet(), result.badSnapshots.toSet())
+        assertEquals(emptyList<Snapshot>(), result.goodSnapshots)
+        assertEquals(snapshotMap.size, result.existingSnapshots)
+        assertEquals(setOf(chunkId1, chunkId2), result.errorChunkIds)
+    }
+
+    @Test
+    fun `check raises error for loader failure`() = runBlocking {
+        // chunkId is "real"
+        val data1 = getRandomByteArray()
+        val chunkId1 = MessageDigest.getInstance("SHA-256").digest(data1).toHexString()
+        // each snapshot gets a different blob
+        val apk1 = apk.copy {
+            splits.clear()
+            splits.add(baseSplit.copy {
+                this.chunkIds.clear()
+                chunkIds.add(ByteString.fromHex(chunkId1))
+            })
+        }
+        val apk2 = apk.copy {
+            splits.clear()
+            splits.add(baseSplit.copy {
+                this.chunkIds.clear()
+                chunkIds.add(ByteString.fromHex(chunkId2))
+            })
+        }
+        val snapshotMap = mapOf(
+            snapshotHandle1 to snapshot.copy {
+                token = 1
+                apps[packageName] = app.copy { this.apk = apk1 }
+                blobs.clear()
+                blobs[chunkId1] = blob1
+            },
+            snapshotHandle2 to snapshot.copy {
+                token = 2
+                apps[packageName] = app.copy { this.apk = apk2 }
+            },
+        )
+        expectLoadingSnapshots(snapshotMap)
+
+        coEvery { loader.loadFile(blobHandle1, null) } returns ByteArrayInputStream(data1)
+        coEvery { loader.loadFile(blobHandle2, null) } throws GeneralSecurityException()
+
+        every { nm.onCheckFinishedWithError(any(), any()) } just Runs
+
+        assertNull(checker.checkerResult)
+        checker.check(100)
+        assertInstanceOf(CheckerResult.Error::class.java, checker.checkerResult)
+        val result = checker.checkerResult as CheckerResult.Error
+        assertEquals(snapshotMap.values.toSet(), result.snapshots.toSet())
+        assertEquals(listOf(snapshotMap[snapshotHandle1]), result.goodSnapshots)
+        assertEquals(listOf(snapshotMap[snapshotHandle2]), result.badSnapshots)
+        assertEquals(snapshotMap.size, result.existingSnapshots)
+        assertEquals(setOf(chunkId2), result.errorChunkIds)
+    }
+
+    @Test
+    fun `check with 100 percent works`() = runBlocking {
+        // get "real" data for blobs
+        val messageDigest = MessageDigest.getInstance("SHA-256")
+        val data1 = getRandomByteArray()
+        val data2 = getRandomByteArray()
+        val chunkId1 = messageDigest.digest(data1).toHexString()
+        val chunkId2 = messageDigest.digest(data2).toHexString()
+        val apk = apk.copy {
+            splits.clear()
+            splits.add(baseSplit.copy {
+                this.chunkIds.clear()
+                chunkIds.add(ByteString.fromHex(chunkId1))
+            })
+            splits.add(apkSplit.copy {
+                this.chunkIds.clear()
+                chunkIds.add(ByteString.fromHex(chunkId2))
+            })
+        }
+        val snapshot = snapshot.copy {
+            apps[packageName] = app.copy { this.apk = apk }
+            blobs[chunkId1] = blob1
+            blobs[chunkId2] = blob2
+        }
+        val snapshotMap = mapOf(
+            snapshotHandle1 to snapshot.copy { token = 1 },
+            snapshotHandle2 to snapshot.copy { token = 2 },
+        )
+        val expectedSize = blob1.length.toLong() + blob2.length.toLong()
+
+        expectLoadingSnapshots(snapshotMap)
+
+        coEvery { loader.loadFile(blobHandle1, null) } returns ByteArrayInputStream(data1)
+        coEvery { loader.loadFile(blobHandle2, null) } returns ByteArrayInputStream(data2)
+
+        every { nm.onCheckComplete(expectedSize, any()) } just Runs
+
+        assertNull(checker.checkerResult)
+        checker.check(100)
+        assertInstanceOf(CheckerResult.Success::class.java, checker.checkerResult)
+        val result = checker.checkerResult as CheckerResult.Success
+        assertEquals(snapshotMap.values.toSet(), result.snapshots.toSet())
+        assertEquals(100, result.percent)
+        assertEquals(expectedSize, result.size)
+
+        verify {
+            nm.onCheckComplete(any(), any())
+        }
+    }
+
+    @Test
+    fun `check prefers app data over APKs`() = runBlocking {
+        val appDataBlob = blob {
+            id = ByteString.copyFrom(Random.nextBytes(32))
+            length = Random.nextInt(0, Int.MAX_VALUE)
+            uncompressedLength = Random.nextInt(0, Int.MAX_VALUE)
+        }
+        val appDataBlobHandle1 = AppBackupFileType.Blob(repoId, appDataBlob.id.hexFromProto())
+        val appDataChunkId = Random.nextBytes(32).toHexString()
+
+        val snapshotMap = mapOf(
+            snapshotHandle1 to snapshot.copy {
+                token = 1
+                apps[packageName] = app.copy { chunkIds.add(ByteString.fromHex(appDataChunkId)) }
+                blobs[appDataChunkId] = appDataBlob
+            },
+        )
+        expectLoadingSnapshots(snapshotMap)
+
+        // only loading app data, not other blobs
+        coEvery { loader.loadFile(appDataBlobHandle1, null) } throws SecurityException()
+
+        every { nm.onCheckFinishedWithError(appDataBlob.length.toLong(), any()) } just Runs
+
+        assertNull(checker.checkerResult)
+        checker.check(1) // 1% to minimize chance of selecting a non-app random blob
+        assertInstanceOf(CheckerResult.Error::class.java, checker.checkerResult)
+        val result = checker.checkerResult as CheckerResult.Error
+        assertEquals(snapshotMap.values.toSet(), result.snapshots.toSet())
+        assertEquals(snapshotMap.values.toSet(), result.badSnapshots.toSet())
+        assertEquals(snapshotMap.size, result.existingSnapshots)
+        assertEquals(setOf(appDataChunkId), result.errorChunkIds)
+
+        coVerify(exactly = 0) {
+            loader.loadFile(blobHandle1, null)
+            loader.loadFile(blobHandle2, null)
+        }
+    }
+
+    private suspend fun expectLoadingSnapshots(
+        snapshots: Map<AppBackupFileType.Snapshot, Snapshot>,
+    ) {
+        every { crypto.repoId } returns repoId
+        every { backendManager.backend } returns backend
+        coEvery {
+            backend.list(folder, AppBackupFileType.Snapshot::class, callback = captureLambda())
+        } answers {
+            snapshots.keys.forEach {
+                val fileInfo = FileInfo(it, Random.nextLong(Long.MAX_VALUE))
+                lambda<(FileInfo) -> Unit>().captured.invoke(fileInfo)
+            }
+        }
+        coEvery {
+            snapshotManager.onSnapshotsLoaded(snapshots.keys.toList())
+        } returns snapshots.values.toList()
+    }
+
+}

From 45d710270afe4aab72eb2ae24dae05c716f1b1a2 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 29 Oct 2024 15:42:56 -0300
Subject: [PATCH 12/20] Restrict Checker.concurrencyLimit to 3 when backend
 requires network

---
 .../java/com/stevesoltys/seedvault/backend/BackendManager.kt | 1 +
 app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt  | 4 ++--
 .../test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt  | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/backend/BackendManager.kt b/app/src/main/java/com/stevesoltys/seedvault/backend/BackendManager.kt
index ebc6d57e..1a7c9fe0 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/backend/BackendManager.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/backend/BackendManager.kt
@@ -43,6 +43,7 @@ class BackendManager(
             return mBackendProperties
         }
     val isOnRemovableDrive: Boolean get() = backendProperties?.isUsb == true
+    val requiresNetwork: Boolean get() = backendProperties?.requiresNetwork == true
 
     init {
         when (settingsManager.storagePluginType) {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
index 9943545e..7fda147a 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
@@ -42,8 +42,8 @@ internal class Checker(
     private var snapshots: List<Snapshot>? = null
     private val concurrencyLimit: Int
         get() {
-            // TODO determine also based on backendManager
-            return Runtime.getRuntime().availableProcessors()
+            val maxConcurrent = if (backendManager.requiresNetwork) 3 else 42
+            return min(Runtime.getRuntime().availableProcessors(), maxConcurrent)
         }
     var checkerResult: CheckerResult? = null
         private set
diff --git a/app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt b/app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt
index 85dc3709..75241f40 100644
--- a/app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt
+++ b/app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt
@@ -86,6 +86,7 @@ internal class CheckerTest : TransportTest() {
     fun `check works even with no backup data`() = runBlocking {
         expectLoadingSnapshots(emptyMap())
 
+        every { backendManager.requiresNetwork } returns Random.nextBoolean()
         every { nm.onCheckFinishedWithError(0, 0) } just Runs
 
         assertNull(checker.checkerResult)
@@ -121,6 +122,7 @@ internal class CheckerTest : TransportTest() {
             snapshotHandle2 to snapshot.copy { token = 2 },
         )
         expectLoadingSnapshots(snapshotMap)
+        every { backendManager.requiresNetwork } returns Random.nextBoolean()
 
         val data = ByteArray(0)
         coEvery { loader.loadFile(blobHandle1, null) } returns ByteArrayInputStream(data)
@@ -172,6 +174,7 @@ internal class CheckerTest : TransportTest() {
             },
         )
         expectLoadingSnapshots(snapshotMap)
+        every { backendManager.requiresNetwork } returns Random.nextBoolean()
 
         coEvery { loader.loadFile(blobHandle1, null) } returns ByteArrayInputStream(data1)
         coEvery { loader.loadFile(blobHandle2, null) } throws GeneralSecurityException()
@@ -220,6 +223,7 @@ internal class CheckerTest : TransportTest() {
         val expectedSize = blob1.length.toLong() + blob2.length.toLong()
 
         expectLoadingSnapshots(snapshotMap)
+        every { backendManager.requiresNetwork } returns Random.nextBoolean()
 
         coEvery { loader.loadFile(blobHandle1, null) } returns ByteArrayInputStream(data1)
         coEvery { loader.loadFile(blobHandle2, null) } returns ByteArrayInputStream(data2)
@@ -257,6 +261,7 @@ internal class CheckerTest : TransportTest() {
             },
         )
         expectLoadingSnapshots(snapshotMap)
+        every { backendManager.requiresNetwork } returns Random.nextBoolean()
 
         // only loading app data, not other blobs
         coEvery { loader.loadFile(appDataBlobHandle1, null) } throws SecurityException()

From 15e8850e5e024d351ef79ee7a3b72e3322132f69 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 29 Oct 2024 18:22:36 -0300
Subject: [PATCH 13/20] Don't allow running app data check while backup is
 running

---
 .../seedvault/BackupStateManager.kt           | 25 +++++++++++++------
 .../seedvault/settings/SettingsFragment.kt    | 14 +++++------
 .../seedvault/settings/SettingsViewModel.kt   | 22 ++++++++++++----
 .../seedvault/worker/AppBackupWorker.kt       |  7 ++++++
 .../seedvault/worker/AppCheckerWorker.kt      | 18 ++++++-------
 app/src/main/res/xml/settings.xml             |  2 +-
 6 files changed, 58 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/BackupStateManager.kt b/app/src/main/java/com/stevesoltys/seedvault/BackupStateManager.kt
index f9028dbe..de1254f2 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/BackupStateManager.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/BackupStateManager.kt
@@ -16,6 +16,7 @@ import com.stevesoltys.seedvault.storage.StorageBackupService
 import com.stevesoltys.seedvault.transport.ConfigurableBackupTransportService
 import com.stevesoltys.seedvault.worker.AppBackupPruneWorker
 import com.stevesoltys.seedvault.worker.AppBackupWorker.Companion.UNIQUE_WORK_NAME
+import com.stevesoltys.seedvault.worker.AppCheckerWorker
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
 
@@ -32,18 +33,28 @@ class BackupStateManager(
         flow = ConfigurableBackupTransportService.isRunning,
         flow2 = StorageBackupService.isRunning,
         flow3 = workManager.getWorkInfosForUniqueWorkFlow(UNIQUE_WORK_NAME),
-        flow4 = workManager.getWorkInfosForUniqueWorkFlow(AppBackupPruneWorker.UNIQUE_WORK_NAME),
-    ) { appBackupRunning, filesBackupRunning, workInfo1, workInfo2 ->
+    ) { appBackupRunning, filesBackupRunning, workInfo1 ->
         val workInfoState1 = workInfo1.getOrNull(0)?.state
-        val workInfoState2 = workInfo2.getOrNull(0)?.state
         Log.i(
             TAG, "appBackupRunning: $appBackupRunning, " +
                 "filesBackupRunning: $filesBackupRunning, " +
-                "appBackupWorker: ${workInfoState1?.name}, " +
-                "pruneBackupWorker: ${workInfoState2?.name}"
+                "appBackupWorker: ${workInfoState1?.name}"
         )
-        appBackupRunning || filesBackupRunning ||
-            workInfoState1 == RUNNING || workInfoState2 == RUNNING
+        appBackupRunning || filesBackupRunning || workInfoState1 == RUNNING
+    }
+
+    val isCheckOrPruneRunning: Flow<Boolean> = combine(
+        flow = workManager.getWorkInfosForUniqueWorkFlow(AppBackupPruneWorker.UNIQUE_WORK_NAME),
+        flow2 = workManager.getWorkInfosForUniqueWorkFlow(AppCheckerWorker.UNIQUE_WORK_NAME),
+    ) { pruneInfo, checkInfo ->
+        val pruneInfoState = pruneInfo.getOrNull(0)?.state
+        val checkInfoState = checkInfo.getOrNull(0)?.state
+        Log.i(
+            TAG,
+            "pruneBackupWorker: ${pruneInfoState?.name}, " +
+                "appCheckerWorker: ${checkInfoState?.name}"
+        )
+        pruneInfoState == RUNNING || checkInfoState == RUNNING
     }
 
     val isAutoRestoreEnabled: Boolean
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 26d2bc52..32ed987a 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt
@@ -49,6 +49,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
     private lateinit var backupLocation: Preference
     private lateinit var backupStatus: Preference
     private lateinit var backupScheduling: Preference
+    private lateinit var backupAppCheck: Preference
     private lateinit var backupStorage: TwoStatePreference
     private lateinit var backupRecoveryCode: Preference
 
@@ -92,14 +93,8 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
         backupLocation = findPreference("backup_location")!!
         backupLocation.setOnPreferenceClickListener {
-            if (viewModel.isBackupRunning.value) {
-                // don't allow changing backup destination while backup is running
-                // TODO we could show toast or snackbar here
-                false
-            } else {
-                viewModel.chooseBackupLocation()
-                true
-            }
+            viewModel.chooseBackupLocation()
+            true
         }
 
         autoRestore = findPreference(PREF_KEY_AUTO_RESTORE)!!
@@ -117,6 +112,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
 
         backupStatus = findPreference("backup_status")!!
         backupScheduling = findPreference("backup_scheduling")!!
+        backupAppCheck = findPreference("backup_app_check")!!
 
         backupStorage = findPreference("backup_storage")!!
         backupStorage.onPreferenceChangeListener = OnPreferenceChangeListener { _, newValue ->
@@ -148,6 +144,8 @@ class SettingsFragment : PreferenceFragmentCompat() {
         viewModel.backupPossible.observe(viewLifecycleOwner) { possible ->
             toolbar.menu.findItem(R.id.action_backup)?.isEnabled = possible
             toolbar.menu.findItem(R.id.action_restore)?.isEnabled = possible
+            backupLocation.isEnabled = possible
+            backupAppCheck.isEnabled = possible
         }
 
         viewModel.lastBackupTime.observe(viewLifecycleOwner) { time ->
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 8fc07fbc..45f5b76b 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt
@@ -83,7 +83,8 @@ internal class SettingsViewModel(
     override val isRestoreOperation = false
     val isFirstStart get() = settingsManager.isFirstStart
 
-    val isBackupRunning: StateFlow<Boolean>
+    private val isBackupRunning: StateFlow<Boolean>
+    private val isCheckOrPruneRunning: StateFlow<Boolean>
     private val mBackupPossible = MutableLiveData(false)
     val backupPossible: LiveData<Boolean> = mBackupPossible
 
@@ -144,12 +145,23 @@ internal class SettingsViewModel(
             started = SharingStarted.Eagerly,
             initialValue = false,
         )
+        isCheckOrPruneRunning = backupStateManager.isCheckOrPruneRunning.stateIn(
+            scope = viewModelScope,
+            started = SharingStarted.Eagerly,
+            initialValue = false,
+        )
         scope.launch {
             // update running state
             isBackupRunning.collect {
                 onBackupRunningStateChanged()
             }
         }
+        scope.launch {
+            // update running state
+            isCheckOrPruneRunning.collect {
+                onBackupRunningStateChanged()
+            }
+        }
         onStoragePropertiesChanged()
         loadFilesSummary()
     }
@@ -172,11 +184,11 @@ internal class SettingsViewModel(
     }
 
     private fun onBackupRunningStateChanged() {
-        if (isBackupRunning.value) mBackupPossible.postValue(false)
-        else viewModelScope.launch(Dispatchers.IO) {
-            val canDo = !isBackupRunning.value && !backendManager.isOnUnavailableUsb()
+        val backupAllowed = !isBackupRunning.value && !isCheckOrPruneRunning.value
+        if (backupAllowed) viewModelScope.launch(Dispatchers.IO) {
+            val canDo = !backendManager.isOnUnavailableUsb()
             mBackupPossible.postValue(canDo)
-        }
+        } else mBackupPossible.postValue(false)
     }
 
     private fun onStoragePropertiesChanged() {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/worker/AppBackupWorker.kt b/app/src/main/java/com/stevesoltys/seedvault/worker/AppBackupWorker.kt
index 5ba281f6..5327ada6 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/worker/AppBackupWorker.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/worker/AppBackupWorker.kt
@@ -22,12 +22,14 @@ import androidx.work.OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST
 import androidx.work.PeriodicWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
+import com.stevesoltys.seedvault.BackupStateManager
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.backend.BackendManager
 import com.stevesoltys.seedvault.repo.AppBackupManager
 import com.stevesoltys.seedvault.settings.SettingsManager
 import com.stevesoltys.seedvault.ui.notification.BackupNotificationManager
 import com.stevesoltys.seedvault.ui.notification.NOTIFICATION_ID_OBSERVER
+import kotlinx.coroutines.flow.first
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import java.util.concurrent.TimeUnit
@@ -100,6 +102,7 @@ class AppBackupWorker(
         }
     }
 
+    private val backupStateManager: BackupStateManager by inject()
     private val backupRequester: BackupRequester by inject()
     private val settingsManager: SettingsManager by inject()
     private val apkBackupManager: ApkBackupManager by inject()
@@ -109,6 +112,10 @@ class AppBackupWorker(
 
     override suspend fun doWork(): Result {
         Log.i(TAG, "Start worker  $this ($id)")
+        if (backupStateManager.isCheckOrPruneRunning.first()) {
+            Log.i(TAG, "isCheckOrPruneRunning was true, so retrying later...")
+            return Result.retry()
+        }
         try {
             setForeground(createForegroundInfo())
         } catch (e: Exception) {
diff --git a/app/src/main/java/com/stevesoltys/seedvault/worker/AppCheckerWorker.kt b/app/src/main/java/com/stevesoltys/seedvault/worker/AppCheckerWorker.kt
index e6fe566a..4dc332fc 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/worker/AppCheckerWorker.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/worker/AppCheckerWorker.kt
@@ -17,10 +17,12 @@ import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST
 import androidx.work.WorkManager
 import androidx.work.WorkerParameters
+import com.stevesoltys.seedvault.BackupStateManager
 import com.stevesoltys.seedvault.repo.Checker
 import com.stevesoltys.seedvault.ui.notification.BackupNotificationManager
 import com.stevesoltys.seedvault.ui.notification.NOTIFICATION_ID_CHECKING
 import io.github.oshai.kotlinlogging.KotlinLogging
+import kotlinx.coroutines.flow.first
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import java.time.Duration
@@ -50,12 +52,16 @@ class AppCheckerWorker(
     }
 
     private val log = KotlinLogging.logger {}
+    private val backupStateManager: BackupStateManager by inject()
     private val checker: Checker by inject()
     private val nm: BackupNotificationManager by inject()
 
     override suspend fun doWork(): Result {
-        // TODO don't let backup/restore happen while we check
         log.info { "Start worker $this ($id)" }
+        if (backupStateManager.isBackupRunning.first()) {
+            Log.i(TAG, "isBackupRunning was true, so retrying later...")
+            return Result.retry()
+        }
         try {
             setForeground(createForegroundInfo())
         } catch (e: Exception) {
@@ -64,14 +70,8 @@ class AppCheckerWorker(
         val percent = inputData.getInt(PERCENT, -1)
         check(percent in 0..100) { "Percent $percent out of bounds." }
 
-        return try {
-            checker.check(percent)
-            Result.success()
-        } catch (e: Exception) {
-            // TODO maybe show error notification
-            log.error(e) { "Error while checking data: " }
-            Result.retry()
-        }
+        checker.check(percent)
+        return Result.success()
     }
 
     private fun createForegroundInfo() = ForegroundInfo(
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 0ab94037..5fc0eca0 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -53,7 +53,7 @@
         <androidx.preference.Preference
             app:fragment="com.stevesoltys.seedvault.ui.check.AppCheckFragment"
             app:icon="@drawable/ic_cloud_search"
-            app:key="backup_scheduling"
+            app:key="backup_app_check"
             app:summary="@string/settings_backup_app_check_summary"
             app:title="@string/settings_backup_app_check_title" />
 

From 4f5199ce27eaebd0dc5c044201fe808cbd0f0cf0 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 30 Oct 2024 09:58:33 -0300
Subject: [PATCH 14/20] Make APK backup self-healing

---
 .../stevesoltys/seedvault/repo/BlobCache.kt   |  9 ++++
 .../stevesoltys/seedvault/worker/ApkBackup.kt | 30 +++++++-----
 .../seedvault/worker/WorkerModule.kt          |  1 +
 .../restore/install/ApkBackupRestoreTest.kt   |  5 +-
 .../seedvault/worker/ApkBackupTest.kt         | 49 ++++++++++++++++++-
 5 files changed, 80 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/BlobCache.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/BlobCache.kt
index 16085512..478c77e5 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/BlobCache.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/BlobCache.kt
@@ -62,6 +62,15 @@ class BlobCache(
      */
     operator fun get(chunkId: String): Blob? = blobMap[chunkId]
 
+    /**
+     * Should only be called after [populateCache] has returned.
+     *
+     * @return true if all [chunkIds] are in cache, or false if one or more is missing.
+     */
+    fun containsAll(chunkIds: List<String>): Boolean = chunkIds.all { chunkId ->
+        blobMap.containsKey(chunkId)
+    }
+
     /**
      * Should get called for all new blobs as soon as they've been saved to the backend.
      */
diff --git a/app/src/main/java/com/stevesoltys/seedvault/worker/ApkBackup.kt b/app/src/main/java/com/stevesoltys/seedvault/worker/ApkBackup.kt
index 7b945845..b4d8cb5c 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/worker/ApkBackup.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/worker/ApkBackup.kt
@@ -19,6 +19,7 @@ import com.stevesoltys.seedvault.proto.Snapshot.Blob
 import com.stevesoltys.seedvault.proto.SnapshotKt.split
 import com.stevesoltys.seedvault.repo.AppBackupManager
 import com.stevesoltys.seedvault.repo.BackupReceiver
+import com.stevesoltys.seedvault.repo.BlobCache
 import com.stevesoltys.seedvault.repo.forProto
 import com.stevesoltys.seedvault.repo.hexFromProto
 import com.stevesoltys.seedvault.settings.SettingsManager
@@ -37,6 +38,7 @@ internal class ApkBackup(
     private val backupReceiver: BackupReceiver,
     private val appBackupManager: AppBackupManager,
     private val settingsManager: SettingsManager,
+    private val blobCache: BlobCache,
 ) {
 
     private val snapshotCreator
@@ -101,22 +103,26 @@ internal class ApkBackup(
         if (!needsBackup && oldApk != null) {
             // We could also check if there are new feature module splits to back up,
             // but we rely on the app themselves to re-download those, if needed after restore.
-            Log.d(
-                TAG, "Package $packageName with version $version" +
-                    " already has a backup ($backedUpVersion)" +
-                    " with the same signature. Not backing it up."
-            )
-            // build up blobMap from old snapshot
+
             val chunkIds = oldApk.splitsList.flatMap {
                 it.chunkIdsList.map { chunkId -> chunkId.hexFromProto() }
             }
-            val blobMap = chunkIds.associateWith { chunkId ->
-                latestSnapshot.blobsMap[chunkId] ?: error("Missing blob for $chunkId")
+            if (blobCache.containsAll(chunkIds)) {
+                Log.d(
+                    TAG, "Package $packageName with version $version" +
+                        " already has a backup ($backedUpVersion)" +
+                        " with the same signature. Not backing it up."
+                )
+                // all blobs are cached, i.e. still on backend, so no new backup needed
+                val blobMap = chunkIds.associateWith { chunkId ->
+                    latestSnapshot.blobsMap[chunkId] ?: error("Missing blob for $chunkId")
+                }
+                // important: add old APK to snapshot or it wouldn't be part of backup
+                snapshotCreator.onApkBackedUp(packageInfo, oldApk, blobMap)
+                return
+            } else {
+                Log.w(TAG, "Blobs for APKs of $packageName have issues in backend. Fixing...")
             }
-            // TODO could also check if all blobs are (still) available in BlobCache
-            // important: add old APK to snapshot or it wouldn't be part of backup
-            snapshotCreator.onApkBackedUp(packageInfo, oldApk, blobMap)
-            return
         }
 
         // builder for Apk object
diff --git a/app/src/main/java/com/stevesoltys/seedvault/worker/WorkerModule.kt b/app/src/main/java/com/stevesoltys/seedvault/worker/WorkerModule.kt
index 40dfd4c7..1b395356 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/worker/WorkerModule.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/worker/WorkerModule.kt
@@ -33,6 +33,7 @@ val workerModule = module {
             backupReceiver = get(),
             appBackupManager = get(),
             settingsManager = get(),
+            blobCache = get(),
         )
     }
     single {
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 874b3ed2..a7579b1c 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
@@ -24,6 +24,7 @@ import com.stevesoltys.seedvault.metadata.PackageMetadataMap
 import com.stevesoltys.seedvault.proto.Snapshot
 import com.stevesoltys.seedvault.repo.AppBackupManager
 import com.stevesoltys.seedvault.repo.BackupReceiver
+import com.stevesoltys.seedvault.repo.BlobCache
 import com.stevesoltys.seedvault.repo.Loader
 import com.stevesoltys.seedvault.repo.SnapshotCreator
 import com.stevesoltys.seedvault.repo.SnapshotManager
@@ -70,6 +71,7 @@ internal class ApkBackupRestoreTest : TransportTest() {
     private val backupStateManager: BackupStateManager = mockk()
     private val backupReceiver: BackupReceiver = mockk()
     private val appBackupManager: AppBackupManager = mockk()
+    private val blobCache: BlobCache = mockk()
     private val snapshotManager: SnapshotManager = mockk()
     private val snapshotCreator: SnapshotCreator = mockk()
     private val loader: Loader = mockk()
@@ -81,7 +83,8 @@ internal class ApkBackupRestoreTest : TransportTest() {
     private val apkInstaller: ApkInstaller = mockk()
     private val installRestriction: InstallRestriction = mockk()
 
-    private val apkBackup = ApkBackup(pm, backupReceiver, appBackupManager, settingsManager)
+    private val apkBackup =
+        ApkBackup(pm, backupReceiver, appBackupManager, settingsManager, blobCache)
     private val apkRestore: ApkRestore = ApkRestore(
         context = strictContext,
         backupManager = backupManager,
diff --git a/app/src/test/java/com/stevesoltys/seedvault/worker/ApkBackupTest.kt b/app/src/test/java/com/stevesoltys/seedvault/worker/ApkBackupTest.kt
index 2a2011da..30957fde 100644
--- a/app/src/test/java/com/stevesoltys/seedvault/worker/ApkBackupTest.kt
+++ b/app/src/test/java/com/stevesoltys/seedvault/worker/ApkBackupTest.kt
@@ -23,7 +23,9 @@ import com.stevesoltys.seedvault.proto.copy
 import com.stevesoltys.seedvault.repo.AppBackupManager
 import com.stevesoltys.seedvault.repo.BackupData
 import com.stevesoltys.seedvault.repo.BackupReceiver
+import com.stevesoltys.seedvault.repo.BlobCache
 import com.stevesoltys.seedvault.repo.SnapshotCreator
+import com.stevesoltys.seedvault.repo.hexFromProto
 import com.stevesoltys.seedvault.transport.backup.BackupTest
 import io.mockk.Runs
 import io.mockk.coEvery
@@ -51,9 +53,11 @@ internal class ApkBackupTest : BackupTest() {
     private val pm: PackageManager = mockk()
     private val backupReceiver: BackupReceiver = mockk()
     private val appBackupManager: AppBackupManager = mockk()
+    private val blobCache: BlobCache = mockk()
     private val snapshotCreator: SnapshotCreator = mockk()
 
-    private val apkBackup = ApkBackup(pm, backupReceiver, appBackupManager, settingsManager)
+    private val apkBackup =
+        ApkBackup(pm, backupReceiver, appBackupManager, settingsManager, blobCache)
 
     private val signatureBytes = byteArrayOf(0x01, 0x02, 0x03)
     private val signatureHash = byteArrayOf(0x03, 0x02, 0x01)
@@ -110,7 +114,9 @@ internal class ApkBackupTest : BackupTest() {
         val apk = apk.copy { versionCode = packageInfo.longVersionCode }
         val app = app { this.apk = apk }
         val s = snapshot.copy { apps.put(packageName, app) }
+        val chunkIds = apk.splitsList.flatMap { it.chunkIdsList.hexFromProto() }
         expectChecks()
+        every { blobCache.containsAll(chunkIds) } returns true
         every {
             snapshotCreator.onApkBackedUp(packageInfo, apk, blobMap)
         } just Runs
@@ -162,6 +168,47 @@ internal class ApkBackupTest : BackupTest() {
             }
         }
 
+    @Test
+    fun `does back up the same version when blobs are missing from cache`(@TempDir tmpDir: Path) =
+        runBlocking {
+            val tmpFile = File(tmpDir.toAbsolutePath().toString())
+            packageInfo.applicationInfo!!.sourceDir = File(tmpFile, "test.apk").apply {
+                assertTrue(createNewFile())
+            }.absolutePath
+            val apk = apk.copy {
+                versionCode = packageInfo.longVersionCode
+                splits.clear()
+                splits.add(baseSplit)
+            }
+            val app = app { this.apk = apk }
+            val s = snapshot.copy { apps.put(packageName, app) }
+            val chunkIds = apk.splitsList.flatMap { it.chunkIdsList.hexFromProto() }
+            expectChecks()
+            every { blobCache.containsAll(chunkIds) } returns false // blobs missing here
+
+            every {
+                pm.getInstallSourceInfo(packageInfo.packageName)
+            } returns InstallSourceInfo(null, null, null, apk.installer)
+            coEvery {
+                backupReceiver.readFromStream("APK backup $packageName ", any())
+            } returns apkBackupData
+
+            every {
+                snapshotCreator.onApkBackedUp(packageInfo, match<Snapshot.Apk> {
+                    it.installer == apk.installer
+                }, apkBackupData.blobMap)
+            } just Runs
+
+            apkBackup.backupApkIfNecessary(packageInfo, s)
+
+            coVerify {
+                backupReceiver.readFromStream("APK backup $packageName ", any())
+                snapshotCreator.onApkBackedUp(packageInfo, match<Snapshot.Apk> {
+                    it.installer == apk.installer
+                }, apkBackupData.blobMap)
+            }
+        }
+
     @Test
     fun `throws exception when APK doesn't exist`() {
         packageInfo.applicationInfo!!.sourceDir = "/tmp/doesNotExist"

From 6d9c18bd29fbd8d58df4436bff3942e3a2ec3faf Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 1 Nov 2024 14:14:01 -0300
Subject: [PATCH 15/20] Checker: account for possibility that one chunkId maps
 to more than one blob

---
 .../com/stevesoltys/seedvault/repo/Checker.kt | 60 +++++++-----
 .../seedvault/repo/CheckerResult.kt           | 20 +++-
 .../stevesoltys/seedvault/repo/CheckerTest.kt | 93 ++++++++++++++++++-
 3 files changed, 141 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
index 7fda147a..76a0a806 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
@@ -6,6 +6,7 @@
 package com.stevesoltys.seedvault.repo
 
 import androidx.annotation.WorkerThread
+import com.google.protobuf.ByteString
 import com.stevesoltys.seedvault.backend.BackendManager
 import com.stevesoltys.seedvault.crypto.Crypto
 import com.stevesoltys.seedvault.proto.Snapshot
@@ -71,10 +72,12 @@ internal class Checker(
         this.handleSize = handles.size // remember number of snapshot handles we had
 
         // get total disk space used by snapshots
-        val sizeMap = mutableMapOf<String, Int>()
+        val sizeMap = mutableMapOf<ByteString, Int>() // uses blob.id as key
         snapshots.forEach { snapshot ->
             // add sizes to a map first, so we don't double count
-            snapshot.blobsMap.forEach { (chunkId, blob) -> sizeMap[chunkId] = blob.length }
+            snapshot.blobsMap.forEach { (_, blob) ->
+                sizeMap[blob.id] = blob.length
+            }
         }
         return sizeMap.values.sumOf { it.toLong() }
     }
@@ -96,13 +99,13 @@ internal class Checker(
             "Got $handleSize handles, but ${snapshots.size} snapshots."
         }
         val blobSample = getBlobSample(snapshots, percent)
-        val sampleSize = blobSample.values.sumOf { it.length.toLong() }
+        val sampleSize = blobSample.sumOf { it.blob.length.toLong() }
         log.info { "Blob sample has ${blobSample.size} blobs worth $sampleSize bytes." }
 
         // check blobs concurrently
         val semaphore = Semaphore(concurrencyLimit)
         val size = AtomicLong()
-        val badChunks = ConcurrentSkipListSet<String>()
+        val badChunks = ConcurrentSkipListSet<ChunkIdBlobPair>()
         val lastNotification = AtomicLong()
         val startTime = System.currentTimeMillis()
         coroutineScope {
@@ -116,7 +119,7 @@ internal class Checker(
                         } catch (e: Exception) {
                             log.error(e) { "Error loading chunk $chunkId: " }
                             // TODO we could try differentiating transient backend issues
-                            badChunks.add(chunkId)
+                            badChunks.add(ChunkIdBlobPair(chunkId, blob))
                         }
                     }
                     // keep track of how much we checked and for how long
@@ -154,25 +157,30 @@ internal class Checker(
         checkerResult = null
     }
 
-    private fun getBlobSample(snapshots: List<Snapshot>, percent: Int): Map<String, Blob> {
-        // split up blobs for app data and for APKs
-        val appBlobs = mutableMapOf<String, Blob>()
-        val apkBlobs = mutableMapOf<String, Blob>()
+    private fun getBlobSample(
+        snapshots: List<Snapshot>,
+        percent: Int,
+    ): List<ChunkIdBlobPair> {
+        // split up blobs for app data and for APKs (use blob.id as key to prevent double counting)
+        val appBlobs = mutableMapOf<ByteString, ChunkIdBlobPair>()
+        val apkBlobs = mutableMapOf<ByteString, ChunkIdBlobPair>()
         snapshots.forEach { snapshot ->
             val appChunkIds = snapshot.appsMap.flatMap { it.value.chunkIdsList.hexFromProto() }
             val apkChunkIds = snapshot.appsMap.flatMap {
                 it.value.apk.splitsList.flatMap { split -> split.chunkIdsList.hexFromProto() }
             }
             appChunkIds.forEach { chunkId ->
-                appBlobs[chunkId] = snapshot.blobsMap[chunkId] ?: error("No Blob for chunkId")
+                val blob = snapshot.blobsMap[chunkId] ?: error("No Blob for chunkId")
+                appBlobs[blob.id] = ChunkIdBlobPair(chunkId, blob)
             }
             apkChunkIds.forEach { chunkId ->
-                apkBlobs[chunkId] = snapshot.blobsMap[chunkId] ?: error("No Blob for chunkId")
+                val blob = snapshot.blobsMap[chunkId] ?: error("No Blob for chunkId")
+                apkBlobs[blob.id] = ChunkIdBlobPair(chunkId, blob)
             }
         }
         // calculate sizes
-        val appSize = appBlobs.values.sumOf { it.length.toLong() }
-        val apkSize = apkBlobs.values.sumOf { it.length.toLong() }
+        val appSize = appBlobs.values.sumOf { it.blob.length.toLong() }
+        val apkSize = apkBlobs.values.sumOf { it.blob.length.toLong() }
         // let's assume it is unlikely that app data and APKs have blobs in common
         val totalSize = appSize + apkSize
         log.info { "Got ${appBlobs.size + apkBlobs.size} blobs worth $totalSize bytes to check." }
@@ -182,23 +190,21 @@ internal class Checker(
         val appTargetSize = min((targetSize * 0.75).roundToLong(), appSize) // 75% of targetSize
         log.info { "Sampling $targetSize bytes of which $appTargetSize bytes for apps." }
 
-        val blobSample = mutableMapOf<String, Blob>()
+        val blobSample = mutableListOf<ChunkIdBlobPair>()
         var currentSize = 0L
         // check apps first until we reach their target size
-        val appIterator = appBlobs.keys.shuffled().iterator() // random app blob iterator
+        val appIterator = appBlobs.values.shuffled().iterator() // random app blob iterator
         while (currentSize < appTargetSize && appIterator.hasNext()) {
-            val randomChunkId = appIterator.next()
-            val blob = appBlobs[randomChunkId] ?: error("No blob")
-            blobSample[randomChunkId] = blob
-            currentSize += blob.length
+            val pair = appIterator.next()
+            blobSample.add(pair)
+            currentSize += pair.blob.length
         }
         // now check APKs until we reach total targetSize
-        val apkIterator = apkBlobs.keys.shuffled().iterator() // random APK blob iterator
+        val apkIterator = apkBlobs.values.shuffled().iterator() // random APK blob iterator
         while (currentSize < targetSize && apkIterator.hasNext()) {
-            val randomChunkId = apkIterator.next()
-            val blob = apkBlobs[randomChunkId] ?: error("No blob")
-            blobSample[randomChunkId] = blob
-            currentSize += blob.length
+            val pair = apkIterator.next()
+            blobSample.add(pair)
+            currentSize += pair.blob.length
         }
         return blobSample
     }
@@ -216,3 +222,9 @@ internal class Checker(
         if (readChunkId != chunkId) throw GeneralSecurityException("ChunkId doesn't match")
     }
 }
+
+data class ChunkIdBlobPair(val chunkId: String, val blob: Blob) : Comparable<ChunkIdBlobPair> {
+    override fun compareTo(other: ChunkIdBlobPair): Int {
+        return chunkId.compareTo(other.chunkId)
+    }
+}
diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/CheckerResult.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/CheckerResult.kt
index a2d5ecdf..2be2066d 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/CheckerResult.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/CheckerResult.kt
@@ -24,7 +24,7 @@ sealed class CheckerResult {
         /**
          * The list of chunkIDs that had errors.
          */
-        val errorChunkIds: Set<String>,
+        val errorChunkIdBlobPairs: Set<ChunkIdBlobPair>,
     ) : CheckerResult() {
         val goodSnapshots: List<Snapshot>
         val badSnapshots: List<Snapshot>
@@ -32,9 +32,23 @@ sealed class CheckerResult {
         init {
             val good = mutableListOf<Snapshot>()
             val bad = mutableListOf<Snapshot>()
+            val errorChunkIds = errorChunkIdBlobPairs.map { it.chunkId }.toSet()
             snapshots.forEach { snapshot ->
-                val isGood = snapshot.blobsMap.keys.intersect(errorChunkIds).isEmpty()
-                if (isGood) good.add(snapshot) else bad.add(snapshot)
+                val badChunkIds = snapshot.blobsMap.keys.intersect(errorChunkIds)
+                if (badChunkIds.isEmpty()) {
+                    // snapshot doesn't contain chunks with erroneous blobs
+                    good.add(snapshot)
+                } else {
+                    // snapshot may contain chunks with erroneous blobs, check deeper
+                    val isBad = badChunkIds.any { chunkId ->
+                        val blob = snapshot.blobsMap[chunkId] ?: error("No blob for chunkId")
+                        // is this chunkId/blob pair in errorChunkIdBlobPairs?
+                        errorChunkIdBlobPairs.any { pair ->
+                            pair.chunkId == chunkId && pair.blob == blob
+                        }
+                    }
+                    if (isBad) bad.add(snapshot) else good.add(snapshot)
+                }
             }
             goodSnapshots = good
             badSnapshots = bad
diff --git a/app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt b/app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt
index 75241f40..cbfca6b1 100644
--- a/app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt
+++ b/app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt
@@ -82,6 +82,36 @@ internal class CheckerTest : TransportTest() {
         assertEquals(expectedSize, checker.getBackupSize())
     }
 
+    @Test
+    fun `getBackupSize returns size without under-counting blobs with same chunkId`() =
+        runBlocking {
+            val apk = apk.copy {
+                splits.clear()
+                splits.add(baseSplit.copy {
+                    this.chunkIds.clear()
+                    chunkIds.add(ByteString.fromHex(chunkId1))
+                })
+            }
+            val snapshot = snapshot.copy {
+                apps[packageName] = app.copy { this.apk = apk }
+                blobs.clear()
+            }
+            val snapshotMap = mapOf(
+                snapshotHandle1 to snapshot.copy {
+                    token = 1
+                    blobs[chunkId1] = blob1
+                },
+                snapshotHandle2 to snapshot.copy {
+                    token = 2
+                    blobs[chunkId1] = blob2
+                },
+            )
+            val expectedSize = blob1.length.toLong() + blob2.length.toLong()
+            expectLoadingSnapshots(snapshotMap)
+
+            assertEquals(expectedSize, checker.getBackupSize())
+        }
+
     @Test
     fun `check works even with no backup data`() = runBlocking {
         expectLoadingSnapshots(emptyMap())
@@ -138,7 +168,8 @@ internal class CheckerTest : TransportTest() {
         assertEquals(snapshotMap.values.toSet(), result.badSnapshots.toSet())
         assertEquals(emptyList<Snapshot>(), result.goodSnapshots)
         assertEquals(snapshotMap.size, result.existingSnapshots)
-        assertEquals(setOf(chunkId1, chunkId2), result.errorChunkIds)
+        val errorPairs = setOf(ChunkIdBlobPair(chunkId1, blob1), ChunkIdBlobPair(chunkId2, blob2))
+        assertEquals(errorPairs, result.errorChunkIdBlobPairs)
     }
 
     @Test
@@ -189,7 +220,8 @@ internal class CheckerTest : TransportTest() {
         assertEquals(listOf(snapshotMap[snapshotHandle1]), result.goodSnapshots)
         assertEquals(listOf(snapshotMap[snapshotHandle2]), result.badSnapshots)
         assertEquals(snapshotMap.size, result.existingSnapshots)
-        assertEquals(setOf(chunkId2), result.errorChunkIds)
+        val errorPairs = setOf(ChunkIdBlobPair(chunkId2, blob2))
+        assertEquals(errorPairs, result.errorChunkIdBlobPairs)
     }
 
     @Test
@@ -247,8 +279,8 @@ internal class CheckerTest : TransportTest() {
     fun `check prefers app data over APKs`() = runBlocking {
         val appDataBlob = blob {
             id = ByteString.copyFrom(Random.nextBytes(32))
-            length = Random.nextInt(0, Int.MAX_VALUE)
-            uncompressedLength = Random.nextInt(0, Int.MAX_VALUE)
+            length = Random.nextInt(1, Int.MAX_VALUE)
+            uncompressedLength = Random.nextInt(1, Int.MAX_VALUE)
         }
         val appDataBlobHandle1 = AppBackupFileType.Blob(repoId, appDataBlob.id.hexFromProto())
         val appDataChunkId = Random.nextBytes(32).toHexString()
@@ -266,6 +298,7 @@ internal class CheckerTest : TransportTest() {
         // only loading app data, not other blobs
         coEvery { loader.loadFile(appDataBlobHandle1, null) } throws SecurityException()
 
+        println("appDataBlob.length = $appDataBlob.length")
         every { nm.onCheckFinishedWithError(appDataBlob.length.toLong(), any()) } just Runs
 
         assertNull(checker.checkerResult)
@@ -275,7 +308,8 @@ internal class CheckerTest : TransportTest() {
         assertEquals(snapshotMap.values.toSet(), result.snapshots.toSet())
         assertEquals(snapshotMap.values.toSet(), result.badSnapshots.toSet())
         assertEquals(snapshotMap.size, result.existingSnapshots)
-        assertEquals(setOf(appDataChunkId), result.errorChunkIds)
+        val errorPairs = setOf(ChunkIdBlobPair(appDataChunkId, appDataBlob))
+        assertEquals(errorPairs, result.errorChunkIdBlobPairs)
 
         coVerify(exactly = 0) {
             loader.loadFile(blobHandle1, null)
@@ -283,6 +317,55 @@ internal class CheckerTest : TransportTest() {
         }
     }
 
+    @Test
+    fun `check doesn't skip broken blobs that have a fix with same chunkID`() = runBlocking {
+        // get "real" data for blob2
+        val messageDigest = MessageDigest.getInstance("SHA-256")
+        val data1 = getRandomByteArray() // broken blob
+        val data2 = getRandomByteArray() // data2 matches chunkId
+        val chunkId = messageDigest.digest(data2).toHexString()
+        val apk = apk.copy {
+            splits.clear()
+            splits.add(baseSplit.copy {
+                this.chunkIds.clear()
+                chunkIds.add(ByteString.fromHex(chunkId))
+            })
+        }
+        val snapshot = snapshot.copy {
+            apps[packageName] = app.copy { this.apk = apk }
+            blobs.clear()
+        }
+        val snapshotMap = mapOf(
+            snapshotHandle1 to snapshot.copy {
+                token = 1
+                blobs[chunkId] = blob1 // snapshot1 has broken blob for chunkId
+            },
+            snapshotHandle2 to snapshot.copy {
+                token = 2
+                blobs[chunkId] = blob2 // snapshot2 has fixed blob for chunkId
+            },
+        )
+
+        expectLoadingSnapshots(snapshotMap)
+        every { backendManager.requiresNetwork } returns Random.nextBoolean()
+
+        coEvery { loader.loadFile(blobHandle1, null) } returns ByteArrayInputStream(data1)
+        coEvery { loader.loadFile(blobHandle2, null) } returns ByteArrayInputStream(data2)
+
+        every { nm.onCheckFinishedWithError(any(), any()) } just Runs
+
+        assertNull(checker.checkerResult)
+        checker.check(100)
+        assertInstanceOf(CheckerResult.Error::class.java, checker.checkerResult)
+        val result = checker.checkerResult as CheckerResult.Error
+        assertEquals(snapshotMap.values.toSet(), result.snapshots.toSet())
+        assertEquals(setOf(snapshotMap[snapshotHandle2]), result.goodSnapshots.toSet())
+        assertEquals(setOf(snapshotMap[snapshotHandle1]), result.badSnapshots.toSet())
+        assertEquals(snapshotMap.size, result.existingSnapshots)
+        val errorPairs = setOf(ChunkIdBlobPair(chunkId, blob1))
+        assertEquals(errorPairs, result.errorChunkIdBlobPairs)
+    }
+
     private suspend fun expectLoadingSnapshots(
         snapshots: Map<AppBackupFileType.Snapshot, Snapshot>,
     ) {

From 69765c7857a9c7c9a418827a7a3d84f83c1c5640 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 4 Nov 2024 09:51:42 -0300
Subject: [PATCH 16/20] Record known bad blobs on do-not-use list in BlobCache

---
 .../stevesoltys/seedvault/repo/BlobCache.kt   | 92 ++++++++++++++++++-
 .../com/stevesoltys/seedvault/repo/Checker.kt |  7 ++
 .../com/stevesoltys/seedvault/repo/Loader.kt  |  6 +-
 .../stevesoltys/seedvault/repo/RepoModule.kt  |  4 +-
 .../seedvault/repo/BlobCacheTest.kt           | 82 ++++++++++++++++-
 .../stevesoltys/seedvault/repo/CheckerTest.kt |  9 +-
 6 files changed, 187 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/BlobCache.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/BlobCache.kt
index 478c77e5..3d01c6cf 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/BlobCache.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/BlobCache.kt
@@ -7,7 +7,10 @@ package com.stevesoltys.seedvault.repo
 
 import android.content.Context
 import android.content.Context.MODE_APPEND
+import android.content.Context.MODE_PRIVATE
+import androidx.annotation.VisibleForTesting
 import androidx.annotation.WorkerThread
+import com.google.protobuf.ByteString
 import com.stevesoltys.seedvault.MemoryLogger
 import com.stevesoltys.seedvault.proto.Snapshot
 import com.stevesoltys.seedvault.proto.Snapshot.Blob
@@ -18,7 +21,18 @@ import org.calyxos.seedvault.core.toHexString
 import java.io.FileNotFoundException
 import java.io.IOException
 
-private const val CACHE_FILE_NAME = "blobsCache"
+@VisibleForTesting
+internal const val CACHE_FILE_NAME = "blobsCache"
+
+/**
+ * The filename of the file where we store which blobs are known to be corrupt
+ * and should not be used anymore.
+ * Each [BLOB_ID_SIZE] bytes are appended without separator or line breaks.
+ */
+@VisibleForTesting
+internal const val DO_NOT_USE_FILE_NAME = "doNotUseBlobs"
+
+private const val BLOB_ID_SIZE = 32
 
 /**
  * Responsible for caching blobs during a backup run,
@@ -73,6 +87,10 @@ class BlobCache(
 
     /**
      * Should get called for all new blobs as soon as they've been saved to the backend.
+     *
+     * We shouldn't need to worry about [Pruner] removing blobs that get cached here locally,
+     * because we do run [Pruner.removeOldSnapshotsAndPruneUnusedBlobs] only after
+     * a successful backup which is when we also clear cache in [clearLocalCache].
      */
     fun saveNewBlob(chunkId: String, blob: Blob) {
         val previous = blobMap.put(chunkId, blob)
@@ -160,6 +178,10 @@ class BlobCache(
             if (sizeOnBackend == blob.length) {
                 // only add blob to our mapping, if it still exists
                 blobMap.putIfAbsent(chunkId, blob)?.let { previous ->
+                    // If there's more than one blob for the same chunk ID, it shouldn't matter
+                    // which one we keep on using provided both are still ok.
+                    // When we are here, the blob exists on storage and has the same size.
+                    // There may still be other corruption such as bit flips in one of the blobs.
                     if (previous.id != blob.id) log.warn {
                         "Chunk ID ${chunkId.substring(0..5)} had more than one blob."
                     }
@@ -174,4 +196,72 @@ class BlobCache(
         }
     }
 
+    /**
+     * This is expected to get called by the [Checker] when it finds a blob
+     * that has the expected file size, but its content hash doesn't match what we expect.
+     *
+     * It appends the given [blobId] to our [DO_NOT_USE_FILE_NAME] file.
+     */
+    fun doNotUseBlob(blobId: ByteString) {
+        try {
+            context.openFileOutput(DO_NOT_USE_FILE_NAME, MODE_APPEND).use { outputStream ->
+                val bytes = blobId.toByteArray()
+                check(bytes.size == 32) { "Blob ID $blobId has unexpected size of ${bytes.size}" }
+                outputStream.write(bytes)
+            }
+        } catch (e: Exception) {
+            log.error(e) { "Error adding blob to do-not-use list, may be corrupted: " }
+        }
+    }
+
+    @VisibleForTesting
+    fun getDoNotUseBlobIds(): Set<String> {
+        val blobsIds = mutableSetOf<String>()
+        try {
+            context.openFileInput(DO_NOT_USE_FILE_NAME).use { inputStream ->
+                val bytes = ByteArray(BLOB_ID_SIZE)
+                while (inputStream.read(bytes) == 32) {
+                    val blobId = bytes.toHexString()
+                    blobsIds.add(blobId)
+                }
+            }
+        } catch (e: FileNotFoundException) {
+            log.info { "No do-not-use list found" }
+        } catch (e: Exception) {
+            log.error(e) { "Our internal do-not-use list is corrupted, deleting it..." }
+            context.deleteFile(DO_NOT_USE_FILE_NAME)
+        }
+        return blobsIds
+    }
+
+    /**
+     * Call this after deleting blobs from the backend,
+     * so we can remove those from our do-not-use list.
+     */
+    fun onBlobsRemoved(blobIds: Set<String>) {
+        log.info { "${blobIds.size} blobs were removed." }
+
+        val blobsIdsToKeep = mutableSetOf<String>()
+
+        try {
+            context.openFileInput(DO_NOT_USE_FILE_NAME).use { inputStream ->
+                val bytes = ByteArray(BLOB_ID_SIZE)
+                while (inputStream.read(bytes) == 32) {
+                    val blobId = bytes.toHexString()
+                    if (blobId !in blobIds) blobsIdsToKeep.add(blobId)
+                }
+            }
+        } catch (e: FileNotFoundException) {
+            log.info { "No do-not-use list found, no need to remove blobs from it." }
+            return
+        } // if something else goes wrong here, we'll delete the file before next backup
+        context.openFileOutput(DO_NOT_USE_FILE_NAME, MODE_PRIVATE).use { outputStream ->
+            blobsIdsToKeep.forEach { blobId ->
+                val bytes = blobId.toByteArrayFromHex()
+                outputStream.write(bytes)
+            }
+        }
+        log.info { "${blobsIdsToKeep.size} blobs remain on do-not-use list." }
+    }
+
 }
diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
index 76a0a806..0fcef513 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/Checker.kt
@@ -7,6 +7,7 @@ package com.stevesoltys.seedvault.repo
 
 import androidx.annotation.WorkerThread
 import com.google.protobuf.ByteString
+import com.stevesoltys.seedvault.MemoryLogger
 import com.stevesoltys.seedvault.backend.BackendManager
 import com.stevesoltys.seedvault.crypto.Crypto
 import com.stevesoltys.seedvault.proto.Snapshot
@@ -35,6 +36,7 @@ internal class Checker(
     private val backendManager: BackendManager,
     private val snapshotManager: SnapshotManager,
     private val loader: Loader,
+    private val blobCache: BlobCache,
     private val nm: BackupNotificationManager,
 ) {
     private val log = KotlinLogging.logger { }
@@ -116,6 +118,10 @@ internal class Checker(
                     semaphore.withPermit {
                         try {
                             checkBlob(chunkId, blob)
+                        } catch (e: HashMismatchException) {
+                            log.error(e) { "Error loading chunk $chunkId: " }
+                            badChunks.add(ChunkIdBlobPair(chunkId, blob))
+                            blobCache.doNotUseBlob(blob.id)
                         } catch (e: Exception) {
                             log.error(e) { "Error loading chunk $chunkId: " }
                             // TODO we could try differentiating transient backend issues
@@ -132,6 +138,7 @@ internal class Checker(
                         val thousandth = ((newSize.toDouble() / sampleSize) * 1000).roundToInt()
                         log.debug { "$thousandth‰ - $bandwidth KB/sec - $newSize bytes" }
                         nm.showCheckNotification(bandwidth, thousandth)
+                        MemoryLogger.log()
                     }
                 }
             }
diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/Loader.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/Loader.kt
index 243ca3b7..3eb1324f 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/Loader.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/Loader.kt
@@ -83,13 +83,13 @@ internal class Loader(
         // check SHA-256 hash first thing
         val sha256 = crypto.sha256(cipherText).toHexString()
         if (sha256 != expectedHash) {
-            throw GeneralSecurityException("File had wrong SHA-256 hash: $expectedHash")
+            throw HashMismatchException("File had wrong SHA-256 hash: $expectedHash")
         }
         // check that we can handle the version of that snapshot
         val version = cipherText[0]
         if (version <= 1) throw GeneralSecurityException("Unexpected version: $version")
         if (version > VERSION) throw UnsupportedVersionException(version)
-        // cache ciperText in cacheFile, if existing
+        // cache cipherText in cacheFile, if existing
         try {
             cacheFile?.outputStream()?.use { outputStream ->
                 outputStream.write(cipherText)
@@ -109,3 +109,5 @@ internal class Loader(
     }
 
 }
+
+internal class HashMismatchException(msg: String? = null) : GeneralSecurityException(msg)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt
index 5c8ac73b..948f1105 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/RepoModule.kt
@@ -20,6 +20,6 @@ val repoModule = module {
         SnapshotManager(snapshotFolder, get(), get(), get())
     }
     factory { SnapshotCreatorFactory(androidContext(), get(), get(), get()) }
-    factory { Pruner(get(), get(), get()) }
-    single { Checker(get(), get(), get(), get(), get()) }
+    factory { Pruner(get(), get(), get(), get()) }
+    single { Checker(get(), get(), get(), get(), get(), get()) }
 }
diff --git a/app/src/test/java/com/stevesoltys/seedvault/repo/BlobCacheTest.kt b/app/src/test/java/com/stevesoltys/seedvault/repo/BlobCacheTest.kt
index 7d91bdff..fd4d1e0e 100644
--- a/app/src/test/java/com/stevesoltys/seedvault/repo/BlobCacheTest.kt
+++ b/app/src/test/java/com/stevesoltys/seedvault/repo/BlobCacheTest.kt
@@ -6,15 +6,21 @@
 package com.stevesoltys.seedvault.repo
 
 import android.content.Context
+import android.content.Context.MODE_APPEND
+import android.content.Context.MODE_PRIVATE
 import com.stevesoltys.seedvault.transport.TransportTest
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.verify
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
 import java.io.File
+import java.io.FileInputStream
+import java.io.FileNotFoundException
 import java.io.FileOutputStream
+import java.io.IOException
 import java.nio.file.Path
 
 internal class BlobCacheTest : TransportTest() {
@@ -34,7 +40,7 @@ internal class BlobCacheTest : TransportTest() {
             assertNull(cache[chunkId2])
 
             // read saved blobs from cache
-            every { strictContext.openFileInput(any()) } returns file.inputStream()
+            every { strictContext.openFileInput(CACHE_FILE_NAME) } returns file.inputStream()
             cache.populateCache(listOf(fileInfo1, fileInfo2), emptyList())
 
             // now both blobs are in the map
@@ -55,7 +61,7 @@ internal class BlobCacheTest : TransportTest() {
 
         BlobCache(strictContext).let { cache ->
             // read saved blobs from cache
-            every { strictContext.openFileInput(any()) } returns file.inputStream()
+            every { strictContext.openFileInput(CACHE_FILE_NAME) } returns file.inputStream()
             cache.populateCache(listOf(fileInfo2), emptyList()) // fileInfo1 is missing
 
             // now only blob2 gets used, because blob1 wasn't on backend
@@ -73,7 +79,7 @@ internal class BlobCacheTest : TransportTest() {
 
         BlobCache(strictContext).let { cache ->
             // read saved blobs from cache
-            every { strictContext.openFileInput(any()) } returns file.inputStream()
+            every { strictContext.openFileInput(CACHE_FILE_NAME) } returns file.inputStream()
             cache.populateCache(listOf(info, fileInfo2), emptyList()) // info has different size now
 
             // now only blob2 gets used, because blob1 wasn't on backend
@@ -129,8 +135,76 @@ internal class BlobCacheTest : TransportTest() {
         blobCache.clearLocalCache()
     }
 
+    @Test
+    fun `get non-existent do not use list`(@TempDir tmpDir: Path) {
+        val cache = BlobCache(strictContext)
+
+        every { strictContext.openFileInput(DO_NOT_USE_FILE_NAME) } throws FileNotFoundException()
+
+        val blobIds = cache.getDoNotUseBlobIds()
+        assertEquals(emptySet<String>(), blobIds)
+    }
+
+    @Test
+    fun `onBlobsRemoved with non-existent do not use list`(@TempDir tmpDir: Path) {
+        val cache = BlobCache(strictContext)
+
+        every { strictContext.openFileInput(DO_NOT_USE_FILE_NAME) } throws FileNotFoundException()
+
+        cache.onBlobsRemoved(setOf("foo", "bar"))
+    }
+
+    @Test
+    fun `doNotUseBlob persists blobs which get removed later`(@TempDir tmpDir: Path) {
+        val file = File(tmpDir.toString(), "tmpCache")
+        val cache = BlobCache(strictContext)
+
+        // add blobs to list
+        every { strictContext.openFileOutput(DO_NOT_USE_FILE_NAME, MODE_APPEND) } answers {
+            FileOutputStream(file, true)
+        }
+        cache.doNotUseBlob(blob1.id)
+        cache.doNotUseBlob(blob2.id)
+
+        // get blobs from list
+        every { strictContext.openFileInput(DO_NOT_USE_FILE_NAME) } answers {
+            FileInputStream(file)
+        }
+        val blobIds = cache.getDoNotUseBlobIds()
+        assertEquals(setOf(blob1.id.hexFromProto(), blob2.id.hexFromProto()), blobIds)
+
+        // remove first blob from list
+        every { strictContext.openFileOutput(DO_NOT_USE_FILE_NAME, MODE_PRIVATE) } answers {
+            FileOutputStream(file, false)
+        }
+        cache.onBlobsRemoved(setOf(blob1.id.hexFromProto(), "foo", "bar"))
+
+        // getting blobs from list now only returns second blob
+        assertEquals(setOf(blob2.id.hexFromProto()), cache.getDoNotUseBlobIds())
+
+        // remove different blobs leaves empty list
+        cache.onBlobsRemoved(setOf(blob2.id.hexFromProto(), "foo", "bar"))
+        assertEquals(emptySet<String>(), cache.getDoNotUseBlobIds())
+
+        // empty list can be added to still
+        cache.doNotUseBlob(blob1.id)
+        assertEquals(setOf(blob1.id.hexFromProto()), cache.getDoNotUseBlobIds())
+    }
+
+    @Test
+    fun `corrupted do-not-use list gets deleted when getting blobs`(@TempDir tmpDir: Path) {
+        val cache = BlobCache(strictContext)
+
+        // get blobs from list deletes broken file, so we can continue using it
+        every { strictContext.openFileInput(DO_NOT_USE_FILE_NAME) } throws IOException()
+        every { strictContext.deleteFile(DO_NOT_USE_FILE_NAME) } returns true
+        cache.getDoNotUseBlobIds()
+
+        verify { strictContext.deleteFile(DO_NOT_USE_FILE_NAME) }
+    }
+
     private fun BlobCache.saveTwoBlobsToCache(file: File) {
-        every { strictContext.openFileOutput(any(), any()) } answers {
+        every { strictContext.openFileOutput(CACHE_FILE_NAME, MODE_APPEND) } answers {
             FileOutputStream(file, true)
         }
 
diff --git a/app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt b/app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt
index cbfca6b1..f360c550 100644
--- a/app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt
+++ b/app/src/test/java/com/stevesoltys/seedvault/repo/CheckerTest.kt
@@ -32,7 +32,6 @@ import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test
 import java.io.ByteArrayInputStream
 import java.io.IOException
-import java.security.GeneralSecurityException
 import java.security.MessageDigest
 import kotlin.random.Random
 
@@ -41,10 +40,11 @@ internal class CheckerTest : TransportTest() {
     private val backendManager: BackendManager = mockk()
     private val snapshotManager: SnapshotManager = mockk()
     private val loader: Loader = mockk()
+    private val blobCache: BlobCache = mockk()
     private val nm: BackupNotificationManager = mockk()
     private val backend: Backend = mockk()
 
-    private val checker = Checker(crypto, backendManager, snapshotManager, loader, nm)
+    private val checker = Checker(crypto, backendManager, snapshotManager, loader, blobCache, nm)
     private val folder = TopLevelFolder(repoId)
 
     private val snapshotHandle1 =
@@ -173,7 +173,7 @@ internal class CheckerTest : TransportTest() {
     }
 
     @Test
-    fun `check raises error for loader failure`() = runBlocking {
+    fun `check records hash error from loader`() = runBlocking {
         // chunkId is "real"
         val data1 = getRandomByteArray()
         val chunkId1 = MessageDigest.getInstance("SHA-256").digest(data1).toHexString()
@@ -208,8 +208,9 @@ internal class CheckerTest : TransportTest() {
         every { backendManager.requiresNetwork } returns Random.nextBoolean()
 
         coEvery { loader.loadFile(blobHandle1, null) } returns ByteArrayInputStream(data1)
-        coEvery { loader.loadFile(blobHandle2, null) } throws GeneralSecurityException()
+        coEvery { loader.loadFile(blobHandle2, null) } throws HashMismatchException()
 
+        every { blobCache.doNotUseBlob(ByteString.fromHex(blobHandle2.name)) } just Runs
         every { nm.onCheckFinishedWithError(any(), any()) } just Runs
 
         assertNull(checker.checkerResult)

From ae77ebed8f37316317941f48dd9542d055dcac69 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 8 Nov 2024 10:41:18 -0300
Subject: [PATCH 17/20] Remove known bad blobs from do-not-use list when
 deleting them

---
 .../java/com/stevesoltys/seedvault/repo/Pruner.kt | 15 +++++++++++----
 .../com/stevesoltys/seedvault/repo/PrunerTest.kt  |  6 +++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/Pruner.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/Pruner.kt
index 4284e292..424e173c 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/Pruner.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/Pruner.kt
@@ -23,6 +23,7 @@ internal class Pruner(
     private val crypto: Crypto,
     private val backendManager: BackendManager,
     private val snapshotManager: SnapshotManager,
+    private val blobCache: BlobCache,
 ) {
 
     private val log = KotlinLogging.logger {}
@@ -77,11 +78,17 @@ internal class Pruner(
                 blob.id.hexFromProto()
             }
         }.toSet()
-        blobHandles.forEach { blobHandle ->
-            if (blobHandle.name !in usedBlobIds) {
-                log.info { "Removing blob ${blobHandle.name}" }
-                backendManager.backend.remove(blobHandle)
+        val removedBlobs = mutableSetOf<String>()
+        try {
+            blobHandles.forEach { blobHandle ->
+                if (blobHandle.name !in usedBlobIds) {
+                    log.info { "Removing blob ${blobHandle.name}" }
+                    backendManager.backend.remove(blobHandle)
+                    removedBlobs.add(blobHandle.name)
+                }
             }
+        } finally {
+            if (removedBlobs.isNotEmpty()) blobCache.onBlobsRemoved(removedBlobs)
         }
     }
 
diff --git a/app/src/test/java/com/stevesoltys/seedvault/repo/PrunerTest.kt b/app/src/test/java/com/stevesoltys/seedvault/repo/PrunerTest.kt
index 0b40708b..f200bf08 100644
--- a/app/src/test/java/com/stevesoltys/seedvault/repo/PrunerTest.kt
+++ b/app/src/test/java/com/stevesoltys/seedvault/repo/PrunerTest.kt
@@ -33,9 +33,10 @@ internal class PrunerTest : TransportTest() {
 
     private val backendManager: BackendManager = mockk()
     private val snapshotManager: SnapshotManager = mockk()
+    private val blobCache: BlobCache = mockk()
     private val backend: Backend = mockk()
 
-    private val pruner = Pruner(crypto, backendManager, snapshotManager)
+    private val pruner = Pruner(crypto, backendManager, snapshotManager, blobCache)
     private val folder = TopLevelFolder(repoId)
 
     private val snapshotHandle1 =
@@ -84,6 +85,7 @@ internal class PrunerTest : TransportTest() {
         blobIds.forEach {
             coEvery { backend.remove(AppBackupFileType.Blob(repoId, it)) } just Runs
         }
+        every { blobCache.onBlobsRemoved(blobIds.toSet()) } just Runs
 
         pruner.removeOldSnapshotsAndPruneUnusedBlobs()
     }
@@ -143,12 +145,14 @@ internal class PrunerTest : TransportTest() {
         // now extra blobs will get removed
         coEvery { backend.remove(AppBackupFileType.Blob(repoId, blob1)) } just Runs
         coEvery { backend.remove(AppBackupFileType.Blob(repoId, blob2)) } just Runs
+        every { blobCache.onBlobsRemoved(setOf(blob1, blob2)) } just Runs
 
         pruner.removeOldSnapshotsAndPruneUnusedBlobs()
 
         coVerify {
             backend.remove(AppBackupFileType.Blob(repoId, blob1))
             backend.remove(AppBackupFileType.Blob(repoId, blob2))
+            blobCache.onBlobsRemoved(setOf(blob1, blob2))
         }
     }
 

From 47c3e652c25c8e899036d4e17495611ee1fa7732 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 8 Nov 2024 10:57:43 -0300
Subject: [PATCH 18/20] Don't include known bad blobs in BlobCache

---
 .../stevesoltys/seedvault/repo/BlobCache.kt   | 20 +++++++----
 .../seedvault/repo/BlobCacheTest.kt           | 35 +++++++++++++++++++
 2 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/repo/BlobCache.kt b/app/src/main/java/com/stevesoltys/seedvault/repo/BlobCache.kt
index 3d01c6cf..76b71821 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/repo/BlobCache.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/repo/BlobCache.kt
@@ -59,14 +59,20 @@ class BlobCache(
         blobMap.clear()
         MemoryLogger.log()
         // create map of blobId to size of blob on backend
-        val blobIds = blobs.associate {
+        val allowedBlobIds = blobs.associate {
             Pair(it.fileHandle.name, it.size.toInt())
+        }.toMutableMap()
+        // remove known bad blob IDs from allowedBlobIds
+        getDoNotUseBlobIds().forEach { knownBadId ->
+            if (allowedBlobIds.remove(knownBadId) != null) {
+                log.info { "Removed known bad blob: $knownBadId" }
+            }
         }
         // load local blob cache and include only blobs on backend
-        loadPersistentBlobCache(blobIds)
+        loadPersistentBlobCache(allowedBlobIds)
         // build up mapping from chunkId to blob from available snapshots
         snapshots.forEach { snapshot ->
-            onSnapshotLoaded(snapshot, blobIds)
+            onSnapshotLoaded(snapshot, allowedBlobIds)
         }
         MemoryLogger.log()
     }
@@ -167,14 +173,14 @@ class BlobCache(
 
     /**
      * Used for populating local [blobMap] cache.
-     * Adds mapping from chunkId to [Blob], if it exists on backend, i.e. part of [blobIds]
-     * and its size matches the one on backend, i.e. value of [blobIds].
+     * Adds mapping from chunkId to [Blob], if it exists on backend, i.e. part of [allowedBlobIds]
+     * and its size matches the one on backend, i.e. value of [allowedBlobIds].
      */
-    private fun onSnapshotLoaded(snapshot: Snapshot, blobIds: Map<String, Int>) {
+    private fun onSnapshotLoaded(snapshot: Snapshot, allowedBlobIds: Map<String, Int>) {
         snapshot.blobsMap.forEach { (chunkId, blob) ->
             // check if referenced blob still exists on backend
             val blobId = blob.id.hexFromProto()
-            val sizeOnBackend = blobIds[blobId]
+            val sizeOnBackend = allowedBlobIds[blobId]
             if (sizeOnBackend == blob.length) {
                 // only add blob to our mapping, if it still exists
                 blobMap.putIfAbsent(chunkId, blob)?.let { previous ->
diff --git a/app/src/test/java/com/stevesoltys/seedvault/repo/BlobCacheTest.kt b/app/src/test/java/com/stevesoltys/seedvault/repo/BlobCacheTest.kt
index fd4d1e0e..1941fba2 100644
--- a/app/src/test/java/com/stevesoltys/seedvault/repo/BlobCacheTest.kt
+++ b/app/src/test/java/com/stevesoltys/seedvault/repo/BlobCacheTest.kt
@@ -41,6 +41,9 @@ internal class BlobCacheTest : TransportTest() {
 
             // read saved blobs from cache
             every { strictContext.openFileInput(CACHE_FILE_NAME) } returns file.inputStream()
+            every {
+                strictContext.openFileInput(DO_NOT_USE_FILE_NAME)
+            } throws FileNotFoundException()
             cache.populateCache(listOf(fileInfo1, fileInfo2), emptyList())
 
             // now both blobs are in the map
@@ -62,6 +65,9 @@ internal class BlobCacheTest : TransportTest() {
         BlobCache(strictContext).let { cache ->
             // read saved blobs from cache
             every { strictContext.openFileInput(CACHE_FILE_NAME) } returns file.inputStream()
+            every {
+                strictContext.openFileInput(DO_NOT_USE_FILE_NAME)
+            } throws FileNotFoundException()
             cache.populateCache(listOf(fileInfo2), emptyList()) // fileInfo1 is missing
 
             // now only blob2 gets used, because blob1 wasn't on backend
@@ -80,6 +86,9 @@ internal class BlobCacheTest : TransportTest() {
         BlobCache(strictContext).let { cache ->
             // read saved blobs from cache
             every { strictContext.openFileInput(CACHE_FILE_NAME) } returns file.inputStream()
+            every {
+                strictContext.openFileInput(DO_NOT_USE_FILE_NAME)
+            } throws FileNotFoundException()
             cache.populateCache(listOf(info, fileInfo2), emptyList()) // info has different size now
 
             // now only blob2 gets used, because blob1 wasn't on backend
@@ -88,6 +97,32 @@ internal class BlobCacheTest : TransportTest() {
         }
     }
 
+    @Test
+    fun `cached blob doesn't get used if known bad on do-not-use list`(@TempDir tmpDir: Path) {
+        val file = File(tmpDir.toString(), "tmpCache")
+        val doNotUseFile = File(tmpDir.toString(), "doNotUse")
+        BlobCache(strictContext).apply {
+            saveTwoBlobsToCache(file)
+            every { strictContext.openFileOutput(DO_NOT_USE_FILE_NAME, MODE_APPEND) } answers {
+                FileOutputStream(doNotUseFile, true)
+            }
+            doNotUseBlob(blob1.id)
+        }
+
+        BlobCache(strictContext).let { cache ->
+            // read saved blobs from cache
+            every { strictContext.openFileInput(CACHE_FILE_NAME) } returns file.inputStream()
+            every {
+                strictContext.openFileInput(DO_NOT_USE_FILE_NAME)
+            } answers { doNotUseFile.inputStream() }
+            cache.populateCache(listOf(fileInfo1, fileInfo2), emptyList())
+
+            // now only blob2 gets used, because blob1 is on do-not-use-list
+            assertNull(cache[chunkId1])
+            assertEquals(blob2, cache[chunkId2])
+        }
+    }
+
     @Test
     fun `blobs from snapshot get added to cache`() {
         assertEquals(blob1, snapshot.blobsMap[chunkId1])

From 32aff32c73b108cd9554aaf22fd49cefd2d059af Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 14 Nov 2024 14:51:11 -0300
Subject: [PATCH 19/20] Fix FullRestore when Loader#loadFiles() throws an error
 for a later blob stream.

---
 .../transport/restore/FullRestore.kt          |  2 +-
 .../transport/restore/FullRestoreTest.kt      | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

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 a5240362..9b70e64f 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
@@ -161,7 +161,7 @@ internal class FullRestore(
         return outputFactory.getOutputStream(pfd).use { outputStream ->
             try {
                 copyInputStream(outputStream)
-            } catch (e: IOException) {
+            } catch (e: Exception) {
                 Log.w(TAG, "Error copying stream for package $packageName.", e)
                 return TRANSPORT_PACKAGE_REJECTED
             }
diff --git a/app/src/test/java/com/stevesoltys/seedvault/transport/restore/FullRestoreTest.kt b/app/src/test/java/com/stevesoltys/seedvault/transport/restore/FullRestoreTest.kt
index 724d644f..c26a602f 100644
--- a/app/src/test/java/com/stevesoltys/seedvault/transport/restore/FullRestoreTest.kt
+++ b/app/src/test/java/com/stevesoltys/seedvault/transport/restore/FullRestoreTest.kt
@@ -15,6 +15,7 @@ import com.stevesoltys.seedvault.coAssertThrows
 import com.stevesoltys.seedvault.getRandomByteArray
 import com.stevesoltys.seedvault.header.MAX_SEGMENT_LENGTH
 import com.stevesoltys.seedvault.header.VERSION
+import com.stevesoltys.seedvault.repo.HashMismatchException
 import com.stevesoltys.seedvault.repo.Loader
 import io.mockk.CapturingSlot
 import io.mockk.Runs
@@ -32,7 +33,9 @@ import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
+import java.io.FilterInputStream
 import java.io.IOException
+import java.io.SequenceInputStream
 import java.security.GeneralSecurityException
 import kotlin.random.Random
 
@@ -114,6 +117,36 @@ internal class FullRestoreTest : RestoreTest() {
         verify { fileDescriptor.close() }
     }
 
+    @Test
+    fun `reading from stream throws HashMismatchException in SequenceInputStream`() = runBlocking {
+        restore.initializeState(VERSION, packageInfo, blobHandles)
+        val bytes = getRandomByteArray()
+
+        val inputStream = SequenceInputStream(
+            ByteArrayInputStream(bytes),
+            object : FilterInputStream(ByteArrayInputStream(bytes)) {
+                override fun read(): Int {
+                    throw HashMismatchException()
+                }
+
+                override fun read(b: ByteArray, off: Int, len: Int): Int {
+                    throw HashMismatchException()
+                }
+            },
+        )
+        coEvery { loader.loadFiles(blobHandles) } returns inputStream
+        every { outputFactory.getOutputStream(fileDescriptor) } returns outputStream
+        every { fileDescriptor.close() } just Runs
+
+        assertEquals(bytes.size, restore.getNextFullRestoreDataChunk(fileDescriptor))
+        assertEquals(
+            TRANSPORT_PACKAGE_REJECTED,
+            restore.getNextFullRestoreDataChunk(fileDescriptor),
+        )
+
+        verify { fileDescriptor.close() }
+    }
+
     @Test
     fun `full chunk gets decrypted`() = runBlocking {
         restore.initializeState(VERSION, packageInfo, blobHandles)

From 417531ff491ccec49f8825f3b2996c66600820ba Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 19 Nov 2024 14:19:21 -0300
Subject: [PATCH 20/20] Don't treat HashMismatchException as a fatal error when
 restoring

because may just be a corrupted file
---
 .../stevesoltys/seedvault/transport/restore/FullRestore.kt    | 4 ++++
 1 file changed, 4 insertions(+)

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 9b70e64f..9d80c669 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
@@ -19,6 +19,7 @@ import com.stevesoltys.seedvault.header.HeaderReader
 import com.stevesoltys.seedvault.header.MAX_SEGMENT_LENGTH
 import com.stevesoltys.seedvault.header.UnsupportedVersionException
 import com.stevesoltys.seedvault.header.getADForFull
+import com.stevesoltys.seedvault.repo.HashMismatchException
 import com.stevesoltys.seedvault.repo.Loader
 import libcore.io.IoUtils.closeQuietly
 import org.calyxos.seedvault.core.backends.AppBackupFileType.Blob
@@ -146,6 +147,9 @@ internal class FullRestore(
             } catch (e: IOException) {
                 Log.w(TAG, "Error getting input stream for $packageName", e)
                 return TRANSPORT_PACKAGE_REJECTED
+            } catch (e: HashMismatchException) {
+                Log.w(TAG, "Hash mismatch for $packageName", e)
+                return TRANSPORT_PACKAGE_REJECTED
             } catch (e: SecurityException) {
                 Log.e(TAG, "Security Exception while getting input stream for $packageName", e)
                 return TRANSPORT_ERROR