Feature/feature drafts by xkello · Pull Request #4652 · MerginMaps/mobile

xkello · 2026-08-18T06:34:36Z

Description

Adds automatic recovery of in-progress feature edits. If the app closes unexpectedly while you're editing a feature - a crash, an incoming call, a dead battery - your unsaved geometry and attribute changes are no longer lost. On the next launch you're offered the chance to resume exactly where you left off, or discard the changes.

Fixes: #4585

What changed

New FeatureDraftStorage / FeatureDraftController (app/drafts/) persist an in-progress edit (geometry + attributes) as a JSON blob via QSettings, debounced by ~1s so it isn't written on every keystroke/vertex.
AttributeController and RecordingMapTool write a draft whenever attributes or geometry are edited, and clear it once the feature is saved, deleted, or the edit is cancelled.
Before a draft is offered, it's validated: not older than 10 days, the layer/schema still matches, and (for edits) the feature still exists.
A new notification, plus resume/discard drawers, let the user act on a pending draft.
New banners on the Layers list and Features list screens surface a draft on the affected layer, reusing the existing "active filters" banner styling.
ActiveProject exposes the draft controller to QML.

Behaviour

Editing a feature's attributes or geometry saves a draft in the background about a second after the last change.
If the app is closed and reopened with a pending draft, a notification appears: "You have unsaved changes. Tap here to open them."
Tapping it - or trying to start a new "Add"/"Edit" while a draft exists - opens a drawer offering to Resume or Discard.
Resuming puts you back exactly where you left off: mid geometry capture, or on the form with the in-progress attributes.
Saving, deleting, or cancelling an edit normally clears its draft; a draft is silently discarded instead of offered if its layer was removed, its schema changed, its feature no longer exists, or it's over 10 days old.

Screen_Recording_20260818-082140_One.UI.Home.mp4

Screen_Recording_20260818-082018_One.UI.Home.mp4

Screen_Recording_20260818-082039.mp4

TLDR @Withalion

Feature edits are now drafted automatically so a crash, call, or dead battery doesn't cost you your unsaved work - surfaced via a notification and resume/discard drawers.

github-actions · 2026-08-18T06:54:53Z

Coverage Report for CI Build 35886137946

Coverage increased (+0.4%) to 59.91%

Details

Coverage increased (+0.4%) from the base build.
Patch coverage: No coverable lines changed in this PR.
607 coverage regressions across 8 files.

Uncovered Changes

No uncovered changes found.

Coverage Regressions

607 previously-covered lines in 8 files lost coverage.

File	Lines Losing Coverage	Coverage
mm/app/maptools/recordingmaptool.cpp	216	70.63%
mm/app/attributes/attributecontroller.cpp	193	76.21%
mm/app/main.cpp	99	36.29%
mm/app/activeproject.cpp	67	70.52%
mm/app/notificationmodel.cpp	21	48.45%
mm/app/maptools/recordingmaptool.h	4	50.0%
mm/core/merginuserinfo.cpp	4	77.12%
mm/app/notificationmodel.h	3	50.0%

Coverage Stats


Relevant Lines:	16014
Covered Lines:	9594
Line Coverage:	59.91%
Coverage Strength:	92.8 hits per line

💛 - Coveralls

github-actions · 2026-08-18T07:06:32Z

📦 Build Artifacts Ready

OS	Status	Build	Info	Workflow run
macOS Build	❌	Build failed or not found.		#7166
linux Build	📬	Mergin Maps 71921 x86_64	Expires: 16/11/2026	#7192
win64 Build	📬	Mergin Maps 63681 win64	Expires: 16/11/2026	#6368
Android Build	📬	Mergin Maps 847751 APK [arm64-v8a]	Expires: 16/11/2026	#8477
	📬	Mergin Maps 847751 APK [arm64-v8a]	Google Play Store	#8477
Android Build	📬	Mergin Maps 847711 APK [armeabi-v7a]	Expires: 16/11/2026	#8477
	📬	Mergin Maps 847711 APK [armeabi-v7a]	Google Play Store	#8477
iOS Build	📬		Build number: 26.08.941811	#9418

Withalion

Great job, it looks very promising! There are some trivial things, a bit more refactoring is needed, but mainly unit tests.

UI/UX

It would be nice to navigate to the geometry you will be recording further after you open the draft
After user is done recording geometry and doesn't fill out anything in the form yet, application crashes. We should open the form right away and not the geometry recording
When a draft is available and an existing feature is clicked to edit the warning drawer opens and closes right away
When a draft is available and "add" button is clicked, the drawer opens correctly, but discarding draft doesn't start recording mode, but stays in "view" mode of map

Withalion

Great job, it looks very promising! There are some trivial things, a bit more refactoring is needed, but mainly unit tests.

UI/UX

It would be nice to navigate to the geometry you will be recording further after you open the draft
After user is done recording geometry and doesn't fill out anything in the form yet, application crashes. We should open the form right away and not the geometry recording
When a draft is available and an existing feature is clicked to edit the warning drawer opens and closes right away
When a draft is available and "add" button is clicked, the drawer opens correctly, but discarding draft doesn't start recording mode, but stays in "view" mode of map

github-actions · 2026-09-23T16:39:55Z

📦 Build Artifacts Ready

OS	Status	Build	Info	Workflow run
macOS Build	📬	Mergin Maps 73291 dmg	Expires: 22/12/2026	#7329
linux Build	📬	Mergin Maps 73551 x86_64	Expires: 22/12/2026	#7355
win64 Build	📬	Mergin Maps 65311 win64	Expires: 22/12/2026	#6531
Android Build	📬	Mergin Maps 864151 APK [arm64-v8a]	Expires: 22/12/2026	#8641
	📬		Google Play Store	#8641
Android Build	📬	Mergin Maps 864111 APK [armeabi-v7a]	Expires: 22/12/2026	#8641
	📬		Google Play Store	#8641
iOS Build	📬		Build number: 26.09.958111	#9581

tomasMizera

Nice! :)

When testing, let's try it out on some low-end devices to see if the 1 second interval is not causing too much slowness in UI. If so, we might need to move the saving part to another thread.

In general, this is going in a very good direction, I believe we will have this ready for testing soon.

tomasMizera · 2026-09-29T09:10:27Z

+    // geometry edits round-trip back into this same setter (via the live QML
+    // binding once the geometry-editing map tool hands the feature back) - that
+    // must not wipe attribute changes already tracked for this same feature
+    bool isSameFeature = !hasLayerChanged && mFeatureLayerPair.feature().id() == pair.feature().id();


Why not? Can't we simply store draft immediately? What is the problem with it?

tomasMizera · 2026-09-29T09:10:44Z

+    {
+      mTouchedFieldIndices.clear();
+
+      // draft immediately so a crash before the first keystroke still resumes into the form


We actually do that here :)

tomasMizera · 2026-09-29T09:28:45Z

+  // only touched fields are drafted - an untouched one falls back to its
+  // default value expression on resume rather than a stale recorded value


I'd prefer if we stored everything, not just selected fields. Imagine there are automatic field values that are changed when a different field changes. They would not get stored. Let's instead try storing everything and when opening the feature again, do not evaluate anything, just present what we stored.

tomasMizera · 2026-09-29T09:35:37Z

+  connect( this, &RecordingMapTool::recordedGeometryChanged, this, [ this ]()
+  {
+    mDraftSaveTimer->start();
+  } );


The signal sounds good to me too for now.

tomasMizera · 2026-09-29T09:41:06Z

+  mActiveLayer->endEditCommand();
+
+  mRecordedGeometry = geometry;
+  mActiveLayer->beginEditCommand( QStringLiteral( "Resume feature" ) );


I do not think we need edit command for resuming. It also does not have any end command associated.

tomasMizera · 2026-09-29T10:21:35Z

+    QTimer mDraftSaveTimer; // debounces saveDraft()
+
+    //! Indices of fields the user has actually changed this session, used for drafting
+    QSet<int> mTouchedFieldIndices;


We should not need this. Simply store everything whenever an attribute is changed

tomasMizera · 2026-09-29T10:24:20Z

+
+void FeatureDraftController::checkForDraft()
+{
+  const QString projectId = QgsProject::instance()->homePath();


This one's not resolved and I am +1 to use project IDs instead of homepath.

tomasMizera · 2026-09-29T10:30:11Z

+
+      // push into the layer too, so the map shows the resumed shape right away
+      // instead of the stale committed one until the next vertex edit
+      layer->startEditing();


Note that this action may fail

tomasMizera · 2026-09-29T10:31:07Z

+  setDraft( true, layer, toQmlStage( draft.stage ), draft.isExistingFeature(), featureTitle );
+}
+
+FeatureLayerPair FeatureDraftController::resumeDraft()


Maybe loadDraft would better say what this method is doing

tomasMizera · 2026-09-29T10:33:33Z

+    featureTitle: __activeProject.featureDraftController.draftFeatureTitle
+    layerName: __activeProject.featureDraftController.draftLayerName
+
+    onResumeClicked: () => root.resumeDraft()


Why are we ignoring the returned feature? We need to open form of the drafted feature, the one that is currently open might not be the one..

xkello requested a review from Withalion August 18, 2026 06:34

Withalion reviewed Aug 20, 2026

View reviewed changes

Richard Kello and others added 3 commits September 23, 2026 17:56

Add feature drafts

93ae4f9

Add redraw for when user goes from form to geometry

ca31b75

Add code change requests

d02dcfb

xkello force-pushed the feature/feature-drafts branch from b242e2a to d02dcfb Compare September 23, 2026 16:00

Update code layout

0a15ce8

xkello requested a review from Withalion September 23, 2026 16:05

tomasMizera requested changes Sep 29, 2026

View reviewed changes

		// only touched fields are drafted - an untouched one falls back to its
		// default value expression on resume rather than a stale recorded value

Conversation

xkello commented Aug 18, 2026

Description

What changed

Behaviour

TLDR @Withalion

Uh oh!

github-actions Bot commented Aug 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Coverage Report for CI Build 35886137946

Coverage increased (+0.4%) to 59.91%

Details

Uncovered Changes

Coverage Regressions

Coverage Stats

💛 - Coveralls

Uh oh!

github-actions Bot commented Aug 18, 2026

📦 Build Artifacts Ready

Uh oh!

Withalion left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Withalion left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Sep 23, 2026

📦 Build Artifacts Ready

Uh oh!

tomasMizera left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

github-actions Bot commented Aug 18, 2026 •

edited

Loading