From 190be5b69483e3cce04da91c5cd63f5aedf3f10e Mon Sep 17 00:00:00 2001 From: otsmr Date: Sat, 16 May 2026 17:15:39 +0200 Subject: [PATCH] fix flutter analyze issues --- lib/src/database/signal/signal_signed_pre_key_store.dart | 3 +-- lib/src/services/api.service.dart | 7 +++---- lib/src/services/api/utils.api.dart | 3 +-- lib/src/services/user.service.dart | 3 +-- .../zoom_tutorial_overlay.dart | 2 +- .../visual/views/settings/backup/backup_setup.view.dart | 2 +- 6 files changed, 8 insertions(+), 12 deletions(-) diff --git a/lib/src/database/signal/signal_signed_pre_key_store.dart b/lib/src/database/signal/signal_signed_pre_key_store.dart index adf927c7..1c282bd9 100644 --- a/lib/src/database/signal/signal_signed_pre_key_store.dart +++ b/lib/src/database/signal/signal_signed_pre_key_store.dart @@ -3,14 +3,13 @@ import 'dart:convert'; import 'package:drift/drift.dart'; import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart'; import 'package:twonly/locator.dart'; -import 'package:twonly/src/constants/secure_storage.keys.dart'; import 'package:twonly/src/database/twonly.db.dart'; import 'package:twonly/src/utils/log.dart'; import 'package:twonly/src/utils/secure_storage.dart'; Future> getSignalSignedPreKeyStoreOld() async { final storeSerialized = await SecureStorage.instance.read( - key: SecureStorageKeys.signalSignedPreKey, + key: 'signed_pre_key_store', ); final store = HashMap(); if (storeSerialized == null) { diff --git a/lib/src/services/api.service.dart b/lib/src/services/api.service.dart index 64224cdb..c81d224d 100644 --- a/lib/src/services/api.service.dart +++ b/lib/src/services/api.service.dart @@ -18,7 +18,6 @@ import 'package:package_info_plus/package_info_plus.dart'; import 'package:twonly/core/bridge/wrapper/key_manager.dart'; import 'package:twonly/globals.dart'; import 'package:twonly/locator.dart'; -import 'package:twonly/src/constants/secure_storage.keys.dart'; import 'package:twonly/src/database/twonly.db.dart'; import 'package:twonly/src/model/protobuf/api/websocket/client_to_server.pbserver.dart'; import 'package:twonly/src/model/protobuf/api/websocket/error.pb.dart'; @@ -426,7 +425,7 @@ class ApiService { Future tryAuthenticateWithToken() async { final apiAuthToken = await SecureStorage.instance.read( - key: SecureStorageKeys.apiAuthToken, + key: 'api_auth_token', ); if (apiAuthToken != null) { @@ -464,7 +463,7 @@ class ApiService { Log.info('Switch was successfully.'); await UserService.update((u) => u.canUseLoginTokenForAuth = true); await SecureStorage.instance.delete( - key: SecureStorageKeys.apiAuthToken, + key: 'api_auth_token', ); } } catch (e) { @@ -586,7 +585,7 @@ class ApiService { final apiAuthTokenB64 = base64Encode(apiAuthToken); await SecureStorage.instance.write( - key: SecureStorageKeys.apiAuthToken, + key: 'api_auth_token', value: apiAuthTokenB64, ); diff --git a/lib/src/services/api/utils.api.dart b/lib/src/services/api/utils.api.dart index c3f9a459..c292b0e5 100644 --- a/lib/src/services/api/utils.api.dart +++ b/lib/src/services/api/utils.api.dart @@ -4,7 +4,6 @@ import 'package:drift/drift.dart'; import 'package:fixnum/fixnum.dart'; import 'package:twonly/core/bridge/wrapper/key_manager.dart'; import 'package:twonly/locator.dart'; -import 'package:twonly/src/constants/secure_storage.keys.dart'; import 'package:twonly/src/database/tables/mediafiles.table.dart'; import 'package:twonly/src/database/twonly.db.dart'; import 'package:twonly/src/model/protobuf/api/websocket/client_to_server.pb.dart' @@ -129,7 +128,7 @@ Future?> getAuthenticationHeader() async { }; } else { final apiAuthTokenRaw = await SecureStorage.instance.read( - key: SecureStorageKeys.apiAuthToken, + key: 'api_auth_token', ); if (apiAuthTokenRaw == null) { diff --git a/lib/src/services/user.service.dart b/lib/src/services/user.service.dart index 700e01bb..e2b8e299 100644 --- a/lib/src/services/user.service.dart +++ b/lib/src/services/user.service.dart @@ -4,7 +4,6 @@ import 'dart:convert'; import 'package:mutex/mutex.dart'; import 'package:twonly/core/bridge/wrapper/key_manager.dart'; import 'package:twonly/locator.dart'; -import 'package:twonly/src/constants/secure_storage.keys.dart'; import 'package:twonly/src/model/json/userdata.model.dart'; import 'package:twonly/src/utils/keyvalue.dart'; import 'package:twonly/src/utils/log.dart'; @@ -38,7 +37,7 @@ class UserService { // 2. If not found, try to load from SecureStorage (Migration path) final userDataJson = await SecureStorage.instance.read( - key: SecureStorageKeys.userData, + key: 'userData', ); if (userDataJson != null) { diff --git a/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/zoom_tutorial_overlay.dart b/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/zoom_tutorial_overlay.dart index 3914ba23..eac3f27a 100644 --- a/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/zoom_tutorial_overlay.dart +++ b/lib/src/visual/views/camera/camera_preview_components/camera_preview_controller_components/zoom_tutorial_overlay.dart @@ -130,7 +130,7 @@ class _ZoomTutorialOverlayState extends State height: 42, decoration: BoxDecoration( shape: BoxShape.circle, - color: Colors.white.withOpacity(0.5), + color: Colors.white.withValues(alpha: 0.5), ), child: const Center( child: FaIcon( diff --git a/lib/src/visual/views/settings/backup/backup_setup.view.dart b/lib/src/visual/views/settings/backup/backup_setup.view.dart index 4b09a0d9..4b00e45e 100644 --- a/lib/src/visual/views/settings/backup/backup_setup.view.dart +++ b/lib/src/visual/views/settings/backup/backup_setup.view.dart @@ -148,7 +148,7 @@ class _SetupBackupViewState extends State { ) : const Icon(Icons.lock_clock_rounded), label: Text( - userService.currentUser.twonlySafeBackup == null + userService.currentUser.isBackupEnabled ? context.lang.backupEnableBackup : context.lang.backupChangePassword, ),