From a2b5a0a6f265955432683137cb8402050033fc72 Mon Sep 17 00:00:00 2001
From: shilangyu <xmarcinmarcin@gmail.com>
Date: Wed, 16 Sep 2020 21:51:08 +0200
Subject: [PATCH] properly handling null in AccountsStore (removed tokenOrNull)

---
 lib/pages/community.dart       | 22 +++++++++++++---------
 lib/stores/accounts_store.dart | 32 +++++++++++++++++++++++++-------
 lib/util/token_or_null.dart    | 16 ----------------
 3 files changed, 38 insertions(+), 32 deletions(-)
 delete mode 100644 lib/util/token_or_null.dart

diff --git a/lib/pages/community.dart b/lib/pages/community.dart
index 4ba81d0..d36f1ee 100644
--- a/lib/pages/community.dart
+++ b/lib/pages/community.dart
@@ -6,7 +6,9 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:intl/intl.dart';
+import 'package:lemmur/stores/accounts_store.dart';
 import 'package:lemmy_api_client/lemmy_api_client.dart';
+import 'package:provider/provider.dart';
 import 'package:url_launcher/url_launcher.dart' as ul;
 
 import '../hooks/memo_future.dart';
@@ -14,7 +16,6 @@ import '../util/api_extensions.dart';
 import '../util/goto.dart';
 import '../util/intl.dart';
 import '../util/text_color.dart';
-import '../util/token_or_null.dart';
 import '../widgets/badge.dart';
 import '../widgets/bottom_modal.dart';
 import '../widgets/fullscreenable_image.dart';
@@ -49,16 +50,17 @@ class CommunityPage extends HookWidget {
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
     var fullCommunitySnap = useMemoFuture(() {
-      final auth = tokenOrNull(context, instanceUrl);
+      final token = context.watch<AccountsStore>().defaultTokenFor(instanceUrl);
+
       if (communityId != null) {
         return LemmyApi(instanceUrl).v1.getCommunity(
               id: communityId,
-              auth: auth,
+              auth: token?.raw,
             );
       } else {
         return LemmyApi(instanceUrl).v1.getCommunity(
               name: communityName,
-              auth: auth,
+              auth: token?.raw,
             );
       }
     });
@@ -531,11 +533,11 @@ class _FollowButton extends HookWidget {
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    final colorOnTopOfAccent = textColorBasedOnBackground(theme.accentColor);
-    final subscribed = community.subscribed ?? false;
-    final token = tokenOrNull(context, community.instanceUrl);
+    final isSubbed = useState(community.subscribed ?? false);
 
-    final isSubbed = useState(subscribed);
+    final colorOnTopOfAccent = textColorBasedOnBackground(theme.accentColor);
+    final token =
+        context.watch<AccountsStore>().defaultTokenFor(community.instanceUrl);
 
     // TODO: use hook for handling spinner and pending
     final showSpinner = useState(false);
@@ -555,7 +557,9 @@ class _FollowButton extends HookWidget {
       final api = LemmyApi(community.instanceUrl).v1;
       try {
         await api.followCommunity(
-            communityId: community.id, follow: !isSubbed.value, auth: token);
+            communityId: community.id,
+            follow: !isSubbed.value,
+            auth: token?.raw);
         isSubbed.value = !isSubbed.value;
         // ignore: avoid_catches_without_on_clauses
       } catch (e) {
diff --git a/lib/stores/accounts_store.dart b/lib/stores/accounts_store.dart
index 012520a..9000b86 100644
--- a/lib/stores/accounts_store.dart
+++ b/lib/stores/accounts_store.dart
@@ -73,21 +73,39 @@ abstract class _AccountsStore with Store {
 
   @computed
   User get defaultUser {
+    if (_defaultAccount == null) {
+      return null;
+    }
+
     var userTag = _defaultAccount.split('@');
     return users[userTag[1]][userTag[0]];
   }
 
   @computed
   Jwt get defaultToken {
+    if (_defaultAccount == null) {
+      return null;
+    }
+
     var userTag = _defaultAccount.split('@');
     return tokens[userTag[1]][userTag[0]];
   }
 
-  User defaultUserFor(String instanceUrl) =>
-      Computed(() => users[instanceUrl][_defaultAccounts[instanceUrl]]).value;
+  User defaultUserFor(String instanceUrl) => Computed(() {
+        if (isAnonymousFor(instanceUrl)) {
+          return null;
+        }
 
-  Jwt defaultTokenFor(String instanceUrl) =>
-      Computed(() => tokens[instanceUrl][_defaultAccounts[instanceUrl]]).value;
+        return users[instanceUrl][_defaultAccounts[instanceUrl]];
+      }).value;
+
+  Jwt defaultTokenFor(String instanceUrl) => Computed(() {
+        if (isAnonymousFor(instanceUrl)) {
+          return null;
+        }
+
+        return tokens[instanceUrl][_defaultAccounts[instanceUrl]];
+      }).value;
 
   @action
   void setDefaultAccount(String instanceUrl, String username) {
@@ -100,11 +118,11 @@ abstract class _AccountsStore with Store {
   }
 
   bool isAnonymousFor(String instanceUrl) => Computed(() {
-        if (users.containsKey(instanceUrl)) {
-          return users[instanceUrl].isEmpty;
-        } else {
+        if (!users.containsKey(instanceUrl)) {
           return true;
         }
+
+        return users[instanceUrl].isEmpty;
       }).value;
 
   @computed
diff --git a/lib/util/token_or_null.dart b/lib/util/token_or_null.dart
deleted file mode 100644
index 974563b..0000000
--- a/lib/util/token_or_null.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';
-
-import '../stores/accounts_store.dart';
-
-/// returns either raw token for default user of `instanceUrl`
-/// or null if this instance is not added or doesn't
-/// have any user logged in
-String tokenOrNull(BuildContext context, String instanceUrl) {
-  final store = context.watch<AccountsStore>();
-
-  if (store.isAnonymousFor(instanceUrl)) {
-    return null;
-  }
-  return store.defaultTokenFor(instanceUrl).raw;
-}