This method converts all saved scheduled export parameters to the new format using the + * timestamp of last export
+ * @param db SQLite database + * @return 10 if upgrade was successful, 9 otherwise + */ + static int upgradeDbToVersion10(SQLiteDatabase db){ + Log.i(DatabaseHelper.LOG_TAG, "Upgrading database to version 9"); + int oldVersion = 9; + + db.beginTransaction(); + try { + Cursor cursor = db.query(ScheduledActionEntry.TABLE_NAME, + new String[]{ScheduledActionEntry.COLUMN_UID, ScheduledActionEntry.COLUMN_TAG}, + ScheduledActionEntry.COLUMN_TYPE + " = ?", + new String[]{ScheduledAction.ActionType.BACKUP.name()}, + null, null, null); + + ContentValues contentValues = new ContentValues(); + while (cursor.moveToNext()){ + String paramString = cursor.getString(cursor.getColumnIndexOrThrow(ScheduledActionEntry.COLUMN_TAG)); + String[] tokens = paramString.split(";"); + ExportParams params = new ExportParams(ExportFormat.valueOf(tokens[0])); + params.setExportTarget(ExportParams.ExportTarget.valueOf(tokens[1])); + params.setDeleteTransactionsAfterExport(Boolean.parseBoolean(tokens[3])); + + boolean exportAll = Boolean.parseBoolean(tokens[2]); + if (exportAll){ + params.setExportStartTime(Timestamp.valueOf(Exporter.TIMESTAMP_ZERO)); + } else { + String lastExportTimeStamp = PreferenceManager.getDefaultSharedPreferences(GnuCashApplication.getAppContext()) + .getString(Exporter.PREF_LAST_EXPORT_TIME, Exporter.TIMESTAMP_ZERO); + Timestamp timestamp = Timestamp.valueOf(lastExportTimeStamp); + params.setExportStartTime(timestamp); + } + + String uid = cursor.getString(cursor.getColumnIndexOrThrow(ScheduledActionEntry.COLUMN_UID)); + contentValues.clear(); + contentValues.put(ScheduledActionEntry.COLUMN_UID, uid); + contentValues.put(ScheduledActionEntry.COLUMN_TAG, params.toCsv()); + db.insert(ScheduledActionEntry.TABLE_NAME, null, contentValues); + } + + cursor.close(); + + db.setTransactionSuccessful(); + oldVersion = 10; + } finally { + db.endTransaction(); + } + return oldVersion; + } + + /** + * Upgrade database to version 11 + *+ * Migrate scheduled backups and update export parameters to the new format + *
+ * @param db SQLite database + * @return 11 if upgrade was successful, 10 otherwise + */ + static int upgradeDbToVersion11(SQLiteDatabase db){ + Log.i(DatabaseHelper.LOG_TAG, "Upgrading database to version 9"); + int oldVersion = 10; + + db.beginTransaction(); + try { + Cursor cursor = db.query(ScheduledActionEntry.TABLE_NAME, null, + ScheduledActionEntry.COLUMN_TYPE + "= ?", + new String[]{ScheduledAction.ActionType.BACKUP.name()}, null, null, null); + + MapTypically it is one file. But QIF export generate multiple files per currency.
- * @return List of paths to exported files - * @throws IOException if the exported files could not be created - */ - private Liste.g. /some/path/file.ext --> file:///some/path/file.ext
+ * @param paths List of file paths to convert + * @return List of file URIs + */ + @NonNull + private ArrayListsrc to dst
+ * Moves a file from src to dst
* @param src Absolute path to the source file
* @param dst Absolute path to the destination file
- * @throws IOException if the file could not be copied
+ * @throws IOException if the file could not be moved.
*/
- public void copyFile(File src, File dst) throws IOException {
- //TODO: Make this asynchronous at some time, t in the future
- if (mExportParams.getExportFormat() == ExportFormat.QIF) {
- QifExporter.splitQIF(src, dst);
- } else {
- FileChannel inChannel = new FileInputStream(src).getChannel();
- FileChannel outChannel = new FileOutputStream(dst).getChannel();
- try {
- inChannel.transferTo(0, inChannel.size(), outChannel);
- } finally {
- if (inChannel != null)
- inChannel.close();
- outChannel.close();
- }
+ public void moveFile(String src, String dst) throws IOException {
+ //TODO: Make this asynchronous at some time, t in the future.
+ File srcFile = new File(src);
+ File dstFile = new File(dst);
+ FileChannel inChannel = new FileInputStream(srcFile).getChannel();
+ FileChannel outChannel = new FileOutputStream(dstFile).getChannel();
+ try {
+ inChannel.transferTo(0, inChannel.size(), outChannel);
+ } finally {
+ if (inChannel != null)
+ inChannel.close();
+ outChannel.close();
}
+ srcFile.delete();
}
}
diff --git a/app/src/main/java/org/gnucash/android/export/ExportParams.java b/app/src/main/java/org/gnucash/android/export/ExportParams.java
index 6b23ede19..97232940e 100644
--- a/app/src/main/java/org/gnucash/android/export/ExportParams.java
+++ b/app/src/main/java/org/gnucash/android/export/ExportParams.java
@@ -16,9 +16,15 @@
package org.gnucash.android.export;
+import android.preference.PreferenceManager;
+
+import org.gnucash.android.BuildConfig;
+import org.gnucash.android.R;
import org.gnucash.android.app.GnuCashApplication;
import org.gnucash.android.ui.export.ExportFormFragment;
+import java.sql.Timestamp;
+
/**
* Encapsulation of the parameters used for exporting transactions.
* The parameters are determined by the user in the export dialog and are then transmitted to the asynchronous task which
@@ -42,10 +48,9 @@ public enum ExportTarget {SD_CARD, SHARING, DROPBOX, GOOGLE_DRIVE }
private ExportFormat mExportFormat = ExportFormat.QIF;
/**
- * Flag to determine if all transactions (including previously exported ones) should be exported
- * By default only new transactions since the last export will be exported.
+ * All transactions created after this date will be exported
*/
- private boolean mExportAllTransactions = false;
+ private Timestamp mExportStartTime = Timestamp.valueOf(Exporter.TIMESTAMP_ZERO);
/**
* Flag to determine if all transactions should be deleted after exporting is complete
@@ -58,11 +63,6 @@ public enum ExportTarget {SD_CARD, SHARING, DROPBOX, GOOGLE_DRIVE }
*/
private ExportTarget mExportTarget = ExportTarget.SHARING;
- /**
- * File path for the internal saving of transactions before determining export destination.
- */
- private String mTargetFilepath;
-
/**
* Creates a new set of paramters and specifies the export format
* @param format Format to use when exporting the transactions
@@ -85,24 +85,23 @@ public ExportFormat getExportFormat() {
*/
public void setExportFormat(ExportFormat exportFormat) {
this.mExportFormat = exportFormat;
- this.mTargetFilepath = GnuCashApplication.getAppContext().getFilesDir() + "/"
- + Exporter.buildExportFilename(mExportFormat);
}
/**
- * Returns flag whether all transactions should be exported, or only new ones since last export
- * @return true if all transactions should be exported, false otherwise
+ * Return date from which to start exporting transactions
+ * Transactions created or modified after this timestamp will be exported
+ * @return Timestamp from which to export */ - public boolean shouldExportAllTransactions() { - return mExportAllTransactions; + public Timestamp getExportStartTime(){ + return mExportStartTime; } /** - * Sets flag for exporting all transactions or only new transactions since last export - * @param exportAll Boolean flag + * Set the timestamp after which all transactions created/modified will be exported + * @param exportStartTime Timestamp */ - public void setExportAllTransactions(boolean exportAll) { - this.mExportAllTransactions = exportAll; + public void setExportStartTime(Timestamp exportStartTime){ + this.mExportStartTime = exportStartTime; } /** @@ -137,19 +136,10 @@ public void setExportTarget(ExportTarget mExportTarget) { this.mExportTarget = mExportTarget; } - /** - * Returns the internal target file path for the exported transactions. - * This file path is not accessible outside the context of the application - * @return String path to exported transactions - */ - public String getTargetFilepath() { - return mTargetFilepath; - } - @Override public String toString() { - return "Export " + mExportFormat.name() + " to " + mExportTarget.name() + " at " - + mTargetFilepath; + return "Export all transactions created since " + mExportStartTime.toString() + + " as "+ mExportFormat.name() + " to " + mExportTarget.name(); } /** @@ -159,11 +149,10 @@ public String toString() { */ public String toCsv(){ String separator = ";"; - String csv = mExportFormat.name() + separator + mExportTarget.name() + separator - + Boolean.toString(mExportAllTransactions) + separator - + Boolean.toString(mDeleteTransactionsAfterExport); - return csv; + return mExportFormat.name() + separator + mExportTarget.name() + separator + + mExportStartTime.toString() + separator + + Boolean.toString(mDeleteTransactionsAfterExport); } /** @@ -175,7 +164,7 @@ public static ExportParams parseCsv(String csvParams){ String[] tokens = csvParams.split(";"); ExportParams params = new ExportParams(ExportFormat.valueOf(tokens[0])); params.setExportTarget(ExportTarget.valueOf(tokens[1])); - params.setExportAllTransactions(Boolean.parseBoolean(tokens[2])); + params.setExportStartTime(Timestamp.valueOf(tokens[2])); params.setDeleteTransactionsAfterExport(Boolean.parseBoolean(tokens[3])); return params; diff --git a/app/src/main/java/org/gnucash/android/export/Exporter.java b/app/src/main/java/org/gnucash/android/export/Exporter.java index 41f041661..9727f1013 100644 --- a/app/src/main/java/org/gnucash/android/export/Exporter.java +++ b/app/src/main/java/org/gnucash/android/export/Exporter.java @@ -35,12 +35,11 @@ import org.gnucash.android.db.TransactionsDbAdapter; import java.io.File; -import java.io.FileFilter; -import java.io.Writer; import java.sql.Timestamp; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; import java.util.Locale; /** @@ -74,7 +73,16 @@ public abstract class Exporter { /** * Export options */ - protected ExportParams mParameters; + protected ExportParams mExportParams; + + /** + * Cache directory to which files will be first exported before moved to final destination. + *There is a different cache dir per export format, which has the name of the export format.
+ * The cache dir is cleared every time a new {@link Exporter} is instantiated.
+ * The files created here are only accessible within this application, and should be copied to SD card before they can be shared
+ *
This path is a temporary cache file whose file extension matches the export format.
+ * This file is deleted every time a new export is started
This value is set when a new application instance is created in {@link GnuCashApplication#onCreate()}. + * The value initialized here is just a placeholder for unit tests
*/ public static Commodity DEFAULT_COMMODITY = new Commodity("US Dollars", "USD", 100); //this value is a stub. Will be overwritten when the app is launched @@ -161,17 +164,10 @@ public int getSmallestFraction() { * @see #getSmallestFraction() */ public int getSmallestFractionDigits(){ - switch (mSmallestFraction) { - case 1: return 0; - case 10: return 1; - case 100: return 2; - case 1000: return 3; - case 10000: return 4; - case 100000: return 5; - case 1000000: return 6; - default: - return 2; - //throw new UnsupportedOperationException("Invalid fraction digits in commodity with fraction: " + mSmallestFraction); + if (mSmallestFraction == 0){ + return 0; + } else { + return Integer.numberOfTrailingZeros(mSmallestFraction); } } @@ -183,12 +179,7 @@ public int getSmallestFractionDigits(){ * @throws IllegalArgumentException if the smallest fraction is not a power of 10 */ public void setSmallestFraction(int smallestFraction) { - if (smallestFraction != 1 && smallestFraction != 10 && smallestFraction != 100 - && smallestFraction != 1000 && smallestFraction != 10000 - && smallestFraction != 1000000 ) //make sure we are not getting digits - this.mSmallestFraction = 100; - else - this.mSmallestFraction = smallestFraction; + this.mSmallestFraction = smallestFraction; } public int getQuoteFlag() { diff --git a/app/src/main/java/org/gnucash/android/model/Money.java b/app/src/main/java/org/gnucash/android/model/Money.java index a30b5675b..02c6930ca 100644 --- a/app/src/main/java/org/gnucash/android/model/Money.java +++ b/app/src/main/java/org/gnucash/android/model/Money.java @@ -90,19 +90,19 @@ public static Money getZeroInstance(){ return sDefaultZero; } + /** + * Returns the {@link BigDecimal} from the {@code numerator} and {@code denominator} + * @param numerator Number of the fraction + * @param denominator Denominator of the fraction + * @return BigDecimal representation of the number + */ public static BigDecimal getBigDecimal(long numerator, long denominator) { int scale; if (numerator == 0 && denominator == 0) { denominator = 1; } - switch ((int)denominator) { - case 1: scale = 0; break; - case 10: scale = 1; break; - case 100: scale = 2; break; - case 1000: scale = 3; break; - default: - throw new InvalidParameterException("invalid denominator " + denominator); - } + + scale = Integer.numberOfTrailingZeros((int)denominator); return new BigDecimal(BigInteger.valueOf(numerator), scale); } @@ -112,8 +112,8 @@ public static BigDecimal getBigDecimal(long numerator, long denominator) { * @param commodity Commodity of the money */ public Money(BigDecimal amount, Commodity commodity){ - this.mAmount = amount; this.mCommodity = commodity; + setAmount(amount); //commodity has to be set first. Because we use it's scale } /** @@ -123,8 +123,9 @@ public Money(BigDecimal amount, Commodity commodity){ * @param currencyCode Currency code as specified by ISO 4217 */ public Money(String amount, String currencyCode){ + //commodity has to be set first mCommodity = Commodity.getInstance(currencyCode); - setAmount(amount); + setAmount(new BigDecimal(amount)); } /** @@ -226,22 +227,13 @@ public long getNumerator() { * @return GnuCash format denominator */ public long getDenominator() { - switch (getScale()) { - case 0: return 1; - case 1: return 10; - case 2: return 100; - case 3: return 1000; - case 4: return 10000; - case 5: return 100000; - case 6: return 1000000; //I think GnuCash XML can have gold and silver with this denom - - } - throw new RuntimeException("Unsupported number of fraction digits " + getScale()); + int scale = getScale(); + return BigDecimal.ONE.scaleByPowerOfTen(scale).longValueExact(); } /** * Returns the scale (precision) used for the decimal places of this amount. - *The scale used depends on the currency
+ *The scale used depends on the commodity
* @return Scale of amount as integer */ private int getScale() { @@ -287,15 +279,14 @@ public String asString(){ * @return String containing formatted Money representation */ public String formattedString(Locale locale){ -/* -//todo: enable this code for 2.1 release. Test better too + NumberFormat currencyFormat = NumberFormat.getCurrencyInstance(locale); Currency currency = Currency.getInstance(mCommodity.getCurrencyCode()); String symbol; if (mCommodity.equals(Commodity.USD) && !locale.equals(Locale.US)) { symbol = "US$"; - } else if (mCommodity.equals(Commodity.EUR) { + } else if (mCommodity.equals(Commodity.EUR)) { symbol = currency.getSymbol(Locale.GERMANY); //euro currency is pretty unique around the world } else { symbol = currency.getSymbol(Locale.US); // US locale has the best symbol formatting table. @@ -307,13 +298,14 @@ public String formattedString(Locale locale){ currencyFormat.setMaximumFractionDigits(mCommodity.getSmallestFractionDigits()); return currencyFormat.format(asDouble()); -*/ - +/* +// old currency formatting code NumberFormat formatter = NumberFormat.getInstance(locale); formatter.setMinimumFractionDigits(mCommodity.getSmallestFractionDigits()); formatter.setMaximumFractionDigits(mCommodity.getSmallestFractionDigits()); Currency currency = Currency.getInstance(mCommodity.getCurrencyCode()); return formatter.format(asDouble()) + " " + currency.getSymbol(locale); +*/ } /** @@ -340,16 +332,7 @@ public Money negate(){ private void setAmount(@NonNull BigDecimal amount) { mAmount = amount.setScale(mCommodity.getSmallestFractionDigits(), ROUNDING_MODE); } - - /** - * Sets the amount value of thisMoney object
- * The amount is parsed by the {@link BigDecimal} constructor
- * @param amount {@link String} amount to be set
- */
- private void setAmount(String amount){
- setAmount(parseToDecimal(amount));
- }
-
+
/**
* Returns a new Money object whose value is the sum of the values of
* this object and addend.
@@ -511,27 +494,6 @@ public int compareTo(@NonNull Money another) {
return mAmount.compareTo(another.mAmount);
}
- /**
- * Parses a Locale specific string into a number using format for {@link Locale#US}
- * @param amountString Formatted String amount
- * @return String amount formatted in the default locale
- */
- public static BigDecimal parseToDecimal(String amountString){
- char separator = new DecimalFormatSymbols(Locale.US).getGroupingSeparator();
- amountString = amountString.replace(Character.toString(separator), "");
- NumberFormat formatter = NumberFormat.getInstance(Locale.US);
- if (formatter instanceof DecimalFormat) {
- ((DecimalFormat)formatter).setParseBigDecimal(true);
- }
- BigDecimal result = new BigDecimal(0);
- try {
- result = (BigDecimal) formatter.parse(amountString);
- } catch (ParseException e) {
- Crashlytics.logException(e);
- }
- return result;
- }
-
/**
* Returns a new instance of {@link Money} object with the absolute value of the current object
* @return Money object with absolute value of this instance
diff --git a/app/src/main/java/org/gnucash/android/model/Split.java b/app/src/main/java/org/gnucash/android/model/Split.java
index 39b619064..5e19936c5 100644
--- a/app/src/main/java/org/gnucash/android/model/Split.java
+++ b/app/src/main/java/org/gnucash/android/model/Split.java
@@ -336,11 +336,11 @@ public static Split parseSplit(String splitCsvString) {
}
return split;
} else {
- int valueNum = Integer.parseInt(tokens[1]);
- int valueDenom = Integer.parseInt(tokens[2]);
+ long valueNum = Long.parseLong(tokens[1]);
+ long valueDenom = Long.parseLong(tokens[2]);
String valueCurrencyCode = tokens[3];
- int quantityNum = Integer.parseInt(tokens[4]);
- int quantityDenom = Integer.parseInt(tokens[5]);
+ long quantityNum = Long.parseLong(tokens[4]);
+ long quantityDenom = Long.parseLong(tokens[5]);
String qtyCurrencyCode = tokens[6];
Money value = new Money(valueNum, valueDenom, valueCurrencyCode);
diff --git a/app/src/main/java/org/gnucash/android/ui/account/AccountFormFragment.java b/app/src/main/java/org/gnucash/android/ui/account/AccountFormFragment.java
index 0108312fc..b83b0288f 100644
--- a/app/src/main/java/org/gnucash/android/ui/account/AccountFormFragment.java
+++ b/app/src/main/java/org/gnucash/android/ui/account/AccountFormFragment.java
@@ -328,7 +328,6 @@ public void onClick(View view) {
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
- Cursor cursor = CommoditiesDbAdapter.getInstance().fetchAllRecords();
CommoditiesCursorAdapter commoditiesAdapter = new CommoditiesCursorAdapter(
getActivity(), android.R.layout.simple_spinner_item);
commoditiesAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
diff --git a/app/src/main/java/org/gnucash/android/ui/account/AccountsActivity.java b/app/src/main/java/org/gnucash/android/ui/account/AccountsActivity.java
index 6a1915a61..494d817ba 100644
--- a/app/src/main/java/org/gnucash/android/ui/account/AccountsActivity.java
+++ b/app/src/main/java/org/gnucash/android/ui/account/AccountsActivity.java
@@ -42,7 +42,7 @@
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.widget.Toolbar;
@@ -65,7 +65,6 @@
import org.gnucash.android.db.DatabaseSchema;
import org.gnucash.android.export.xml.GncXmlExporter;
import org.gnucash.android.importer.ImportAsyncTask;
-import org.gnucash.android.model.Money;
import org.gnucash.android.ui.common.BaseDrawerActivity;
import org.gnucash.android.ui.common.FormActivity;
import org.gnucash.android.ui.common.UxArgument;
@@ -77,7 +76,6 @@
import java.io.FileNotFoundException;
import java.io.InputStream;
-import java.util.ArrayList;
import butterknife.Bind;
import butterknife.ButterKnife;
@@ -152,12 +150,12 @@ public class AccountsActivity extends BaseDrawerActivity implements OnAccountCli
/**
* Configuration for rating the app
*/
- public static RateThisApp.Config rateAppConfig = new RateThisApp.Config(14, 100);
+ public static RateThisApp.Config rateAppConfig = new RateThisApp.Config(30, 100);
/**
* Adapter for managing the sub-account and transaction fragment pages in the accounts view
*/
- private class AccountViewPagerAdapter extends FragmentStatePagerAdapter {
+ private class AccountViewPagerAdapter extends FragmentPagerAdapter {
public AccountViewPagerAdapter(FragmentManager fm){
super(fm);
@@ -297,18 +295,9 @@ private void handleOpenFileIntent(Intent intent) {
Uri data = intent.getData();
if (data != null){
GncXmlExporter.createBackup();
-
intent.setData(null);
- InputStream accountInputStream = null;
- try {
- accountInputStream = getContentResolver().openInputStream(data);
- new ImportAsyncTask(this).execute(accountInputStream);
- } catch (FileNotFoundException e) {
- Crashlytics.logException(e);
- Log.e(LOG_TAG, "Error opening file for import - " + e.getMessage());
- } finally {
- removeFirstRunFlag();
- }
+ new ImportAsyncTask(this).execute(data);
+ removeFirstRunFlag();
}
}
@@ -380,8 +369,6 @@ public void setTab(int index){
private void init() {
PreferenceManager.setDefaultValues(this, R.xml.fragment_transaction_preferences, false);
- Money.DEFAULT_CURRENCY_CODE = GnuCashApplication.getDefaultCurrencyCode();
-
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
boolean firstRun = prefs.getBoolean(getString(R.string.key_first_run), true);
@@ -495,12 +482,13 @@ public static void createDefaultAccounts(final String currencyCode, final Activi
@Override
public void onTaskComplete() {
AccountsDbAdapter.getInstance().updateAllAccounts(DatabaseSchema.AccountEntry.COLUMN_CURRENCY, currencyCode);
+ GnuCashApplication.setDefaultCurrencyCode(currencyCode);
}
};
}
- InputStream accountFileInputStream = activity.getResources().openRawResource(R.raw.default_accounts);
- new ImportAsyncTask(activity, delegate).execute(accountFileInputStream);
+ Uri uri = Uri.parse("android.resource://" + BuildConfig.APPLICATION_ID + "/" + R.raw.default_accounts);
+ new ImportAsyncTask(activity, delegate).execute(uri);
}
/**
@@ -539,14 +527,8 @@ public static void startXmlFileChooser(Activity activity) {
* @param data Intent data containing the XML uri
*/
public static void importXmlFileFromIntent(Activity context, Intent data) {
- try {
- GncXmlExporter.createBackup();
- InputStream accountInputStream = context.getContentResolver().openInputStream(data.getData());
- new ImportAsyncTask(context).execute(accountInputStream);
- } catch (FileNotFoundException e) {
- Crashlytics.logException(e);
- Toast.makeText(context, R.string.toast_error_importing_accounts, Toast.LENGTH_SHORT).show();
- }
+ GncXmlExporter.createBackup();
+ new ImportAsyncTask(context).execute(data.getData());
}
/**
diff --git a/app/src/main/java/org/gnucash/android/ui/account/AccountsListFragment.java b/app/src/main/java/org/gnucash/android/ui/account/AccountsListFragment.java
index 74deec211..a1623f233 100644
--- a/app/src/main/java/org/gnucash/android/ui/account/AccountsListFragment.java
+++ b/app/src/main/java/org/gnucash/android/ui/account/AccountsListFragment.java
@@ -49,6 +49,7 @@
import android.widget.TextView;
import org.gnucash.android.R;
+import org.gnucash.android.app.GnuCashApplication;
import org.gnucash.android.db.AccountsDbAdapter;
import org.gnucash.android.db.DatabaseCursorLoader;
import org.gnucash.android.db.DatabaseSchema;
@@ -256,8 +257,9 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
else {
inflater.inflate(R.menu.account_actions, menu);
// Associate searchable configuration with the SearchView
+
SearchManager searchManager =
- (SearchManager) getActivity().getSystemService(Context.SEARCH_SERVICE);
+ (SearchManager) GnuCashApplication.getAppContext().getSystemService(Context.SEARCH_SERVICE);
mSearchView = (android.support.v7.widget.SearchView)
MenuItemCompat.getActionView(menu.findItem(R.id.menu_search));
if (mSearchView == null)
diff --git a/app/src/main/java/org/gnucash/android/ui/export/ExportFormFragment.java b/app/src/main/java/org/gnucash/android/ui/export/ExportFormFragment.java
index 0303fde47..410b48a76 100644
--- a/app/src/main/java/org/gnucash/android/ui/export/ExportFormFragment.java
+++ b/app/src/main/java/org/gnucash/android/ui/export/ExportFormFragment.java
@@ -21,6 +21,7 @@
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
+import android.content.res.Resources;
import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
@@ -28,6 +29,7 @@
import android.support.v4.app.FragmentManager;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.SwitchCompat;
import android.text.format.Time;
import android.util.Log;
import android.view.LayoutInflater;
@@ -39,13 +41,18 @@
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.LinearLayout;
import android.widget.RadioButton;
import android.widget.Spinner;
import android.widget.TextView;
+import com.codetroopers.betterpickers.calendardatepicker.CalendarDatePickerDialog;
+import com.codetroopers.betterpickers.radialtimepicker.RadialTimePickerDialog;
import com.codetroopers.betterpickers.recurrencepicker.EventRecurrence;
import com.codetroopers.betterpickers.recurrencepicker.EventRecurrenceFormatter;
import com.codetroopers.betterpickers.recurrencepicker.RecurrencePickerDialog;
+import com.crashlytics.android.Crashlytics;
import com.dropbox.sync.android.DbxAccountManager;
import org.gnucash.android.R;
@@ -54,26 +61,37 @@
import org.gnucash.android.export.ExportAsyncTask;
import org.gnucash.android.export.ExportFormat;
import org.gnucash.android.export.ExportParams;
+import org.gnucash.android.export.Exporter;
import org.gnucash.android.model.BaseModel;
import org.gnucash.android.model.ScheduledAction;
import org.gnucash.android.ui.account.AccountsActivity;
import org.gnucash.android.ui.common.UxArgument;
import org.gnucash.android.ui.settings.SettingsActivity;
+import org.gnucash.android.ui.transaction.TransactionFormFragment;
import org.gnucash.android.ui.util.RecurrenceParser;
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
+
/**
* Dialog fragment for exporting accounts and transactions in various formats
* The dialog is used for collecting information on the export options and then passing them * to the {@link org.gnucash.android.export.Exporter} responsible for exporting
* @author Ngewi Fet