Merge branch 'hotfix/patches'

Author: codinguser

CHANGELOG.md

@@ -1,5 +1,13 @@
 Change Log
 ===============================================================================
+Version 2.0.4 *(2015-12-02)*
+----------------------------
+* Fixed: Transaction export time not always working reliably
+* Fixed: Renaming account causes transactions to be deleted
+* Fixed: Progress dialog not displayed during initial import
+* Fixed: Unable to finish first-run wizard if choosing to create accounts manually
+* Fixed: Removed inapplicable options in scheduled actions context menu
+
 Version 2.0.3 *(2015-11-21)*
 ----------------------------
 * Fixed: Unable to enter decimal amounts in split editor

app/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'io.fabric'
 
 def versionMajor = 2
 def versionMinor = 0
-def versionPatch = 3
+def versionPatch = 4
 def versionBuild = 0
 
 def buildTime() {

app/src/main/java/org/gnucash/android/db/AccountsDbAdapter.java

@@ -794,9 +794,13 @@ private Money computeBalance(String accountUID, long startTimestamp, long endTim
      * @param endTimestamp the end timestamp of the time range
      * @return Money balance of account list
      */
-    public Money getAccountsBalance(List<String> accountUIDList, long startTimestamp, long endTimestamp) {
+    public Money getAccountsBalance(@NonNull List<String> accountUIDList, long startTimestamp, long endTimestamp) {
         String currencyCode = GnuCashApplication.getDefaultCurrencyCode();
         Money balance = Money.createZeroInstance(currencyCode);
+
+        if (accountUIDList.isEmpty())
+            return balance;
+
         boolean hasDebitNormalBalance = getAccountType(accountUIDList.get(0)).hasDebitNormalBalance();
 
         SplitsDbAdapter splitsDbAdapter = SplitsDbAdapter.getInstance();

app/src/main/java/org/gnucash/android/db/DatabaseAdapter.java

@@ -423,7 +423,7 @@ public String getUID(long id){
             if (cursor.moveToFirst()) {
                 uid = cursor.getString(cursor.getColumnIndexOrThrow(DatabaseSchema.CommonColumns.COLUMN_UID));
             } else {
-                throw new IllegalArgumentException("Account record ID " + id + " does not exist in the db");
+                throw new IllegalArgumentException(mTableName + " Record ID " + id + " does not exist in the db");
             }
         } finally {
             cursor.close();
@@ -620,6 +620,20 @@ public void setTransactionSuccessful() {
         mDb.setTransactionSuccessful();
     }
 
+    /// Foreign key constraits should be enabled in general.
+    /// But if it affects speed (check constraints takes time)
+    /// and the constrained can be assured by the program,
+    /// or if some SQL exec will cause deletion of records
+    /// (like use replace in accounts update will delete all transactions)
+    /// that need not be deleted, then it can be disabled temporarily
+    public void enableForeignKey(boolean enable) {
+        if (enable){
+            mDb.execSQL("PRAGMA foreign_keys=ON");
+        } else {
+            mDb.execSQL("PRAGMA foreign_keys=OFF");
+        }
+    }
+
     /**
      * Expose mDb.endTransaction()
      */

app/src/main/java/org/gnucash/android/db/TransactionsDbAdapter.java

@@ -37,6 +37,7 @@
 import org.gnucash.android.model.Split;
 import org.gnucash.android.model.Transaction;
 
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -633,6 +634,26 @@ public long getTimestampOfLatestTransaction(AccountType type, String currencyCod
         return getTimestamp("MAX", type, currencyCode);
     }
 
+    /**
+     * Returns the most recent `modified_at` timestamp of non-template transactions in the database
+     * @return Last moodified time in milliseconds or current time if there is none in the database
+     */
+    public Timestamp getTimestampOfLastModification(){
+        Cursor cursor = mDb.query(TransactionEntry.TABLE_NAME,
+                new String[]{"MAX(" + TransactionEntry.COLUMN_MODIFIED_AT + ")"},
+                null, null, null, null, null);
+
+        Timestamp timestamp = new Timestamp(System.currentTimeMillis());
+        if (cursor.moveToFirst()){
+            String timeString = cursor.getString(0);
+            if (timeString != null){ //in case there were no transactions in the XML file (account structure only)
+                timestamp = Timestamp.valueOf(timeString);
+            }
+        }
+        cursor.close();
+        return timestamp;
+    }
+
     /**
      * Returns the earliest or latest timestamp of transactions for a specific account type and currency
      * @param mod Mode (either MAX or MIN)

app/src/main/java/org/gnucash/android/export/Exporter.java

@@ -201,11 +201,11 @@ public String getExportMimeType(){
     public static class ExporterException extends RuntimeException{
 
         public ExporterException(ExportParams params){
-            super("Failed to generate " + params.getExportFormat().toString());
+            super("Failed to generate export with parameters:  " + params.toString());
         }
 
         public ExporterException(@NonNull ExportParams params, @NonNull String msg) {
-            super("Failed to generate " + params.getExportFormat().toString() + "-" + msg);
+            super("Failed to generate export with parameters: " + params.toString() + " - " + msg);
         }
 
         public ExporterException(ExportParams params, Throwable throwable){

app/src/main/java/org/gnucash/android/importer/GncXmlImporter.java

@@ -21,6 +21,7 @@
 import android.util.Log;
 
 import org.gnucash.android.app.GnuCashApplication;
+import org.gnucash.android.db.TransactionsDbAdapter;
 import org.gnucash.android.export.Exporter;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -93,8 +94,11 @@ public static void parse(InputStream gncXmlInputStream) throws ParserConfigurati
         xr.parse(new InputSource(bos));
         long endTime = System.nanoTime();
 
-        String timeStamp = new Timestamp(System.currentTimeMillis()).toString();
-        PreferenceManager.getDefaultSharedPreferences(GnuCashApplication.getAppContext()).edit().putString(Exporter.PREF_LAST_EXPORT_TIME, timeStamp).apply();
+        Timestamp timeStamp = TransactionsDbAdapter.getInstance().getTimestampOfLastModification();
+        PreferenceManager.getDefaultSharedPreferences(GnuCashApplication.getAppContext())
+                .edit()
+                .putString(Exporter.PREF_LAST_EXPORT_TIME, timeStamp.toString())
+                .apply();
 
         Log.d(GncXmlImporter.class.getSimpleName(), String.format("%d ns spent on importing the file", endTime-startTime));
     }

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

@@ -846,7 +846,9 @@ private void saveAccount() {
 		if (mAccountsDbAdapter == null)
 			mAccountsDbAdapter = AccountsDbAdapter.getInstance();
         // bulk update, will not update transactions
+        mAccountsDbAdapter.enableForeignKey(false);
 		mAccountsDbAdapter.bulkAddRecords(accountsToUpdate);
+        mAccountsDbAdapter.enableForeignKey(true);
 
 		finishFragment();
 	}

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

@@ -525,10 +525,11 @@ public static void startXmlFileChooser(Activity activity) {
      * <p>This method is usually called in response to {@link AccountsActivity#startXmlFileChooser(Activity)}</p>
      * @param context Activity context
      * @param data Intent data containing the XML uri
+     * @param onFinishTask Task to be executed when import is complete
      */
-    public static void importXmlFileFromIntent(Activity context, Intent data) {
+    public static void importXmlFileFromIntent(Activity context, Intent data, TaskDelegate onFinishTask) {
         GncXmlExporter.createBackup();
-        new ImportAsyncTask(context).execute(data.getData());
+        new ImportAsyncTask(context, onFinishTask).execute(data.getData());
     }
 
     /**

app/src/main/java/org/gnucash/android/ui/common/BaseDrawerActivity.java

@@ -193,7 +193,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
         switch (requestCode) {
             case AccountsActivity.REQUEST_PICK_ACCOUNTS_FILE:
-                AccountsActivity.importXmlFileFromIntent(this, data);
+                AccountsActivity.importXmlFileFromIntent(this, data, null);
                 break;
         }
     }