Updated strings for v1.5.4 release

Fixed: crash when creating transactions

Author: codinguser

CHANGELOG.md

@@ -1,5 +1,15 @@
 Change Log
 ===============================================================================
+Version 1.5.4 *(2015-02-16)*
+----------------------------
+* Fixed: Crash when creating TRADING accounts
+* Fixed: Crash when deleting scheduled transactions
+* Fixed: Account parent can be set to self, creating a cyclic hierarchy
+* Fixed: Transactions not saved when double-entry is enabled but no transfer account is specified
+* Improved: Auto-select the device locale currency in the account-creation dialog
+* Improved: Upgraded structure of repository to match latest Android conventions
+* Improved: Updated instrumentation tests and enabled better test reporting with Spoon
+
 Version 1.5.3 *(2015-02-02)*
 ----------------------------
 * Fixed: Unable to edit double-entry transactions

CONTRIBUTORS

@@ -21,4 +21,5 @@ Lei Xiao Bao <[email protected]>
 Yongxin Wang <[email protected]>
 Matthew Hague <[email protected]>
 Spanti Nicola <[email protected]>
-Jesse Shieh <[email protected]>
+Jesse Shieh <[email protected]>
+Àlex Magaz Graça <[email protected]>

app/pom.xml

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

app/project.properties

@@ -11,7 +11,7 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
+target=android-18
 android.library.reference.1=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.4.0
 android.library.reference.2=gen-external-apklibs/com.viewpagerindicator_library_2.4.1
 

app/src/main/AndroidManifest.xml

@@ -17,10 +17,10 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.gnucash.android"
-    android:versionCode="46"
+    android:versionCode="47"
     android:versionName="@string/app_version_name" >
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="18"/>
 
     <permission-group 
         android:name="org.gnucash.android.permission.group.GNUCASH"

app/src/main/java/org/gnucash/android/ui/account/AccountFormFragment.java

@@ -559,7 +559,9 @@ private void loadParentAccountList(AccountType accountType){
 
         if (mAccount != null){  //if editing an account
             mDescendantAccountUIDs = mAccountsDbAdapter.getDescendantAccountUIDs(mAccount.getUID(), null, null);
-            mDescendantAccountUIDs.add(mAccountsDbAdapter.getGnuCashRootAccountUID());
+            String rootAccountUID = mAccountsDbAdapter.getGnuCashRootAccountUID();
+            if (rootAccountUID != null)
+                mDescendantAccountUIDs.add(rootAccountUID);
             // limit cyclic account hierarchies.
             condition += " AND (" + DatabaseSchema.AccountEntry.COLUMN_UID + " NOT IN ( '"
                     + TextUtils.join("','", mDescendantAccountUIDs) + "','" + mAccountUID + "' ) )";

app/src/main/res/values/strings.xml

@@ -17,7 +17,7 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">GnuCash</string>
-    <string name="app_version_name">1.5.3</string>
+    <string name="app_version_name">1.5.4</string>
     <string name="title_add_account">Create Account</string>
     <string name="title_edit_account">Edit Account</string>
     <string name="info_details">Info</string>

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.5.3-SNAPSHOT</version>
+		<version>1.5.4-SNAPSHOT</version>
 		<groupId>org.gnucash.android</groupId>
 		<artifactId>gnucash-android-parent</artifactId>
 	</parent>

integration-tests/project.properties

@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
+target=android-18

integration-tests/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     android:versionCode="3"
     android:versionName="1.2.4" >
 
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16" />
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="18" />
 
     <uses-permission android:name="org.gnucash.android.permission.RECORD_TRANSACTION" />
     <uses-permission android:name="org.gnucash.android.permission.CREATE_ACCOUNT" />