assets/locales/en_us.json

@@ -253,8 +253,7 @@
   "channelName": "Name",
   "channelDescription": "Description",
   "channelDirectDescription": "Direct message with @username",
-  "channelPublic": "Public channel",
+  "channelEncrypted": "Encrypted Channel",
-  "channelCommunity": "Community channel",
   "channelMember": "Channel member",
   "channelMembers": "Channel members",
   "channelMembersAdd": "Add channel members",

assets/locales/zh_cn.json

@@ -254,8 +254,7 @@
   "channelName": "显示名称",
   "channelDescription": "频道简介",
   "channelDirectDescription": "与 @username 的私聊",
-  "channelPublic": "公开频道",
+  "channelEncrypted": "加密频道",
-  "channelCommunity": "社区频道",
   "channelMember": "频道成员",
   "channelMembers": "频道成员",
   "channelMembersAdd": "添加频道成员",

ios/Podfile.lock

@@ -73,7 +73,7 @@ PODS:
     - Firebase/Performance (= 11.0.0)
     - firebase_core
     - Flutter
-  - FirebaseABTesting (11.2.0):
+  - FirebaseABTesting (11.1.0):
     - FirebaseCore (~> 11.0)
   - FirebaseAnalytics (11.0.0):
     - FirebaseAnalytics/AdIdSupport (= 11.0.0)
@@ -97,9 +97,9 @@ PODS:
     - FirebaseCoreInternal (~> 11.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/Logger (~> 8.0)
-  - FirebaseCoreExtension (11.2.0):
+  - FirebaseCoreExtension (11.1.0):
     - FirebaseCore (~> 11.0)
-  - FirebaseCoreInternal (11.2.0):
+  - FirebaseCoreInternal (11.1.0):
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
   - FirebaseCrashlytics (11.0.0):
     - FirebaseCore (~> 11.0)
@@ -110,7 +110,7 @@ PODS:
     - GoogleUtilities/Environment (~> 8.0)
     - nanopb (~> 3.30910.0)
     - PromisesObjC (~> 2.4)
-  - FirebaseInstallations (11.2.0):
+  - FirebaseInstallations (11.1.0):
     - FirebaseCore (~> 11.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/UserDefaults (~> 8.0)
@@ -134,7 +134,7 @@ PODS:
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/UserDefaults (~> 8.0)
     - nanopb (~> 3.30910.0)
-  - FirebaseRemoteConfig (11.2.0):
+  - FirebaseRemoteConfig (11.1.0):
     - FirebaseABTesting (~> 11.0)
     - FirebaseCore (~> 11.0)
     - FirebaseInstallations (~> 11.0)
@@ -142,8 +142,8 @@ PODS:
     - FirebaseSharedSwift (~> 11.0)
     - GoogleUtilities/Environment (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
-  - FirebaseRemoteConfigInterop (11.2.0)
+  - FirebaseRemoteConfigInterop (11.1.0)
-  - FirebaseSessions (11.2.0):
+  - FirebaseSessions (11.1.0):
     - FirebaseCore (~> 11.0)
     - FirebaseCoreExtension (~> 11.0)
     - FirebaseInstallations (~> 11.0)
@@ -152,7 +152,7 @@ PODS:
     - GoogleUtilities/UserDefaults (~> 8.0)
     - nanopb (~> 3.30910.0)
     - PromisesSwift (~> 2.1)
-  - FirebaseSharedSwift (11.2.0)
+  - FirebaseSharedSwift (11.1.0)
   - Flutter (1.0.0)
   - flutter_background_service_ios (0.0.3):
     - Flutter
@@ -450,19 +450,19 @@ SPEC CHECKSUMS:
   firebase_crashlytics: 4111f8198b78c99471c955af488cecd8224967e6
   firebase_messaging: c40f84e7a98da956d5262fada373b5c458edcf13
   firebase_performance: 8b7b9ca5adf3a9b3afa12b4eb96b9cabefc2c248
-  FirebaseABTesting: 2104d957ce33888a3d6f3bde298cdee376dde8f1
+  FirebaseABTesting: c2e22c3aab99afa81d0561708b2c1c356c556976
   FirebaseAnalytics: 27eb78b97880ea4a004839b9bac0b58880f5a92a
   FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383
-  FirebaseCoreExtension: cda74ddfb001224bd8fd1d6e74698b4ed07803de
+  FirebaseCoreExtension: aa5c9779c2d0d39d83f1ceb3fdbafe80c4feecfa
-  FirebaseCoreInternal: 0c569513412da9f3b31bd0b340013bbee8f295c5
+  FirebaseCoreInternal: adefedc9a88dbe393c4884640a73ec9e8e790f8c
   FirebaseCrashlytics: 745d8f0221fe49c62865391d1bf56f5a12eeec0b
-  FirebaseInstallations: 771177d89d6c451dc6e50085ec82e2fc77ed0a4a
+  FirebaseInstallations: d0a8fea5a6fa91abc661591cf57c0f0d70863e57
   FirebaseMessaging: d2d1d9c62c46dd2db49a952f7deb5b16ad2c9742
   FirebasePerformance: efdc02bacb1b4710588c9f867011605c081cdf79
-  FirebaseRemoteConfig: fca0b2d017fc1de52b28a4e5bcf2007c1a840457
+  FirebaseRemoteConfig: 05521e937b72e01847a7128da5a492327364c705
-  FirebaseRemoteConfigInterop: 477b26fdeb8fb5fbaf22fa9db5343b42289dc7db
+  FirebaseRemoteConfigInterop: abf8b1bbc0bf1b84abd22b66746926410bf91a87
-  FirebaseSessions: adcec8b72d0066a385e3affcd1bcb1ebb3908ce6
+  FirebaseSessions: 78f137e68dc01ca71606169ba4ac73b98c13752a
-  FirebaseSharedSwift: 7a0d78d155ede78407f0fdc89fbc914014c7c540
+  FirebaseSharedSwift: 260a35e08943ec810d820a70bc0359136351d0c5
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_background_service_ios: e30e0d3ee69e4cee66272d0c78eacd48c2e94aac
   flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069

ios/Runner.xcodeproj/project.pbxproj

@@ -616,7 +616,6 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -921,7 +920,6 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
@@ -949,7 +947,6 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";

lib/models/channel.dart

@@ -19,8 +19,7 @@ class Channel {
   int accountId;
   Realm? realm;
   int? realmId;
-  bool isPublic;
+  bool isEncrypted;
-  bool isCommunity;
 
   @JsonKey(includeFromJson: false, includeToJson: true)
   bool isAvailable = false;
@@ -37,8 +36,7 @@ class Channel {
     required this.members,
     required this.account,
     required this.accountId,
-    required this.isPublic,
+    required this.isEncrypted,
-    required this.isCommunity,
     required this.realm,
     required this.realmId,
   });

lib/models/channel.g.dart

@@ -22,8 +22,7 @@ Channel _$ChannelFromJson(Map<String, dynamic> json) => Channel(
           .toList(),
       account: Account.fromJson(json['account'] as Map<String, dynamic>),
       accountId: (json['account_id'] as num).toInt(),
-      isPublic: json['is_public'] as bool,
+      isEncrypted: json['is_encrypted'] as bool,
-      isCommunity: json['is_community'] as bool,
       realm: json['realm'] == null
           ? null
           : Realm.fromJson(json['realm'] as Map<String, dynamic>),
@@ -44,8 +43,7 @@ Map<String, dynamic> _$ChannelToJson(Channel instance) => <String, dynamic>{
       'account_id': instance.accountId,
       'realm': instance.realm?.toJson(),
       'realm_id': instance.realmId,
-      'is_public': instance.isPublic,
+      'is_encrypted': instance.isEncrypted,
-      'is_community': instance.isCommunity,
       'is_available': instance.isAvailable,
     };
 

lib/screens/auth/signin.dart

@@ -7,9 +7,6 @@ import 'package:solian/exceptions/request.dart';
 import 'package:solian/exts.dart';
 import 'package:solian/models/auth.dart';
 import 'package:solian/providers/auth.dart';
-import 'package:solian/providers/content/channel.dart';
-import 'package:solian/providers/content/realm.dart';
-import 'package:solian/providers/relation.dart';
 import 'package:solian/providers/websocket.dart';
 import 'package:solian/services.dart';
 import 'package:solian/widgets/sized_container.dart';
@@ -167,7 +164,6 @@ class _SignInScreenState extends State<SignInScreen> {
 
       final result = AuthResult.fromJson(resp.body);
       _currentTicket = result.ticket;
-      _passwordController.clear();
 
       // Finish sign in if possible
       if (result.isFinished) {
@@ -177,9 +173,6 @@ class _SignInScreenState extends State<SignInScreen> {
           await auth.refreshAuthorizeStatus();
           await auth.refreshUserProfile();
 
-          Get.find<ChannelProvider>().refreshAvailableChannel();
-          Get.find<RealmProvider>().refreshAvailableRealms();
-          Get.find<RelationshipProvider>().refreshRelativeList();
           Get.find<WebSocketProvider>().registerPushNotifications();
           autoConfigureBackgroundNotificationService();
           autoStartBackgroundNotificationService();

lib/screens/channel/channel_organize.dart

@@ -35,14 +35,13 @@ class _ChannelOrganizeScreenState extends State<ChannelOrganizeScreen> {
   final _nameController = TextEditingController();
   final _descriptionController = TextEditingController();
 
-  bool _isPublic = false;
+  bool _isEncrypted = false;
-  bool _isCommunity = false;
 
-  void _applyChannel() async {
+  void applyChannel() async {
     final AuthProvider auth = Get.find();
     if (auth.isAuthorized.isFalse) return;
 
-    if (_aliasController.value.text.isEmpty) _randomizeAlias();
+    if (_aliasController.value.text.isEmpty) randomizeAlias();
 
     setState(() => _isBusy = true);
 
@@ -53,7 +52,7 @@ class _ChannelOrganizeScreenState extends State<ChannelOrganizeScreen> {
       'alias': _aliasController.value.text.toLowerCase(),
       'name': _nameController.value.text,
       'description': _descriptionController.value.text,
-      'is_encrypted': _isPublic,
+      'is_encrypted': _isEncrypted,
     };
 
     Response? resp;
@@ -72,28 +71,27 @@ class _ChannelOrganizeScreenState extends State<ChannelOrganizeScreen> {
     setState(() => _isBusy = false);
   }
 
-  void _randomizeAlias() {
+  void randomizeAlias() {
     _aliasController.text =
         const Uuid().v4().replaceAll('-', '').substring(0, 12);
   }
 
-  void _syncWidget() {
+  void syncWidget() {
     if (widget.edit != null) {
       _aliasController.text = widget.edit!.alias;
       _nameController.text = widget.edit!.name;
       _descriptionController.text = widget.edit!.description;
-      _isPublic = widget.edit!.isPublic;
+      _isEncrypted = widget.edit!.isEncrypted;
-      _isCommunity = widget.edit!.isCommunity;
     }
   }
 
-  void _cancelAction() {
+  void cancelAction() {
     AppRouter.instance.pop();
   }
 
   @override
   void initState() {
-    _syncWidget();
+    syncWidget();
     super.initState();
   }
 
@@ -101,7 +99,7 @@ class _ChannelOrganizeScreenState extends State<ChannelOrganizeScreen> {
   Widget build(BuildContext context) {
     final notifyBannerActions = [
       TextButton(
-        onPressed: _cancelAction,
+        onPressed: cancelAction,
         child: Text('cancel'.tr),
       ),
     ];
@@ -115,7 +113,7 @@ class _ChannelOrganizeScreenState extends State<ChannelOrganizeScreen> {
           toolbarHeight: AppTheme.toolbarHeight(context),
           actions: [
             TextButton(
-              onPressed: _isBusy ? null : () => _applyChannel(),
+              onPressed: _isBusy ? null : () => applyChannel(),
               child: Text('apply'.tr.toUpperCase()),
             )
           ],
@@ -166,7 +164,7 @@ class _ChannelOrganizeScreenState extends State<ChannelOrganizeScreen> {
                       visualDensity:
                           const VisualDensity(horizontal: -2, vertical: -2),
                     ),
-                    onPressed: () => _randomizeAlias(),
+                    onPressed: () => randomizeAlias(),
                     child: const Icon(Icons.refresh),
                   )
                 ],
@@ -198,17 +196,12 @@ class _ChannelOrganizeScreenState extends State<ChannelOrganizeScreen> {
               ),
               const Divider(thickness: 0.3),
               CheckboxListTile(
-                title: Text('channelPublic'.tr),
+                title: Text('channelEncrypted'.tr),
-                value: _isPublic,
+                value: _isEncrypted,
-                onChanged: (value) =>
+                onChanged: (widget.edit?.isEncrypted ?? false)
-                    setState(() => _isPublic = value ?? false),
+                    ? null
-                controlAffinity: ListTileControlAffinity.leading,
+                    : (newValue) =>
-              ),
+                        setState(() => _isEncrypted = newValue ?? false),
-              CheckboxListTile(
-                title: Text('channelCommunity'.tr),
-                value: _isCommunity,
-                onChanged: (value) =>
-                    setState(() => _isCommunity = value ?? false),
                 controlAffinity: ListTileControlAffinity.leading,
               ),
             ],

macos/Podfile.lock

@@ -60,9 +60,9 @@ PODS:
     - FirebaseCoreInternal (~> 11.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/Logger (~> 8.0)
-  - FirebaseCoreExtension (11.2.0):
+  - FirebaseCoreExtension (11.1.0):
     - FirebaseCore (~> 11.0)
-  - FirebaseCoreInternal (11.2.0):
+  - FirebaseCoreInternal (11.1.0):
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
   - FirebaseCrashlytics (11.0.0):
     - FirebaseCore (~> 11.0)
@@ -73,7 +73,7 @@ PODS:
     - GoogleUtilities/Environment (~> 8.0)
     - nanopb (~> 3.30910.0)
     - PromisesObjC (~> 2.4)
-  - FirebaseInstallations (11.2.0):
+  - FirebaseInstallations (11.1.0):
     - FirebaseCore (~> 11.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/UserDefaults (~> 8.0)
@@ -87,8 +87,8 @@ PODS:
     - GoogleUtilities/Reachability (~> 8.0)
     - GoogleUtilities/UserDefaults (~> 8.0)
     - nanopb (~> 3.30910.0)
-  - FirebaseRemoteConfigInterop (11.2.0)
+  - FirebaseRemoteConfigInterop (11.1.0)
-  - FirebaseSessions (11.2.0):
+  - FirebaseSessions (11.1.0):
     - FirebaseCore (~> 11.0)
     - FirebaseCoreExtension (~> 11.0)
     - FirebaseInstallations (~> 11.0)
@@ -344,13 +344,13 @@ SPEC CHECKSUMS:
   firebase_messaging: ce70e6615f0cd906d80b7a651b960d76dad6de56
   FirebaseAnalytics: 27eb78b97880ea4a004839b9bac0b58880f5a92a
   FirebaseCore: 3cf438f431f18c12cdf2aaf64434648b63f7e383
-  FirebaseCoreExtension: cda74ddfb001224bd8fd1d6e74698b4ed07803de
+  FirebaseCoreExtension: aa5c9779c2d0d39d83f1ceb3fdbafe80c4feecfa
-  FirebaseCoreInternal: 0c569513412da9f3b31bd0b340013bbee8f295c5
+  FirebaseCoreInternal: adefedc9a88dbe393c4884640a73ec9e8e790f8c
   FirebaseCrashlytics: 745d8f0221fe49c62865391d1bf56f5a12eeec0b
-  FirebaseInstallations: 771177d89d6c451dc6e50085ec82e2fc77ed0a4a
+  FirebaseInstallations: d0a8fea5a6fa91abc661591cf57c0f0d70863e57
   FirebaseMessaging: d2d1d9c62c46dd2db49a952f7deb5b16ad2c9742
-  FirebaseRemoteConfigInterop: 477b26fdeb8fb5fbaf22fa9db5343b42289dc7db
+  FirebaseRemoteConfigInterop: abf8b1bbc0bf1b84abd22b66746926410bf91a87
-  FirebaseSessions: adcec8b72d0066a385e3affcd1bcb1ebb3908ce6
+  FirebaseSessions: 78f137e68dc01ca71606169ba4ac73b98c13752a
   flutter_local_notifications: 3805ca215b2fb7f397d78b66db91f6a747af52e4
   flutter_secure_storage_macos: 59459653abe1adb92abbc8ea747d79f8d19866c9
   flutter_webrtc: 2b4e4a2de70a1485836e40fd71a7a94c77d49bd9

macos/Runner.xcodeproj/project.pbxproj

@@ -701,7 +701,6 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
@@ -844,7 +843,6 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
@@ -872,7 +870,6 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";