make use of getBindingAdapter and save a field

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

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionAccountRowItemHolder.java b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionAccountRowItemHolder.java
index 5e930569e1afac281593d7a7d0d5cd51151b87e2..4b0c1134c911f450099ed425f412e19679ad7751 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionAccountRowItemHolder.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/new_transaction/NewTransactionAccountRowItemHolder.java
@@ -56,7 +56,7 @@ class NewTransactionAccountRowItemHolder extends NewTransactionItemViewHolder {
     //TODO multiple amounts with different currencies per posting?
     NewTransactionAccountRowItemHolder(@NonNull NewTransactionAccountRowBinding b,
                                        NewTransactionItemsAdapter adapter) {
-        super(b.getRoot(), adapter);
+        super(b.getRoot());
         this.b = b;
         new TextViewClearHelper().attachToTextView(b.comment);
 
@@ -225,7 +225,11 @@ class NewTransactionAccountRowItemHolder extends NewTransactionItemViewHolder {
                  focusInfo.position != getBindingAdapterPosition()))
                 return;
 
-            NewTransactionModel.TransactionAccount acc = getItem().toTransactionAccount();
+            final NewTransactionModel.Item item = getItem();
+            if (item == null)
+                return;
+
+            NewTransactionModel.TransactionAccount acc = item.toTransactionAccount();
             switch (focusInfo.element) {
                 case Amount:
                     b.accountRowAccAmounts.requestFocus();
@@ -404,7 +408,9 @@ class NewTransactionAccountRowItemHolder extends NewTransactionItemViewHolder {
             return false;
         }
 
-        NewTransactionModel.Item item = getItem();
+        final NewTransactionModel.Item item = getItem();
+        if (item == null)
+            return false;
 
         syncingData = true;
 
@@ -524,8 +530,11 @@ class NewTransactionAccountRowItemHolder extends NewTransactionItemViewHolder {
 
                 setEditable(true);
 
-                applyFocus(mAdapter.model.getFocusInfo()
-                                         .getValue());
+                NewTransactionItemsAdapter adapter =
+                        (NewTransactionItemsAdapter) getBindingAdapter();
+                if (adapter != null)
+                    applyFocus(adapter.model.getFocusInfo()
+                                            .getValue());
             }
             finally {
                 syncingData = false;