π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Use plain fields for the accounts client cache
Neeraj Gupta564aec82dbdb
diff --git a/mobile/apps/photos/lib/services/account/user_service.dart b/mobile/apps/photos/lib/services/account/user_service.dartindex 392d521826..216b9c6058 100644--- a/mobile/apps/photos/lib/services/account/user_service.dart+++ b/mobile/apps/photos/lib/services/account/user_service.dart@@ -68,7 +68,8 @@ class UserService {final _logger = Logger((UserService).toString());final _config = Configuration.instance;late SharedPreferences _preferences;- ({String origin, AccountsClient client})? _accountsClient;+ AccountsClient? _accountsClient;+ String? _accountsClientOrigin;StreamSubscription<UserLoggedOutEvent>? _loggedOutEventSubscription;StreamSubscription<SignedInEvent>? _signedInEventSubscription;@@ -877,7 +878,7 @@ class UserService {AccountsClient _getAccountsClient() {final origin = endpointConfig.endpoint;- if (_accountsClient?.origin != origin) {+ if (_accountsClient == null || _accountsClientOrigin != origin) {final services = ServiceLocator.instance;final client = accounts.createAccountsClient(config: AccountsClientConfig(@@ -889,9 +890,10 @@ class UserService {as String,),);- _accountsClient = (origin: origin, client: client);+ _accountsClient = client;+ _accountsClientOrigin = origin;}- return _accountsClient!.client;+ return _accountsClient!;}Future<void> recoverTwoFactor(diff --git a/mobile/packages/accounts/lib/services/user_service.dart b/mobile/packages/accounts/lib/services/user_service.dartindex 83f39a34e4..4b6e7acd73 100644--- a/mobile/packages/accounts/lib/services/user_service.dart+++ b/mobile/packages/accounts/lib/services/user_service.dart@@ -59,7 +59,8 @@ class UserService {late BaseConfiguration _config;late BaseHomePage _homePage;late CreateAccountsClient _createAccountsClient;- ({String origin, AccountsClient client})? _accountsClient;+ AccountsClient? _accountsClient;+ String? _accountsClientOrigin;InstallSourceHandler? _installSourceHandler;UserService._privateConstructor();@@ -943,7 +944,7 @@ class UserService {AccountsClient _getAccountsClient() {final origin = _config.getHttpEndpoint();- if (_accountsClient?.origin != origin) {+ if (_accountsClient == null || _accountsClientOrigin != origin) {final headers = _enteDio.options.headers;final client = _createAccountsClient(config: AccountsClientConfig(@@ -953,9 +954,10 @@ class UserService {userAgent: headers[HttpHeaders.userAgentHeader] as String,),);- _accountsClient = (origin: origin, client: client);+ _accountsClient = client;+ _accountsClientOrigin = origin;}- return _accountsClient!.client;+ return _accountsClient!;}Future<void> recoverTwoFactor(