v0.2.24 (#61)

* bumped version.

* improved collapse.

* improved download speed.

* improved err handling.

* improved error handling.

* improved error handling.

* improved logging.

* improved logging.

* bumped version.

fastlane/metadata/android/en-US/changelogs/22.txt

@@ -1 +0,0 @@
-- Bugfixes.

fastlane/metadata/android/en-US/changelogs/23.txt

@@ -1 +0,0 @@
-- Updates to UI.

fastlane/metadata/android/en-US/changelogs/24.txt

@@ -1 +0,0 @@
-- Updates to UI.

fastlane/metadata/android/en-US/changelogs/25.txt

@@ -1 +0,0 @@
-- Updates to UI.

fastlane/metadata/android/en-US/changelogs/26.txt

@@ -1 +0,0 @@
-- Tapping on comments in notification and history screen will lead you directly to the comment.

fastlane/metadata/android/en-US/changelogs/27.txt

@@ -1,3 +0,0 @@
-- Tapping on comment in notification or history screen will now lead you directly to the comment.
-- Fixed the bug where reply box cannot be expanded in editing mode.
-- Fixed inconsistent font size in history screen.

fastlane/metadata/android/en-US/changelogs/28.txt

@@ -1 +0,0 @@
-- Added offline mode.

fastlane/metadata/android/en-US/changelogs/29.txt

@@ -1,2 +0,0 @@
-- Added offline mode.
-- Bugfixes.

fastlane/metadata/android/en-US/changelogs/30.txt

@@ -1,2 +0,0 @@
-- Added offline mode.
-- Bugfixes.

fastlane/metadata/android/en-US/changelogs/31.txt

@@ -1,2 +0,0 @@
-- Added offline mode.
-- Bugfixes.

fastlane/metadata/android/en-US/changelogs/34.txt

@@ -1,3 +0,0 @@
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/35.txt

@@ -1,3 +0,0 @@
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/36.txt

@@ -1,3 +0,0 @@
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/37.txt

@@ -1,4 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/38.txt

@@ -1,4 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/39.txt

@@ -1,4 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/40.txt

@@ -1,4 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/41.txt

@@ -1,4 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/42.txt

@@ -1,4 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/43.txt

@@ -1,4 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/44.txt

@@ -1,4 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/45.txt

@@ -1,4 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/46.txt

@@ -1,4 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/47.txt

@@ -1,4 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/48.txt

@@ -1,4 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/49.txt

@@ -1,4 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/50.txt

@@ -1,4 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/51.txt

@@ -1,4 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.

fastlane/metadata/android/en-US/changelogs/52.txt

@@ -1,5 +0,0 @@
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.
-- Bugfixes.

fastlane/metadata/android/en-US/changelogs/53.txt

@@ -1,6 +0,0 @@
-- You can now add filters for searching.
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.
-- Bugfixes.

fastlane/metadata/android/en-US/changelogs/54.txt

@@ -1,6 +0,0 @@
-- You can now add filters for searching.
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.
-- Bugfixes.

fastlane/metadata/android/en-US/changelogs/55.txt

@@ -1,6 +0,0 @@
-- You can now add filters for searching.
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.
-- Bugfixes.

fastlane/metadata/android/en-US/changelogs/56.txt

@@ -1,6 +0,0 @@
-- You can now add filters for searching.
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.
-- Bugfixes.

fastlane/metadata/android/en-US/changelogs/57.txt

@@ -1,7 +0,0 @@
-- You can share links.
-- You can now add filters for searching.
-- You can now participate in polls.
-- Pick up where you left off.
-- Swipe left on comment tile to view its parents without scrolling all the way up.
-- Huge performance boost.
-- Bugfixes.

fastlane/metadata/android/en-US/changelogs/66.txt

@@ -0,0 +1,2 @@
+- Offline mode now includes web pages.
+- You can now sort comments in story screen.

ios/Runner.xcodeproj/project.pbxproj

@@ -568,7 +568,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = QMWX3X2NF7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -577,7 +577,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.23;
+				MARKETING_VERSION = 0.2.24;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -705,7 +705,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = QMWX3X2NF7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -714,7 +714,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.23;
+				MARKETING_VERSION = 0.2.24;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -736,7 +736,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = QMWX3X2NF7;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -745,7 +745,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.23;
+				MARKETING_VERSION = 0.2.24;
 				PRODUCT_BUNDLE_IDENTIFIER = com.jiaqi.hacki;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

lib/blocs/stories/stories_bloc.dart

@@ -7,7 +7,9 @@ import 'package:hacki/config/locator.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/repositories/repositories.dart';
+import 'package:logger/logger.dart';
 import 'package:responsive_builder/responsive_builder.dart';
+import 'package:rxdart/rxdart.dart';
 
 part 'stories_event.dart';
 part 'stories_state.dart';
@@ -281,12 +283,6 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
         includingWebPage: event.includingWebPage,
         isPrioritized: false,
       );
-
-      emit(
-        state.copyWith(
-          downloadStatus: StoriesDownloadStatus.finished,
-        ),
-      );
     } catch (_) {
       emit(
         state.copyWith(
@@ -321,41 +317,50 @@ class StoriesBloc extends Bloc<StoriesEvent, StoriesState> {
       await _cacheRepository.cacheStory(story: story);
 
       if (story.url.isNotEmpty && includingWebPage) {
+        locator.get<Logger>().i('downloading ${story.url}');
         await _cacheRepository.cacheUrl(url: story.url);
       }
 
-      final Completer<void> completer = Completer<void>();
       _storiesRepository
           .fetchAllChildrenComments(ids: story.kids)
-          .listen((Comment? comment) async {
-        if (comment != null) {
-          await _cacheRepository.cacheComment(comment: comment);
-        }
-      }).onDone(() {
-        completer.complete();
-        add(StoryDownloaded(skipped: false));
-      });
-
-      await completer.future;
+          .whereType<Comment>()
+          .listen(
+            (Comment comment) => unawaited(
+              _cacheRepository.cacheComment(comment: comment),
+            ),
+          )
+          .onDone(() => add(StoryDownloaded(skipped: false)));
     }
   }
 
   void onStoryDownloaded(StoryDownloaded event, Emitter<StoriesState> emit) {
     if (event.skipped) {
+      final int updatedStoriesToBeDownloaded = state.storiesToBeDownloaded - 1;
+
       emit(
         state.copyWith(
-          storiesToBeDownloaded: state.storiesToBeDownloaded - 1,
+          storiesToBeDownloaded: updatedStoriesToBeDownloaded,
+          downloadStatus:
+              state.storiesDownloaded == updatedStoriesToBeDownloaded
+                  ? StoriesDownloadStatus.finished
+                  : null,
         ),
       );
     } else {
       final int updatedStoriesDownloaded = state.storiesDownloaded + 1;
+      final int updatedStoriesToBeDownloaded =
+          updatedStoriesDownloaded > state.storiesToBeDownloaded
+              ? state.storiesToBeDownloaded + 1
+              : state.storiesToBeDownloaded;
+
       emit(
         state.copyWith(
           storiesDownloaded: updatedStoriesDownloaded,
-          storiesToBeDownloaded:
-              updatedStoriesDownloaded > state.storiesToBeDownloaded
-                  ? state.storiesToBeDownloaded + 1
-                  : state.storiesToBeDownloaded,
+          storiesToBeDownloaded: updatedStoriesToBeDownloaded,
+          downloadStatus:
+              updatedStoriesDownloaded == updatedStoriesToBeDownloaded
+                  ? StoriesDownloadStatus.finished
+                  : null,
         ),
       );
     }

lib/config/custom_log_filter.dart

@@ -0,0 +1,31 @@
+import 'package:logger/logger.dart';
+
+class CustomLogFilter extends LogFilter {
+  @override
+  // ignore: overridden_fields
+  Level? level = Level.verbose;
+
+  /// The minimal level allowed in production.
+  static const Level _minimalLevel = Level.info;
+
+  @override
+  bool shouldLog(LogEvent event) {
+    bool shouldLog = false;
+
+    if (event.level.index >= _minimalLevel.index) {
+      return true;
+    }
+
+    assert(
+      () {
+        if (event.level.index >= level!.index) {
+          shouldLog = true;
+        }
+        return true;
+      }(),
+      '',
+    );
+
+    return shouldLog;
+  }
+}

lib/config/locator.dart

@@ -1,5 +1,5 @@
-import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
+import 'package:hacki/config/custom_log_filter.dart';
 import 'package:hacki/repositories/repositories.dart';
 import 'package:hacki/services/services.dart';
 import 'package:logger/logger.dart';
@@ -19,8 +19,5 @@ Future<void> setUpLocator() async {
     ..registerSingleton<CacheRepository>(CacheRepository())
     ..registerSingleton<CacheService>(CacheService())
     ..registerSingleton<LocalNotification>(LocalNotification())
-    ..registerSingleton<Logger>(Logger())
-    ..registerSingleton<RouteObserver<ModalRoute<dynamic>>>(
-      RouteObserver<ModalRoute<dynamic>>(),
-    );
+    ..registerSingleton<Logger>(Logger(filter: CustomLogFilter()));
 }

lib/main.dart

@@ -221,9 +221,6 @@ class HackiApp extends StatelessWidget {
                       debugShowCheckedModeBanner: false,
                       theme: useTrueDark ? trueDarkTheme : theme,
                       navigatorKey: navigatorKey,
-                      navigatorObservers: <NavigatorObserver>[
-                        locator.get<RouteObserver<ModalRoute<dynamic>>>(),
-                      ],
                       onGenerateRoute: CustomRouter.onGenerateRoute,
                       initialRoute: HomeScreen.routeName,
                     ),

lib/repositories/auth_repository.dart

@@ -5,6 +5,7 @@ import 'package:hacki/config/locator.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hacki/repositories/postable_repository.dart';
 import 'package:hacki/repositories/repositories.dart';
+import 'package:logger/logger.dart';
 
 class AuthRepository extends PostableRepository {
   AuthRepository({
@@ -44,6 +45,7 @@ class AuthRepository extends PostableRepository {
           password: password,
         );
       } catch (_) {
+        locator.get<Logger>().e(_);
         return false;
       }
     }

lib/repositories/cache_repository.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/foundation.dart';
+import 'package:hacki/config/locator.dart';
 import 'package:hacki/models/models.dart';
 import 'package:hive/hive.dart';
 import 'package:http/http.dart';
+import 'package:logger/logger.dart';
 
 /// [CacheRepository] is for storing stories and comments for offline reading.
 /// It's using [Hive] as its database which is being stored in temp directory.
@@ -9,12 +11,12 @@ class CacheRepository {
   CacheRepository({
     Future<Box<List<int>>>? storyIdBox,
     Future<Box<Map<dynamic, dynamic>>>? storyBox,
-    Future<Box<String>>? webPageBox,
+    Future<LazyBox<String>>? webPageBox,
     Future<LazyBox<Map<dynamic, dynamic>>>? commentBox,
   })  : _storyIdBox = storyIdBox ?? Hive.openBox<List<int>>(_storyIdBoxName),
         _storyBox =
             storyBox ?? Hive.openBox<Map<dynamic, dynamic>>(_storyBoxName),
-        _webPageBox = webPageBox ?? Hive.openBox<String>(_webPageBoxName),
+        _webPageBox = webPageBox ?? Hive.openLazyBox<String>(_webPageBoxName),
         _commentBox = commentBox ??
             Hive.openLazyBox<Map<dynamic, dynamic>>(_commentBoxName);
 
@@ -25,7 +27,7 @@ class CacheRepository {
   final Future<Box<List<int>>> _storyIdBox;
   final Future<Box<Map<dynamic, dynamic>>> _storyBox;
   final Future<LazyBox<Map<dynamic, dynamic>>> _commentBox;
-  final Future<Box<String>> _webPageBox;
+  final Future<LazyBox<String>> _webPageBox;
 
   Future<bool> get hasCachedStories =>
       _storyBox.then((Box<Map<dynamic, dynamic>> box) => box.isNotEmpty);
@@ -34,39 +36,92 @@ class CacheRepository {
     required StoryType of,
     required List<int> ids,
   }) async {
-    final Box<List<int>> box = await _storyIdBox;
+    late final Box<List<int>> box;
+
+    try {
+      box = await _storyIdBox;
+    } catch (_) {
+      locator.get<Logger>().e(_);
+      await Hive.deleteBoxFromDisk(_storyIdBoxName);
+      box = await _storyIdBox;
+    }
+
     return box.put(of.name, ids);
   }
 
   Future<void> cacheStory({required Story story}) async {
-    final Box<Map<dynamic, dynamic>> box = await _storyBox;
+    late final Box<Map<dynamic, dynamic>> box;
+
+    try {
+      box = await _storyBox;
+    } catch (_) {
+      locator.get<Logger>().e(_);
+      await Hive.deleteBoxFromDisk(_storyBoxName);
+      box = await _storyBox;
+    }
+
     return box.put(story.id.toString(), story.toJson());
   }
 
   Future<void> cacheUrl({required String url}) async {
-    final Box<String> box = await _webPageBox;
-    final String html = await compute(downloadWebPage, url);
+    late final LazyBox<String> box;
+
+    try {
+      box = await _webPageBox;
+    } catch (_) {
+      locator.get<Logger>().e(_);
+      await Hive.deleteBoxFromDisk(_webPageBoxName);
+      box = await _webPageBox;
+    }
+
+    final String html = await compute(_downloadWebPage, url);
     return box.put(url, html);
   }
 
   Future<String?> getHtml({required String url}) async {
-    final Box<String> box = await _webPageBox;
+    try {
+      final LazyBox<String> box = await _webPageBox;
       return box.get(url);
+    } catch (_) {
+      locator.get<Logger>().e(_);
+      await Hive.deleteBoxFromDisk(_webPageBoxName);
+      return null;
+    }
   }
 
   Future<bool> hasCachedWebPage({required String url}) async {
-    final Box<String> box = await _webPageBox;
+    try {
+      final LazyBox<String> box = await _webPageBox;
       return box.containsKey(url);
+    } catch (_) {
+      locator.get<Logger>().e(_);
+      await Hive.deleteBoxFromDisk(_webPageBoxName);
+      return false;
+    }
   }
 
   Future<List<int>> getCachedStoryIds({required StoryType of}) async {
+    try {
       final Box<List<int>> box = await _storyIdBox;
       final List<int>? ids = box.get(of.name);
       return ids ?? <int>[];
+    } catch (_) {
+      locator.get<Logger>().e(_);
+      await Hive.deleteBoxFromDisk(_storyIdBoxName);
+      return <int>[];
+    }
   }
 
   Stream<Story> getCachedStoriesStream({required List<int> ids}) async* {
-    final Box<Map<dynamic, dynamic>> box = await _storyBox;
+    late final Box<Map<dynamic, dynamic>> box;
+
+    try {
+      box = await _storyBox;
+    } catch (_) {
+      locator.get<Logger>().e(_);
+      await Hive.deleteBoxFromDisk(_storyBoxName);
+      return;
+    }
 
     for (final int id in ids) {
       final Map<dynamic, dynamic>? json = box.get(id.toString());
@@ -83,7 +138,16 @@ class CacheRepository {
   }
 
   Future<Story?> getCachedStory({required int id}) async {
-    final Box<Map<dynamic, dynamic>> box = await _storyBox;
+    late final Box<Map<dynamic, dynamic>> box;
+
+    try {
+      box = await _storyBox;
+    } catch (_) {
+      locator.get<Logger>().e(_);
+      await Hive.deleteBoxFromDisk(_storyBoxName);
+      return null;
+    }
+
     final Map<dynamic, dynamic>? json = box.get(id.toString());
     if (json == null) {
       return null;
@@ -93,11 +157,21 @@ class CacheRepository {
   }
 
   Future<void> cacheComment({required Comment comment}) async {
-    final LazyBox<Map<dynamic, dynamic>> box = await _commentBox;
+    late final LazyBox<Map<dynamic, dynamic>> box;
+
+    try {
+      box = await _commentBox;
+    } catch (_) {
+      locator.get<Logger>().e(_);
+      await Hive.deleteBoxFromDisk(_commentBoxName);
+      box = await _commentBox;
+    }
+
     return box.put(comment.id.toString(), comment.toJson());
   }
 
   Future<Comment?> getCachedComment({required int id}) async {
+    try {
       final LazyBox<Map<dynamic, dynamic>> box = await _commentBox;
       final Map<dynamic, dynamic>? json = await box.get(id.toString());
       if (json == null) {
@@ -105,6 +179,11 @@ class CacheRepository {
       }
       final Comment comment = Comment.fromJson(json.cast<String, dynamic>());
       return comment;
+    } catch (_) {
+      locator.get<Logger>().e(_);
+      await Hive.deleteBoxFromDisk(_commentBoxName);
+      return null;
+    }
   }
 
   Stream<Comment> getCachedCommentsStream({
@@ -127,23 +206,47 @@ class CacheRepository {
   }
 
   Future<int> deleteAllStoryIds() async {
+    try {
       final Box<List<int>> box = await _storyIdBox;
       return box.clear();
+    } catch (_) {
+      locator.get<Logger>().e(_);
+      await Hive.deleteBoxFromDisk(_storyIdBoxName);
+      return 0;
+    }
   }
 
   Future<int> deleteAllStories() async {
+    try {
       final Box<Map<dynamic, dynamic>> box = await _storyBox;
       return box.clear();
+    } catch (_) {
+      locator.get<Logger>().e(_);
+      await Hive.deleteBoxFromDisk(_storyBoxName);
+      return 0;
+    }
   }
 
   Future<int> deleteAllComments() async {
+    try {
       final LazyBox<Map<dynamic, dynamic>> box = await _commentBox;
       return box.clear();
+    } catch (_) {
+      locator.get<Logger>().e(_);
+      await Hive.deleteBoxFromDisk(_commentBoxName);
+      return 0;
+    }
   }
 
   Future<int> deleteAllWebPages() async {
-    final Box<String> box = await _webPageBox;
+    try {
+      final LazyBox<String> box = await _webPageBox;
       return box.clear();
+    } catch (_) {
+      locator.get<Logger>().e(_);
+      await Hive.deleteBoxFromDisk(_webPageBoxName);
+      return 0;
+    }
   }
 
   Future<int> deleteAll() async {
@@ -153,12 +256,13 @@ class CacheRepository {
         .whenComplete(deleteAllWebPages);
   }
 
-  static Future<String> downloadWebPage(String link) async {
+  static Future<String> _downloadWebPage(String link) async {
     try {
       final Client client = Client();
       final Uri url = Uri.parse(link);
       final Response response = await client.get(url);
       final String body = response.body;
+      client.close();
       return body;
     } catch (_) {
       return '''Web page not available.''';

lib/repositories/preference_repository.dart

@@ -2,6 +2,8 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:hacki/config/locator.dart';
+import 'package:logger/logger.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:synced_shared_preferences/synced_shared_preferences.dart';
 
@@ -153,9 +155,13 @@ class PreferenceRepository {
         aOptions: androidOptions,
       );
     } catch (_) {
+      try {
         await _secureStorage.deleteAll(
           aOptions: androidOptions,
         );
+      } catch (_) {
+        locator.get<Logger>().e(_);
+      }
 
       rethrow;
     }

lib/screens/home_screen.dart

@@ -46,7 +46,7 @@ class HomeScreen extends StatefulWidget {
 }
 
 class _HomeScreenState extends State<HomeScreen>
-    with SingleTickerProviderStateMixin, RouteAware {
+    with SingleTickerProviderStateMixin {
   final CacheService cacheService = locator.get<CacheService>();
   final Throttle featureDiscoveryDismissThrottle = Throttle(
     delay: _throttleDelay,
@@ -61,18 +61,6 @@ class _HomeScreenState extends State<HomeScreen>
 
   static const Duration _throttleDelay = Duration(seconds: 1);
 
-  @override
-  void didPopNext() {
-    super.didPopNext();
-    if (context.read<StoriesBloc>().deviceScreenType ==
-        DeviceScreenType.mobile) {
-      Future<void>.delayed(
-        const Duration(milliseconds: 500),
-        cacheService.resetCollapsedComments,
-      );
-    }
-  }
-
   @override
   void initState() {
     super.initState();
@@ -100,23 +88,13 @@ class _HomeScreenState extends State<HomeScreen>
           siriSuggestionSubject.stream.listen(onSiriSuggestionTapped);
     }
 
-    SchedulerBinding.instance
-      ..addPostFrameCallback((_) {
+    SchedulerBinding.instance.addPostFrameCallback((_) {
       FeatureDiscovery.discoverFeatures(
         context,
         const <String>{
           Constants.featureLogIn,
         },
       );
-      })
-      ..addPostFrameCallback((_) {
-        final ModalRoute<dynamic>? route = ModalRoute.of(context);
-
-        if (route == null) return;
-
-        locator
-            .get<RouteObserver<ModalRoute<dynamic>>>()
-            .subscribe(this, route);
     });
 
     tabController = TabController(vsync: this, length: 6)

lib/screens/item/item_screen.dart

@@ -66,12 +66,17 @@ class ItemScreen extends StatefulWidget {
   static Route<dynamic> route(ItemScreenArgs args) {
     return MaterialPageRoute<ItemScreen>(
       settings: const RouteSettings(name: routeName),
-      builder: (BuildContext context) => MultiBlocProvider(
+      builder: (BuildContext context) => RepositoryProvider<CacheService>(
+        create: (BuildContext context) => CacheService(),
+        lazy: false,
+        child: MultiBlocProvider(
           providers: <BlocProvider<dynamic>>[
             BlocProvider<CommentsCubit>(
-            create: (_) => CommentsCubit(
-              offlineReading: context.read<StoriesBloc>().state.offlineReading,
+              create: (BuildContext context) => CommentsCubit(
+                offlineReading:
+                    context.read<StoriesBloc>().state.offlineReading,
                 item: args.item,
+                cacheService: context.read<CacheService>(),
               )..init(
                   onlyShowTargetComment: args.onlyShowTargetComment,
                   targetParents: args.targetComments,
@@ -87,6 +92,7 @@ class ItemScreen extends StatefulWidget {
             parentComments: args.targetComments ?? <Comment>[],
           ),
         ),
+      ),
     );
   }
 
@@ -100,13 +106,17 @@ class ItemScreen extends StatefulWidget {
           return true;
         }
       },
+      child: RepositoryProvider<CacheService>(
+        create: (BuildContext context) => CacheService(),
         child: MultiBlocProvider(
           key: ValueKey<ItemScreenArgs>(args),
           providers: <BlocProvider<dynamic>>[
             BlocProvider<CommentsCubit>(
               create: (BuildContext context) => CommentsCubit(
-              offlineReading: context.read<StoriesBloc>().state.offlineReading,
+                offlineReading:
+                    context.read<StoriesBloc>().state.offlineReading,
                 item: args.item,
+                cacheService: context.read<CacheService>(),
               )..init(
                   onlyShowTargetComment: args.onlyShowTargetComment,
                   targetParents: args.targetComments,
@@ -123,6 +133,7 @@ class ItemScreen extends StatefulWidget {
             splitViewEnabled: true,
           ),
         ),
+      ),
     );
   }
 

lib/screens/profile/profile_screen.dart

@@ -410,7 +410,7 @@ class _ProfileScreenState extends State<ProfileScreen>
                                   showAboutDialog(
                                     context: context,
                                     applicationName: 'Hacki',
-                                    applicationVersion: 'v0.2.23',
+                                    applicationVersion: 'v0.2.24',
                                     applicationIcon: ClipRRect(
                                       borderRadius: const BorderRadius.all(
                                         Radius.circular(

lib/screens/widgets/comment_tile.dart

@@ -7,6 +7,7 @@ import 'package:hacki/blocs/blocs.dart';
 import 'package:hacki/cubits/cubits.dart';
 import 'package:hacki/extensions/extensions.dart';
 import 'package:hacki/models/models.dart';
+import 'package:hacki/services/services.dart';
 import 'package:hacki/styles/styles.dart';
 import 'package:hacki/utils/utils.dart';
 
@@ -43,6 +44,7 @@ class CommentTile extends StatelessWidget {
       lazy: false,
       create: (_) => CollapseCubit(
         commentId: comment.id,
+        cacheService: context.read<CacheService>(),
       )..init(),
       child: BlocBuilder<CollapseCubit, CollapseState>(
         builder: (BuildContext context, CollapseState state) {

lib/services/cache_service.dart

@@ -2,11 +2,11 @@ import 'package:hacki/models/models.dart' show Comment;
 import 'package:rxdart/rxdart.dart';
 
 class CacheService {
-  static final Map<int, Comment> _comments = <int, Comment>{};
-  static final Map<int, String> _drafts = <int, String>{};
-  static final Map<int, Set<int>> _kids = <int, Set<int>>{};
-  static final Set<int> _collapsed = <int>{};
-  static final Map<int, Set<int>> _hidden = <int, Set<int>>{};
+  final Map<int, Comment> _comments = <int, Comment>{};
+  final Map<int, String> _drafts = <int, String>{};
+  final Map<int, Set<int>> _kids = <int, Set<int>>{};
+  final Set<int> _collapsed = <int>{};
+  final Map<int, Set<int>> _hidden = <int, Set<int>>{};
   final PublishSubject<Map<int, Set<int>>> _hiddenCommentsSubject =
       PublishSubject<Map<int, Set<int>>>();
 

pubspec.yaml

@@ -1,6 +1,6 @@
 name: hacki
 description: A Hacker News reader.
-version: 0.2.23+65
+version: 0.2.24+66
 publish_to: none
 
 environment: