diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8784f83aa..d8d792439 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -136,6 +136,10 @@
             android:label="@string/notification_checking_finished_title"
             android:launchMode="singleTask"/>
 
+        <activity
+            android:name=".ui.check.FileCheckResultActivity"
+            android:launchMode="singleTask"/>
+
         <service
             android:name=".transport.ConfigurableBackupTransportService"
             android:exported="false">
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 97362a902..eac8aee2c 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsViewModel.kt
@@ -47,6 +47,7 @@ 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 com.stevesoltys.seedvault.worker.FileCheckerWorker
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -90,6 +91,8 @@ internal class SettingsViewModel(
 
     private val mBackupSize = MutableLiveData<Long>()
     val backupSize: LiveData<Long> = mBackupSize
+    private val mFilesBackupSize = MutableLiveData<Long>()
+    val filesBackupSize: LiveData<Long> = mFilesBackupSize
 
     internal val lastBackupTime = settingsManager.lastBackupTime
     internal val appBackupWorkInfo =
@@ -329,10 +332,20 @@ internal class SettingsViewModel(
         }
     }
 
+    fun loadFileBackupSize() {
+        viewModelScope.launch(Dispatchers.IO) {
+            mFilesBackupSize.postValue(storageBackup.getBackupSize())
+        }
+    }
+
     fun checkAppBackups(percent: Int) {
         AppCheckerWorker.scheduleNow(app, percent)
     }
 
+    fun checkFileBackups(percent: Int) {
+        FileCheckerWorker.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/check/AppCheckFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckFragment.kt
index f6988b803..280a655f3 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckFragment.kt
@@ -20,8 +20,8 @@ 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
-private const val WARN_BYTES = 1024 * 1024 * 1024 // 1 GB
+internal const val WARN_PERCENT = 25
+internal const val WARN_BYTES = 1024 * 1024 * 1024 // 1 GB
 
 class AppCheckFragment : Fragment() {
 
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/check/FileCheckFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/check/FileCheckFragment.kt
new file mode 100644
index 000000000..0882c082d
--- /dev/null
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/check/FileCheckFragment.kt
@@ -0,0 +1,89 @@
+/*
+ * 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
+import android.view.LayoutInflater
+import android.view.View
+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
+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
+
+class FileCheckFragment : 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
+
+        v.requireViewById<TextView>(R.id.titleView).setText(R.string.settings_file_check_title)
+        v.requireViewById<TextView>(R.id.descriptionView).setText(R.string.settings_file_check_text)
+        v.requireViewById<TextView>(R.id.introView).setText(R.string.settings_file_check_text2)
+
+        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.filesBackupSize.value?.let {
+                Formatter.formatShortFileSize(context, (it * value / 100).toLong())
+            } ?: "${value.toInt()}%"
+        }
+        slider.addOnChangeListener { _, value, _ ->
+            onSliderChanged(value)
+        }
+
+        viewModel.filesBackupSize.observe(viewLifecycleOwner) {
+            if (it != null) {
+                slider.labelBehavior = LabelFormatter.LABEL_VISIBLE
+                slider.invalidate()
+                onSliderChanged(slider.value)
+            }
+            // we can stop observing as the loaded size won't change again
+            viewModel.filesBackupSize.removeObservers(viewLifecycleOwner)
+        }
+
+        v.requireViewById<Button>(R.id.startButton).setOnClickListener {
+            viewModel.checkFileBackups(slider.value.toInt())
+            requireActivity().onBackPressedDispatcher.onBackPressed()
+        }
+        return v
+    }
+
+    override fun onStart() {
+        super.onStart()
+        viewModel.loadFileBackupSize()
+    }
+
+    private fun onSliderChanged(value: Float) {
+        val size = viewModel.filesBackupSize.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) View.VISIBLE else View.GONE
+        if (sliderLabel.visibility != newVisibility) {
+            sliderLabel.visibility = newVisibility
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/check/FileCheckResultActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/check/FileCheckResultActivity.kt
new file mode 100644
index 000000000..c7f86ca21
--- /dev/null
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/check/FileCheckResultActivity.kt
@@ -0,0 +1,22 @@
+/*
+ * SPDX-FileCopyrightText: 2024 The Calyx Institute
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.stevesoltys.seedvault.ui.check
+
+import android.os.Bundle
+import com.stevesoltys.seedvault.ui.setupEdgeToEdge
+import org.calyxos.backup.storage.api.StorageBackup
+import org.calyxos.backup.storage.ui.check.CheckResultActivity
+import org.koin.android.ext.android.inject
+
+class FileCheckResultActivity : CheckResultActivity() {
+
+    override val storageBackup: StorageBackup by inject()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setupEdgeToEdge()
+        super.onCreate(savedInstanceState)
+    }
+}
diff --git a/app/src/main/java/com/stevesoltys/seedvault/worker/FileCheckerWorker.kt b/app/src/main/java/com/stevesoltys/seedvault/worker/FileCheckerWorker.kt
new file mode 100644
index 000000000..fe71e8fd0
--- /dev/null
+++ b/app/src/main/java/com/stevesoltys/seedvault/worker/FileCheckerWorker.kt
@@ -0,0 +1,50 @@
+/*
+ * SPDX-FileCopyrightText: 2024 The Calyx Institute
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.stevesoltys.seedvault.worker
+
+import android.content.Context
+import android.util.Log
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkerParameters
+import com.stevesoltys.seedvault.BackupStateManager
+import com.stevesoltys.seedvault.ui.check.FileCheckResultActivity
+import io.github.oshai.kotlinlogging.KotlinLogging
+import kotlinx.coroutines.flow.first
+import org.calyxos.backup.storage.api.StorageBackup
+import org.calyxos.backup.storage.check.CheckerWorker
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+class FileCheckerWorker(
+    appContext: Context,
+    workerParams: WorkerParameters,
+) : CheckerWorker(appContext, workerParams), KoinComponent {
+
+    companion object {
+        private val TAG = FileCheckerWorker::class.simpleName
+
+        fun scheduleNow(
+            context: Context,
+            percent: Int,
+        ) {
+            scheduleNow(context, percent, OneTimeWorkRequestBuilder<FileCheckerWorker>())
+        }
+    }
+
+    private val log = KotlinLogging.logger {}
+    private val backupStateManager: BackupStateManager by inject()
+    override val storageBackup: StorageBackup by inject()
+    override val resultActivityClass: Class<*> = FileCheckResultActivity::class.java
+
+    override suspend fun doWork(): Result {
+        log.info { "Start worker $this ($id)" }
+        if (backupStateManager.isBackupRunning.first()) {
+            Log.i(TAG, "isBackupRunning was true, so retrying later...")
+            return Result.retry()
+        }
+        return super.doWork()
+    }
+}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5e66f82a1..355073413 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -73,6 +73,9 @@
     <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_file_check_title">Verify files backup integrity</string>
+    <string name="settings_file_check_text">Here you can run a one-time check to verify your files backup.</string>
+    <string name="settings_file_check_text2">Select how much of the files 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_expert_title">Expert settings</string>
     <string name="settings_expert_logcat_title">Save app log</string>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 5fc0eca05..281e0aa26 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -69,13 +69,20 @@
 
         <androidx.preference.Preference
             android:dependency="backup_storage"
-            app:dependency="backup_storage"
             app:fragment="com.stevesoltys.seedvault.ui.files.FileSelectionFragment"
             app:icon="@drawable/ic_library_add"
             app:key="backup_files"
             app:summary="@string/settings_backup_files_summary"
             app:title="@string/settings_backup_files_title" />
 
+        <androidx.preference.Preference
+            android:dependency="backup_storage"
+            app:fragment="com.stevesoltys.seedvault.ui.check.FileCheckFragment"
+            app:icon="@drawable/ic_cloud_search"
+            app:key="backup_file_check"
+            app:summary="@string/settings_backup_app_check_summary"
+            app:title="@string/settings_backup_app_check_title" />
+
     </PreferenceCategory>
 
     <androidx.preference.Preference
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/check/NotificationCheckObserver.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/check/NotificationCheckObserver.kt
new file mode 100644
index 000000000..51f4637dd
--- /dev/null
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/check/NotificationCheckObserver.kt
@@ -0,0 +1,38 @@
+/*
+ * SPDX-FileCopyrightText: 2021 The Calyx Institute
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.calyxos.backup.storage.check
+
+import android.content.Context
+import org.calyxos.backup.storage.api.CheckObserver
+import org.calyxos.backup.storage.ui.Notifications
+
+public open class NotificationCheckObserver internal constructor(
+    private val n: Notifications,
+    private val reportActivityClass: Class<*>,
+) : CheckObserver {
+
+    public constructor(
+        context: Context,
+        reportActivityClass: Class<*>,
+    ) : this(Notifications(context), reportActivityClass)
+
+    override fun onStartChecking() {
+        n.showCheckStartedNotification()
+    }
+
+    override fun onCheckUpdate(speed: Long, thousandth: Int) {
+        n.showCheckNotification(speed, thousandth)
+    }
+
+    override fun onCheckSuccess(size: Long, speed: Long) {
+        n.onCheckComplete(reportActivityClass, size, speed)
+    }
+
+    override fun onCheckFoundErrors(size: Long, speed: Long) {
+        n.onCheckFinishedWithError(reportActivityClass, size, speed)
+    }
+
+}
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/ui/Notifications.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/Notifications.kt
index f4b86b59a..a7e5b5829 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/ui/Notifications.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/Notifications.kt
@@ -5,31 +5,51 @@
 
 package org.calyxos.backup.storage.ui
 
+import android.app.ActivityOptions
+import android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED
 import android.app.Notification
 import android.app.Notification.FOREGROUND_SERVICE_IMMEDIATE
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.NotificationManager.IMPORTANCE_LOW
 import android.app.PendingIntent
+import android.app.PendingIntent.FLAG_IMMUTABLE
+import android.app.PendingIntent.getActivity
 import android.content.Context
+import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.text.format.Formatter.formatShortFileSize
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationCompat.Action
+import androidx.core.app.NotificationCompat.Builder
 import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
 import org.calyxos.backup.storage.R
+import org.calyxos.backup.storage.ui.check.ACTION_FINISHED
+import org.calyxos.backup.storage.ui.check.ACTION_SHOW
 
 private const val CHANNEL_ID_BACKUP = "seedvault.storage.backup"
 private const val CHANNEL_ID_RESTORE = "seedvault.storage.restore"
+private const val CHANNEL_ID_CHECK = "seedvault.storage.check"
 internal const val NOTIFICATION_ID_BACKUP = 1000
 internal const val NOTIFICATION_ID_PRUNE = 1001
 internal const val NOTIFICATION_ID_RESTORE = 1002
 internal const val NOTIFICATION_ID_RESTORE_COMPLETE = 1003
+internal const val NOTIFICATION_ID_CHECK = 1004
+internal const val NOTIFICATION_ID_CHECK_COMPLETE = 1005
 
 internal class Notifications(private val context: Context) {
 
     private val nm = context.getSystemService(NotificationManager::class.java).apply {
         createNotificationChannel(createBackupChannel())
         createNotificationChannel(createRestoreChannel())
+        createNotificationChannel(createCheckChannel())
+    }
+
+    companion object {
+        fun onCheckCompleteNotificationSeen(nm: NotificationManager) {
+            nm.cancel(NOTIFICATION_ID_CHECK_COMPLETE)
+        }
     }
 
     private fun createBackupChannel(): NotificationChannel {
@@ -46,17 +66,25 @@ internal class Notifications(private val context: Context) {
         }
     }
 
+    private fun createCheckChannel(): NotificationChannel {
+        val title = context.getString(R.string.notification_check_channel_title)
+        return NotificationChannel(CHANNEL_ID_CHECK, title, IMPORTANCE_LOW).apply {
+            enableVibration(false)
+        }
+    }
+
     internal fun getBackupNotification(
         @StringRes textRes: Int,
         transferred: Int = 0,
         expected: Int = 0,
     ) = getNotification(
+        channel = CHANNEL_ID_BACKUP,
         icon = R.drawable.ic_cloud_upload,
         title = context.getString(R.string.notification_backup_title),
         infoText = context.getString(textRes),
         transferred = transferred,
         expected = expected
-    )
+    ).build()
 
     internal fun updateBackupNotification(
         @StringRes textRes: Int,
@@ -76,12 +104,13 @@ internal class Notifications(private val context: Context) {
         transferred: Int = 0,
         expected: Int = 0,
     ) = getNotification(
+        channel = CHANNEL_ID_BACKUP,
         icon = R.drawable.ic_auto_delete,
         title = context.getString(R.string.notification_backup_title),
         infoText = context.getString(textRes),
         transferred = transferred,
         expected = expected
-    )
+    ).build()
 
     internal fun updatePruneNotification(
         @StringRes textRes: Int,
@@ -101,12 +130,13 @@ internal class Notifications(private val context: Context) {
             context.getString(R.string.notification_restore_info, restored, expected)
         } else null
         return getNotification(
+            channel = CHANNEL_ID_RESTORE,
             icon = R.drawable.ic_cloud_restore,
             title = context.getString(R.string.notification_restore_title),
             infoText = info,
             transferred = restored,
             expected = expected
-        )
+        ).build()
     }
 
     internal fun updateRestoreNotification(restored: Int, expected: Int) {
@@ -131,7 +161,7 @@ internal class Notifications(private val context: Context) {
                 append(context.getString(R.string.notification_restore_complete_errors, errors))
             }
         }.toString().ifEmpty { null }
-        val notification = NotificationCompat.Builder(context, CHANNEL_ID_BACKUP).apply {
+        val notification = Builder(context, CHANNEL_ID_BACKUP).apply {
             setSmallIcon(R.drawable.ic_cloud_done)
             setContentTitle(title)
             setContentText(msg)
@@ -147,13 +177,96 @@ internal class Notifications(private val context: Context) {
         nm.notify(NOTIFICATION_ID_RESTORE_COMPLETE, notification)
     }
 
+    fun getCheckNotification(
+        info: String? = null,
+        transferred: Int = 0,
+        expected: Int = 0,
+    ): Builder = getNotification(
+        channel = CHANNEL_ID_CHECK,
+        icon = R.drawable.ic_cloud_search,
+        title = context.getString(R.string.notification_check_title),
+        infoText = info,
+        transferred = transferred,
+        expected = expected,
+    )
+
+    fun showCheckStartedNotification() {
+        val text = context.getString(R.string.notification_check_text)
+        val notification = getCheckNotification(text).build()
+        nm.notify(NOTIFICATION_ID_CHECK, notification)
+    }
+
+    fun showCheckNotification(speed: Long, thousandth: Int) {
+        val text = "${formatShortFileSize(context, speed)}/s"
+        val notification = getCheckNotification(text, thousandth, 1000).build()
+        nm.notify(NOTIFICATION_ID_CHECK, notification)
+    }
+
+    fun onCheckComplete(reportClass: Class<*>, size: Long, speed: Long) {
+        val text = context.getString(
+            R.string.notification_check_finished_text,
+            formatShortFileSize(context, size),
+            "${formatShortFileSize(context, speed)}/s",
+        )
+        val notification = getOnCheckFinishedBuilder(reportClass)
+            .setContentTitle(context.getString(R.string.notification_check_finished_title))
+            .setContentText(text)
+            .setSmallIcon(R.drawable.ic_cloud_done)
+            .build()
+        nm.cancel(NOTIFICATION_ID_CHECK)
+        nm.notify(NOTIFICATION_ID_CHECK_COMPLETE, notification)
+    }
+
+    fun onCheckFinishedWithError(reportClass: Class<*>, size: Long, speed: Long) {
+        val text = context.getString(
+            R.string.notification_check_error_text,
+            formatShortFileSize(context, size),
+            "${formatShortFileSize(context, speed)}/s",
+        )
+        val notification = getOnCheckFinishedBuilder(reportClass)
+            .setContentTitle(context.getString(R.string.notification_check_error_title))
+            .setContentText(text)
+            .setSmallIcon(R.drawable.ic_cloud_error)
+            .build()
+        nm.cancel(NOTIFICATION_ID_CHECK)
+        nm.notify(NOTIFICATION_ID_CHECK_COMPLETE, notification)
+    }
+
+    private fun getOnCheckFinishedBuilder(reportClass: Class<*>): 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()
+            .setPendingIntentCreatorBackgroundActivityStartMode(
+                MODE_BACKGROUND_ACTIVITY_START_ALLOWED
+            ).toBundle()
+        val cIntent = Intent(context, reportClass).apply {
+            addFlags(FLAG_ACTIVITY_NEW_TASK)
+            setAction(ACTION_SHOW)
+        }
+        val dIntent = Intent(context, reportClass).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_check_action)
+        val action = Action.Builder(null, actionTitle, contentIntent).build()
+        return getCheckNotification()
+            .setProgress(0, 0, false)
+            .setContentIntent(contentIntent)
+            .addAction(action)
+            .setDeleteIntent(deleteIntent)
+            .setAutoCancel(true)
+    }
+
     private fun getNotification(
+        channel: String,
         @DrawableRes icon: Int,
         title: CharSequence,
         infoText: CharSequence?,
         transferred: Int = 0,
         expected: Int = 0,
-    ) = Notification.Builder(context, CHANNEL_ID_BACKUP).apply {
+    ) = Builder(context, channel).apply {
         setSmallIcon(icon)
         setContentTitle(title)
         setContentText(infoText)
@@ -162,6 +275,6 @@ internal class Notifications(private val context: Context) {
         setWhen(System.currentTimeMillis())
         setProgress(expected, transferred, expected == 0)
         setForegroundServiceBehavior(FOREGROUND_SERVICE_IMMEDIATE)
-    }.build()
+    }
 
 }
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/ui/check/CheckResultActivity.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/check/CheckResultActivity.kt
new file mode 100644
index 000000000..9a565b990
--- /dev/null
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/check/CheckResultActivity.kt
@@ -0,0 +1,151 @@
+/*
+ * SPDX-FileCopyrightText: 2024 The Calyx Institute
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.calyxos.backup.storage.ui.check
+
+import android.app.NotificationManager
+import android.os.Bundle
+import android.text.format.Formatter.formatShortFileSize
+import android.util.Log
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.RecyclerView
+import org.calyxos.backup.storage.R
+import org.calyxos.backup.storage.api.CheckResult
+import org.calyxos.backup.storage.api.SnapshotItem
+import org.calyxos.backup.storage.api.StorageBackup
+import org.calyxos.backup.storage.api.StoredSnapshot
+import org.calyxos.backup.storage.ui.Notifications.Companion.onCheckCompleteNotificationSeen
+import org.calyxos.backup.storage.ui.restore.SnapshotAdapter
+import org.calyxos.backup.storage.ui.restore.SnapshotClickListener
+
+internal const val ACTION_FINISHED = "FINISHED"
+internal const val ACTION_SHOW = "SHOW"
+private val TAG = CheckResultActivity::class.simpleName
+
+public abstract class CheckResultActivity : AppCompatActivity(), SnapshotClickListener {
+
+    protected abstract val storageBackup: StorageBackup
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (savedInstanceState == null) when (intent.action) {
+            ACTION_FINISHED -> {
+                val nm = getSystemService(NotificationManager::class.java)
+                onCheckCompleteNotificationSeen(nm)
+                finish() // result will be cleared in onDestroy()
+            }
+            ACTION_SHOW -> {
+                val nm = getSystemService(NotificationManager::class.java)
+                onCheckCompleteNotificationSeen(nm)
+                onActionReceived()
+            }
+            else -> {
+                Log.e(TAG, "Unknown action: ${intent.action}")
+                finish()
+            }
+        }
+    }
+
+    private fun onActionReceived() {
+        when (val result = storageBackup.checkResult) {
+            is CheckResult.Success -> onSuccess(result)
+            is CheckResult.Error -> onError(result)
+            is CheckResult.GeneralError, null -> {
+                if (result == null) {
+                    val str = getString(R.string.check_error_no_result)
+                    val e = NullPointerException(str)
+                    val r = CheckResult.GeneralError(e)
+                    onGeneralError(r)
+                } else {
+                    onGeneralError(result as CheckResult.GeneralError)
+                }
+            }
+        }
+    }
+
+    private fun onSuccess(result: CheckResult.Success) {
+        setContentView(R.layout.activity_check_results)
+        val intro = getString(
+            R.string.check_success_intro,
+            result.snapshots.size,
+            result.percent,
+            formatShortFileSize(this, result.size),
+        )
+        requireViewById<TextView>(R.id.introView).text = intro
+
+        val items = result.snapshots.map { snapshot ->
+            SnapshotItem(
+                storedSnapshot = StoredSnapshot("doesNotMatter", snapshot.timeStart),
+                snapshot = snapshot,
+            )
+        }.sortedByDescending { it.time }
+        val listView = requireViewById<RecyclerView>(R.id.listView)
+        listView.adapter = SnapshotAdapter(this).apply {
+            submitList(items)
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        if (isFinishing) storageBackup.clearCheckResult()
+    }
+
+    private fun onError(result: CheckResult.Error) {
+        setContentView(R.layout.activity_check_results)
+        requireViewById<ImageView>(R.id.imageView).setImageResource(R.drawable.ic_cloud_error)
+        requireViewById<TextView>(R.id.titleView).setText(R.string.check_error_title)
+
+        val intro = if (result.existingSnapshots == 0) {
+            getString(R.string.check_error_no_snapshots)
+        } else if (result.snapshots.isEmpty()) {
+            getString(
+                R.string.check_error_only_broken_snapshots,
+                result.existingSnapshots,
+            )
+        } else {
+            getString(R.string.check_error_has_snapshots, result.existingSnapshots)
+        }
+        requireViewById<TextView>(R.id.introView).text = intro
+
+        val items = (result.goodSnapshots.map { snapshot ->
+            SnapshotItem(
+                storedSnapshot = StoredSnapshot("doesNotMatter", snapshot.timeStart),
+                snapshot = snapshot,
+                hasError = false,
+            )
+        } + result.badSnapshots.map { snapshot ->
+            SnapshotItem(
+                storedSnapshot = StoredSnapshot("doesNotMatter", snapshot.timeStart),
+                snapshot = snapshot,
+                hasError = true,
+            )
+        }).sortedByDescending { it.time }
+        val listView = requireViewById<RecyclerView>(R.id.listView)
+        listView.adapter = SnapshotAdapter(this).apply {
+            submitList(items)
+        }
+    }
+
+    private fun onGeneralError(result: CheckResult.GeneralError) {
+        setContentView(R.layout.activity_check_results)
+        requireViewById<ImageView>(R.id.imageView).setImageResource(R.drawable.ic_cloud_error)
+        requireViewById<TextView>(R.id.titleView).setText(R.string.check_error_title)
+
+        requireViewById<TextView>(R.id.introView).text =
+            getString(R.string.check_error_no_snapshots)
+
+        requireViewById<TextView>(R.id.errorView).text =
+            "${result.e.localizedMessage}\n\n${result.e}"
+    }
+
+    override fun onSnapshotClicked(item: SnapshotItem) {
+        Toast.makeText(this, "Not yet implemented", Toast.LENGTH_SHORT).show()
+    }
+
+}
diff --git a/storage/lib/src/main/java/org/calyxos/backup/storage/ui/restore/SnapshotAdapter.kt b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/restore/SnapshotAdapter.kt
index 461cfc3f2..4f073284d 100644
--- a/storage/lib/src/main/java/org/calyxos/backup/storage/ui/restore/SnapshotAdapter.kt
+++ b/storage/lib/src/main/java/org/calyxos/backup/storage/ui/restore/SnapshotAdapter.kt
@@ -8,8 +8,11 @@ package org.calyxos.backup.storage.ui.restore
 import android.text.format.DateUtils.FORMAT_ABBREV_ALL
 import android.text.format.DateUtils.getRelativeTimeSpanString
 import android.text.format.Formatter
+import android.util.Log
 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.TextView
 import androidx.recyclerview.widget.DiffUtil
@@ -47,6 +50,7 @@ internal class SnapshotAdapter(private val listener: SnapshotClickListener) :
     inner class SnapshotViewHolder(view: View) : RecyclerView.ViewHolder(view) {
         private val layout: ViewGroup = view.findViewById(R.id.layout)
         private val nameView: TextView = view.findViewById(R.id.nameView)
+        private val errorView: TextView = view.findViewById(R.id.errorView)
         private val timeView: TextView = view.findViewById(R.id.timeView)
         private val sizeView: TextView = view.findViewById(R.id.sizeView)
 
@@ -58,6 +62,12 @@ internal class SnapshotAdapter(private val listener: SnapshotClickListener) :
                 layout.setOnClickListener { listener.onSnapshotClicked(item) }
             }
             nameView.text = item.snapshot?.name
+            if (item.hasError) {
+                errorView.visibility = VISIBLE
+            } else {
+                Log.e("EST", "ITEM HAS ERROR: $item")
+                errorView.visibility = GONE
+            }
             val now = System.currentTimeMillis()
             timeView.text = getRelativeTimeSpanString(item.time, now, 0L, FORMAT_ABBREV_ALL)
             sizeView.text = item.snapshot?.size?.let { size ->
diff --git a/storage/lib/src/main/res/drawable/ic_cloud_error.xml b/storage/lib/src/main/res/drawable/ic_cloud_error.xml
new file mode 100644
index 000000000..b783a396d
--- /dev/null
+++ b/storage/lib/src/main/res/drawable/ic_cloud_error.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  SPDX-FileCopyrightText: Material Design Authors / Google LLC
+  SPDX-License-Identifier: Apache-2.0
+  -->
+<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="#FF000000"
+        android:pathData="M19,20H6C2.71,20 0,17.29 0,14C0,10.9 2.34,8.36 5.35,8.03C6.6,5.64 9.11,4 12,4C15.64,4 18.67,6.59 19.35,10.03C21.95,10.22 24,12.36 24,15C24,17.74 21.74,20 19,20M11,15V17H13V15H11M11,13H13V8H11V13Z" />
+</vector>
diff --git a/storage/lib/src/main/res/drawable/ic_cloud_search.xml b/storage/lib/src/main/res/drawable/ic_cloud_search.xml
new file mode 100644
index 000000000..55e31bfe1
--- /dev/null
+++ b/storage/lib/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/storage/lib/src/main/res/layout/activity_check_results.xml b/storage/lib/src/main/res/layout/activity_check_results.xml
new file mode 100644
index 000000000..1faa4a692
--- /dev/null
+++ b/storage/lib/src/main/res/layout/activity_check_results.xml
@@ -0,0 +1,79 @@
+<?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_check_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/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"
+            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+            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/item_snapshot" />
+
+        <TextView
+            android:id="@+id/errorView"
+            style="@style/SudDescription"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:textColor="?colorError"
+            android:textSize="16sp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/listView"
+            app:layout_constraintVertical_bias="0.0"
+            tools:text="Could be an optional error message spanning more than one line."
+            tools:visibility="visible" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</ScrollView>
diff --git a/storage/lib/src/main/res/layout/item_snapshot.xml b/storage/lib/src/main/res/layout/item_snapshot.xml
index e57a4ca86..4849777c3 100644
--- a/storage/lib/src/main/res/layout/item_snapshot.xml
+++ b/storage/lib/src/main/res/layout/item_snapshot.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   SPDX-FileCopyrightText: 2021 The Calyx Institute
   SPDX-License-Identifier: Apache-2.0
   -->
@@ -23,13 +22,27 @@
             android:id="@+id/nameView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceListItem"
             android:layout_marginEnd="8dp"
+            android:textAppearance="?android:attr/textAppearanceListItem"
             app:layout_constraintEnd_toStartOf="@+id/sizeView"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="Backup name which might be quite long, who knows...?" />
 
+        <TextView
+            android:id="@+id/errorView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="8dp"
+            android:text="@string/check_error_snapshot"
+            android:textColor="?colorError"
+            android:visibility="gone"
+            app:layout_constraintEnd_toStartOf="@+id/sizeView"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/nameView"
+            tools:visibility="visible" />
+
         <TextView
             android:id="@+id/timeView"
             android:layout_width="wrap_content"
@@ -39,7 +52,7 @@
             app:layout_constraintEnd_toStartOf="@+id/sizeView"
             app:layout_constraintHorizontal_chainStyle="spread_inside"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/nameView"
+            app:layout_constraintTop_toBottomOf="@+id/errorView"
             tools:text="24h ago" />
 
         <TextView
diff --git a/storage/lib/src/main/res/values/strings.xml b/storage/lib/src/main/res/values/strings.xml
index b79f55bc6..acfc7bd88 100644
--- a/storage/lib/src/main/res/values/strings.xml
+++ b/storage/lib/src/main/res/values/strings.xml
@@ -21,6 +21,15 @@
     <string name="notification_restore_complete_dups">%1$d files were duplicates.</string>
     <string name="notification_restore_complete_errors">%1$d files had errors.</string>
 
+    <string name="notification_check_channel_title">Files backup integrity check</string>
+    <string name="notification_check_title">Checking files backups…</string>
+    <string name="notification_check_text">Retrieving available backup data.</string>
+    <string name="notification_check_finished_title">Files backup integrity verified</string>
+    <string name="notification_check_finished_text">Successfully checked %1$s at an average speed of %2$s.</string>
+    <string name="notification_check_error_title">Files backup errors found</string>
+    <string name="notification_check_error_text">Tap for details. We checked %1$s at an average speed of %2$s.</string>
+    <string name="notification_check_action">Details</string>
+
     <string name="snapshots_title">Available storage backups</string>
     <string name="snapshots_empty">No storage backups found\n\nSorry, but there is nothing that can be restored.</string>
     <string name="snapshots_error">Error loading snapshots</string>
@@ -28,4 +37,13 @@
     <string name="select_files_title">Review files for restore</string>
     <string name="select_files_number_of_files">%1$d file(s)</string>
     <string name="select_files_button_restore">Restore selected files</string>
+
+    <string name="check_success_intro">%1$d snapshots were found and %2$d%% of their data (%3$s) successfully verified:</string>
+    <string name="check_error_title">@string/notification_check_error_title</string>
+    <string name="check_error_no_snapshots">We could not find any backup. Please run a successful backup first and then try checking again.</string>
+    <string name="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="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="check_error_no_result">We lost the detailed results. Did a long time pass since running the check? Try running again.</string>
+    <string name="check_error_snapshot">This backup has some errors. You may be able to restore it partly.</string>
+
 </resources>