transaction list: no crash of the transaction list is not loaded yet and an item...

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / transaction_list / TransactionListViewModel.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java
index 53f48d342464b2e910f722f58730c7d3404b70fe..02affd86735f85bf5710f59395e379043c0163fe 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java
@@ -29,15 +29,18 @@ import java.util.List;
 
 public class TransactionListViewModel extends ViewModel {
     public static ObservableValue<Boolean> updating = new ObservableValue<>();
 
 public class TransactionListViewModel extends ViewModel {
     public static ObservableValue<Boolean> updating = new ObservableValue<>();

+    public static ObservableValue<String> updateError = new ObservableValue<>();

 
     public static void scheduleTransactionListReload() {
         String filter = TransactionListFragment.accountFilter.get();
 
     public static void scheduleTransactionListReload() {
         String filter = TransactionListFragment.accountFilter.get();

-        AsyncTask<String, Void, List<TransactionListItem>> task = new UTT();
+        AsyncTask<String, Void, String> task = new UTT();

         task.execute(filter);
     }
     public static TransactionListItem getTransactionListItem(int position) {
         List<TransactionListItem> transactions = Data.transactions.get();
         task.execute(filter);
     }
     public static TransactionListItem getTransactionListItem(int position) {
         List<TransactionListItem> transactions = Data.transactions.get();

-        if (position >= transactions.size()) return null;
+        if (transactions == null) return null;
+        if (position >= transactions.size() + 1) return null;
+        if (position == transactions.size()) return new TransactionListItem();

         return transactions.get(position);
     }
     public static int getTransactionCount() {
         return transactions.get(position);
     }
     public static int getTransactionCount() {


@@ -47,9 +50,9 @@ public class TransactionListViewModel extends ViewModel {
     }
     private static class UTT extends UpdateTransactionsTask {
         @Override
     }
     private static class UTT extends UpdateTransactionsTask {
         @Override

-        protected void onPostExecute(List<TransactionListItem> list) {
-            super.onPostExecute(list);
-            if (list != null) Data.transactions.set(list);
+        protected void onPostExecute(String error) {
+            super.onPostExecute(error);
+            if (error != null) updateError.set(error);

         }
     }
 }
         }
     }
 }