fixes

Author: lhns

app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

app/src/main/java/de/lolhens/resticui/BackupManager.kt

@@ -269,7 +269,7 @@ class BackupManager private constructor(context: Context) {
 
             val historyEntry = BackupHistoryEntry(
                 timestamp = ZonedDateTime.now(),
-                duration = Duration.ZERO,
+                duration = HourDuration(Duration.ZERO),
                 scheduled = scheduled,
                 cancelled = cancelled,
                 snapshotId = summary?.snapshot_id,
@@ -291,7 +291,7 @@ class BackupManager private constructor(context: Context) {
                 if (removeOld && throwable == null && (folder.keepLast != null || folder.keepWithin != null)) {
                     resticRepo.forget(
                         folder.keepLast,
-                        folder.keepWithin,
+                        folder.keepWithin?.duration,
                         prune = true
                     ).handle { _, _ ->
                         callback()

app/src/main/java/de/lolhens/resticui/Serializers.kt

@@ -22,15 +22,17 @@ object ZonedDateTimeSerializer : KSerializer<ZonedDateTime> {
         ZonedDateTime.parse(decoder.decodeString())
 }
 
-object DurationSerializer : KSerializer<Duration> {
+data class HourDuration(val duration: Duration)
+
+object HourDurationSerializer : KSerializer<HourDuration> {
     override val descriptor: SerialDescriptor =
-        PrimitiveSerialDescriptor((Duration::class).simpleName!!, PrimitiveKind.LONG)
+        PrimitiveSerialDescriptor((HourDuration::class).simpleName!!, PrimitiveKind.LONG)
 
-    override fun serialize(encoder: Encoder, value: Duration) =
-        encoder.encodeLong(value.toHours())
+    override fun serialize(encoder: Encoder, value: HourDuration) =
+        encoder.encodeLong(value.duration.toHours())
 
-    override fun deserialize(decoder: Decoder): Duration =
-        Duration.ofHours(decoder.decodeLong())
+    override fun deserialize(decoder: Decoder): HourDuration =
+        HourDuration(Duration.ofHours(decoder.decodeLong()))
 }
 
 object FileSerializer : KSerializer<File> {

app/src/main/java/de/lolhens/resticui/config/BackupHistoryEntry.kt

@@ -1,16 +1,16 @@
 package de.lolhens.resticui.config
 
-import de.lolhens.resticui.DurationSerializer
+import de.lolhens.resticui.HourDuration
+import de.lolhens.resticui.HourDurationSerializer
 import de.lolhens.resticui.ZonedDateTimeSerializer
 import de.lolhens.resticui.restic.ResticSnapshotId
 import kotlinx.serialization.Serializable
-import java.time.Duration
 import java.time.ZonedDateTime
 
 @Serializable
 data class BackupHistoryEntry(
     val timestamp: @Serializable(with = ZonedDateTimeSerializer::class) ZonedDateTime,
-    val duration: @Serializable(with = DurationSerializer::class) Duration,
+    val duration: @Serializable(with = HourDurationSerializer::class) HourDuration,
     val scheduled: Boolean,
     val cancelled: Boolean,
     val snapshotId: ResticSnapshotId?,

app/src/main/java/de/lolhens/resticui/config/FolderConfig.kt

@@ -1,11 +1,11 @@
 package de.lolhens.resticui.config
 
-import de.lolhens.resticui.DurationSerializer
 import de.lolhens.resticui.FileSerializer
+import de.lolhens.resticui.HourDuration
+import de.lolhens.resticui.HourDurationSerializer
 import de.lolhens.resticui.ui.folder.FolderEditFragment
 import kotlinx.serialization.Serializable
 import java.io.File
-import java.time.Duration
 import java.time.ZonedDateTime
 
 @Serializable
@@ -15,7 +15,7 @@ data class FolderConfig(
     val path: @Serializable(with = FileSerializer::class) File,
     val schedule: String,
     val keepLast: Int? = null,
-    val keepWithin: @Serializable(with = DurationSerializer::class) Duration? = null,
+    val keepWithin: @Serializable(with = HourDurationSerializer::class) HourDuration? = null,
     val history: List<BackupHistoryEntry> = emptyList()
 ) {
     fun repo(config: Config): RepoConfig? = config.repos.find { it.base.id == repoId }

app/src/main/java/de/lolhens/resticui/ui/folder/FolderEditFragment.kt

@@ -5,6 +5,7 @@ import android.view.*
 import android.widget.ArrayAdapter
 import androidx.fragment.app.Fragment
 import de.lolhens.resticui.BackupManager
+import de.lolhens.resticui.HourDuration
 import de.lolhens.resticui.R
 import de.lolhens.resticui.config.FolderConfig
 import de.lolhens.resticui.config.FolderConfigId
@@ -109,7 +110,7 @@ class FolderEditFragment : Fragment() {
             binding.editFolder.setText(folder.path.path)
             binding.spinnerSchedule.setSelection(schedules.indexOfFirst { it.first == folder.schedule })
             val scheduleIndex = retainProfiles.indexOfFirst {
-                it.toLong() == folder.keepWithin?.toHours()
+                it.toLong() == folder.keepWithin?.duration?.toHours()
             }
             binding.spinnerRetainWithin.setSelection(if (scheduleIndex == -1) 0 else scheduleIndex)
         }
@@ -133,7 +134,7 @@ class FolderEditFragment : Fragment() {
                 val schedule = binding.spinnerSchedule.selectedItem?.toString()
                 val keepWithin =
                     if (retainProfiles[binding.spinnerRetainWithin.selectedItemPosition] < 0) null
-                    else Duration.ofHours(retainProfiles[binding.spinnerRetainWithin.selectedItemPosition].toLong())
+                    else HourDuration(Duration.ofHours(retainProfiles[binding.spinnerRetainWithin.selectedItemPosition].toLong()))
 
                 if (
                     repo != null &&

app/src/main/java/de/lolhens/resticui/ui/folder/FolderFragment.kt

@@ -73,7 +73,7 @@ class FolderFragment : Fragment() {
                     if (folder.keepLast == null) "" else "in last ${folder.keepLast}",
                     if (folder.keepWithin == null) "" else "within ${
                         Formatters.durationDaysHours(
-                            folder.keepWithin
+                            folder.keepWithin.duration
                         )
                     }"
                 ).filter { it.isNotEmpty() }.joinToString(" and ")
@@ -82,9 +82,9 @@ class FolderFragment : Fragment() {
             val resticRepo = repo.repo(backupManager.restic)
 
             backupManager.observeConfig(viewLifecycleOwner) { config ->
-                val folder = config.folders.find { it.id == folderId }!!
+                val folder = config.folders.find { it.id == folderId }
 
-                val lastSuccessfulBackup = folder.lastBackup(filterSuccessful = true)
+                val lastSuccessfulBackup = folder?.lastBackup(filterSuccessful = true)
 
                 binding.textLastBackup.text =
                     if (lastSuccessfulBackup == null) ""
@@ -95,8 +95,11 @@ class FolderFragment : Fragment() {
                         binding.progressFolderSnapshots.visibility = GONE
 
                         val snapshots =
-                            snapshots?.filter { it.paths.contains(folder.path) }?.reversed()
-                                ?: emptyList()
+                            if (folder != null)
+                                snapshots?.filter { it.paths.contains(folder.path) }?.reversed()
+                                    ?: emptyList()
+                            else
+                                emptyList()
 
                         snapshotIds = snapshots.map { it.id }
                         binding.listFolderSnapshots.adapter = ArrayAdapter(