Merge branch 'develop' into feature/qif_export

Author: codinguser

CHANGELOG.md

@@ -1,13 +1,29 @@
 Change Log
 ===============================================================================
+Version 1.2.5 *(2013-09-17)*
+----------------------------
+* Feature: Search accounts by name
+* Fixed: crash when deleting accounts
+* Fixed: auto-completing transaction names does not copy the time or export flag
+* Fixed: random crash when opening app (or loading accounts)
+
+Version 1.2.4 *(2013-09-05)*
+----------------------------
+* Added support for detecting placeholder accounts during import
+* Use full qualified account names in account selection spinners
+* Loads complete transaction as a template when the autocomplete suggestion is selected
+* Fixed: selecting items from lists caused multiple to be selected in the wrong positions
+* Fixed: widgets not updated when all accounts or all transactions are deleted
+* Other minor bug fixes.
+
 Version 1.2.3 *(2013-08-28)*
 ----------------------------
 * Fixed: crashes when editing/creating transactions
 * Feature: Added Chinese language translation
 * Feature: Autocomplete transaction descriptions
 * Improved reliability of importing stock accounts
 * Improved speed of loading account balance
-* Improved incrased touch target area of "new transaction" button in accounts list view
+* Improved increased touch target area of "new transaction" button in accounts list view
 
 Version 1.2.2 *(2013-06-23)*
 ----------------------------

app/AndroidManifest.xml

@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.gnucash.android"
-    android:versionCode="14"
-    android:versionName="1.2.4" >
+    android:versionCode="16"
+    android:versionName="1.2.5" >
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15"/>
 

app/pom.xml

@@ -22,7 +22,7 @@
     <description>Gnucash Android companion application</description>
 
     <parent>
-        <version>1.2.4-SNAPSHOT</version>
+        <version>1.2.6-SNAPSHOT</version>
         <groupId>org.gnucash.android</groupId>
         <artifactId>gnucash-android-parent</artifactId>
     </parent>

app/src/org/gnucash/android/ui/accounts/AccountsListFragment.java

@@ -310,6 +310,7 @@ protected void deleteAccount(long rowId) {
             mAccountsDbAdapter.reassignParent(accountUID, null);
             Toast.makeText(getActivity(), R.string.toast_account_deleted, Toast.LENGTH_SHORT).show();
             WidgetConfigurationActivity.updateAllWidgets(getActivity().getApplicationContext());
+            getLoaderManager().destroyLoader(0);
         }
         refreshList();
     }
@@ -729,7 +730,15 @@ protected Money doInBackground(Long... params) {
                 cancel(true);
                 return Money.getZeroInstance();
             }
-            Money balance = accountsDbAdapter.getAccountBalance(params[0]);
+            Money balance = Money.getZeroInstance();
+
+            try {
+                balance = accountsDbAdapter.getAccountBalance(params[0]);
+            } catch (IllegalArgumentException ex){
+                //sometimes a load computation has been started and the data set changes.
+                //the account ID may no longer exist. So we catch that exception here and do nothing
+                Log.e(TAG, "Error computing account balance: " + ex);
+            }
             return balance;
         }
 

app/src/org/gnucash/android/ui/transactions/NewTransactionFragment.java

@@ -163,8 +163,16 @@ public class NewTransactionFragment extends SherlockFragment implements
 	 */
 	private Spinner mDoubleAccountSpinner;
 
+    /**
+     * Flag to note if double entry accounting is in use or not
+     */
 	private boolean mUseDoubleEntry;
 
+    /**
+     * Flag to note if the user has manually edited the amount of the transaction
+     */
+    boolean mAmountManuallyEdited = false;
+
 	/**
 	 * Create the view and retrieve references to the UI elements
 	 */
@@ -252,6 +260,8 @@ public Cursor runQuery(CharSequence name) {
             public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
                 mTransaction = mTransactionsDbAdapter.getTransaction(id);
                 mTransaction.setUID(UUID.randomUUID().toString());
+                mTransaction.setExported(false);
+                mTransaction.setTime(System.currentTimeMillis());
                 long accountId = ((TransactionsActivity)getSherlockActivity()).getCurrentAccountID();
                 mTransaction.setAccountUID(mTransactionsDbAdapter.getAccountUID(accountId));
                 initializeViewsWithTransaction();
@@ -269,7 +279,10 @@ private void initializeViewsWithTransaction(){
 
 		mNameEditText.setText(mTransaction.getName());
 		mTransactionTypeButton.setChecked(mTransaction.getTransactionType() == TransactionType.DEBIT);
-		mAmountEditText.setText(mTransaction.getAmount().toPlainString());
+		if (!mAmountManuallyEdited){
+            //when autocompleting, only change the amount if the user has not manually changed it already
+            mAmountEditText.setText(mTransaction.getAmount().toPlainString());
+        }
 		mCurrencyTextView.setText(mTransaction.getAmount().getCurrency().getSymbol(Locale.getDefault()));
 		mDescriptionEditText.setText(mTransaction.getDescription());
 		mDateTextView.setText(DATE_FORMATTER.format(mTransaction.getTimeMillis()));
@@ -643,7 +656,7 @@ public void beforeTextChanged(CharSequence s, int start, int count,
 		public void onTextChanged(CharSequence s, int start, int before,
 				int count) {
 			// nothing to see here, move along
-			
+			mAmountManuallyEdited = true;
 		}
 
 	}

integration-tests/pom.xml

@@ -17,7 +17,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-		<version>1.2.4-SNAPSHOT</version>
+		<version>1.2.6-SNAPSHOT</version>
 		<groupId>org.gnucash.android</groupId>
 		<artifactId>gnucash-android-parent</artifactId>
 	</parent>

pom.xml

@@ -17,7 +17,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-	<version>1.2.4-SNAPSHOT</version>
+	<version>1.2.6-SNAPSHOT</version>
     <groupId>org.gnucash.android</groupId>
     <artifactId>gnucash-android-parent</artifactId>
     <name>GnuCash Android parent</name>