Merge branch 'main' into todos

Author: MritunjayTiwari14

lib/api/model/initial_snapshot.dart

@@ -88,6 +88,8 @@ class InitialSnapshot {
 
   final bool realmMandatoryTopics;
 
+  final String realmName;
+
   /// The number of days until a user's account is treated as a full member.
   ///
   /// Search for "realm_waiting_period_threshold" in https://zulip.com/api/register-queue.
@@ -103,6 +105,8 @@ class InitialSnapshot {
 
   final bool realmEnableReadReceipts;
 
+  final Uri realmIconUrl;
+
   final bool realmPresenceDisabled;
 
   final Map<String, RealmDefaultExternalAccount> realmDefaultExternalAccounts;
@@ -174,11 +178,13 @@ class InitialSnapshot {
     required this.realmDeleteOwnMessagePolicy,
     required this.realmWildcardMentionPolicy,
     required this.realmMandatoryTopics,
+    required this.realmName,
     required this.realmWaitingPeriodThreshold,
     required this.realmMessageContentDeleteLimitSeconds,
     required this.realmAllowMessageEditing,
     required this.realmMessageContentEditLimitSeconds,
     required this.realmEnableReadReceipts,
+    required this.realmIconUrl,
     required this.realmPresenceDisabled,
     required this.realmDefaultExternalAccounts,
     required this.maxFileUploadSizeMib,

lib/api/model/initial_snapshot.g.dart

@@ -48,7 +48,7 @@ class GetServerSettingsResult {
   final Uri realmUrl;
 
   final String realmName;
-  final String realmIcon;
+  final Uri realmIcon;
   final String realmDescription;
   final bool realmWebPublicAccessEnabled;
 

lib/api/route/realm.dart

@@ -8,6 +8,7 @@ import 'package:drift/internal/versioned_schema.dart';
 import 'package:drift/remote.dart';
 import 'package:sqlite3/common.dart';
 
+import '../api/route/realm.dart';
 import '../log.dart';
 import 'legacy_app_data.dart';
 import 'schema_versions.g.dart';
@@ -128,6 +129,20 @@ class Accounts extends Table {
   /// It never changes for a given account.
   Column<String> get realmUrl => text().map(const UriConverter())();
 
+  /// The name of the Zulip realm this account is on.
+  ///
+  /// This corresponds to [GetServerSettingsResult.realmName].
+  ///
+  /// Nullable just because older versions of the app didn't store this.
+  Column<String> get realmName => text().nullable()();
+
+  /// The icon URL of the Zulip realm this account is on.
+  ///
+  /// This corresponds to [GetServerSettingsResult.realmIcon].
+  ///
+  /// Nullable just because older versions of the app didn't store this.
+  Column<String> get realmIcon => text().map(const UriConverter()).nullable()();
+
   /// The Zulip user ID of this account.
   ///
   /// This is the identifier the server uses for the account.
@@ -169,7 +184,7 @@ class AppDatabase extends _$AppDatabase {
   //    information on using the build_runner.
   //  * Write a migration in `_migrationSteps` below.
   //  * Write tests.
-  static const int latestSchemaVersion = 11; // See note.
+  static const int latestSchemaVersion = 12; // See note.
 
   @override
   int get schemaVersion => latestSchemaVersion;
@@ -264,6 +279,10 @@ class AppDatabase extends _$AppDatabase {
           'value': Variable(firstAccountId),
         }));
     },
+    from11To12: (Migrator m, Schema12 schema) async {
+      await m.addColumn(schema.accounts, schema.accounts.realmName);
+      await m.addColumn(schema.accounts, schema.accounts.realmIcon);
+    },
   );
 
   Future<void> _createLatestSchema(Migrator m) async {