true if double entry is enabled, false otherwise
*/
public static boolean isDoubleEntryEnabled(){
- SharedPreferences sharedPrefs = PreferenceActivity.getActiveBookSharedPreferences(context);
+ SharedPreferences sharedPrefs = PreferenceActivity.getActiveBookSharedPreferences();
return sharedPrefs.getBoolean(context.getString(R.string.key_use_double_entry), true);
}
@@ -263,7 +263,7 @@ public static boolean isDoubleEntryEnabled(){
* @return true if opening balances should be saved, false otherwise
*/
public static boolean shouldSaveOpeningBalances(boolean defaultValue){
- SharedPreferences sharedPrefs = PreferenceActivity.getActiveBookSharedPreferences(context);
+ SharedPreferences sharedPrefs = PreferenceActivity.getActiveBookSharedPreferences();
return sharedPrefs.getBoolean(context.getString(R.string.key_save_opening_balances), defaultValue);
}
diff --git a/app/src/main/java/org/gnucash/android/db/adapter/BooksDbAdapter.java b/app/src/main/java/org/gnucash/android/db/adapter/BooksDbAdapter.java
index 799f4ea3e..e8e6460e9 100644
--- a/app/src/main/java/org/gnucash/android/db/adapter/BooksDbAdapter.java
+++ b/app/src/main/java/org/gnucash/android/db/adapter/BooksDbAdapter.java
@@ -17,6 +17,7 @@
package org.gnucash.android.db.adapter;
import android.content.ContentValues;
+import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteStatement;
@@ -26,6 +27,7 @@
import org.gnucash.android.app.GnuCashApplication;
import org.gnucash.android.db.DatabaseSchema.BookEntry;
import org.gnucash.android.model.Book;
+import org.gnucash.android.ui.settings.PreferenceActivity;
import org.gnucash.android.util.TimestampHelper;
/**
@@ -92,6 +94,24 @@ public Book buildModelInstance(@NonNull Cursor cursor) {
return stmt;
}
+
+ /**
+ * Deletes a book - removes the book record from the database and deletes the database file from the disk
+ * @param bookUID GUID of the book
+ * @return true if deletion was successful, false otherwise
+ * @see #deleteRecord(String)
+ */
+ public boolean deleteBook(@NonNull String bookUID){
+ Context context = GnuCashApplication.getAppContext();
+ boolean result = context.deleteDatabase(bookUID);
+ if (result) //delete the db entry only if the file deletion was successful
+ result &= deleteRecord(bookUID);
+
+ PreferenceActivity.getBookSharedPreferences(bookUID).edit().clear().apply();
+
+ return result;
+ }
+
/**
* Sets the book with unique identifier {@code uid} as active and all others as inactive
* If the parameter is null, then the currently active book is not changed
diff --git a/app/src/main/java/org/gnucash/android/db/adapter/DatabaseAdapter.java b/app/src/main/java/org/gnucash/android/db/adapter/DatabaseAdapter.java index f12c2e4d7..d6de72871 100644 --- a/app/src/main/java/org/gnucash/android/db/adapter/DatabaseAdapter.java +++ b/app/src/main/java/org/gnucash/android/db/adapter/DatabaseAdapter.java @@ -17,6 +17,8 @@ package org.gnucash.android.db.adapter; import android.content.ContentValues; +import android.content.Context; +import android.content.SharedPreferences; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteStatement; @@ -32,6 +34,7 @@ import org.gnucash.android.db.DatabaseSchema.TransactionEntry; import org.gnucash.android.model.AccountType; import org.gnucash.android.model.BaseModel; +import org.gnucash.android.ui.settings.PreferenceActivity; import org.gnucash.android.util.TimestampHelper; import java.util.ArrayList; @@ -712,19 +715,6 @@ public boolean deleteRecord(@NonNull String uid){ return deleteRecord(getID(uid)); } - /** - * Deletes a book - removes the book record from the database and deletes the database file from the disk - * @param bookUID GUID of the book - * @returntrue if deletion was successful, false otherwise
- * @see #deleteRecord(String)
- */
- public boolean deleteBook(@NonNull String bookUID){
- boolean result = GnuCashApplication.getAppContext().deleteDatabase(bookUID);
- if (result) //delete the db entry only if the file deletion was successful
- result &= deleteRecord(bookUID);
- return result;
- }
-
/**
* Returns an attribute from a specific column in the database for a specific record.
* The attribute is returned as a string which can then be converted to another type if 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 d407db82c..066e68d10 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 @@ -238,7 +238,7 @@ public void onCreate(Bundle savedInstanceState) { setHasOptionsMenu(true); mAccountsDbAdapter = AccountsDbAdapter.getInstance(); - SharedPreferences sharedPrefs = PreferenceActivity.getActiveBookSharedPreferences(getActivity()); + SharedPreferences sharedPrefs = PreferenceActivity.getActiveBookSharedPreferences(); mUseDoubleEntry = sharedPrefs.getBoolean(getString(R.string.key_use_double_entry), true); } diff --git a/app/src/main/java/org/gnucash/android/ui/settings/PreferenceActivity.java b/app/src/main/java/org/gnucash/android/ui/settings/PreferenceActivity.java index a5016ece7..f5c87a9c9 100644 --- a/app/src/main/java/org/gnucash/android/ui/settings/PreferenceActivity.java +++ b/app/src/main/java/org/gnucash/android/ui/settings/PreferenceActivity.java @@ -34,7 +34,9 @@ import android.view.View; import org.gnucash.android.R; +import org.gnucash.android.app.GnuCashApplication; import org.gnucash.android.db.adapter.BooksDbAdapter; +import org.gnucash.android.model.Book; import org.gnucash.android.ui.passcode.PasscodeLockActivity; import butterknife.Bind; @@ -147,12 +149,20 @@ public boolean onOptionsItemSelected(MenuItem item) { /** * Returns the shared preferences file for the currently active book. * Should be used instead of {@link PreferenceManager#getDefaultSharedPreferences(Context)} - * @param context Application context * @return Shared preferences file */ - public static SharedPreferences getActiveBookSharedPreferences(Context context){ - //// TODO: 21.12.2015 optimize the getActiveBookUID retrieval by caching it somewhere - return context.getSharedPreferences(BooksDbAdapter.getInstance().getActiveBookUID(), Context.MODE_PRIVATE); + public static SharedPreferences getActiveBookSharedPreferences(){ + return getBookSharedPreferences(BooksDbAdapter.getInstance().getActiveBookUID()); + } + + /** + * Return the {@link SharedPreferences} for a specific book + * @param bookUID GUID of the book + * @return Shared preferences + */ + public static SharedPreferences getBookSharedPreferences(String bookUID){ + Context context = GnuCashApplication.getAppContext(); + return context.getSharedPreferences(bookUID, Context.MODE_PRIVATE); } @Override diff --git a/app/src/main/java/org/gnucash/android/ui/transaction/TransactionFormFragment.java b/app/src/main/java/org/gnucash/android/ui/transaction/TransactionFormFragment.java index aa4a77b21..67e34d4bb 100644 --- a/app/src/main/java/org/gnucash/android/ui/transaction/TransactionFormFragment.java +++ b/app/src/main/java/org/gnucash/android/ui/transaction/TransactionFormFragment.java @@ -293,7 +293,7 @@ public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); setHasOptionsMenu(true); - SharedPreferences sharedPrefs = PreferenceActivity.getActiveBookSharedPreferences(getActivity()); + SharedPreferences sharedPrefs = PreferenceActivity.getActiveBookSharedPreferences(); mUseDoubleEntry = sharedPrefs.getBoolean(getString(R.string.key_use_double_entry), false); if (!mUseDoubleEntry){ mDoubleEntryLayout.setVisibility(View.GONE); @@ -538,7 +538,7 @@ private void initalizeViews() { mTime = mDate = Calendar.getInstance(); mTransactionTypeSwitch.setAccountType(mAccountType); - String typePref = PreferenceActivity.getActiveBookSharedPreferences(getActivity()).getString(getString(R.string.key_default_transaction_type), "DEBIT"); + String typePref = PreferenceActivity.getActiveBookSharedPreferences().getString(getString(R.string.key_default_transaction_type), "DEBIT"); mTransactionTypeSwitch.setChecked(TransactionType.valueOf(typePref)); String code = GnuCashApplication.getDefaultCurrencyCode(); diff --git a/app/src/main/java/org/gnucash/android/ui/transaction/TransactionsListFragment.java b/app/src/main/java/org/gnucash/android/ui/transaction/TransactionsListFragment.java index bf1bcc5ba..8d27d592d 100644 --- a/app/src/main/java/org/gnucash/android/ui/transaction/TransactionsListFragment.java +++ b/app/src/main/java/org/gnucash/android/ui/transaction/TransactionsListFragment.java @@ -95,7 +95,7 @@ public void onCreate(Bundle savedInstanceState) { Bundle args = getArguments(); mAccountUID = args.getString(UxArgument.SELECTED_ACCOUNT_UID); - mUseCompactView = PreferenceActivity.getActiveBookSharedPreferences(getActivity()) + mUseCompactView = PreferenceActivity.getActiveBookSharedPreferences() .getBoolean(getActivity().getString(R.string.key_use_compact_list), !GnuCashApplication.isDoubleEntryEnabled()); //if there was a local override of the global setting, respect it if (savedInstanceState != null) diff --git a/app/src/main/java/org/gnucash/android/util/PreferencesHelper.java b/app/src/main/java/org/gnucash/android/util/PreferencesHelper.java index 2b67ac6c8..d58f2e7dc 100644 --- a/app/src/main/java/org/gnucash/android/util/PreferencesHelper.java +++ b/app/src/main/java/org/gnucash/android/util/PreferencesHelper.java @@ -78,7 +78,7 @@ public static void setLastExportTime(Timestamp lastExportTime, String bookUID) { * @return A {@link Timestamp} with the time. */ public static Timestamp getLastExportTime() { - final String utcString = PreferenceActivity.getActiveBookSharedPreferences(GnuCashApplication.getAppContext()) + final String utcString = PreferenceActivity.getActiveBookSharedPreferences() .getString(PREFERENCE_LAST_EXPORT_TIME_KEY, TimestampHelper.getUtcStringFromTimestamp(TimestampHelper.getTimestampFromEpochZero())); Log.d(LOG_TAG, "Retrieving '" + utcString + "' as lastExportTime from Android Preferences.");