fix uncache method

Author: avdosev

lib/stores/habr_storage.dart

@@ -31,27 +31,26 @@ class HabrStorage {
   }
 
   Future<Either<AppError, Post>> article(String id) async {
-    final articleOrError = await api.article(id);
-    if (articleOrError.isLeft) {
-      final cachedPost = await articles.get(id);
-      final cachedAuthor =
-          cachedPost != null ? await authors.get(cachedPost.authorId) : null;
-
-      return Either.condLazy(
-        cachedPost != null && cachedAuthor != null,
-        () => AppError(
-            errCode: ErrorType.NotFound,
-            message: "Article not found in local storage"),
-        () => Post(
-          id: cachedPost.id,
-          title: cachedPost.title,
-          body: cachedPost.body,
-          publishDate: cachedPost.publishDate,
-          author: cachedAuthor,
-        ),
-      );
-    }
-    return articleOrError;
+    return cachedArticle(id).thenLeft((_) => api.article(id));
+  }
+
+  Future<Either<AppError, Post>> cachedArticle(String id) async {
+    final cachedPost = await articles.get(id);
+    final cachedAuthor =
+        cachedPost != null ? await authors.get(cachedPost.authorId) : null;
+    return Either.condLazy(
+      cachedPost != null && cachedAuthor != null,
+      () => AppError(
+          errCode: ErrorType.NotFound,
+          message: "Article not found in local storage"),
+      () => Post(
+        id: cachedPost.id,
+        title: cachedPost.title,
+        body: cachedPost.body,
+        publishDate: cachedPost.publishDate,
+        author: cachedAuthor,
+      ),
+    );
   }
 
   Future<bool> addArticleInCache(String id) {
@@ -125,18 +124,15 @@ class HabrStorage {
   }
 
   Future _cacheAuthor(Author author) async {
-    String avatarUrl;
-
     if (author.avatar.isNotDefault) {
-      final maybeSavedImage = await imgStore.saveImage(author.avatar.url);
-      avatarUrl = maybeSavedImage.fold((left) => null, (right) => right);
+      await imgStore.saveImage(author.avatar.url);
     }
 
     await authors.put(author.id, author);
   }
 
   Future _uncacheArticle(String articleId) async {
-    final eitherPost = await article(articleId);
+    final eitherPost = await cachedArticle(articleId);
     if (eitherPost.isLeft) return;
     final post = eitherPost.right;
     await articles.delete(articleId);

pubspec.yaml

@@ -21,7 +21,7 @@ dependencies:
   html: "0.14.0+3"
   share: ^2.0.1
   flutter_highlight: "0.6.0"
-  either_dart: ^0.1.1
+  either_dart: ^0.1.3
   flutter_svg: "^0.22.0"
   url_launcher: "^5.6.0"
   hive: ^1.4.4