move null check before the value is used

[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 6e20f65221bf39409f4f406432bc40139deb3845..bd53c2d812e99de09e9c829044bbf49b4aa957f6 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
@@ -22,6 +22,7 @@ import android.os.AsyncTask;
 import net.ktnx.mobileledger.async.UpdateTransactionsTask;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.TransactionListItem;
+import net.ktnx.mobileledger.utils.LockHolder;
 import net.ktnx.mobileledger.utils.ObservableValue;
 
 import androidx.lifecycle.ViewModel;
@@ -31,15 +32,15 @@ public class TransactionListViewModel extends ViewModel {
     public static ObservableValue<String> updateError = new ObservableValue<>();
 
     public static void scheduleTransactionListReload() {
-        if (Data.profile.get() == null) return;
+        if (Data.profile.getValue() == null) return;
 
-        String filter = TransactionListFragment.accountFilter.get();
+        String filter = Data.accountFilter.getValue();
         AsyncTask<String, Void, String> task = new UTT();
         task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, filter);
     }
     public static TransactionListItem getTransactionListItem(int position) {
+        if (Data.transactions == null) return null;
         try(LockHolder lh = Data.transactions.lockForReading()) {
-            if (Data.transactions == null) return null;
             if (position >= Data.transactions.size() + 1) return null;
             if (position == Data.transactions.size()) return new TransactionListItem();
             return Data.transactions.get(position);