From fc936f1f3cfa28a0b798ca568208f4ab12a2dc51 Mon Sep 17 00:00:00 2001 From: sajee_techi Date: Fri, 19 Dec 2025 15:03:51 +0530 Subject: [PATCH] refactor(accounts): update getAllAccounts to return DBAccountV4 - Update AccountsServiceInterface to use DBAccountV4 for account retrieval. - Migrate Android, Apple, and Web account service implementations to DBAccountV4. - Update AccountsTable.all() to fetch and map records using DBAccountV4.fromMap. - Ensure type consistency across account backup services following the v4 database migration. --- lib/services/accounts/accounts.dart | 2 +- lib/services/accounts/native/android.dart | 4 ++-- lib/services/accounts/native/apple.dart | 4 ++-- lib/services/accounts/web.dart | 2 +- lib/services/db/backup/accounts.dart | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/services/accounts/accounts.dart b/lib/services/accounts/accounts.dart index ec83f715..f9656850 100644 --- a/lib/services/accounts/accounts.dart +++ b/lib/services/accounts/accounts.dart @@ -31,7 +31,7 @@ abstract class AccountsServiceInterface { // key = wb_$wallet_address, value = $name|$privateKey // get all accounts - Future> getAllAccounts(); + Future> getAllAccounts(); // set account Future setAccount(DBAccount account); diff --git a/lib/services/accounts/native/android.dart b/lib/services/accounts/native/android.dart index 6829748a..c48535ed 100644 --- a/lib/services/accounts/native/android.dart +++ b/lib/services/accounts/native/android.dart @@ -189,8 +189,8 @@ class AndroidAccountsService extends AccountsServiceInterface { // get all wallet backups @override - Future> getAllAccounts() async { - final List accounts = await _accountsDB.accounts.all(); + Future> getAllAccounts() async { + final List accounts = await _accountsDB.accounts.all(); for (final account in accounts) { final privateKey = await _credentials.read(account.id); diff --git a/lib/services/accounts/native/apple.dart b/lib/services/accounts/native/apple.dart index b5a7189b..b8ab257d 100644 --- a/lib/services/accounts/native/apple.dart +++ b/lib/services/accounts/native/apple.dart @@ -302,8 +302,8 @@ class AppleAccountsService extends AccountsServiceInterface { // get all wallet backups @override - Future> getAllAccounts() async { - final List accounts = await _accountsDB.accounts.all(); + Future> getAllAccounts() async { + final List accounts = await _accountsDB.accounts.all(); for (final account in accounts) { final privateKey = await _credentials.read(account.id); diff --git a/lib/services/accounts/web.dart b/lib/services/accounts/web.dart index 4b31f568..00febc33 100644 --- a/lib/services/accounts/web.dart +++ b/lib/services/accounts/web.dart @@ -32,7 +32,7 @@ class WebAccountsService extends AccountsServiceInterface { // get all wallet backups @override - Future> getAllAccounts() async { + Future> getAllAccounts() async { return []; } diff --git a/lib/services/db/backup/accounts.dart b/lib/services/db/backup/accounts.dart index ecaa0cd9..acc8cbf5 100644 --- a/lib/services/db/backup/accounts.dart +++ b/lib/services/db/backup/accounts.dart @@ -317,11 +317,11 @@ class AccountsTable extends DBTable { await db.delete(name); } - Future> all() async { + Future> all() async { final List> maps = await db.query(name); return List.generate(maps.length, (i) { - return DBAccount.fromMap(maps[i]); + return DBAccountV4.fromMap(maps[i]); }); }