diff --git a/app/src/main/java/cy/agorise/crystalwallet/dao/TransactionDao.java b/app/src/main/java/cy/agorise/crystalwallet/dao/TransactionDao.java index dbe6763..9bd79b2 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/dao/TransactionDao.java +++ b/app/src/main/java/cy/agorise/crystalwallet/dao/TransactionDao.java @@ -24,7 +24,10 @@ public interface TransactionDao { LivePagedListProvider transactionsByDate(); @Query("SELECT * FROM crypto_coin_transaction WHERE account_id = :idAccount ORDER BY date ASC") - LiveData> getByIdAccount(long idAccount); + LiveData> getByIdAccountLiveData(long idAccount); + + @Query("SELECT * FROM crypto_coin_transaction WHERE account_id = :idAccount ORDER BY date ASC") + List getByIdAccount(long idAccount); @Insert(onConflict = OnConflictStrategy.REPLACE) public long[] insertTransaction(CryptoCoinTransaction... transactions); diff --git a/app/src/main/java/cy/agorise/crystalwallet/manager/BitsharesAccountManager.java b/app/src/main/java/cy/agorise/crystalwallet/manager/BitsharesAccountManager.java index d5ce063..b7c3d08 100644 --- a/app/src/main/java/cy/agorise/crystalwallet/manager/BitsharesAccountManager.java +++ b/app/src/main/java/cy/agorise/crystalwallet/manager/BitsharesAccountManager.java @@ -269,7 +269,7 @@ public class BitsharesAccountManager implements CryptoAccountManager, CryptoNetI public static void refreshAccountTransactions(long idAccount, Context context){ CrystalDatabase db = CrystalDatabase.getAppDatabase(context); - LiveData> transactions = db.transactionDao().getByIdAccount(idAccount); + List transactions = db.transactionDao().getByIdAccount(idAccount); CryptoNetAccount account = db.cryptoNetAccountDao().getById(idAccount); if(account.getCryptoNet() == CryptoNet.BITSHARES) { @@ -278,7 +278,7 @@ public class BitsharesAccountManager implements CryptoAccountManager, CryptoNetI grapheneAccount.loadInfo(db.grapheneAccountInfoDao().getByAccountId(idAccount)); - int start = transactions.getValue().size(); + int start = transactions.size(); int limit = 50; int stop = start + limit;