HOTFIX Separate language from preference update (#4062)
This commit is contained in:
@@ -1,9 +1,11 @@
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:server_settings/server_settings/tmail_server_settings.dart';
|
||||
|
||||
abstract class ServerSettingsDataSource {
|
||||
Future<TMailServerSettings> getServerSettings(AccountId accountId);
|
||||
Future<TMailServerSettings> updateServerSettings(
|
||||
Session session,
|
||||
AccountId accountId,
|
||||
TMailServerSettings serverSettings);
|
||||
}
|
||||
+3
-2
@@ -1,4 +1,5 @@
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:server_settings/server_settings/tmail_server_settings.dart';
|
||||
import 'package:tmail_ui_user/features/server_settings/data/datasource/server_settings_data_source.dart';
|
||||
import 'package:tmail_ui_user/features/server_settings/data/network/server_settings_api.dart';
|
||||
@@ -20,9 +21,9 @@ class RemoteServerSettingsDataSourceImpl implements ServerSettingsDataSource {
|
||||
}
|
||||
|
||||
@override
|
||||
Future<TMailServerSettings> updateServerSettings(AccountId accountId, TMailServerSettings serverSettings) {
|
||||
Future<TMailServerSettings> updateServerSettings(Session session, AccountId accountId, TMailServerSettings serverSettings) {
|
||||
return Future.sync(() async {
|
||||
return await _serverSettingsAPI.updateServerSettings(accountId, serverSettings);
|
||||
return await _serverSettingsAPI.updateServerSettings(session, accountId, serverSettings);
|
||||
}).catchError(_exceptionThrower.throwException);
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:jmap_dart_client/http/http_client.dart';
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/error/method/exception/error_method_response_exception.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:jmap_dart_client/jmap/jmap_request.dart';
|
||||
import 'package:server_settings/server_settings/get/get_server_settings_method.dart';
|
||||
import 'package:server_settings/server_settings/get/get_server_settings_response.dart';
|
||||
@@ -10,6 +11,7 @@ import 'package:server_settings/server_settings/set/set_server_settings_response
|
||||
import 'package:server_settings/server_settings/tmail_server_settings.dart';
|
||||
import 'package:tmail_ui_user/features/base/mixin/handle_error_mixin.dart';
|
||||
import 'package:tmail_ui_user/features/server_settings/domain/exceptions/server_settings_exception.dart';
|
||||
import 'package:tmail_ui_user/features/server_settings/domain/extensions/tmail_server_settings_extension.dart';
|
||||
|
||||
class ServerSettingsAPI with HandleSetErrorMixin {
|
||||
final HttpClient httpClient;
|
||||
@@ -44,10 +46,12 @@ class ServerSettingsAPI with HandleSetErrorMixin {
|
||||
}
|
||||
|
||||
Future<TMailServerSettings> updateServerSettings(
|
||||
Session session,
|
||||
AccountId accountId,
|
||||
TMailServerSettings serverSettings
|
||||
) async {
|
||||
final processingInvocation = ProcessingInvocation();
|
||||
serverSettings = serverSettings.normalized(session, accountId);
|
||||
|
||||
final setServerSettingsMethod = SetServerSettingsMethod(accountId)
|
||||
..addUpdatesSingleton({
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/session/session.dart';
|
||||
import 'package:server_settings/server_settings/tmail_server_settings.dart';
|
||||
import 'package:tmail_ui_user/features/server_settings/data/datasource/server_settings_data_source.dart';
|
||||
import 'package:tmail_ui_user/features/server_settings/domain/repository/server_settings_repository.dart';
|
||||
@@ -14,7 +15,8 @@ class ServerSettingsRepositoryImpl implements ServerSettingsRepository {
|
||||
|
||||
@override
|
||||
Future<TMailServerSettings> updateServerSettings(
|
||||
Session session,
|
||||
AccountId accountId,
|
||||
TMailServerSettings serverSettings)
|
||||
=> _serverSettingsDataSource.updateServerSettings(accountId, serverSettings);
|
||||
=> _serverSettingsDataSource.updateServerSettings(session, accountId, serverSettings);
|
||||
}
|
||||
Reference in New Issue
Block a user