Fix empty file type maps occuring when updating from 0.2.5 to 0.3.0

Author: w2sv

core/datastore/src/main/kotlin/com/w2sv/datastore/proto/navigatorconfig/NavigatorConfigMapper.kt

@@ -27,6 +27,7 @@ import com.w2sv.domain.model.navigatorconfig.FileTypeConfigMap
 import com.w2sv.domain.model.navigatorconfig.NavigatorConfig
 import com.w2sv.domain.model.navigatorconfig.SourceConfig
 import com.w2sv.kotlinutils.map
+import slimber.log.i
 
 internal fun NavigatorConfig.toProto(hasBeenMigrated: Boolean): NavigatorConfigProto =
     NavigatorConfigMapper.toProto(this, hasBeenMigrated)
@@ -46,6 +47,15 @@ private object NavigatorConfigMapper : ProtoMapper<NavigatorConfigProto, Navigat
     private fun NavigatorConfigProto.fileTypeConfigMap(): FileTypeConfigMap =
         buildMap {
             (extensionPresetFileTypesMap + extensionConfigurableFileTypesMap + customFileTypesMap)
+                .ifEmpty {
+                    // This scope will be entered when a user updates from version 0.2.5 to 0.3.0, which introduces storing of file types (color, extensions),
+                    // while previously all that data was static and therefore not stored.
+                    // As previously configuration of the default values was impossible, we proceed with the defaults.
+                    // Once the user saves any new configuration of the navigator config, the proto file type maps
+                    // (extensionPresetFileTypesMap, extensionConfigurableFileTypesMap, customFileTypesMap) won't be empty anymore.
+                    i { "proto file type maps empty; using default ones" }
+                    NavigatorConfig.default.toProto(true).run { extensionPresetFileTypesMap + extensionConfigurableFileTypesMap }
+                }
                 .forEach { (ordinal, proto) ->
                     put(
                         when (proto) {

core/datastore/src/test/kotlin/com/w2sv/datastore/proto/navigatorconfig/NavigatorConfigMapperTest.kt

@@ -1,5 +1,6 @@
 package com.w2sv.datastore.proto.navigatorconfig
 
+import com.w2sv.datastore.NavigatorConfigProto
 import com.w2sv.domain.model.filetype.CustomFileType
 import com.w2sv.domain.model.filetype.PresetFileType
 import com.w2sv.domain.model.filetype.SourceType
@@ -59,6 +60,21 @@ internal class NavigatorConfigMapperTest {
             }
         assertEquals(nonDefaultConfig, nonDefaultConfig.backAndForthMapped())
     }
+
+    /**
+     * Empty file type maps occur when updating app from 0.2.5 to 0.3.0 due to inherent navigator proto config changes.
+     */
+    @Test
+    fun `default preset file types are used when proto file type maps are empty`() {
+        val protoConfigWithEmptyFileTypeMaps = NavigatorConfigProto.newBuilder()
+            .mergeFrom(NavigatorConfig.default.toProto(true)) // clone from default
+            .clearExtensionPresetFileTypes()
+            .clearExtensionConfigurableFileTypes()
+            .clearCustomFileTypes()
+            .build()
+
+        assertEquals(NavigatorConfig.default, protoConfigWithEmptyFileTypeMaps.toExternal())
+    }
 }
 
 private fun NavigatorConfig.backAndForthMapped(): NavigatorConfig =

core/navigator/src/main/kotlin/com/w2sv/navigator/notifications/appnotifications/movefile/MoveFileNotificationManager.kt

@@ -38,15 +38,15 @@ import com.w2sv.navigator.notifications.appnotifications.AppNotificationId
 import com.w2sv.navigator.notifications.appnotifications.batchmove.BatchMoveNotificationManager
 import com.w2sv.navigator.notifications.appnotifications.iconBitmap
 import dagger.hilt.android.qualifiers.ApplicationContext
+import java.io.IOException
+import javax.inject.Inject
+import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
 import slimber.log.i
-import java.io.IOException
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @Singleton
 internal class MoveFileNotificationManager @Inject constructor(