π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
refactor: streamline data loading and unsaved changes detection in multiple pages
AmanRajSinghMourya5aef732e086f
diff --git a/mobile/apps/locker/lib/ui/pages/account_credentials_page.dart b/mobile/apps/locker/lib/ui/pages/account_credentials_page.dartindex c1fb265702..0ff5509ce3 100644--- a/mobile/apps/locker/lib/ui/pages/account_credentials_page.dart+++ b/mobile/apps/locker/lib/ui/pages/account_credentials_page.dart@@ -22,27 +22,28 @@ class _AccountCredentialsPageStatefinal TextEditingController _usernameController = TextEditingController();final TextEditingController _passwordController = TextEditingController();final TextEditingController _notesController = TextEditingController();+ String _initialName = '';+ String _initialUsername = '';+ String _initialPassword = '';+ String _initialNotes = '';@override- void initState() {- super.initState();- _loadExistingData();- }-- void _loadExistingData() {+ void loadExistingData() {final data = currentData;- if (data != null) {- _nameController.text = data.name;- _usernameController.text = data.username;- _passwordController.text = data.password;- _notesController.text = data.notes ?? '';- }+ _nameController.text = data?.name ?? '';+ _usernameController.text = data?.username ?? '';+ _passwordController.text = data?.password ?? '';+ _notesController.text = data?.notes ?? '';+ _initialName = _nameController.text;+ _initialUsername = _usernameController.text;+ _initialPassword = _passwordController.text;+ _initialNotes = _notesController.text;}@overridevoid refreshUIWithCurrentData() {super.refreshUIWithCurrentData();- _loadExistingData();+ loadExistingData();}@override@@ -89,6 +90,14 @@ class _AccountCredentialsPageState_passwordController.text.trim().isNotEmpty;}+ @override+ bool get hasUnsavedChanges {+ return _nameController.text.trim() != _initialName.trim() ||+ _usernameController.text.trim() != _initialUsername.trim() ||+ _passwordController.text.trim() != _initialPassword.trim() ||+ _notesController.text.trim() != _initialNotes.trim();+ }+@overrideAccountCredentialData createInfoData() {return AccountCredentialData(diff --git a/mobile/apps/locker/lib/ui/pages/base_info_page.dart b/mobile/apps/locker/lib/ui/pages/base_info_page.dartindex 9b8df4362c..6b127ab89c 100644--- a/mobile/apps/locker/lib/ui/pages/base_info_page.dart+++ b/mobile/apps/locker/lib/ui/pages/base_info_page.dart@@ -5,6 +5,7 @@ import 'package:ente_events/event_bus.dart';import 'package:ente_strings/ente_strings.dart';import 'package:ente_ui/utils/toast_util.dart';import "package:ente_utils/email_util.dart";+import 'package:flutter/foundation.dart';import 'package:flutter/material.dart';import 'package:flutter/services.dart';import 'package:hugeicons/hugeicons.dart';@@ -59,6 +60,7 @@ abstract class BaseInfoPageState<T extends InfoData, W extends BaseInfoPage<T>>// Collection selection stateList<Collection> _availableCollections = [];Set<int> _selectedCollectionIds = {};+ Set<int> _initialSelectedCollectionIds = {};bool _hasLoadedCollectionSelection = false;// Getter for current data - prioritizes updated data over existing file data@@ -93,6 +95,13 @@ abstract class BaseInfoPageState<T extends InfoData, W extends BaseInfoPage<T>>List<Widget> buildViewFields();bool validateForm();+ @protected+ bool get hasUnsavedChanges;++ @protected+ String get discardChangesDescription =>+ context.strings.unsavedChangesDescription;+bool get showCollectionSelectionTitle => true;double get collectionSpacing => 24;double get viewModeBottomPadding => 20;@@ -124,6 +133,20 @@ abstract class BaseInfoPageState<T extends InfoData, W extends BaseInfoPage<T>>@protectedFuture<bool> onEditModeBackPressed() async {+ final hasCollectionChanges = !setEquals(+ _selectedCollectionIds,+ _initialSelectedCollectionIds,+ );+ if (!hasUnsavedChanges && !hasCollectionChanges) {+ return true;+ }++ final shouldDiscard = await _showDiscardChangesDialog();+ if (!shouldDiscard) {+ return false;+ }++ _restoreEditSession();return true;}@@ -211,6 +234,7 @@ abstract class BaseInfoPageState<T extends InfoData, W extends BaseInfoPage<T>>setState(() {_availableCollections = filteredCollections;_selectedCollectionIds = initialSelection;+ _initialSelectedCollectionIds = Set<int>.of(initialSelection);_hasLoadedCollectionSelection = true;});} catch (e) {@@ -257,6 +281,8 @@ abstract class BaseInfoPageState<T extends InfoData, W extends BaseInfoPage<T>>}if (mounted && widget.existingFile != null) {+ _captureEditSessionState();+// Switch to view mode with updated datasetState(() {_currentMode = InfoPageMode.view;@@ -494,6 +520,10 @@ abstract class BaseInfoPageState<T extends InfoData, W extends BaseInfoPage<T>>}void _toggleMode() {+ if (isInViewMode) {+ _captureEditSessionState();+ }+setState(() {_currentMode = _currentMode == InfoPageMode.view? InfoPageMode.edit@@ -509,6 +539,37 @@ abstract class BaseInfoPageState<T extends InfoData, W extends BaseInfoPage<T>>);}+ void _captureEditSessionState() {+ _initialSelectedCollectionIds = Set<int>.of(_selectedCollectionIds);+ }++ void _restoreEditSession() {+ loadExistingData();+ setState(() {+ _selectedCollectionIds = Set<int>.of(_initialSelectedCollectionIds);+ });+ }++ Future<bool> _showDiscardChangesDialog() async {+ final result = await showBottomSheetComponent<bool>(+ context: context,+ builder: (_) => BottomSheetComponent(+ title: context.strings.unsavedNoteChangesTitle,+ message: discardChangesDescription,+ illustration: LockerBottomSheetIllustration.warningGrey,+ actions: [+ ButtonComponent(+ label: context.strings.discardChanges,+ variant: ButtonComponentVariant.critical,+ onTap: () => Navigator.of(context).pop(true),+ ),+ ],+ ),+ );++ return result ?? false;+ }+Widget buildViewField({required String label,required String value,diff --git a/mobile/apps/locker/lib/ui/pages/emergency_contact_page.dart b/mobile/apps/locker/lib/ui/pages/emergency_contact_page.dartindex ac8db21d76..64d466851a 100644--- a/mobile/apps/locker/lib/ui/pages/emergency_contact_page.dart+++ b/mobile/apps/locker/lib/ui/pages/emergency_contact_page.dart@@ -22,26 +22,25 @@ class _EmergencyContactPageStatefinal TextEditingController _contactDetailsController =TextEditingController();final TextEditingController _notesController = TextEditingController();+ String _initialName = '';+ String _initialContactDetails = '';+ String _initialNotes = '';@override- void initState() {- super.initState();- _loadExistingData();- }-- void _loadExistingData() {+ void loadExistingData() {final data = currentData;- if (data != null) {- _nameController.text = data.name;- _contactDetailsController.text = data.contactDetails;- _notesController.text = data.notes ?? '';- }+ _nameController.text = data?.name ?? '';+ _contactDetailsController.text = data?.contactDetails ?? '';+ _notesController.text = data?.notes ?? '';+ _initialName = _nameController.text;+ _initialContactDetails = _contactDetailsController.text;+ _initialNotes = _notesController.text;}@overridevoid refreshUIWithCurrentData() {super.refreshUIWithCurrentData();- _loadExistingData();+ loadExistingData();}@override@@ -67,6 +66,14 @@ class _EmergencyContactPageState_contactDetailsController.text.trim().isNotEmpty;}+ @override+ bool get hasUnsavedChanges {+ return _nameController.text.trim() != _initialName.trim() ||+ _contactDetailsController.text.trim() !=+ _initialContactDetails.trim() ||+ _notesController.text.trim() != _initialNotes.trim();+ }+@overrideEmergencyContactData createInfoData() {return EmergencyContactData(diff --git a/mobile/apps/locker/lib/ui/pages/personal_note_page.dart b/mobile/apps/locker/lib/ui/pages/personal_note_page.dartindex a9a0e6253a..7aad0b156e 100644--- a/mobile/apps/locker/lib/ui/pages/personal_note_page.dart+++ b/mobile/apps/locker/lib/ui/pages/personal_note_page.dart@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';import 'package:locker/models/info/info_item.dart';import 'package:locker/ui/components/collection_selection_widget.dart';import 'package:locker/ui/pages/base_info_page.dart';-import "package:locker/utils/bottom_sheet_illustration.dart";class PersonalNotePage extends BaseInfoPage<PersonalNoteData> {const PersonalNotePage({@@ -205,43 +204,13 @@ class _PersonalNotePageStateonFieldChanged();}- bool get _hasUnsavedChanges {+ @override+ bool get hasUnsavedChanges {return _contentController.text.trim() != _initialContent.trim() ||_nameController.text.trim() != _initialTitle.trim();}@override- Future<bool> onEditModeBackPressed() async {- if (!_hasUnsavedChanges) {- return true;- }-- final shouldDiscard = await _showDiscardChangesDialog();- if (!shouldDiscard) {- return false;- }-- _syncControllers(triggerSetState: true, updateInitial: false);- return true;- }-- Future<bool> _showDiscardChangesDialog() async {- final result = await showBottomSheetComponent<bool>(- context: context,- builder: (_) => BottomSheetComponent(- title: context.strings.unsavedNoteChangesTitle,- message: context.strings.unsavedNoteChangesDescription,- illustration: LockerBottomSheetIllustration.warningGrey,- actions: [- ButtonComponent(- label: context.strings.discardChanges,- variant: ButtonComponentVariant.critical,- onTap: () => Navigator.of(context).pop(true),- ),- ],- ),- );-- return result ?? false;- }+ String get discardChangesDescription =>+ context.strings.unsavedNoteChangesDescription;}diff --git a/mobile/apps/locker/lib/ui/pages/physical_records_page.dart b/mobile/apps/locker/lib/ui/pages/physical_records_page.dartindex 65baf15384..d8b56537a4 100644--- a/mobile/apps/locker/lib/ui/pages/physical_records_page.dart+++ b/mobile/apps/locker/lib/ui/pages/physical_records_page.dart@@ -21,26 +21,25 @@ class _PhysicalRecordsPageStatefinal TextEditingController _nameController = TextEditingController();final TextEditingController _locationController = TextEditingController();final TextEditingController _notesController = TextEditingController();+ String _initialName = '';+ String _initialLocation = '';+ String _initialNotes = '';@override- void initState() {- super.initState();- _loadExistingData();- }-- void _loadExistingData() {+ void loadExistingData() {final data = currentData;- if (data != null) {- _nameController.text = data.name;- _locationController.text = data.location;- _notesController.text = data.notes ?? '';- }+ _nameController.text = data?.name ?? '';+ _locationController.text = data?.location ?? '';+ _notesController.text = data?.notes ?? '';+ _initialName = _nameController.text;+ _initialLocation = _locationController.text;+ _initialNotes = _notesController.text;}@overridevoid refreshUIWithCurrentData() {super.refreshUIWithCurrentData();- _loadExistingData();+ loadExistingData();}@override@@ -85,6 +84,13 @@ class _PhysicalRecordsPageState_locationController.text.trim().isNotEmpty;}+ @override+ bool get hasUnsavedChanges {+ return _nameController.text.trim() != _initialName.trim() ||+ _locationController.text.trim() != _initialLocation.trim() ||+ _notesController.text.trim() != _initialNotes.trim();+ }+@overridePhysicalRecordData createInfoData() {return PhysicalRecordData(