From 3afa05c7cb47b04ab369a75f20c781d1e48428a0 Mon Sep 17 00:00:00 2001 From: Ngewi Fet Date: Mon, 9 Jul 2012 02:01:03 +0200 Subject: [PATCH] Fixed export test Remove export flag requirement for transactions --- GnucashMobile/res/values/strings.xml | 2 +- .../gnucash/android/db/DatabaseHelper.java | 2 +- .../android/ui/ExportDialogFragment.java | 29 ++++++++++--------- .../android/ui/NewTransactionFragment.java | 2 +- .../gnucash/android/test/OfxExportTest.java | 3 +- README.md | 2 +- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/GnucashMobile/res/values/strings.xml b/GnucashMobile/res/values/strings.xml index fa5424659..a159ca63e 100644 --- a/GnucashMobile/res/values/strings.xml +++ b/GnucashMobile/res/values/strings.xml @@ -64,7 +64,7 @@ By default, only new transactions since last export will be exported. Check this option to export all transactions Error exporting OFX data - Email… + Share file… SD Card Export diff --git a/GnucashMobile/src/org/gnucash/android/db/DatabaseHelper.java b/GnucashMobile/src/org/gnucash/android/db/DatabaseHelper.java index 4c9b48aed..f97fec313 100644 --- a/GnucashMobile/src/org/gnucash/android/db/DatabaseHelper.java +++ b/GnucashMobile/src/org/gnucash/android/db/DatabaseHelper.java @@ -68,7 +68,7 @@ public class DatabaseHelper extends SQLiteOpenHelper { + KEY_DESCRIPTION + " text, " + KEY_TIMESTAMP + " integer not null, " + KEY_ACCOUNT_UID + " varchar(255) not null, " - + KEY_EXPORTED + " tinyint not null default 0, " + + KEY_EXPORTED + " tinyint default 0, " + "FOREIGN KEY (" + KEY_ACCOUNT_UID + ") REFERENCES " + ACCOUNTS_TABLE_NAME + " (" + KEY_UID + ")" + ");"; diff --git a/GnucashMobile/src/org/gnucash/android/ui/ExportDialogFragment.java b/GnucashMobile/src/org/gnucash/android/ui/ExportDialogFragment.java index f46a43f87..ff50b6d04 100644 --- a/GnucashMobile/src/org/gnucash/android/ui/ExportDialogFragment.java +++ b/GnucashMobile/src/org/gnucash/android/ui/ExportDialogFragment.java @@ -55,6 +55,7 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; +import android.os.Environment; import android.support.v4.app.DialogFragment; import android.util.Log; import android.view.LayoutInflater; @@ -134,22 +135,22 @@ public void onClick(View v) { break; case 1: -// -// File src = new File(mFilePath); -// File dst = new File(Environment.getExternalStorageDirectory() + "/" + buildExportFilename()); -// try { -// copyFile(src, dst); -// } catch (IOException e) { -// Toast.makeText(getActivity(), -// "Could not write OFX file to :\n" + dst.getAbsolutePath(), -// Toast.LENGTH_LONG).show(); -// e.printStackTrace(); -// break; -// } -// + + File src = new File(mFilePath); + File dst = new File(Environment.getExternalStorageDirectory() + "/" + buildExportFilename()); + try { + copyFile(src, dst); + } catch (IOException e) { + Toast.makeText(getActivity(), + "Could not write OFX file to :\n" + dst.getAbsolutePath(), + Toast.LENGTH_LONG).show(); + e.printStackTrace(); + break; + } + //file already exists, just let the user know Toast.makeText(getActivity(), - "OFX file exported to:\n" + mFilePath, + "OFX file exported to:\n" + dst.getAbsolutePath(), Toast.LENGTH_LONG).show(); break; diff --git a/GnucashMobile/src/org/gnucash/android/ui/NewTransactionFragment.java b/GnucashMobile/src/org/gnucash/android/ui/NewTransactionFragment.java index d6fd73e95..8194181a6 100644 --- a/GnucashMobile/src/org/gnucash/android/ui/NewTransactionFragment.java +++ b/GnucashMobile/src/org/gnucash/android/ui/NewTransactionFragment.java @@ -152,7 +152,7 @@ private void initializeViewsWithTransaction(){ mNameEditText.setText(mTransaction.getName()); mTransactionTypeButton.setChecked(mTransaction.getTransactionType() == TransactionType.DEBIT); //multiply to balance out division by the TextWatcher attached to this view - mAmountEditText.setText(Double.toString(mTransaction.getAmount() * 10)); + mAmountEditText.setText(Double.toString(mTransaction.getAmount())); mDescriptionEditText.setText(mTransaction.getDescription()); mDateTextView.setText(DATE_FORMATTER.format(mTransaction.getTimeMillis())); mTimeTextView.setText(TIME_FORMATTER.format(mTransaction.getTimeMillis())); diff --git a/GnucashMobileTest/src/org/gnucash/android/test/OfxExportTest.java b/GnucashMobileTest/src/org/gnucash/android/test/OfxExportTest.java index af12313e2..915ec5519 100644 --- a/GnucashMobileTest/src/org/gnucash/android/test/OfxExportTest.java +++ b/GnucashMobileTest/src/org/gnucash/android/test/OfxExportTest.java @@ -30,6 +30,7 @@ import org.gnucash.android.ui.AccountsActivity; import org.gnucash.android.ui.ExportDialogFragment; +import android.os.Environment; import android.test.ActivityInstrumentationTestCase2; import android.widget.Spinner; @@ -62,7 +63,7 @@ public void testOfxExport(){ String filename = ExportDialogFragment.buildExportFilename(); // File file = new File(getActivity().getExternalFilesDir(null), filename); - File file = new File(getActivity().getExternalFilesDir(null) + "/" + filename); + File file = new File(Environment.getExternalStorageDirectory() + "/" + filename); assertNotNull(file); assertTrue(file.exists()); } diff --git a/README.md b/README.md index b8e35f98c..2ba3e25af 100644 --- a/README.md +++ b/README.md @@ -24,4 +24,4 @@ project into your workspace and run it as "Android JUnit Test". Gnucash for Android is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of -the License, or (at your option) any later version. \ No newline at end of file +the License, or (at your option) any later version.