Commit 2771f74
committed
fix(android): reopen the startup project after the app process restarts (#1948)
On Android, both startup modes fell back to the default workspace on every cold
start and showed "The startup project is unavailable."
Two things were in the way. `openRecentProjectFile` sends the stored path to the
`read_project_file` Tauri command, whose guard requires a filesystem path, so a
`content://` URI was refused before anything was read. Routing content URIs
through `tauri-plugin-fs` instead (it resolves them via Android's
ContentResolver) gets past that, but only until the process ends:
`tauri-plugin-dialog`'s `open()` launches `ACTION_GET_CONTENT`, whose read grant
is tied to the activity that received it and cannot be renewed from inside the
app - a persistable grant needs `ACTION_OPEN_DOCUMENT` plus
`takePersistableUriPermission`, neither of which the plugin issues. The startup
restore runs exactly once per cold start, which is exactly when that grant is
gone, so the feature could never work there. This is the read-side half of the
problem #1833 fixed for saving.
So GeoLibre keeps its own copy. `lib/startup-project-snapshot.ts` writes the
project text into the app's private data directory whenever the startup
preference points at the project being opened or saved, and
`openRecentProjectFile` falls back to that copy when the original URI can no
longer be read. Two fixed slots ("specific" and "last") rather than one file per
project: the preference can only ever restore two projects, and a fixed pair
needs no pruning - which would need an `fs:allow-remove` scope the app
deliberately does not grant outside its own temp files.
Committing the preference in Settings also copies the project right then, via
`ensureStartupProjectSnapshot`. That is the path the report describes - open a
project, then ask for it back on the next launch - and nothing else re-reads the
project in between, so without it the preference would be saved with no copy
behind it.
Everything is gated on the path being a content URI, so desktop keeps re-reading
the real file and never doubles a project on disk. A copy over 25 MB is skipped
(the ceiling already applied to a project fetched by URL) rather than duplicating
hundreds of megabytes of embedded vector data on a phone. The source path must
match exactly, so a copy can never stand in for a different project, and a
`RecentProjectGoneError` still means gone - a deleted file is not resurrected
from a stale copy. Every failure is logged and swallowed: the copy is a fallback
for a later launch and must never fail the open or save that triggered it.
The `fs:scope` entry in the capability is required, not incidental. An fs
permission's scope applies only to the commands that permission grants, so
`fs:default`'s app-directory scope reaches `read_text_file` but not `mkdir` or
`write_text_file`; without the entry every copy fails with "forbidden path"
(caught on the emulator, not by inspection).
Verified on an Android 16 emulator with the reporter's own steps and a project at
the path from the report, /sdcard/Documents/json/General_Project.geolibre.json:
open it through the document picker, set the startup preference, force-stop, cold
start. Before the change the log shows "Could not restore the startup project ...
requires that you obtain access using ACTION_OPEN_DOCUMENT"; after it, both
"Reopen the last project" and "Open a specific project" come back with the
project, its layer, and its camera, no banner, and the log shows the fallback
taking over from the dead URI.
Fixes #19481 parent 5f28f0c commit 2771f74
9 files changed
Lines changed: 692 additions & 6 deletions
File tree
- apps/geolibre-desktop
- src-tauri/capabilities
- src
- components/layout
- hooks
- lib
- docs/user-guide
- tests
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
27 | 35 | | |
28 | 36 | | |
29 | 37 | | |
| |||
Lines changed: 8 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
99 | | - | |
| 99 | + | |
100 | 100 | | |
101 | 101 | | |
102 | 102 | | |
| |||
1189 | 1189 | | |
1190 | 1190 | | |
1191 | 1191 | | |
| 1192 | + | |
| 1193 | + | |
| 1194 | + | |
| 1195 | + | |
| 1196 | + | |
| 1197 | + | |
| 1198 | + | |
1192 | 1199 | | |
1193 | 1200 | | |
1194 | 1201 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| 36 | + | |
36 | 37 | | |
37 | 38 | | |
| 39 | + | |
38 | 40 | | |
39 | 41 | | |
40 | 42 | | |
| |||
338 | 340 | | |
339 | 341 | | |
340 | 342 | | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
341 | 356 | | |
342 | 357 | | |
343 | 358 | | |
344 | 359 | | |
345 | 360 | | |
346 | 361 | | |
347 | 362 | | |
| 363 | + | |
348 | 364 | | |
349 | 365 | | |
350 | 366 | | |
| |||
1107 | 1123 | | |
1108 | 1124 | | |
1109 | 1125 | | |
| 1126 | + | |
| 1127 | + | |
| 1128 | + | |
1110 | 1129 | | |
1111 | 1130 | | |
1112 | 1131 | | |
| |||
Lines changed: 246 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
0 commit comments