Skip to content

Commit

Permalink
fix show locked home widget token
Browse files Browse the repository at this point in the history
  • Loading branch information
@frankmer
frankmer committed Feb 20, 2024
1 parent 5445d77 commit 259a63b
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 44 deletions.
18 changes: 12 additions & 6 deletions ...essors/scheme_processors/navigation_scheme_processors/home_widget_navigate_processor.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import '../../../utils/home_widget_utils.dart';
import '../../../utils/logger.dart';
import '../../../utils/riverpod_providers.dart';
import '../../../views/link_home_widget_view/link_home_widget_view.dart';
import '../../../views/main_view/main_view.dart';
import '../../../views/splash_screen/splash_screen.dart';
import 'navigation_scheme_processor_interface.dart';

Expand Down Expand Up @@ -45,7 +44,7 @@ class HomeWidgetNavigateProcessor implements NavigationSchemeProcessor {
LinkHomeWidgetView(homeWidgetId: uri.queryParameters['id']!),
);
} else {
Navigator.popUntil(context, (route) => route.settings.name == MainView.routeName);
Navigator.popUntil(context, (route) => route.isFirst);
Navigator.of(context).push(
MaterialPageRoute(
builder: (context) => LinkHomeWidgetView(homeWidgetId: uri.queryParameters['id']!),
Expand All @@ -64,18 +63,25 @@ class HomeWidgetNavigateProcessor implements NavigationSchemeProcessor {
return;
}
Logger.info('Showing otp of locked Token of homeWidget: ${uri.queryParameters['id']}', name: 'home_widget_processor.dart#_showLockedHomeWidgetProcessor');
if (!fromInit) {
Navigator.popUntil(context, (route) => route.settings.name == MainView.routeName);
}
Navigator.popUntil(context, (route) => route.isFirst);

final tokenId = await HomeWidgetUtils().getTokenIdOfWidgetId(uri.queryParameters['id']!);
if (tokenId == null) {
Logger.warning('Could not find token for widget id: ${uri.queryParameters['id']}', name: 'home_widget_processor.dart#_showLockedHomeWidgetProcessor');
return;
}
await Future.delayed(const Duration(milliseconds: 200));
if (globalRef == null) {
Logger.warning('Could not find globalRef', name: 'home_widget_processor.dart#_showLockedHomeWidgetProcessor');
return;
}
globalRef!.read(tokenProvider.notifier).showTokenById(tokenId);
final authenticated = await globalRef!.read(tokenProvider.notifier).showTokenById(tokenId);

if (authenticated) {
final folderId = globalRef!.read(tokenProvider).currentOfId(tokenId)?.folderId;
if (folderId != null) {
globalRef!.read(tokenFolderProvider.notifier).expandFolderById(folderId);
}
}
}
}
28 changes: 24 additions & 4 deletions lib/state_notifiers/token_notifier.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'dart:async';
import 'dart:convert';
import 'dart:developer';
import 'dart:io';

import 'package:base32/base32.dart';
Expand Down Expand Up @@ -134,6 +135,7 @@ class TokenNotifier extends StateNotifier<TokenState> {
}

Future<TokenState> _loadFromRepo() async {
log('_loadFromRepo');
List<Token> tokens;
loadingRepo = Future(
() async {
Expand Down Expand Up @@ -207,28 +209,36 @@ class TokenNotifier extends StateNotifier<TokenState> {
await updatingTokens;
}

Future<void> showToken(Token token) async {
Future<bool> showToken(Token token) async {
await updatingTokens;
log('showToken');
updatingTokens = Future(() async {
final authenticated = await lockAuth(localizedReason: AppLocalizations.of(globalNavigatorKey.currentContext!)!.authenticateToShowOtp);
log('authenticated: $authenticated');
if (!authenticated) return null;
await loadingRepo;
token = state.currentOf(token)?.copyWith(isHidden: false) ?? token.copyWith(isHidden: false);
log('token: $token');
return _addOrReplaceTokens([token]);
});
await updatingTokens;
final authenticated = (await updatingTokens)?.isNotEmpty ?? false;
log('authenticated_2: $authenticated');
_timers[token.id]?.cancel();
_timers[token.id] = Timer(token.showDuration, () async {
log('hideToken');
await hideToken(token);
log('hideToken_2');
});
return authenticated;
}

Future<void> showTokenById(String tokenId) async {
Future<bool> showTokenById(String tokenId) async {
await updatingTokens;
final token = getTokenFromId(tokenId);
if (token != null) {
await showToken(token);
return await showToken(token);
}
return false;
}

Future<void> addOrReplaceToken(Token token) async {
Expand Down Expand Up @@ -256,7 +266,9 @@ class TokenNotifier extends StateNotifier<TokenState> {
/// Always waits for updating Functions to use the latest state
Future<TokenState?> loadStateFromRepo() async {
log("loadStateFromRepo");
await updatingTokens;
log("loadStateFromRepo_2");
try {
return await _loadFromRepo();
} catch (_) {
Expand All @@ -267,6 +279,7 @@ class TokenNotifier extends StateNotifier<TokenState> {

Future<bool> saveStateToRepo() async {
await updatingTokens;
_cancelTimers();
try {
await _repo.saveOrReplaceTokens(state.tokens);
Logger.info('Saved ${state.tokens.length} Tokens to storage.', name: 'token_notifier.dart#saveStateToRepo');
Expand Down Expand Up @@ -560,4 +573,11 @@ class TokenNotifier extends StateNotifier<TokenState> {
Token? getTokenFromId(String id) {
return state.tokens.firstWhereOrNull((element) => element.id == id);
}

void _cancelTimers() {
for (final key in _timers.keys) {
_timers[key]?.cancel();
}
_timers.clear();
}
}
29 changes: 15 additions & 14 deletions lib/views/splash_screen/splash_screen.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,23 +78,23 @@ class _SplashScreenState extends ConsumerState<SplashScreen> {

Future<void> _navigate() async {
SplashScreen.didNavigated = true;
await Future.wait([
if (SplashScreen._initialView != null)
Navigator.push<bool>(
context,
PageRouteBuilder(
pageBuilder: (_, __, ___) => SplashScreen._initialView!,
transitionDuration: _splashScreenDuration,
transitionsBuilder: (_, a, __, view) => FadeTransition(
opacity: CurvedAnimation(
curve: const Interval(0, 1, curve: Curves.easeOut),
parent: a,
),
child: view,
if (SplashScreen._initialView != null) {
await Navigator.push<bool>(
context,
PageRouteBuilder(
pageBuilder: (_, __, ___) => SplashScreen._initialView!,
transitionDuration: _splashScreenDuration,
transitionsBuilder: (_, a, __, view) => FadeTransition(
opacity: CurvedAnimation(
curve: const Interval(0, 1, curve: Curves.easeOut),
parent: a,
),
child: view,
),
),
]);
);
}

_pushReplace();
}

Expand All @@ -117,6 +117,7 @@ class _SplashScreenState extends ConsumerState<SplashScreen> {
: PageRouteBuilder(
pageBuilder: (_, __, ___) => nextView,
);
Navigator.of(context).popUntil((route) => route.isFirst);
Navigator.pushReplacement(context, routeBuilder);
}

Expand Down
64 changes: 44 additions & 20 deletions pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,10 +237,10 @@ packages:
dependency: transitive
description:
name: coverage
sha256: "595a29b55ce82d53398e1bcc2cba525d7bd7c59faeb2d2540e9d42c390cfeeeb"
sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76"
url: "https://pub.dev"
source: hosted
version: "1.6.4"
version: "1.7.2"
cross_file:
dependency: transitive
description:
Expand Down Expand Up @@ -365,10 +365,10 @@ packages:
dependency: transitive
description:
name: file
sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
url: "https://pub.dev"
source: hosted
version: "6.1.4"
version: "7.0.0"
file_selector:
dependency: "direct main"
description:
Expand Down Expand Up @@ -788,6 +788,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "6.7.1"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev"
source: hosted
version: "2.0.1"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev"
source: hosted
version: "2.0.1"
lints:
dependency: transitive
description:
Expand Down Expand Up @@ -872,18 +896,18 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.8.0"
material_design_icons_flutter:
dependency: "direct main"
description:
Expand All @@ -896,10 +920,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
mime:
dependency: transitive
description:
Expand Down Expand Up @@ -984,10 +1008,10 @@ packages:
dependency: transitive
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
path_provider:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1103,10 +1127,10 @@ packages:
dependency: transitive
description:
name: platform
sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102
sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
url: "https://pub.dev"
source: hosted
version: "3.1.2"
version: "3.1.4"
plugin_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -1135,10 +1159,10 @@ packages:
dependency: transitive
description:
name: process
sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09"
sha256: "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32"
url: "https://pub.dev"
source: hosted
version: "4.2.4"
version: "5.0.2"
protobuf:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1532,10 +1556,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: c538be99af830f478718b51630ec1b6bee5e74e52c8a802d328d9e71d35d2583
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev"
source: hosted
version: "11.10.0"
version: "13.0.0"
watcher:
dependency: transitive
description:
Expand Down Expand Up @@ -1564,10 +1588,10 @@ packages:
dependency: transitive
description:
name: webdriver
sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49"
sha256: "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e"
url: "https://pub.dev"
source: hosted
version: "3.0.2"
version: "3.0.3"
webkit_inspection_protocol:
dependency: transitive
description:
Expand Down

0 comments on commit 259a63b

Please sign in to comment.