From 3b552e32c47a1c2e0286f8768ab3e7d47cf33e0c Mon Sep 17 00:00:00 2001
From: fuwa <fuwa25519@protonmail.com>
Date: Sat, 25 Jan 2020 05:05:42 +0000
Subject: [PATCH] use Future.delayed helper

---
 cyberwow/lib/controller/refresh.dart | 6 ++++--
 cyberwow/lib/helper.dart             | 2 ++
 cyberwow/lib/main.dart               | 2 +-
 cyberwow/lib/state/loading.dart      | 8 +++++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/cyberwow/lib/controller/refresh.dart b/cyberwow/lib/controller/refresh.dart
index 9b9ed5f..855e70c 100644
--- a/cyberwow/lib/controller/refresh.dart
+++ b/cyberwow/lib/controller/refresh.dart
@@ -27,6 +27,7 @@ import 'rpc/rpc.dart' as rpc;
 
 import '../config.dart';
 import '../logging.dart';
+import '../helper.dart';
 
 typedef GetNotificationFunc = AppLifecycleState Function();
 
@@ -37,9 +38,10 @@ Stream<Null> pull(GetNotificationFunc getNotification, final String puller) asyn
 
     if (_appState == AppLifecycleState.resumed) {
       yield null;
-      await Future.delayed(const Duration(milliseconds: 1000), () => null);
+      await tick();
     } else {
-      await Future.delayed(const Duration(seconds: 2), () => null);
+      await tick();
+      await tick();
     }
   }
 }
diff --git a/cyberwow/lib/helper.dart b/cyberwow/lib/helper.dart
index 02881c0..4cc46cf 100644
--- a/cyberwow/lib/helper.dart
+++ b/cyberwow/lib/helper.dart
@@ -69,3 +69,5 @@ List<dynamic> asList(dynamic x) => x ?? [];
 List<Map<String, dynamic>> asJsonArray(dynamic x) => x?.cast<Map<String, dynamic>>() ?? [];
 
 Map<String, dynamic> asMap(dynamic x) => x ?? {};
+
+Future<void> tick() async => await Future.delayed(const Duration(seconds: 1));
diff --git a/cyberwow/lib/main.dart b/cyberwow/lib/main.dart
index a249984..02f5702 100644
--- a/cyberwow/lib/main.dart
+++ b/cyberwow/lib/main.dart
@@ -199,7 +199,7 @@ class _CyberWOW_PageState extends State<CyberWOW_Page> with WidgetsBindingObserv
     _exiting = true;
     inputStreamController.sink.add('exit');
 
-    await Future.delayed(const Duration(seconds: 5), () => null);
+    await Future.delayed(const Duration(seconds: 5));
 
     // the process controller should call exit(0) for us
     log.warning('Daemon took too long to shut down!');
diff --git a/cyberwow/lib/state/loading.dart b/cyberwow/lib/state/loading.dart
index 10d7357..3db022e 100644
--- a/cyberwow/lib/state/loading.dart
+++ b/cyberwow/lib/state/loading.dart
@@ -24,6 +24,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import '../controller/helper.dart';
 import '../config.dart' as config;
 import '../logging.dart';
+import '../helper.dart';
 
 import 'prototype.dart';
 import 'syncing.dart';
@@ -49,10 +50,11 @@ class LoadingState extends AppState {
 
       for (final String char in chars) {
         append(char);
-        await Future.delayed(Duration(milliseconds: config.c.splashDelay), () => "1");
+        await Future.delayed(Duration(milliseconds: config.c.splashDelay));
       }
 
-      await Future.delayed(const Duration(seconds: 2), () => "1");
+      await tick();
+      await tick();
     }
 
     SharedPreferences _prefs = await SharedPreferences.getInstance();
@@ -60,7 +62,7 @@ class LoadingState extends AppState {
 
     if (_bannerShown == null) {
       await showBanner();
-      _prefs.setBool(config.bannerShownKey, true);
+      await _prefs.setBool(config.bannerShownKey, true);
     }
 
     SyncingState _next = SyncingState(appHook);