π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Warn when offline codes remain without key
Neeraj Gupta8839d08959b3
diff --git a/mobile/apps/auth/lib/app/view/app.dart b/mobile/apps/auth/lib/app/view/app.dartindex 0fa2ee55f2..f5c2735c49 100644--- a/mobile/apps/auth/lib/app/view/app.dart+++ b/mobile/apps/auth/lib/app/view/app.dart@@ -23,10 +23,12 @@ import 'package:flutter_localizations/flutter_localizations.dart';class App extends StatefulWidget {final Locale? locale;final ThemeMode savedThemeMode;+ final bool hasInaccessibleOfflineCodes;const App({super.key,this.locale = const Locale("en"),this.savedThemeMode = ThemeMode.system,+ this.hasInaccessibleOfflineCodes = false,});static void setLocale(BuildContext context, Locale newLocale) {@@ -142,18 +144,24 @@ class _AppState extends State<App> with WidgetsBindingObserver {}Map<String, WidgetBuilder> get _getRoutes {- final config = Configuration.instance;- final hasOfflineAccount = config.hasOptedForOfflineMode();- final isOfflineKeyMissing =- hasOfflineAccount && config.getOfflineSecretKey() == null;return {- "/": (context) =>- config.hasConfiguredAccount() ||- (hasOfflineAccount && !isOfflineKeyMissing)- ? const HomePage()- : OnboardingPage(- showOfflineKeyUnavailableDialog: isOfflineKeyMissing,- ),+ "/": (context) {+ final config = Configuration.instance;+ final hasOfflineAccount = config.hasOptedForOfflineMode();+ final isOfflineKeyMissing =+ hasOfflineAccount && config.getOfflineSecretKey() == null;+ final shouldShowOfflineKeyUnavailableDialog =+ isOfflineKeyMissing &&+ (!config.hasConfiguredAccount() ||+ widget.hasInaccessibleOfflineCodes);+ return !shouldShowOfflineKeyUnavailableDialog &&+ (config.hasConfiguredAccount() || hasOfflineAccount)+ ? const HomePage()+ : OnboardingPage(+ showOfflineKeyUnavailableDialog:+ shouldShowOfflineKeyUnavailableDialog,+ );+ },};}diff --git a/mobile/apps/auth/lib/main.dart b/mobile/apps/auth/lib/main.dartindex 17d823df91..5239640e2b 100644--- a/mobile/apps/auth/lib/main.dart+++ b/mobile/apps/auth/lib/main.dart@@ -19,6 +19,7 @@ import 'package:ente_auth/services/window_listener_service.dart';import 'package:ente_auth/store/authenticator_db.dart';import 'package:ente_auth/store/code_display_store.dart';import 'package:ente_auth/store/code_store.dart';+import 'package:ente_auth/store/offline_authenticator_db.dart';import 'package:ente_auth/ui/home_page.dart';import 'package:ente_auth/ui/utils/icon_utils.dart';import 'package:ente_auth/utils/debug_build_flags.dart';@@ -145,10 +146,17 @@ Future<void> _runInForeground() async {rethrow;}final Locale? locale = await getLocale(noFallback: true);+ final hasInaccessibleOfflineCodes = await _hasInaccessibleOfflineCodes(+ configuration,+ );unawaited(UpdateService.instance.showUpdateNotification());runApp(AppLock(- builder: (args) => App(locale: locale, savedThemeMode: savedThemeMode),+ builder: (args) => App(+ locale: locale,+ savedThemeMode: savedThemeMode,+ hasInaccessibleOfflineCodes: hasInaccessibleOfflineCodes,+ ),debugShowCheckedModeBanner: false,lockScreen: LockScreen(configuration),enabled: await LockScreenSettings.instance.shouldShowLockScreen(),@@ -167,6 +175,20 @@ Future<void> _runInForeground() async {});}+Future<bool> _hasInaccessibleOfflineCodes(Configuration configuration) async {+ if (!configuration.hasConfiguredAccount() ||+ !configuration.hasOptedForOfflineMode() ||+ configuration.getOfflineSecretKey() != null) {+ return false;+ }+ try {+ return await OfflineAuthenticatorDB.instance.hasEntries();+ } catch (error, stackTrace) {+ _logger.severe("Failed to inspect offline codes", error, stackTrace);+ return true;+ }+}+Future _runWithLogs(Function() function, {String prefix = ""}) async {String dir = "";try {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();