π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Adjust app lock resume handling
Neeraj Guptadb4efb3c58fc
diff --git a/mobile/packages/lock_screen/lib/ui/app_lock.dart b/mobile/packages/lock_screen/lib/ui/app_lock.dartindex 3eb2ca4a12..c7306945fd 100644--- a/mobile/packages/lock_screen/lib/ui/app_lock.dart+++ b/mobile/packages/lock_screen/lib/ui/app_lock.dart@@ -3,6 +3,9 @@ import 'dart:async';import "package:ente_lock_screen/lock_screen_settings.dart";import 'package:flutter/material.dart';+@visibleForTesting+const appLockContentObscurerKey = ValueKey('app_lock_content_obscurer');+/// A widget which handles app lifecycle events for showing and hiding a lock screen./// This should wrap around a `MyApp` widget (or equivalent).///@@ -73,6 +76,7 @@ class _AppLockState extends State<AppLock> with WidgetsBindingObserver {late bool _isLocked;late bool _enabled;late ThemeMode _themeMode;+ int? _backgroundedAt;Timer? _backgroundLockLatencyTimer;@@ -104,14 +108,31 @@ class _AppLockState extends State<AppLock> with WidgetsBindingObserver {if (state == AppLifecycleState.paused &&(!this._isLocked && this._didUnlockForAppLaunch)) {+ this._backgroundedAt = DateTime.now().millisecondsSinceEpoch;+ this._setLocked(true);this._backgroundLockLatencyTimer = Timer(Duration(milliseconds: LockScreenSettings.instance.getAutoLockTime()),- () => this.showLockScreen(),+ () {+ this._backgroundedAt = null;+ unawaited(this.showLockScreen());+ },);}if (state == AppLifecycleState.resumed) {this._backgroundLockLatencyTimer?.cancel();+ final int? backgroundedAt = this._backgroundedAt;+ this._backgroundedAt = null;++ if (backgroundedAt != null) {+ final int elapsed =+ DateTime.now().millisecondsSinceEpoch - backgroundedAt;+ if (elapsed >= LockScreenSettings.instance.getAutoLockTime()) {+ unawaited(this.showLockScreen());+ } else {+ this._setLocked(false);+ }+ }}super.didChangeAppLifecycleState(state);@@ -130,7 +151,9 @@ class _AppLockState extends State<AppLock> with WidgetsBindingObserver {Widget build(BuildContext context) {return MaterialApp(debugShowCheckedModeBanner: widget.debugShowCheckedModeBanner,- home: this.widget.enabled ? this._lockScreen : this.widget.builder(null),+ home: this.widget.enabled+ ? this._lockScreen+ : this._unlockedContent(null),navigatorKey: _navigatorKey,themeMode: this._themeMode,theme: widget.lightTheme,@@ -149,7 +172,8 @@ class _AppLockState extends State<AppLock> with WidgetsBindingObserver {);case '/unlocked':return PageRouteBuilder(- pageBuilder: (_, _, _) => this.widget.builder(settings.arguments),+ pageBuilder: (_, _, _) =>+ this._unlockedContent(settings.arguments),settings: settings,);}@@ -162,6 +186,26 @@ class _AppLockState extends State<AppLock> with WidgetsBindingObserver {return PopScope(canPop: false, child: this.widget.lockScreen);}+ Widget _unlockedContent(Object? args) {+ return Stack(+ fit: StackFit.expand,+ children: [+ this.widget.builder(args),+ if (this._isLocked)+ Positioned.fill(+ key: appLockContentObscurerKey,+ child: AbsorbPointer(+ child: Builder(+ builder: (context) => ColoredBox(+ color: Theme.of(context).scaffoldBackgroundColor,+ ),+ ),+ ),+ ),+ ],+ );+ }+/// Causes `AppLock` to either pop the [lockScreen] if the app is already running/// or instantiates widget returned from the [builder] method if the app is cold/// launched.@@ -218,7 +262,7 @@ class _AppLockState extends State<AppLock> with WidgetsBindingObserver {/// Show the [lockScreen] for automatic locking (app launch, background resume).Future<void> showLockScreen() {- this._isLocked = true;+ this._setLocked(true);return _navigatorKey.currentState!.pushNamed('/lock-screen',arguments: {"manual": false},@@ -227,7 +271,7 @@ class _AppLockState extends State<AppLock> with WidgetsBindingObserver {/// Show the [lockScreen] for user-initiated manual lock (no auto-auth on first frame).Future<void> showManualLockScreen() {- this._isLocked = true;+ this._setLocked(true);return _navigatorKey.currentState!.pushNamed('/lock-screen',arguments: {"manual": true},@@ -243,7 +287,20 @@ class _AppLockState extends State<AppLock> with WidgetsBindingObserver {}void _didUnlockOnAppPaused() {- this._isLocked = false;+ this._setLocked(false);_navigatorKey.currentState!.pop();}++ void _setLocked(bool locked) {+ if (this._isLocked == locked) {+ return;+ }+ if (!mounted) {+ this._isLocked = locked;+ return;+ }+ setState(() {+ this._isLocked = locked;+ });+ }}diff --git a/mobile/packages/lock_screen/test/app_lock_test.dart b/mobile/packages/lock_screen/test/app_lock_test.dartindex 4caddb2ef6..68e1d09571 100644--- a/mobile/packages/lock_screen/test/app_lock_test.dart+++ b/mobile/packages/lock_screen/test/app_lock_test.dart@@ -49,18 +49,58 @@ void main() {final materialApp = tester.widget<MaterialApp>(find.byType(MaterialApp));expect(materialApp.debugShowCheckedModeBanner, isFalse);});++ testWidgets('covers unlocked content until unlock', (tester) async {+ await tester.pumpWidget(+ _buildAppLock(+ ThemeMode.light,+ child: Builder(+ builder: (context) => GestureDetector(+ behavior: HitTestBehavior.opaque,+ onTap: () => AppLock.of(context)!.showLockScreen(),+ child: const Text('secret content'),+ ),+ ),+ lockScreen: Builder(+ builder: (context) => TextButton(+ onPressed: () => AppLock.of(context)!.didUnlock(),+ child: const Text('Unlock'),+ ),+ ),+ ),+ );++ final obscurer = find.byKey(appLockContentObscurerKey, skipOffstage: false);++ expect(obscurer, findsNothing);++ await tester.tap(find.text('secret content'));+ await tester.pumpAndSettle();++ expect(obscurer, findsOneWidget);++ await tester.pump(const Duration(seconds: 1));++ expect(obscurer, findsOneWidget);++ await tester.tap(find.text('Unlock'));+ await tester.pumpAndSettle();++ expect(obscurer, findsNothing);+ });}Widget _buildAppLock(ThemeMode savedThemeMode, {Widget? child,+ Widget lockScreen = const SizedBox.shrink(),bool debugShowCheckedModeBanner = true,}) {return AppLock(builder: (_) =>child ??Builder(builder: (context) => Text(Theme.of(context).brightness.name)),- lockScreen: const SizedBox.shrink(),+ lockScreen: lockScreen,enabled: false,savedThemeMode: savedThemeMode,lightTheme: ThemeData(brightness: Brightness.light),