codinguser#876 - Fix NPE when type switching on a new transaction

JeanGarf · May 28, 2020 · eb0f00d · eb0f00d
1 parent b59e69b
commit eb0f00d
Showing 1 changed file with 20 additions and 7 deletions.
diff --git a/app/src/main/java/org/gnucash/android/ui/transaction/TransactionFormFragment.java b/app/src/main/java/org/gnucash/android/ui/transaction/TransactionFormFragment.java
@@ -783,8 +783,11 @@ private void setListeners() {
             public void onCheckedChanged(CompoundButton buttonView,
                                          boolean isChecked) {
 
-                // Compute balance signed value of saved transaction
-                final Money signedTransactionBalance = mTransaction.getBalance(mAccountUID);
+                // UI to Transaction
+                Transaction transaction = extractTransactionFromView();
+
+                // Compute balance signed value of transaction
+                final Money signedTransactionBalance = transaction.getBalance(mAccountUID);
 
                 // Update Amount Signum
                 updateAmountEditText(signedTransactionBalance);
@@ -984,6 +987,13 @@ private List<Split> extractSplitsFromView() {
         transaction.setSplits(splits);
         transaction.setExported(false); //not necessary as exports use timestamps now. Because, legacy
 
+        if (mEditMode) {
+            // Editing an existing transaction
+
+            // reset the transaction UID
+            transaction.setUID(mTransaction.getUID());
+        }
+
         return transaction;
     }
 
@@ -1029,13 +1039,16 @@ private void saveNewTransaction() {
             return;
         }
 
-        Transaction transaction = extractTransactionFromView();
+        //
+        // UI to Transaction, with same UID if transaction edit mode
+        //
+
+        mTransaction = extractTransactionFromView();
 
-        if (mEditMode) { //if editing an existing transaction
-            transaction.setUID(mTransaction.getUID());
-        }
+        //
+        // Save transaction in DB
+        //
 
-        mTransaction = transaction;
         mAccountsDbAdapter.beginTransaction();
 
         try {