🐛 Fix date getter may failed when nothing in storage.

openjmu · Feb 18, 2020 · 44a25c3 · 44a25c3
1 parent 16d0075
commit 44a25c3
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/lib/providers/date_provider.dart b/lib/providers/date_provider.dart
@@ -46,7 +46,7 @@ class DateProvider extends ChangeNotifier {
   Future<void> initCurrentWeek() async {
     final _dateInCache = HiveBoxes.startWeekBox.get('startDate');
     if (_dateInCache != null) _startDate = _dateInCache;
-    await getCurrentWeek(init: _dateInCache == null);
+    await getCurrentWeek();
     initCurrentWeekTimer();
   }
 
@@ -55,24 +55,23 @@ class DateProvider extends ChangeNotifier {
     await HiveBoxes.startWeekBox.put('startDate', date);
   }
 
-  Future<void> getCurrentWeek({bool init = false}) async {
+  Future<void> getCurrentWeek() async {
     now = DateTime.now();
     final box = HiveBoxes.startWeekBox;
     try {
       DateTime _day;
-      if (init) {
+      _day = box.get('startDate');
+      if (_day == null) {
         final result = (await NetUtils.get(API.firstDayOfTerm)).data;
         _day = DateTime.parse(jsonDecode(result)['start']);
-      } else {
-        _day = box.get('startDate');
       }
       if (_startDate == null) {
         updateStartDate(_day);
       } else {
         if (_startDate != _day) updateStartDate(_day);
       }
 
-      final _d = startDate.difference(now).inDays;
+      final _d = _startDate.difference(now).inDays;
       if (_difference != _d) _difference = _d;
 
       final _w = -((_difference - 1) / 7).floor();
@@ -98,7 +97,7 @@ class DateProvider extends ChangeNotifier {
   void startFetchCurrentWeekTimer() {
     _fetchCurrentWeekTimer?.cancel();
     _fetchCurrentWeekTimer = Timer.periodic(30.seconds, (_) {
-      getCurrentWeek(init: true);
+      getCurrentWeek();
     });
   }
 }