From 10d76e4b00f1a5e0f0cfe25ffa36fa5597239e4d Mon Sep 17 00:00:00 2001
From: Moshe <moshe.waisberg@tikalk.com>
Date: Mon, 26 Jun 2017 15:15:24 +0300
Subject: [PATCH 1/2] Adding a split to the transaction was removing more rows
 than it should have: old transaction had n rows; the new transaction has n+1
 rows; but the (n+1)th row was "Balance".

---
 .../android/ui/transaction/TransactionDetailActivity.java   | 6 ++++--
 app/src/main/res/layout/activity_transaction_detail.xml     | 3 ++-
 app/src/main/res/layout/item_split_amount_info.xml          | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/gnucash/android/ui/transaction/TransactionDetailActivity.java b/app/src/main/java/org/gnucash/android/ui/transaction/TransactionDetailActivity.java
index 30afa6d2a..44771f872 100644
--- a/app/src/main/java/org/gnucash/android/ui/transaction/TransactionDetailActivity.java
+++ b/app/src/main/java/org/gnucash/android/ui/transaction/TransactionDetailActivity.java
@@ -54,6 +54,7 @@ public class TransactionDetailActivity extends PasscodeLockActivity {
 
     private String mTransactionUID;
     private String mAccountUID;
+    private int mDetailTableRows;
 
     public static final int REQUEST_EDIT_TRANSACTION = 0x10;
 
@@ -126,6 +127,7 @@ private void bindViews(){
         TextView balanceTextView = accountBalance.isNegative() ? mDebitBalance : mCreditBalance;
         TransactionsActivity.displayBalance(balanceTextView, accountBalance);
 
+        mDetailTableRows = mDetailTableLayout.getChildCount();
         boolean useDoubleEntry = GnuCashApplication.isDoubleEntryEnabled();
         LayoutInflater inflater = LayoutInflater.from(this);
         int index = 0;
@@ -175,8 +177,8 @@ private void refresh(){
      * Remove the split item views from the transaction detail prior to refreshing them
      */
     private void removeSplitItemViews(){
-        long splitCount = TransactionsDbAdapter.getInstance().getSplitCount(mTransactionUID);
-        mDetailTableLayout.removeViews(0, (int)splitCount);
+        // Remove all rows that are not special.
+        mDetailTableLayout.removeViews(0, mDetailTableLayout.getChildCount() - mDetailTableRows);
         mDebitBalance.setText("");
         mCreditBalance.setText("");
     }
diff --git a/app/src/main/res/layout/activity_transaction_detail.xml b/app/src/main/res/layout/activity_transaction_detail.xml
index 66a50ed96..4eba5bfe4 100644
--- a/app/src/main/res/layout/activity_transaction_detail.xml
+++ b/app/src/main/res/layout/activity_transaction_detail.xml
@@ -73,7 +73,8 @@
             android:stretchColumns="1"
             android:orientation="vertical" >
 
-            <TableRow android:layout_width="match_parent"
+            <TableRow android:id="@+id/row_balance"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:weightSum="5"
                 android:paddingTop="5dp"
diff --git a/app/src/main/res/layout/item_split_amount_info.xml b/app/src/main/res/layout/item_split_amount_info.xml
index a656fa061..2b4f17bd9 100644
--- a/app/src/main/res/layout/item_split_amount_info.xml
+++ b/app/src/main/res/layout/item_split_amount_info.xml
@@ -16,6 +16,7 @@
 -->
 <TableRow xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/row_split_amount_info"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:weightSum="5"

From a29d556bc4c9361a1897b72a6fa13400533b883c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=80lex=20Magaz=20Gra=C3=A7a?= <alexandre.magaz@gmail.com>
Date: Tue, 4 Jul 2017 18:24:20 +0200
Subject: [PATCH 2/2] Revert unneeded changes

---
 app/src/main/res/layout/activity_transaction_detail.xml | 3 +--
 app/src/main/res/layout/item_split_amount_info.xml      | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/res/layout/activity_transaction_detail.xml b/app/src/main/res/layout/activity_transaction_detail.xml
index 4eba5bfe4..66a50ed96 100644
--- a/app/src/main/res/layout/activity_transaction_detail.xml
+++ b/app/src/main/res/layout/activity_transaction_detail.xml
@@ -73,8 +73,7 @@
             android:stretchColumns="1"
             android:orientation="vertical" >
 
-            <TableRow android:id="@+id/row_balance"
-                android:layout_width="match_parent"
+            <TableRow android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:weightSum="5"
                 android:paddingTop="5dp"
diff --git a/app/src/main/res/layout/item_split_amount_info.xml b/app/src/main/res/layout/item_split_amount_info.xml
index 2b4f17bd9..a656fa061 100644
--- a/app/src/main/res/layout/item_split_amount_info.xml
+++ b/app/src/main/res/layout/item_split_amount_info.xml
@@ -16,7 +16,6 @@
 -->
 <TableRow xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/row_split_amount_info"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:weightSum="5"