store [nfc]: Move tryResolveUrl up to base, and use it more

Author: gnprice

lib/model/emoji.dart

@@ -192,12 +192,12 @@ class EmojiStoreImpl extends PerAccountStoreBase with EmojiStore {
     required String? stillUrl,
     required String emojiName,
   }) {
-    final resolvedUrl = tryResolveUrl(realmUrl, sourceUrl);
+    final resolvedUrl = this.tryResolveUrl(sourceUrl);
     if (resolvedUrl == null) return TextEmojiDisplay(emojiName: emojiName);
 
     Uri? resolvedStillUrl;
     if (stillUrl != null) {
-      resolvedStillUrl = tryResolveUrl(realmUrl, stillUrl);
+      resolvedStillUrl = this.tryResolveUrl(stillUrl);
       if (resolvedStillUrl == null) return TextEmojiDisplay(emojiName: emojiName);
     }
 

lib/model/store.dart

@@ -368,6 +368,11 @@ abstract class PerAccountStoreBase {
   /// Always equal to `account.realmUrl` and `connection.realmUrl`.
   Uri get realmUrl => connection.realmUrl;
 
+  /// Resolve [reference] as a URL relative to [realmUrl].
+  ///
+  /// This returns null if [reference] fails to parse as a URL.
+  Uri? tryResolveUrl(String reference) => _tryResolveUrl(realmUrl, reference);
+
   ////////////////////////////////
   // Data attached to the self-account on the realm.
 
@@ -381,6 +386,17 @@ abstract class PerAccountStoreBase {
   Account get account => _globalStore.getAccount(accountId)!;
 }
 
+const _tryResolveUrl = tryResolveUrl;
+
+/// Like [Uri.resolve], but on failure return null instead of throwing.
+Uri? tryResolveUrl(Uri baseUrl, String reference) {
+  try {
+    return baseUrl.resolve(reference);
+  } on FormatException {
+    return null;
+  }
+}
+
 /// Store for the user's data for a given Zulip account.
 ///
 /// This should always have a consistent snapshot of the state on the server,
@@ -522,11 +538,6 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor
   ////////////////////////////////
   // Data attached to the realm or the server.
 
-  /// Resolve [reference] as a URL relative to [realmUrl].
-  ///
-  /// This returns null if [reference] fails to parse as a URL.
-  Uri? tryResolveUrl(String reference) => _tryResolveUrl(realmUrl, reference);
-
   /// Always equal to `connection.zulipFeatureLevel`
   /// and `account.zulipFeatureLevel`.
   int get zulipFeatureLevel => connection.zulipFeatureLevel!;
@@ -899,17 +910,6 @@ class PerAccountStore extends PerAccountStoreBase with ChangeNotifier, EmojiStor
   String toString() => '${objectRuntimeType(this, 'PerAccountStore')}#${shortHash(this)}';
 }
 
-const _tryResolveUrl = tryResolveUrl;
-
-/// Like [Uri.resolve], but on failure return null instead of throwing.
-Uri? tryResolveUrl(Uri baseUrl, String reference) {
-  try {
-    return baseUrl.resolve(reference);
-  } on FormatException {
-    return null;
-  }
-}
-
 /// A [GlobalStoreBackend] that uses a live, persistent local database.
 ///
 /// Used as part of a [LiveGlobalStore].