From e95f98b450d519b7d9bd078a0002865bea6972aa Mon Sep 17 00:00:00 2001
From: Dara Adedeji <daraadedeji07@gmail.com>
Date: Sat, 3 Oct 2026 21:44:48 -0400
Subject: [PATCH] Keep a shared .ica's map colors when the profile isn't here

Export writes the strategy's profile id and its palette. Import kept the
id whenever one was present and dropped the palette, so a strategy using
someone else's custom profile drew in Default colors. When the id doesn't
exist on this machine and the file has a palette, the strategy now keeps
the palette as its own colors.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
---
 lib/strategy/strategy_import_export.dart | 13 ++++-
 test/strategy_folder_import_test.dart    | 60 ++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 1 deletion(-)

diff --git a/lib/strategy/strategy_import_export.dart b/lib/strategy/strategy_import_export.dart
index ae49dd8f..4b2eda09 100644
--- a/lib/strategy/strategy_import_export.dart
+++ b/lib/strategy/strategy_import_export.dart
@@ -1896,10 +1896,21 @@ class StrategyImportExportService {
               rawImportedThemeProfileId.isNotEmpty
           ? rawImportedThemeProfileId
           : null;
-      final resolvedThemeProfileId = importedThemeProfileId == null
+      final remappedThemeProfileId = importedThemeProfileId == null
           ? null
           : (themeProfileIdRemap[importedThemeProfileId] ??
               importedThemeProfileId);
+      // A profile this machine doesn't have (someone else's custom profile,
+      // or a built-in from a newer Icarus) would draw in Default colors. The
+      // file carries the palette, so the strategy keeps it as its own.
+      final profileIsHere = remappedThemeProfileId != null &&
+          Hive.box<MapThemeProfile>(HiveBoxNames.mapThemeProfilesBox)
+                  .get(remappedThemeProfileId) !=
+              null;
+      final resolvedThemeProfileId =
+          profileIsHere || importedThemeOverridePalette == null
+              ? remappedThemeProfileId
+              : null;
 
       final pages = json['pages'] != null
           ? await StrategyPage.listFromJson(
diff --git a/test/strategy_folder_import_test.dart b/test/strategy_folder_import_test.dart
index 75122d06..f5fba866 100644
--- a/test/strategy_folder_import_test.dart
+++ b/test/strategy_folder_import_test.dart
@@ -590,6 +590,66 @@ void main() {
     );
   });
 
+  test('a shared .ica keeps its colors when the receiver lacks the profile',
+      () async {
+    final palette = MapThemePalette(
+      baseColorValue: 0xFF2A1B2E,
+      detailColorValue: 0xFFC78B5A,
+      highlightColorValue: 0xFF6FD3C4,
+    );
+    final profile = await container
+        .read(mapThemeProfilesProvider.notifier)
+        .createProfile(name: 'Haven Dusk', palette: palette);
+    await _storeStrategy(
+      name: 'Sender copy',
+      folderID: null,
+      themeProfileId: profile!.id,
+    );
+    final file = File(path.join(tempDir.path, 'shared.ica'));
+    await StrategyImportExportService(container).zipStrategyData(
+      strategy: _strategyByName('Sender copy'),
+      outputFilePath: file.path,
+    );
+    // The receiver's machine has never seen this custom profile.
+    await container
+        .read(mapThemeProfilesProvider.notifier)
+        .deleteProfile(profile.id);
+
+    final result =
+        await StrategyImportExportService(container).loadFromFileDrop(
+      [XFile(file.path)],
+    );
+
+    expect(result.strategiesImported, 1);
+    final imported = _strategyByName('shared');
+    expect(imported.themeProfileId, isNull);
+    expect(imported.themeOverridePalette, palette);
+  });
+
+  test('an .ica using a built-in theme still points at the built-in', () async {
+    await _storeStrategy(
+      name: 'Valorant colors',
+      folderID: null,
+      themeProfileId: MapThemeProfilesProvider.immutableValorantProfileId,
+    );
+    final file = File(path.join(tempDir.path, 'builtin.ica'));
+    await StrategyImportExportService(container).zipStrategyData(
+      strategy: _strategyByName('Valorant colors'),
+      outputFilePath: file.path,
+    );
+
+    await StrategyImportExportService(container).loadFromFileDrop(
+      [XFile(file.path)],
+    );
+
+    final imported = _strategyByName('builtin');
+    expect(
+      imported.themeProfileId,
+      MapThemeProfilesProvider.immutableValorantProfileId,
+    );
+    expect(imported.themeOverridePalette, isNull);
+  });
+
   test('standalone .ica drop imports into the current folder', () async {
     final parentFolder = await _createFolder(
       container,