Address Claude review feedback

- Move a pinned startup project to the document an ordinary Save landed on.
  Confirmed on the emulator: saving a project opened through the document picker
  is refused in place and falls back to the save dialog, and the document that
  dialog creates has a different URI - saving over
  `General_Project.geolibre.json` yields one ending
  `General_Project.geolibre.json (1)`. A "specific" preference pinned to the
  original therefore stopped matching after the very first save, so its copy was
  never refreshed again and every later launch restored the project as it looked
  when it was pinned, from a URI nothing could open. `startupSettingsAfterForcedSaveAs`
  follows the preference across, before the copy is written so that copy lands in
  the slot the moved preference resolves to.

  Narrow on purpose: it applies only when a plain Save changed the path by
  itself, which is the signature of that forced fallback. An explicit Save As is
  the user deliberately writing a different file and must not silently re-point
  a preference at it, and on desktop a plain Save never changes the path, so this
  never fires there.

- Document the two Android consequences in the user guide: a project deleted
  from the device still reopens from GeoLibre's copy (Android reports a deleted
  file and an expired reference the same way, and treating it as deleted would
  wipe the user's startup preference), and saving a project opened from device
  storage asks where to save it once, with the preference following it there.

Verified on an Android 16 emulator: pin a project as the startup project, open
it, Save (the dialog appears and creates the "(1)" document), and the preference
and its copy both move to it; force-stop and cold start reopens the saved
project with no banner. Also confirmed Save after a snapshot-based restore still
falls back to the save dialog rather than surfacing a raw error - the expired
grant reports "Permission Denial", which `isUriWritePermissionError` matches.

Author: giswqs

apps/geolibre-desktop/src/hooks/useProjectFileActions.ts

@@ -53,6 +53,7 @@ import {
   saveChoicesForProject,
   type ProjectSaveChoices,
 } from "../lib/project-save-choices";
+import { startupSettingsAfterForcedSaveAs } from "../lib/startup-project";
 import { resolveProjectXyzLayers } from "../lib/xyz-url";
 import {
   importQgisProject,
@@ -1130,6 +1131,20 @@ export function useProjectFileActions(mapControllerRef: MapControllerRef) {
       name: project.name,
       openedAt: new Date().toISOString(),
     });
+    // An ordinary Save that landed somewhere else is Android refusing to write
+    // the picked document and the save dialog creating a new one in its place
+    // (GeoLibre#1833). Move a startup preference pinned to the old document
+    // across, or it keeps naming one nothing can open again. Before the copy
+    // below, so that copy lands in the slot the moved preference resolves to.
+    const startupSettings = useDesktopSettingsStore.getState().desktopSettings;
+    const movedStartup = options?.saveAs
+      ? null
+      : startupSettingsAfterForcedSaveAs(startupSettings.startup, existingLocalPath, path);
+    if (movedStartup) {
+      useDesktopSettingsStore
+        .getState()
+        .setDesktopSettings({ ...startupSettings, startup: movedStartup });
+    }
     // Refresh the restorable copy so a startup restore reopens what was just
     // saved rather than the state the project was opened in.
     rememberStartupProjectSnapshot(path, contentToSave);

apps/geolibre-desktop/src/lib/startup-project.ts

@@ -38,3 +38,39 @@ export function startupProjectPath(
   // plus the failure banner on any launch where that host is unreachable.
   return recentProjects.find((entry) => !isRemotePath(entry.path))?.path ?? null;
 }
+
+/**
+ * Follow a pinned startup project to the new path an ordinary Save landed on,
+ * or null when the preference should stay as it is.
+ *
+ * This only ever happens on Android. A project opened through the document
+ * picker carries a read-only `content://` grant, so the first in-place Save is
+ * refused and falls back to the save dialog (GeoLibre#1833), and the document
+ * the dialog *creates* has a different URI -- on the emulator, saving over
+ * `General_Project.geolibre.json` yields a URI ending
+ * `General_Project.geolibre.json (1)`. The user asked to save the project they
+ * pinned, so the preference has to follow it there; left pinned to the old URI
+ * it would name a document nothing can open again, and restore the copy taken
+ * when it was pinned for as long as the preference lasts.
+ *
+ * Narrow on purpose. It applies only when a plain Save changed the path by
+ * itself, which is the signature of that forced fallback: an explicit Save As is
+ * the user deliberately writing a *different* file, and must not silently
+ * re-point a preference at it. On desktop a plain Save never changes the path,
+ * so this never fires there.
+ *
+ * @param settings - The current startup preference.
+ * @param previousPath - The path the project was saved from, if any.
+ * @param newPath - The path the save actually landed on.
+ * @returns The updated preference, or null to leave it unchanged.
+ */
+export function startupSettingsAfterForcedSaveAs(
+  settings: StartupSettings,
+  previousPath: string | null,
+  newPath: string,
+): StartupSettings | null {
+  if (settings.mode !== "specific") return null;
+  if (!previousPath || previousPath === newPath) return null;
+  if (settings.projectPath !== previousPath) return null;
+  return { ...settings, projectPath: newPath };
+}

docs/user-guide/settings.md

@@ -89,7 +89,9 @@ Two deliberate limits are worth knowing:
 - **A URL always wins.** Launching with a project or `?data=` parameter in the URL skips the startup restore entirely, and so does opening your own project before the restore finishes.
 
 !!! note "Android reopens its own copy"
-    Android identifies a project picked from device storage by a temporary reference that stops working once the app's process ends — which is exactly when the startup restore runs. So on Android GeoLibre keeps a copy of the startup project in its own private storage and reopens that copy, refreshing it every time you open or save the project. Practically this means a project edited in another app after you last saved it in GeoLibre reopens as GeoLibre last saw it; open it again from **File → Open** to pick the newer contents back up.
+    Android identifies a project picked from device storage by a temporary reference that stops working once the app's process ends — which is exactly when the startup restore runs. So on Android GeoLibre keeps a copy of the startup project in its own private storage and reopens that copy, refreshing it every time you open or save the project. Two consequences worth knowing: a project edited in another app after you last saved it in GeoLibre reopens as GeoLibre last saw it (open it again from **File → Open** to pick the newer contents back up), and a project deleted from the device still reopens from GeoLibre's copy rather than dropping out of the startup preference, because Android reports a deleted file and an expired reference the same way.
+
+    Saving a project you opened from device storage asks you where to save it, once — Android does not grant write access to a file you only picked to read. If your startup project is that project, the preference follows it to the file that save creates, so it keeps opening the copy you are actually working in.
 
 ## Updates
 

tests/startup-project-settings.test.ts

@@ -4,7 +4,10 @@ import {
   DEFAULT_STARTUP_SETTINGS,
   normalizeDesktopSettings,
 } from "../apps/geolibre-desktop/src/hooks/useDesktopSettings";
-import { startupProjectPath } from "../apps/geolibre-desktop/src/lib/startup-project";
+import {
+  startupProjectPath,
+  startupSettingsAfterForcedSaveAs,
+} from "../apps/geolibre-desktop/src/lib/startup-project";
 
 describe("startup project settings", () => {
   it("defaults to the normal untitled workspace", () => {
@@ -118,3 +121,67 @@ describe("startupProjectPath", () => {
     );
   });
 });
+
+describe("startupSettingsAfterForcedSaveAs", () => {
+  // Saving a project opened through the Android document picker is refused in
+  // place and falls back to the save dialog, which creates a new document: on
+  // the emulator, saving over General_Project.geolibre.json lands on a URI
+  // ending "General_Project.geolibre.json (1)".
+  const PICKED =
+    "content://com.android.externalstorage.documents/document/primary%3AGeneral.geolibre.json";
+  const CREATED = `${PICKED}%20(1)`;
+
+  it("follows a pinned project to the document the save actually created", () => {
+    assert.deepEqual(
+      startupSettingsAfterForcedSaveAs(
+        { mode: "specific", projectPath: PICKED, projectName: "General" },
+        PICKED,
+        CREATED,
+      ),
+      { mode: "specific", projectPath: CREATED, projectName: "General" },
+    );
+  });
+
+  it("leaves a preference pinned to some other project alone", () => {
+    assert.equal(
+      startupSettingsAfterForcedSaveAs(
+        { mode: "specific", projectPath: "/tmp/pinned.geolibre.json", projectName: "Pinned" },
+        PICKED,
+        CREATED,
+      ),
+      null,
+    );
+  });
+
+  it("does nothing for the modes that resolve a path of their own", () => {
+    assert.equal(
+      startupSettingsAfterForcedSaveAs(
+        { mode: "last", projectPath: null, projectName: null },
+        PICKED,
+        CREATED,
+      ),
+      null,
+    );
+    assert.equal(startupSettingsAfterForcedSaveAs(DEFAULT_STARTUP_SETTINGS, PICKED, CREATED), null);
+  });
+
+  it("does nothing when the save stayed where it was, or had nowhere to start", () => {
+    // The desktop case: a plain Save writes the file it opened, every time.
+    assert.equal(
+      startupSettingsAfterForcedSaveAs(
+        { mode: "specific", projectPath: PICKED, projectName: "General" },
+        PICKED,
+        PICKED,
+      ),
+      null,
+    );
+    assert.equal(
+      startupSettingsAfterForcedSaveAs(
+        { mode: "specific", projectPath: PICKED, projectName: "General" },
+        null,
+        CREATED,
+      ),
+      null,
+    );
+  });
+});