api: Require InitialSnapshot.userSettings, present since Zulip Server 5

Related: #268

Author: chrisbobbe

lib/api/model/initial_snapshot.dart

@@ -68,13 +68,7 @@ class InitialSnapshot {
 
   final List<ZulipStream> streams;
 
-  // Servers pre-5.0 don't have `user_settings`, and instead provide whatever
-  // user settings they support at toplevel in the initial snapshot. Since we're
-  // likely to desupport pre-5.0 servers before wide release, we prefer to
-  // ignore the toplevel fields and use `user_settings` where present instead,
-  // even at the expense of functionality with pre-5.0 servers.
-  // TODO(server-5) remove pre-5.0 comment
-  final UserSettings? userSettings; // TODO(server-5)
+  final UserSettings userSettings;
 
   final List<UserTopicItem>? userTopics; // TODO(server-6)
 

lib/api/model/initial_snapshot.g.dart

@@ -663,7 +663,7 @@ class PerAccountStore extends PerAccountStoreBase with
   ////////////////////////////////
   // Data attached to the self-account on the realm.
 
-  final UserSettings? userSettings; // TODO(server-5)
+  final UserSettings userSettings;
 
   @override
   Map<int, SavedSnippet> get savedSnippets => _savedSnippets.savedSnippets;
@@ -907,11 +907,11 @@ class PerAccountStore extends PerAccountStoreBase with
         }
         switch (event.property!) {
           case UserSettingName.twentyFourHourTime:
-            userSettings?.twentyFourHourTime        = event.value as bool;
+            userSettings.twentyFourHourTime        = event.value as bool;
           case UserSettingName.displayEmojiReactionUsers:
-            userSettings?.displayEmojiReactionUsers = event.value as bool;
+            userSettings.displayEmojiReactionUsers = event.value as bool;
           case UserSettingName.emojiset:
-            userSettings?.emojiset                  = event.value as Emojiset;
+            userSettings.emojiset                  = event.value as Emojiset;
         }
         notifyListeners();
 

lib/model/store.dart

@@ -121,7 +121,7 @@ class ReactionChipsList extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final store = PerAccountStoreWidget.of(context);
-    final displayEmojiReactionUsers = store.userSettings?.displayEmojiReactionUsers ?? false;
+    final displayEmojiReactionUsers = store.userSettings.displayEmojiReactionUsers ?? false;
     final showNames = displayEmojiReactionUsers && reactions.total <= 3;
 
     return Wrap(spacing: 4, runSpacing: 4, crossAxisAlignment: WrapCrossAlignment.center,

lib/widgets/emoji_reaction.dart

@@ -821,14 +821,14 @@ void main() {
       await preparePoll();
 
       // Pick some arbitrary event and check it gets processed on the store.
-      check(store.userSettings!.twentyFourHourTime).isFalse();
+      check(store.userSettings.twentyFourHourTime).isFalse();
       connection.prepare(json: GetEventsResult(events: [
         UserSettingsUpdateEvent(id: 2,
           property: UserSettingName.twentyFourHourTime, value: true),
       ], queueId: null).toJson());
       updateMachine.debugAdvanceLoop();
       async.elapse(Duration.zero);
-      check(store.userSettings!.twentyFourHourTime).isTrue();
+      check(store.userSettings.twentyFourHourTime).isTrue();
     }));
 
     void checkReload(FutureOr<void> Function() prepareError, {
@@ -858,14 +858,14 @@ void main() {
         // The new UpdateMachine updates the new store.
         updateMachine.debugPauseLoop();
         updateMachine.poll();
-        check(store.userSettings!.twentyFourHourTime).isFalse();
+        check(store.userSettings.twentyFourHourTime).isFalse();
         connection.prepare(json: GetEventsResult(events: [
           UserSettingsUpdateEvent(id: 2,
             property: UserSettingName.twentyFourHourTime, value: true),
         ], queueId: null).toJson());
         updateMachine.debugAdvanceLoop();
         async.elapse(Duration.zero);
-        check(store.userSettings!.twentyFourHourTime).isTrue();
+        check(store.userSettings.twentyFourHourTime).isTrue();
       });
     }