Merge branch 'release/v1.2.1'

codinguser · codinguser · commit 53937c83c809 · 2013-06-22T17:40:03.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 Change Log
 ===============================================================================
+Version 1.2.1 *(2013-06-22)*
+----------------------------
+* Fixed: crash when opening Settings on devices with Gingerbread or earlier
+* Improved performance for loading list of accounts and transactions
+* Show progress dialog for importing accounts and improve reliability
+
 Version 1.2.0 *(2013-06-20)*
 ----------------------------
 * Feature: Import GnuCash desktop account structure
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ After satisfying those requirements, the build is pretty simple:
 You might find that your device doesn't let you install your build if you
 already have the version from the Android Market installed.  This is standard
 Android security as it it won't let you directly replace an app that's been
-signed with a different key.  Manually uninstall Gauges from your device and
+signed with a different key.  Manually uninstall GnuCash from your device and
 you will then be able to install your own built version.
 
 
diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.gnucash.android"
-    android:versionCode="8"
-    android:versionName="1.2.0" >
+    android:versionCode="9"
+    android:versionName="1.2.1" >
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15"/>
     
diff --git a/app/pom.xml b/app/pom.xml
@@ -22,7 +22,7 @@
     <description>Gnucash Android companion application</description>
 
     <parent>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.1</version>
         <groupId>org.gnucash.android</groupId>
         <artifactId>gnucash-android-parent</artifactId>
     </parent>
diff --git a/app/res/values-de/strings.xml b/app/res/values-de/strings.xml
@@ -337,6 +337,8 @@
     <string name="summary_delete_all_transactions">All transactions in all accounts will be deleted!</string>
     <string name="title_delete_all_transactions">Delete all transactions</string>
     <string name="toast_all_transactions_deleted">All transactions successfully deleted!</string>
+    <string name="title_progress_importing_accounts">Importing accounts</string>
+    <string name="toast_tap_again_to_confirm_delete">Tap again to confirm. ALL entries will be deleted!!</string>
     <plurals name="label_sub_accounts">
         <item quantity="one">%d Unterkonto</item>
         <item quantity="other">%d Unterkonten</item>
diff --git a/app/res/values-el/strings.xml b/app/res/values-el/strings.xml
@@ -351,6 +351,8 @@
     <string name="title_delete_all_transactions">Διαγραφή όλων των κινήσεων</string>
     <string name="toast_all_transactions_deleted">Όλες οι κινήσεις διαγράφηκαν
 	με επιτυχία!</string>
+    <string name="title_progress_importing_accounts">Importing accounts</string>
+    <string name="toast_tap_again_to_confirm_delete">Tap again to confirm. ALL entries will be deleted!!</string>
     <plurals name="label_sub_accounts">
         <item quantity="one">%d υπο-λογαριασμός</item>
         <item quantity="other">%d υπο-λογαριασμοί</item>
diff --git a/app/res/values-es-rMX/strings.xml b/app/res/values-es-rMX/strings.xml
@@ -334,6 +334,8 @@
     <string name="summary_delete_all_transactions">&#161;Todas las transaccipnes en todas las cuentas ser&#225;n borradas!</string>
     <string name="title_delete_all_transactions">Borrar todas las transacciones</string>
     <string name="toast_all_transactions_deleted">&#161;Todas las transacciones han sido borradas con exit&#243;samente!</string>
+    <string name="title_progress_importing_accounts">Importing accounts</string>
+    <string name="toast_tap_again_to_confirm_delete">Tap again to confirm. ALL entries will be deleted!!</string>
     <plurals name="label_sub_accounts">
         <item quantity="one">%d subcuenta</item>
         <item quantity="other">%d subcuentas</item>
diff --git a/app/res/values-es/strings.xml b/app/res/values-es/strings.xml
@@ -335,6 +335,8 @@
     <string name="summary_delete_all_transactions">Todas las transaccipnes en todas las cuentas ser&#225;n borradas</string>
     <string name="title_delete_all_transactions">Borrar todas las transacciones</string>
     <string name="toast_all_transactions_deleted">Todas las transacciones han sido borradas con &#233;xito</string>
+    <string name="title_progress_importing_accounts">Importing accounts</string>
+    <string name="toast_tap_again_to_confirm_delete">Tap again to confirm. ALL entries will be deleted!!</string>
     <plurals name="label_sub_accounts">
         <item quantity="one">%d sub-cuenta</item>
         <item quantity="other">%d sub-cuentas</item>
diff --git a/app/res/values-fr/strings.xml b/app/res/values-fr/strings.xml
@@ -333,6 +333,8 @@
     <string name="summary_delete_all_transactions">Toutes les transactions sur tous les comptes seront supprim&#233;s!</string>
     <string name="title_delete_all_transactions">Supprimer toutes les transactions</string>
     <string name="toast_all_transactions_deleted">Toutes les transactions ont &#233;t&#233; supprim&#233;es avec succ&#232;s!</string>
+    <string name="title_progress_importing_accounts">Importing accounts</string>
+    <string name="toast_tap_again_to_confirm_delete">Tap again to confirm. ALL entries will be deleted!!</string>
     <plurals name="label_sub_accounts">
         <item quantity="one">%d sous-compte</item>
         <item quantity="other">%d sous-comptes</item>
diff --git a/app/res/values-hu/strings.xml b/app/res/values-hu/strings.xml
@@ -336,6 +336,8 @@
     <string name="summary_delete_all_transactions">All transactions in all accounts will be deleted!</string>
     <string name="title_delete_all_transactions">Delete all transactions</string>
     <string name="toast_all_transactions_deleted">All transactions successfully deleted!</string>
+    <string name="title_progress_importing_accounts">Importing accounts</string>
+    <string name="toast_tap_again_to_confirm_delete">Tap again to confirm. ALL entries will be deleted!!</string>
     <plurals name="label_sub_accounts">
         <item quantity="one">%d sub-account</item>
         <item quantity="other">%d sub-accounts</item>
diff --git a/app/res/values-it/strings.xml b/app/res/values-it/strings.xml
@@ -336,6 +336,8 @@
     <string name="summary_delete_all_transactions">Verranno eliminate tutte le transazioni in tutti i conti</string>
     <string name="title_delete_all_transactions">Elimina tutte le transazioni</string>
     <string name="toast_all_transactions_deleted">Tutte le transazioni sono state eliminate!</string>
+    <string name="title_progress_importing_accounts">Importing accounts</string>
+    <string name="toast_tap_again_to_confirm_delete">Tap again to confirm. ALL entries will be deleted!!</string>
     <plurals name="label_sub_accounts">
         <item quantity="one">%d sotto-conto</item>
         <item quantity="other">%d sotto-conti</item>
diff --git a/app/res/values-nb/strings.xml b/app/res/values-nb/strings.xml
@@ -338,6 +338,8 @@ format og importeres i regnskapsprogrammet GnuCash for PC.</string>
     <string name="summary_delete_all_transactions">Alle transaksjoner i alle kontoer vil bli slettet!</string>
     <string name="title_delete_all_transactions">Slette alle transaksjoner</string>
     <string name="toast_all_transactions_deleted">Alle transaksjoner slettet!</string>
+    <string name="title_progress_importing_accounts">Importing accounts</string>
+    <string name="toast_tap_again_to_confirm_delete">Tap again to confirm. ALL entries will be deleted!!</string>
     <plurals name="label_sub_accounts">
         <item quantity="one">%d under-konto</item>
         <item quantity="other">%d under-kontoer</item>
diff --git a/app/res/values-nl/strings.xml b/app/res/values-nl/strings.xml
@@ -337,6 +337,8 @@
     <string name="summary_delete_all_transactions">All transactions in all accounts will be deleted!</string>
     <string name="title_delete_all_transactions">Delete all transactions</string>
     <string name="toast_all_transactions_deleted">All transactions successfully deleted!</string>
+    <string name="title_progress_importing_accounts">Importing accounts</string>
+    <string name="toast_tap_again_to_confirm_delete">Tap again to confirm. ALL entries will be deleted!!</string>
     <plurals name="label_sub_accounts">
         <item quantity="one">%d sub-account</item>
         <item quantity="other">%d sub-accounts</item>
diff --git a/app/res/values-pt-rBR/strings.xml b/app/res/values-pt-rBR/strings.xml
@@ -336,6 +336,8 @@
     <string name="summary_delete_all_transactions">All transactions in all accounts will be deleted!</string>
     <string name="title_delete_all_transactions">Delete all transactions</string>
     <string name="toast_all_transactions_deleted">All transactions successfully deleted!</string>
+    <string name="title_progress_importing_accounts">Importing accounts</string>
+    <string name="toast_tap_again_to_confirm_delete">Tap again to confirm. ALL entries will be deleted!!</string>
     <plurals name="label_sub_accounts">
         <item quantity="one">%d sub-account</item>
         <item quantity="other">%d sub-accounts</item>
diff --git a/app/res/values-ru/strings.xml b/app/res/values-ru/strings.xml
@@ -333,6 +333,8 @@
     <string name="summary_delete_all_transactions">Все проводки во всех счетах будут удалены!</string>
     <string name="title_delete_all_transactions">Удалить все проводки</string>
     <string name="toast_all_transactions_deleted">Все проводки удалены!</string>
+    <string name="title_progress_importing_accounts">Importing accounts</string>
+    <string name="toast_tap_again_to_confirm_delete">Tap again to confirm. ALL entries will be deleted!!</string>
     <plurals name="label_sub_accounts">
         <item quantity="one">%d дочерний счёт</item>
         <item quantity="other">%d шт. дочерних счетов</item>
diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
@@ -533,6 +533,8 @@
     <string name="summary_delete_all_transactions">All transactions in all accounts will be deleted!</string>
     <string name="title_delete_all_transactions">Delete all transactions</string>
     <string name="toast_all_transactions_deleted">All transactions successfully deleted!</string>
+    <string name="title_progress_importing_accounts">Importing accounts</string>
+    <string name="toast_tap_again_to_confirm_delete">Tap again to confirm. ALL entries will be deleted!!</string>
     <plurals name="label_sub_accounts">
         <item quantity="one">%d sub-account</item>
         <item quantity="other">%d sub-accounts</item>
diff --git a/app/res/xml/fragment_account_preferences.xml b/app/res/xml/fragment_account_preferences.xml
@@ -11,4 +11,7 @@
     <Preference android:key="@string/key_import_accounts"
                 android:summary="@string/summary_import_accounts"
                 android:title="@string/title_import_accounts" />
+    <Preference android:key="@string/key_delete_all_accounts"
+                android:summary="@string/summary_delete_all_accounts"
+                android:title="@string/title_delete_all_accounts" />
 </PreferenceScreen>
diff --git a/app/res/xml/fragment_transaction_preferences.xml b/app/res/xml/fragment_transaction_preferences.xml
@@ -24,4 +24,7 @@
     <CheckBoxPreference android:summary="@string/summary_use_double_entry"
                         android:key="@string/key_use_double_entry"
                         android:title="@string/title_use_double_entry"/>
+    <Preference android:key="@string/key_delete_all_transactions"
+                android:summary="@string/summary_delete_all_transactions"
+                android:title="@string/title_delete_all_transactions" />
 </PreferenceScreen>
diff --git a/app/src/org/gnucash/android/data/Money.java b/app/src/org/gnucash/android/data/Money.java
@@ -80,7 +80,21 @@ public final class Money implements Comparable<Money>{
 	 * otherwise US dollars are used
 	 */
 	public static String DEFAULT_CURRENCY_CODE 	= "USD";
-	
+
+    /**
+     * A zero instance with the currency of the default locale.
+     * This can be used anywhere where a starting amount is required without having to create a new object
+     */
+    public static final Money sDefaultZero = Money.createInstance(Currency.getInstance(Locale.getDefault()).getCurrencyCode());
+
+    /**
+     * Returns a Money instance initialized to the local currency and value 0
+     * @return Money instance of value 0 in locale currency
+     */
+    public static Money getZeroInstance(){
+        return sDefaultZero;
+    }
+
 	/**
 	 * Default constructor
 	 * Initializes the object with an amount of 0 and currency set to the device default locale
@@ -229,7 +243,15 @@ public String formattedString(Locale locale){
 		formatter.setMaximumFractionDigits(DECIMAL_PLACES);
 		return formatter.format(asDouble()) + " " + mCurrency.getSymbol(locale);
 	}
-	
+
+    /**
+     * Equivalent to calling formattedString(Locale.getDefault())
+     * @return String formatted Money representation in default locale
+     */
+    public String formattedString(){
+        return formattedString(Locale.getDefault());
+    }
+
 	/**
 	 * Returns a new Money object whose amount is the negated value of this object amount.
 	 * The original <code>Money</code> object remains unchanged.
diff --git a/app/src/org/gnucash/android/db/AccountsDbAdapter.java b/app/src/org/gnucash/android/db/AccountsDbAdapter.java
@@ -453,7 +453,15 @@ public String getGnuCashRootAccountUID(){
      * @return Number of sub accounts
      */
     public int getSubAccountCount(long accountId){
-        return getSubAccountIds(accountId).size();
+        //TODO: at some point when API level 11 and above only is supported, use DatabaseUtils.queryNumEntries
+
+        String queryCount = "SELECT COUNT(*) FROM " + DatabaseHelper.ACCOUNTS_TABLE_NAME + " WHERE "
+                + DatabaseHelper.KEY_PARENT_ACCOUNT_UID + " = ?";
+        Cursor cursor = mDb.rawQuery(queryCount, new String[]{getAccountUID(accountId)});
+        cursor.moveToFirst();
+        int count = cursor.getInt(0);
+        cursor.close();
+        return count;
     }
 
 	/**
@@ -524,5 +532,4 @@ public int deleteAllRecords(){
         return mDb.delete(DatabaseHelper.ACCOUNTS_TABLE_NAME, null, null);
 	}
 
-
 }
diff --git a/app/src/org/gnucash/android/db/DatabaseAdapter.java b/app/src/org/gnucash/android/db/DatabaseAdapter.java
@@ -101,7 +101,23 @@ public void close(){
 		mDbHelper.close();
 		mDb.close();
 	}
-	
+
+    /**
+     * Checks if the database is open
+     * @return <code>true</code> if the database is open, <code>false</code> otherwise
+     */
+    public boolean isOpen(){
+        return mDb.isOpen();
+    }
+
+    /**
+     * Returns the context used to create this adapter
+     * @return Android application context
+     */
+    public Context getContext(){
+        return mContext.getApplicationContext();
+    }
+
 	/**
 	 * Retrieves record with id <code>rowId</code> from table <code>tableName</code>
 	 * @param tableName Name of table where record is found
diff --git a/app/src/org/gnucash/android/ui/accounts/AccountsActivity.java b/app/src/org/gnucash/android/ui/accounts/AccountsActivity.java
@@ -17,12 +17,16 @@
 package org.gnucash.android.ui.accounts;
 
 import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
@@ -46,6 +50,7 @@
 import org.gnucash.android.util.OnAccountClickedListener;
 
 import java.io.FileNotFoundException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Currency;
 import java.util.Locale;
@@ -384,17 +389,22 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
         switch (requestCode){
             case AccountsListFragment.REQUEST_PICK_ACCOUNTS_FILE:
-                try {
-                    GnucashAccountXmlHandler.parse(this, getContentResolver().openInputStream(data.getData()));
-                    Toast.makeText(this, R.string.toast_success_importing_accounts, Toast.LENGTH_LONG).show();
-                } catch (FileNotFoundException e) {
-                    Toast.makeText(this, R.string.toast_error_importing_accounts, Toast.LENGTH_LONG).show();
-                    e.printStackTrace();
-                }
+                new AccountImporterTask(this).execute(data.getData());
                 break;
         }
     }
 
+    /**
+     * Starts the AccountsActivity and clears the activity stack
+     * @param context Application context
+     */
+    public static void start(Context context){
+        Intent accountsActivityIntent = new Intent(context, AccountsActivity.class);
+        accountsActivityIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        accountsActivityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(accountsActivityIntent);
+    }
+
     @Override
 	public void accountSelected(long accountRowId) {
 		Intent intent = new Intent(this, TransactionsActivity.class);
@@ -414,4 +424,47 @@ private void removeFirstRunFlag(){
 		editor.commit();
 	}
 
+    /**
+     * Imports a GnuCash (desktop) account file and displays a progress dialog.
+     * The AccountsActivity is opened when importing is done.
+     */
+    public static class AccountImporterTask extends AsyncTask<Uri, Void, Boolean>{
+        private final Context context;
+        private ProgressDialog progressDialog;
+
+        public AccountImporterTask(Context context){
+            this.context = context;
+        }
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            progressDialog = new ProgressDialog(context);
+            progressDialog.setTitle(R.string.title_progress_importing_accounts);
+            progressDialog.setIndeterminate(true);
+            progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+            progressDialog.show();
+        }
+
+        @Override
+        protected Boolean doInBackground(Uri... uris) {
+            try {
+                GnucashAccountXmlHandler.parse(context, context.getContentResolver().openInputStream(uris[0]));
+            } catch (Exception exception){
+                exception.printStackTrace();
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        protected void onPostExecute(Boolean importSuccess) {
+            progressDialog.dismiss();
+
+            int message = importSuccess ? R.string.toast_success_importing_accounts : R.string.toast_error_importing_accounts;
+            Toast.makeText(context, message, Toast.LENGTH_LONG).show();
+
+            AccountsActivity.start(context);
+        }
+    }
 }
diff --git a/app/src/org/gnucash/android/ui/accounts/AccountsListFragment.java b/app/src/org/gnucash/android/ui/accounts/AccountsListFragment.java
diff --git a/app/src/org/gnucash/android/ui/settings/SettingsActivity.java b/app/src/org/gnucash/android/ui/settings/SettingsActivity.java
diff --git a/app/src/org/gnucash/android/ui/transactions/TransactionsActivity.java b/app/src/org/gnucash/android/ui/transactions/TransactionsActivity.java
diff --git a/app/src/org/gnucash/android/ui/transactions/TransactionsListFragment.java b/app/src/org/gnucash/android/ui/transactions/TransactionsListFragment.java
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
diff --git a/pom.xml b/pom.xml
