Fix bugs from double-entry mode and account spinners

Fix: crash when saving transaction in double-entry mode with only one account in system Fix: crash when editing account (default transfer account setting) with no other account in system Fix broken CI build (update Android tools version in Travis config) Fixes codinguser#473
ZcMirror · Feb 5, 2016 · 0aef6f5 · 0aef6f5
1 parent 8a61607
commit 0aef6f5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ android:
   components:
     - platform-tools
     - tools
-    - build-tools-23.0.1
+    - build-tools-23.0.2
 
     # The SDK version used to compile your project
     - android-23

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
 Change Log
 ===============================================================================
-Version 2.0.6 *(2016-02-29)*
+Version 2.0.6 *(2016-02-20)*
 ----------------------------
 * Fixed: Saving transaction gets slower with increase in size of database
 * Fixed: Imbalance amount wrongly computed in split editor (for some accounts)
 * Fixed: Amount text boxes in split editor sometimes do not get focus
+* Fixed: Crash when saving account with no transfer account selected
 * Fixed: Crash when creating a new transaction with no transfer account
 
 Version 2.0.5 *(2015-12-12)*

diff --git a/app/src/main/java/org/gnucash/android/ui/account/AccountFormFragment.java b/app/src/main/java/org/gnucash/android/ui/account/AccountFormFragment.java
@@ -791,7 +791,8 @@ private void saveAccount() {
 		}
         mAccount.setParentUID(newParentAccountUID);
 
-        if (mDefaultTransferAccountCheckBox.isChecked()){
+        if (mDefaultTransferAccountCheckBox.isChecked()
+                && mDefaulTransferAccountSpinner.getSelectedItemId() != Spinner.INVALID_ROW_ID){
             long id = mDefaulTransferAccountSpinner.getSelectedItemId();
             mAccount.setDefaultTransferAccountUID(mAccountsDbAdapter.getUID(id));
         } else {

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
@@ -793,7 +793,7 @@ private void saveNewTransaction() {
 
                     String transferAcctUID;
                     long transferAcctId = mTransferAccountSpinner.getSelectedItemId();
-                    if (mUseDoubleEntry || transferAcctId < 0) {
+                    if (mUseDoubleEntry && transferAcctId > 0) {
                         transferAcctUID = mAccountsDbAdapter.getUID(transferAcctId);
                     } else {
                         transferAcctUID = mAccountsDbAdapter.getOrCreateImbalanceAccountUID(currency);

diff --git a/play_store_description.txt b/play_store_description.txt
@@ -2,7 +2,7 @@ GnuCash is a mobile finance expense tracker application for Android.
 
 It is a companion application for GnuCash for the desktop and enables flexible tracking of expenses on-the-go which can be exported to QIF or OFX formats.
 
-Some of feature highligts  include:
+Some of feature highlights  include:
 
 <b>&bull; An easy-to-use interface.</b>