Merge remote-tracking branch 'codinguser/master' into hotfix/patches

Author: pnemonic78

CHANGELOG.md

@@ -1,5 +1,20 @@
 Change Log
 ===============================================================================
+Version 2.3.0 *(2017-09-xx)*
+----------------------------
+* Improved #696: QIF files are now always zipped regardless of the export destination
+
+Version 2.2.1 *(2017-08-31)*
+----------------------------
+* Fixed #343: Transaction notes are not exported in QIF exports
+* Fixed #649: Commas in the account name cause errors in report generation
+* Fixed #689: Long press on the transaction amount brings up QWERTY keyboard
+* Fixed #695: Long list of splits not fully visible in transaction detail view
+* Fixed #699: Transaction detail screen footer disappears after editing transaction
+* Fixed #701: Split memos disappear after transaction edit
+* Fixed: Imported weekly scheduled actions no having the days of the week set
+* Updated translations - new language Turkish
+
 Version 2.2.0 *(2017-05-05)*
 ----------------------------
 * Feature #646: Option to select backup file using Storage Access Framework

app/build.gradle

@@ -6,8 +6,8 @@ apply plugin: 'android-apt'
 
 def versionMajor = 2
 def versionMinor = 2
-def versionPatch = 0
-def versionBuild = 4
+def versionPatch = 1
+def versionBuild = 2
 
 def buildTime() {
     def df = new SimpleDateFormat("yyyyMMdd HH:mm 'UTC'")

app/src/main/java/org/gnucash/android/export/qif/QifExporter.java

@@ -82,6 +82,7 @@ public List<String> generateExport() throws ExporterException {
                             TransactionEntry.TABLE_NAME + "_" + TransactionEntry.COLUMN_UID + " AS trans_uid",
                             TransactionEntry.TABLE_NAME + "_" + TransactionEntry.COLUMN_TIMESTAMP + " AS trans_time",
                             TransactionEntry.TABLE_NAME + "_" + TransactionEntry.COLUMN_DESCRIPTION + " AS trans_desc",
+                            TransactionEntry.TABLE_NAME + "_" + TransactionEntry.COLUMN_NOTES + " AS trans_notes",
                             SplitEntry.TABLE_NAME + "_" + SplitEntry.COLUMN_QUANTITY_NUM + " AS split_quantity_num",
                             SplitEntry.TABLE_NAME + "_" + SplitEntry.COLUMN_QUANTITY_DENOM + " AS split_quantity_denom",
                             SplitEntry.TABLE_NAME + "_" + SplitEntry.COLUMN_TYPE + " AS split_type",
@@ -151,9 +152,14 @@ public List<String> generateExport() throws ExporterException {
                         writer.append(QifHelper.DATE_PREFIX)
                                 .append(QifHelper.formatDate(cursor.getLong(cursor.getColumnIndexOrThrow("trans_time"))))
                                 .append(newLine);
-                        writer.append(QifHelper.MEMO_PREFIX)
+                        // Payee / description
+                        writer.append(QifHelper.PAYEE_PREFIX)
                                 .append(cursor.getString(cursor.getColumnIndexOrThrow("trans_desc")))
                                 .append(newLine);
+                        // Notes, memo
+                        writer.append(QifHelper.MEMO_PREFIX)
+                                .append(cursor.getString(cursor.getColumnIndexOrThrow("trans_notes")))
+                                .append(newLine);
                         // deal with imbalance first
                         double imbalance = cursor.getDouble(cursor.getColumnIndexOrThrow("trans_acct_balance"));
                         BigDecimal decimalImbalance = BigDecimal.valueOf(imbalance).setScale(2, BigDecimal.ROUND_HALF_UP);

app/src/main/java/org/gnucash/android/export/qif/QifHelper.java

@@ -29,6 +29,7 @@ public class QifHelper {
     /*
     Prefixes for the QIF file
      */
+    public static final String PAYEE_PREFIX         = "P";
     public static final String DATE_PREFIX          = "D";
     public static final String AMOUNT_PREFIX        = "T";
     public static final String MEMO_PREFIX          = "M";

app/src/main/java/org/gnucash/android/ui/transaction/TransactionDetailActivity.java

@@ -54,6 +54,7 @@ public class TransactionDetailActivity extends PasscodeLockActivity {
 
     private String mTransactionUID;
     private String mAccountUID;
+    private int mDetailTableRows;
 
     public static final int REQUEST_EDIT_TRANSACTION = 0x10;
 
@@ -126,6 +127,7 @@ private void bindViews(){
         TextView balanceTextView = accountBalance.isNegative() ? mDebitBalance : mCreditBalance;
         TransactionsActivity.displayBalance(balanceTextView, accountBalance);
 
+        mDetailTableRows = mDetailTableLayout.getChildCount();
         boolean useDoubleEntry = GnuCashApplication.isDoubleEntryEnabled();
         LayoutInflater inflater = LayoutInflater.from(this);
         int index = 0;
@@ -175,8 +177,8 @@ private void refresh(){
      * Remove the split item views from the transaction detail prior to refreshing them
      */
     private void removeSplitItemViews(){
-        long splitCount = TransactionsDbAdapter.getInstance().getSplitCount(mTransactionUID);
-        mDetailTableLayout.removeViews(0, (int)splitCount);
+        // Remove all rows that are not special.
+        mDetailTableLayout.removeViews(0, mDetailTableLayout.getChildCount() - mDetailTableRows);
         mDebitBalance.setText("");
         mCreditBalance.setText("");
     }

app/src/main/java/org/gnucash/android/ui/transaction/TransactionFormFragment.java

@@ -698,7 +698,7 @@ private List<Split> extractSplitsFromView(){
 
         BigDecimal amountBigd = mAmountEditText.getValue();
         String baseCurrencyCode = mTransactionsDbAdapter.getAccountCurrencyCode(mAccountUID);
-        Money value 	= new Money(amountBigd, Commodity.getInstance(baseCurrencyCode)).abs();
+        Money value = new Money(amountBigd, Commodity.getInstance(baseCurrencyCode));
         Money quantity = new Money(value);
 
         String transferAcctUID = getTransferAccountUID();
@@ -719,9 +719,24 @@ private List<Split> extractSplitsFromView(){
             }
         }
 
-        Split split1 = new Split(value, mAccountUID);
+        Split split1;
+        Split split2;
+        // Try to preserve the other split attributes.
+        if (mSplitsList.size() >= 2) {
+            split1 = mSplitsList.get(0);
+            split1.setValue(value);
+            split1.setQuantity(value);
+            split1.setAccountUID(mAccountUID);
+
+            split2 = mSplitsList.get(1);
+            split2.setValue(value);
+            split2.setQuantity(quantity);
+            split2.setAccountUID(transferAcctUID);
+        } else {
+            split1 = new Split(value, mAccountUID);
+            split2 = new Split(value, quantity, transferAcctUID);
+        }
         split1.setType(mTransactionTypeSwitch.getTransactionType());
-        Split split2 = new Split(value, quantity, transferAcctUID);
         split2.setType(mTransactionTypeSwitch.getTransactionType().invert());
 
         List<Split> splitList = new ArrayList<>();

app/src/main/java/org/gnucash/android/ui/util/widget/CalculatorEditText.java

@@ -15,10 +15,10 @@
  */
 package org.gnucash.android.ui.util.widget;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.inputmethodservice.KeyboardView;
+import android.os.Build;
 import android.support.annotation.Nullable;
 import android.support.annotation.XmlRes;
 import android.support.v7.widget.AppCompatEditText;
@@ -29,15 +29,13 @@
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.inputmethod.InputMethodManager;
 
 import com.crashlytics.android.Crashlytics;
 
 import net.objecthunter.exp4j.Expression;
 import net.objecthunter.exp4j.ExpressionBuilder;
 
 import org.gnucash.android.R;
-import org.gnucash.android.app.GnuCashApplication;
 import org.gnucash.android.model.Commodity;
 import org.gnucash.android.ui.common.FormActivity;
 import org.gnucash.android.util.AmountParser;
@@ -148,18 +146,12 @@ public void onClick(View v) {
         // Disable spell check (hex strings look like words to Android)
         setInputType(getInputType() | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
 
-        // FIXME: for some reason, this prevents the text selection from working
-        setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                if (v != null && !isInEditMode())
-                    ((InputMethodManager) GnuCashApplication.getAppContext()
-                            .getSystemService(Activity.INPUT_METHOD_SERVICE))
-                            .hideSoftInputFromWindow(v.getWindowToken(), 0);
-
-                return false;
-            }
-        });
+        // Disable system keyboard appearing on long-press, but for some reason, this prevents the text selection from working.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            setShowSoftInputOnFocus(false);
+        } else {
+            setRawInputType(InputType.TYPE_CLASS_NUMBER);
+        }
 
         // Although this handler doesn't make sense, if removed, the standard keyboard
         // shows up in addition to the calculator one when the EditText gets a touch event.

app/src/main/res/layout/fragment_transaction_form.xml

@@ -72,6 +72,7 @@
                     android:background="@android:color/transparent"
                     android:textColor="@color/debit_red"
                     android:textSize="20sp"
+                    android:textIsSelectable="true"
                     gnucash:keyboardKeysLayout="@xml/calculator_keyboard"/>
 
                 <ImageView android:id="@+id/btn_split_editor"

app/src/main/res/values-af-rZA/strings.xml

@@ -16,19 +16,19 @@
  limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="title_create_account">Create Account</string>
-  <string name="title_edit_account">Edit Account</string>
-  <string name="description_add_transaction_icon">Add a new transaction to an account</string>
-  <string name="description_view_account_icon">View account details</string>
-  <string name="label_no_accounts">No accounts to display</string>
-  <string name="label_account_name">Account name</string>
-  <string name="btn_cancel">Cancel</string>
-  <string name="btn_save">Save</string>
-  <string name="btn_test">Test</string>
-  <string name="label_passcode">Enter Passcode</string>
-  <string name="toast_wrong_passcode">Wrong passcode, please try again</string>
-  <string name="toast_passcode_set">Passcode set</string>
-  <string name="label_confirm_passcode">Please confirm your passcode</string>
+  <string name="title_create_account">Skep Rekening</string>
+  <string name="title_edit_account">Wysig Rekening</string>
+  <string name="description_add_transaction_icon">Voeg \'n nuwe transaksie by \'n rekening</string>
+  <string name="description_view_account_icon">Bekyk rekening besonderhede</string>
+  <string name="label_no_accounts">Geen rekeninge om te wys</string>
+  <string name="label_account_name">Rekeningnaam</string>
+  <string name="btn_cancel">Kanselleer</string>
+  <string name="btn_save">Stoor</string>
+  <string name="btn_test">Toets</string>
+  <string name="label_passcode">Voer Wagwoord in</string>
+  <string name="toast_wrong_passcode">Verkeerde wagwoord, probeer asseblief weer</string>
+  <string name="toast_passcode_set">Wagwoord ingestel</string>
+  <string name="label_confirm_passcode">Bevestig asseblief jou wagwoord</string>
   <string name="toast_invalid_passcode_confirmation">Invalid passcode confirmation. Please try again</string>
   <string name="label_transaction_name">Description</string>
   <string name="label_transaction_amount">Amount</string>

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

@@ -19,7 +19,7 @@
   <string name="title_create_account">Neues Konto</string>
   <string name="title_edit_account">Konto bearbeiten</string>
   <string name="description_add_transaction_icon">Neue Buchung in ein Konto</string>
-  <string name="description_view_account_icon">View account details</string>
+  <string name="description_view_account_icon">Account-Details anzeigen</string>
   <string name="label_no_accounts">Keine Konten vorhanden</string>
   <string name="label_account_name">Kontoname</string>
   <string name="btn_cancel">Abbrechen</string>
@@ -56,10 +56,10 @@
   <string name="hint_delete_after_export">Alle exportierten Buchungen werden nach dem Export gelöscht.</string>
   <string name="title_settings">Einstellungen</string>
   <string-array name="export_destinations">
-    <item>Save As&#8230;</item>
+    <item>Speichern unter&#8230;</item>
     <item>Dropbox</item>
     <item>ownCloud</item>
-    <item>Send to&#8230;</item>
+    <item>Senden an&#8230;</item>
   </string-array>
   <string name="btn_move">Verschieben</string>
   <string name="title_move_transactions">%1$d Buchung(en) verschieben</string>
@@ -77,7 +77,7 @@
   <string name="label_permission_record_transaction">Buchungen speichern in GnuCash</string>
   <string name="label_permission_create_account">Konten in GnuCash erstellen</string>
   <string name="label_display_account">Konto anzeigen</string>
-  <string name="label_hide_account_balance">Hide account balance in widget</string>
+  <string name="label_hide_account_balance">Kontostand im Widget ausblenden</string>
   <string name="btn_create_accounts">Konten erstellen</string>
   <string name="error_no_accounts">Keine Konten vorhanden.\nErstellen Sie ein Konto um Widgets hinzuzufügen</string>
   <string name="title_license">Lizenz</string>
@@ -86,7 +86,7 @@
   <string name="label_widget_configuration">Konto auswählen</string>
   <string name="toast_no_transactions_to_export">Keine Buchungen zum Exportieren</string>
   <string name="title_passcode_preferences">Sicherheit</string>
-  <string name="title_enable_passcode">Enable passcode</string>
+  <string name="title_enable_passcode">Zugangscode aktivieren</string>
   <string name="title_change_passcode">PIN ändern</string>
   <string name="title_about_gnucash">Über GnuCash</string>
   <string name="title_export_email">GnuCash Android exportierte %1$s-Datei</string>
@@ -117,12 +117,11 @@
   <string name="summary_xml_ofx_header">Diese Option aktivieren, wenn Sie die OFX-Dateien für ein anderes Programm als GnuCash auf dem Desktop exportieren</string>
   <string name="title_whats_new">Neuigkeiten in dieser Version</string>
   <string name="whats_new">
-        - Added ability to export to any service which supports the Storage Access Framework \n
-        - Added option to set the location for regular automatic backups (See backup settings)\n
-        - Added Bitcoin currency support\n
-        - Added support for renaming books\n
-        - Multiple bug fixes and improvements\n
-	</string>
+        - Export zu einem beliebigen Dienst mit Storage Access Framework Unterstützung möglich \n
+        - Option, um Ort für regelmäßige automatische Backups, hinzugefügt (Siehe Backup Einstellungen)\n
+        - Bitcoin-Unterstützung hinzugefügt\n
+        - Bücher umbenennen ermöglicht\n
+        - Mehrere Bugfixes and Verbesserungen\n</string>
   <string name="label_dismiss">Schließen</string>
   <string name="toast_transanction_amount_required">Geben Sie einen Betrag ein, um die Buchung speichern zu können</string>
   <string name="toast_error_importing_accounts">Beim Importieren der GnuCash-Konten ist ein Fehler aufgetreten!</string>
@@ -253,8 +252,8 @@
   <string name="summary_owncloud_sync">ownCload-Export aktivieren</string>
   <string name="title_backup_prefs">Sicherungs-Einstellungen</string>
   <string name="title_create_backup_pref">Sicherung erstellen</string>
-  <string name="summary_create_backup_pref">Create a backup of the active book</string>
-  <string name="summary_restore_backup_pref">Restore most recent backup of active book</string>
+  <string name="summary_create_backup_pref">Erstelle eine Sicherungskopie des aktuellen Buches</string>
+  <string name="summary_restore_backup_pref">Letzte Sicherung vom aktiven Buch wiederherstellen</string>
   <string name="toast_backup_successful">Sicherung erfolgreich</string>
   <string name="toast_backup_failed">Sicherung fehlgeschlagen</string>
   <string name="export_warning_xml">Alle Konten und Buchungen werden exportiert</string>
@@ -276,8 +275,8 @@
   <string name="owncloud_user_ok">OC Benutzername/Passwort OK</string>
   <string name="owncloud_dir_ok">Dir-Name OK</string>
   <plurals name="label_every_x_hours">
-    <item quantity="one">Hourly</item>
-    <item quantity="other">Every %d hours</item>
+    <item quantity="one">Stündlich</item>
+    <item quantity="other">Alle %d Stunden</item>
   </plurals>
   <plurals name="label_every_x_days">
     <item quantity="one">Täglich</item>
@@ -434,23 +433,23 @@ No user-identifiable information will be collected as part of this process!</str
   <string name="label_recommend_app">Im Play Store empfehlen</string>
   <string name="repeat_until_date">bis %1$s</string>
   <string name="repeat_on_weekday">am %1$s</string>
-  <string name="repeat_x_times">for %1$d times</string>
+  <string name="repeat_x_times">für %1$d Mal</string>
   <string name="menu_show_compact_view">Kompakte Ansicht</string>
   <string name="book_default_name">Buch %1$d</string>
-  <string name="last_export_time_never">never</string>
-  <string name="title_rename_book">Rename Book</string>
-  <string name="btn_rename">Rename</string>
-  <string name="menu_rename">Rename</string>
-  <string name="title_select_backup_file">Select backup file</string>
-  <string name="summary_select_backup_file">Select a file for automatic backups</string>
-  <string name="title_confirm_restore_backup">Confirm restore from backup</string>
-  <string name="msg_confirm_restore_backup_into_new_book">A new book will be opened with the contents of this backup. Do you wish to proceed?</string>
-  <string name="btn_restore">Restore</string>
-  <string name="title_no_backups_found">No backups found</string>
-  <string name="msg_no_backups_to_restore_from">There are no existing backup files to restore from</string>
+  <string name="last_export_time_never">nie</string>
+  <string name="title_rename_book">Buch umbenennen</string>
+  <string name="btn_rename">Umbenennen</string>
+  <string name="menu_rename">Umbenennen</string>
+  <string name="title_select_backup_file">Eine Sicherungsdatei auswählen</string>
+  <string name="summary_select_backup_file">Wählen Sie eine Datei für die automatische Sicherungen</string>
+  <string name="title_confirm_restore_backup">Wiederherstellung von einer Sicherung bestätigen</string>
+  <string name="msg_confirm_restore_backup_into_new_book">Es wird ein neues Buch mit den Daten dieser Sicherungsdatei geöffnet.</string>
+  <string name="btn_restore">Wiederherstellen</string>
+  <string name="title_no_backups_found">Keine Sicherungen gefunden</string>
+  <string name="msg_no_backups_to_restore_from">Es sind keine Sicherungsdateien vorhanden, die wiederhergestellt werden könnten</string>
   <!-- This is the filename for default backups. So use only simple characters and no spaces. Do not change the extension -->
   <string name="label_backup_filename">gnucash_android_backup.gnca</string>
-  <string name="label_select_destination_after_export">Select the destination after export is complete</string>
-  <string name="label_dropbox_export_destination">Export to \'/Apps/GnuCash Android/\' folder on Dropbox</string>
-  <string name="title_section_preferences">Preferences</string>
+  <string name="label_select_destination_after_export">Wähle den Zielort, wenn der Export abgeschlossen wurde</string>
+  <string name="label_dropbox_export_destination">Exportiere in Dropbox-Ordner: \'/Apps/GnuCash Android/\'</string>
+  <string name="title_section_preferences">Voreinstellungen</string>
 </resources>