Fix remotes won't be parsed correctly, closes #111

Author: CodeDoctorDE

app/lib/api/storage/remote/model.dart

@@ -4,7 +4,7 @@ import 'package:dart_mappable/dart_mappable.dart';
 
 part 'model.mapper.dart';
 
-@MappableClass()
+@MappableClass(discriminatorKey: 'type')
 sealed class RemoteStorage with RemoteStorageMappable {
   final String url;
   final String username;
@@ -18,22 +18,22 @@ sealed class RemoteStorage with RemoteStorageMappable {
   String get displayName => '$username@${uri.host}';
 }
 
-@MappableClass()
+@MappableClass(discriminatorValue: 'caldav')
 final class CalDavStorage extends RemoteStorage with CalDavStorageMappable {
   const CalDavStorage({required super.url, required super.username});
 }
 
-@MappableClass()
+@MappableClass(discriminatorValue: 'ical')
 final class ICalStorage extends RemoteStorage with ICalStorageMappable {
   const ICalStorage({required super.url, required super.username});
 }
 
-@MappableClass()
+@MappableClass(discriminatorValue: 'webdav')
 final class WebDavStorage extends RemoteStorage with WebDavStorageMappable {
   const WebDavStorage({required super.url, required super.username});
 }
 
-@MappableClass()
+@MappableClass(discriminatorValue: 'sia')
 final class SiaStorage extends RemoteStorage with SiaStorageMappable {
   const SiaStorage({required super.url, required super.username});
 }

app/lib/api/storage/remote/model.mapper.dart

@@ -143,10 +143,20 @@ class FlowSettings with FlowSettingsMappable, LeapSettings {
       prefs.getString(syncModeKey) ?? 'noMobile',
     ),
     remotes:
-        prefs
-            .getStringList(remotesKey)
-            ?.map((e) => RemoteStorageMapper.fromJson(e))
-            .toList() ??
+        prefs.getStringList(remotesKey)?.map((e) {
+          if (e.startsWith('"')) {
+            e = jsonDecode(e);
+          }
+          final map = jsonDecode(e) as Map<String, dynamic>;
+          if (!map.containsKey('type')) {
+            if (map['url'].toString().contains('caldav')) {
+              map['type'] = 'caldav';
+            } else {
+              map['type'] = 'ical';
+            }
+          }
+          return RemoteStorageMapper.fromMap(map);
+        }).toList() ??
         [],
     startOfWeek: prefs.getInt(startOfWeekKey) ?? 0,
     density: ThemeDensity.values.byName(
@@ -173,10 +183,8 @@ class FlowSettings with FlowSettingsMappable, LeapSettings {
       prefs.setString(localeKey, locale);
   Future<void> saveSyncMode(SharedPreferences prefs) =>
       prefs.setString(syncModeKey, syncMode.name);
-  Future<void> saveRemotes(SharedPreferences prefs) => prefs.setStringList(
-    remotesKey,
-    remotes.map((e) => json.encode(e.toJson())).toList(),
-  );
+  Future<void> saveRemotes(SharedPreferences prefs) =>
+      prefs.setStringList(remotesKey, remotes.map((e) => e.toJson()).toList());
   Future<void> saveStartOfWeek(SharedPreferences prefs) =>
       prefs.setInt(startOfWeekKey, startOfWeek);
   Future<void> saveDensity(SharedPreferences prefs) =>

app/lib/cubits/settings.dart

@@ -1161,10 +1161,10 @@ packages:
     dependency: "direct main"
     description:
       name: sqflite_common_ffi_web
-      sha256: "33495e9172c958d907c48fd43fbea0b9c0a2ec2e36a548ebd07672fde61b6497"
+      sha256: "793c1ff5b0c95ac618e7731e209db99e96abff59ad3432a3c91bd2b1454a00d5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1+1"
+    version: "1.0.1+2"
   sqflite_darwin:
     dependency: transitive
     description:

app/pubspec.lock

@@ -15,20 +15,20 @@
     "@astrojs/starlight": "^0.36.0",
     "@phosphor-icons/react": "^2.1.10",
     "@types/react": "^19.2.2",
-    "@types/react-dom": "^19.2.1",
-    "astro": "^5.14.4",
+    "@types/react-dom": "^19.2.2",
+    "astro": "^5.14.5",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
     "remark-gemoji": "^8.0.0",
     "remark-heading-id": "^1.0.1",
     "typescript": "^5.9.3"
   },
-  "packageManager": "[email protected].2",
+  "packageManager": "[email protected].3",
   "devDependencies": {
-    "@vite-pwa/astro": "^1.1.0",
+    "@vite-pwa/astro": "^1.1.1",
     "sass": "^1.93.2",
     "sharp": "^0.34.4",
-    "vite-plugin-pwa": "^1.0.3",
+    "vite-plugin-pwa": "^1.1.0",
     "workbox-window": "^7.3.0"
   }
 }