π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Recover offline mode without losing codes
Neeraj Gupta27a0da189f0b
diff --git a/mobile/apps/auth/lib/app/view/app.dart b/mobile/apps/auth/lib/app/view/app.dartindex 0fa2ee55f2..7a94fc5250 100644--- a/mobile/apps/auth/lib/app/view/app.dart+++ b/mobile/apps/auth/lib/app/view/app.dart@@ -151,9 +151,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {config.hasConfiguredAccount() ||(hasOfflineAccount && !isOfflineKeyMissing)? const HomePage()- : OnboardingPage(- showOfflineKeyUnavailableDialog: isOfflineKeyMissing,- ),+ : OnboardingPage(recoverOfflineMode: isOfflineKeyMissing),};}diff --git a/mobile/apps/auth/lib/core/configuration.dart b/mobile/apps/auth/lib/core/configuration.dartindex 50b7375b5e..9f29d94beb 100644--- a/mobile/apps/auth/lib/core/configuration.dart+++ b/mobile/apps/auth/lib/core/configuration.dart@@ -94,15 +94,15 @@ class Configuration extends BaseConfiguration}Future<void> optForOfflineMode() async {- if ((await _secureStorage.containsKey(key: offlineAuthSecretKey))) {- _offlineAuthKey = await _secureStorage.read(key: offlineAuthSecretKey);- } else {- _offlineAuthKey = CryptoUtil.bin2base64(CryptoUtil.generateKey());+ var offlineAuthKey = await _secureStorage.read(key: offlineAuthSecretKey);+ if (offlineAuthKey == null) {+ offlineAuthKey = CryptoUtil.bin2base64(CryptoUtil.generateKey());await _secureStorage.write(key: offlineAuthSecretKey,- value: _offlineAuthKey,+ value: offlineAuthKey,);}+ _offlineAuthKey = offlineAuthKey;await _preferences.setBool(hasOptedForOfflineModeKey, true);}diff --git a/mobile/apps/auth/lib/onboarding/view/onboarding_page.dart b/mobile/apps/auth/lib/onboarding/view/onboarding_page.dartindex ba436160a6..6d63eb515d 100644--- a/mobile/apps/auth/lib/onboarding/view/onboarding_page.dart+++ b/mobile/apps/auth/lib/onboarding/view/onboarding_page.dart@@ -11,6 +11,7 @@ import 'package:ente_auth/app/view/app.dart';import 'package:ente_auth/core/configuration.dart';import 'package:ente_auth/events/trigger_logout_event.dart';import 'package:ente_auth/locale.dart';+import 'package:ente_auth/store/offline_authenticator_db.dart';import 'package:ente_auth/theme/colors.dart';import 'package:ente_auth/theme/ente_theme.dart';import 'package:ente_auth/ui/account/logout_dialog.dart';@@ -34,12 +35,9 @@ import 'package:flutter_svg/flutter_svg.dart';import 'package:local_auth/local_auth.dart';class OnboardingPage extends StatefulWidget {- final bool showOfflineKeyUnavailableDialog;+ final bool recoverOfflineMode;- const OnboardingPage({- super.key,- this.showOfflineKeyUnavailableDialog = false,- });+ const OnboardingPage({super.key, this.recoverOfflineMode = false});@overrideState<OnboardingPage> createState() => _OnboardingPageState();@@ -58,6 +56,7 @@ class _OnboardingPageState extends State<OnboardingPage> {int _activeDotIndex = 0;int _currentPage = 0;bool _autoScrollDisabled = false;+ bool _isRecoveringOfflineMode = false;@overridevoid initState() {@@ -73,20 +72,9 @@ class _OnboardingPageState extends State<OnboardingPage> {await autoLogoutAlert(context);});_startAutoScroll();- if (widget.showOfflineKeyUnavailableDialog) {+ if (widget.recoverOfflineMode) {WidgetsBinding.instance.addPostFrameCallback((_) {- if (!mounted) return;- final l10n = context.strings;- unawaited(- showErrorDialog(- context,- l10n.unableToAccessYourCodes,- l10n.offlineKeyUnavailableMessage,- isDismissable: false,- showContactSupport: false,- dismissButtonLabel: l10n.ok,- ),- );+ unawaited(_recoverOfflineMode());});}super.initState();@@ -275,6 +263,11 @@ class _OnboardingPageState extends State<OnboardingPage> {return;}final bool hasOptedBefore = Configuration.instance.hasOptedForOfflineMode();+ if (hasOptedBefore &&+ Configuration.instance.getOfflineSecretKey() == null) {+ await _recoverOfflineMode();+ return;+ }ButtonResult? result;if (!hasOptedBefore && !shouldSkipAuthGuidance) {if (!mounted) return;@@ -304,6 +297,40 @@ class _OnboardingPageState extends State<OnboardingPage> {}}+ Future<void> _recoverOfflineMode() async {+ if (_isRecoveringOfflineMode) return;+ _isRecoveringOfflineMode = true;+ try {+ final offlineDatabase = OfflineAuthenticatorDB.instance;+ if (await offlineDatabase.hasEntries()) {+ if (!mounted) return;+ final l10n = context.strings;+ final result = await showChoiceDialog(+ context,+ title: l10n.unableToAccessYourCodes,+ body: l10n.offlineKeyUnavailableMessage,+ firstButtonLabel: l10n.startFresh,+ secondButtonLabel: l10n.cancel,+ isCritical: true,+ isDismissible: false,+ );+ if (result?.action != ButtonAction.first) return;+ await offlineDatabase.clearTable();+ }+ await Configuration.instance.optForOfflineMode();+ if (!mounted) return;+ unawaited(+ Navigator.of(context).pushReplacement(+ MaterialPageRoute(+ builder: (BuildContext context) => const HomePage(),+ ),+ ),+ );+ } finally {+ _isRecoveringOfflineMode = false;+ }+ }+void _startAutoScroll() {if (_autoScrollDisabled) {return;diff --git a/mobile/apps/auth/lib/store/offline_authenticator_db.dart b/mobile/apps/auth/lib/store/offline_authenticator_db.dartindex 9fe86f2660..12cb81c349 100644--- a/mobile/apps/auth/lib/store/offline_authenticator_db.dart+++ b/mobile/apps/auth/lib/store/offline_authenticator_db.dart@@ -146,6 +146,16 @@ class OfflineAuthenticatorDB {return _convertRows(rows);}+ Future<bool> hasEntries() async {+ final db = await instance.database;+ final rows = await db.query(+ entityTable,+ columns: ['_generatedID'],+ limit: 1,+ );+ return rows.isNotEmpty;+ }+Future<void> deleteByIDs({List<int>? generatedIDs, List<String>? ids}) async {final db = await instance.database;final batch = db.batch();diff --git a/mobile/packages/strings/lib/l10n/arb/strings_en.arb b/mobile/packages/strings/lib/l10n/arb/strings_en.arbindex aef7bcac11..6d5042e61a 100644--- a/mobile/packages/strings/lib/l10n/arb/strings_en.arb+++ b/mobile/packages/strings/lib/l10n/arb/strings_en.arb@@ -2926,7 +2926,7 @@"offlineHomeSignupBannerAction": "Back up now","offlineHomeSignupBannerDescription": "Encrypted backups across 3 locations to keep your memories safe.","offlineHomeSignupBannerTitle": "Protect your memories forever",- "offlineKeyUnavailableMessage": "The encryption key for your offline codes is unavailable. Log in or restore from a backup to continue.",+ "offlineKeyUnavailableMessage": "The encryption key for your offline codes is unavailable. Starting fresh will permanently remove these codes from this device.","offlineModeWarning": "You have chosen to proceed without backups. Please take manual backups to make sure your codes are safe.","offlineNameFaceBannerSubtitle": "Sign up to tag them and easily find their photos later.","offlineNameFaceBannerTitle": "Give this face a name",@@ -4297,6 +4297,7 @@"spotlightOnYourself": "Spotlight on yourself","stargazing": "Under the stars","startBackup": "Start backup",+ "startFresh": "Start fresh","startRecovery": "Start recovery","startRecoveryDesc": "Are you sure you want to initiate recovery for {email}'s account?","@startRecoveryDesc": {