Adds multibook support for the homescreen widget

When adding a widget, there is now an option for choosing the book in addition to the account.
Updates to an account in the relevant book will be reflected in the widget.
This change handles no migration from the old widget structure. (Users need to remove and re-add widgets)

Author: codinguser

app/src/main/java/org/gnucash/android/app/GnuCashApplication.java

@@ -126,7 +126,7 @@ public void onCreate(){
         BookDbHelper bookDbHelper = new BookDbHelper(getApplicationContext());
         mBooksDbAdapter = new BooksDbAdapter(bookDbHelper.getWritableDatabase());
 
-        initDatabaseAdapters();
+        initializeDatabaseAdapters();
         setDefaultCurrencyCode(getDefaultCurrencyCode());
 
         if (BuildConfig.DEBUG && !isRoboUnitTest())
@@ -137,7 +137,7 @@ public void onCreate(){
      * Initialize database adapter singletons for use in the application
      * This method should be called every time a new book is opened
      */
-    private static void initDatabaseAdapters() {
+    private static void initializeDatabaseAdapters() {
         if (mDbHelper != null){ //close if open
             mDbHelper.getReadableDatabase().close();
         }
@@ -205,15 +205,23 @@ public static BooksDbAdapter getBooksDbAdapter(){
     }
 
     /**
-     * Loads the book with GUID {@code bookUID}
+     * Loads the book with GUID {@code bookUID} and opens the AccountsActivity
      * @param bookUID GUID of the book to be loaded
      */
     public static void loadBook(@NonNull String bookUID){
-        mBooksDbAdapter.setActive(bookUID);
-        initDatabaseAdapters();
+        activateBook(bookUID);
         AccountsActivity.start(getAppContext());
     }
 
+    /**
+     * Activates the book with unique identifer {@code bookUID}, and refreshes the database adapters
+     * @param bookUID GUID of the book to be activated
+     */
+    public static void activateBook(@NonNull String bookUID){
+        mBooksDbAdapter.setActive(bookUID);
+        initializeDatabaseAdapters();
+    }
+
     /**
      * Returns the currently active database in the application
      * @return Currently active {@link SQLiteDatabase}

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

@@ -124,6 +124,16 @@ public void onCreate(SQLiteDatabase db) {
 
     }
 
+    /**
+     * Returns the database for the book
+     * @param bookUID GUID of the book
+     * @return SQLiteDatabase of the book
+     */
+    public static SQLiteDatabase getDatabase(String bookUID){
+        DatabaseHelper dbHelper = new DatabaseHelper(GnuCashApplication.getAppContext(), bookUID);
+        return dbHelper.getWritableDatabase();
+    }
+
     /**
      * Inserts the book into the database
      * @param db Book database

app/src/main/java/org/gnucash/android/db/adapter/BooksDbAdapter.java

@@ -31,6 +31,8 @@
 import org.gnucash.android.ui.settings.PreferenceActivity;
 import org.gnucash.android.util.TimestampHelper;
 
+import java.util.List;
+
 /**
  * Database adapter for creating/modifying book entries
  */

app/src/main/java/org/gnucash/android/receivers/TransactionAppWidgetProvider.java

@@ -21,8 +21,11 @@
 import android.content.SharedPreferences.Editor;
 import android.preference.PreferenceManager;
 
+import org.gnucash.android.db.adapter.BooksDbAdapter;
+import org.gnucash.android.model.Book;
 import org.gnucash.android.ui.common.UxArgument;
 import org.gnucash.android.ui.homescreen.WidgetConfigurationActivity;
+import org.gnucash.android.ui.settings.PreferenceActivity;
 
 /**
  * {@link AppWidgetProvider} which is responsible for managing widgets on the homescreen
@@ -43,13 +46,13 @@ public void onUpdate(Context context, AppWidgetManager appWidgetManager,
         for (int i=0; i<N; i++) {
             int appWidgetId = appWidgetIds[i];
 
-            String accountUID = PreferenceManager
-                    .getDefaultSharedPreferences(context)
+            String accountUID = PreferenceActivity.getActiveBookSharedPreferences()
                     .getString(UxArgument.SELECTED_ACCOUNT_UID + appWidgetId, null);
             if (accountUID == null)
             	return;
 
-            WidgetConfigurationActivity.updateWidget(context, appWidgetId, accountUID);
+            WidgetConfigurationActivity.updateWidget(context, appWidgetId, accountUID,
+					BooksDbAdapter.getInstance().getActiveBookUID());
         }
 	}
 
@@ -62,11 +65,11 @@ public void onEnabled(Context context) {
     @Override
 	public void onDeleted(Context context, int[] appWidgetIds) {
 		super.onDeleted(context, appWidgetIds);		
-		Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
+		Editor editor = PreferenceActivity.getActiveBookSharedPreferences().edit();
 
 		for (int appWidgetId : appWidgetIds) {
 			editor.remove(UxArgument.SELECTED_ACCOUNT_UID + appWidgetId);
 		}
-		editor.commit();		
+		editor.apply();
 	}
 }

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

@@ -102,6 +102,12 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(getContentView());
 
+        //if a parameter was passed to open an account within a specific book, then switch
+        String bookUID = getIntent().getStringExtra(UxArgument.BOOK_UID);
+        if (bookUID != null && !bookUID.equals(BooksDbAdapter.getInstance().getActiveBookUID())){
+            GnuCashApplication.activateBook(bookUID);
+        }
+
         ButterKnife.bind(this);
         setSupportActionBar(mToolbar);
         final ActionBar actionBar = getSupportActionBar();

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

@@ -29,6 +29,7 @@
 import org.gnucash.android.R;
 import org.gnucash.android.app.GnuCashApplication;
 import org.gnucash.android.db.adapter.AccountsDbAdapter;
+import org.gnucash.android.db.adapter.BooksDbAdapter;
 import org.gnucash.android.ui.account.AccountFormFragment;
 import org.gnucash.android.ui.budget.BudgetAmountEditorFragment;
 import org.gnucash.android.ui.budget.BudgetFormFragment;
@@ -57,6 +58,12 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_form);
 
+        //if a parameter was passed to open an account within a specific book, then switch
+        String bookUID = getIntent().getStringExtra(UxArgument.BOOK_UID);
+        if (bookUID != null && !bookUID.equals(BooksDbAdapter.getInstance().getActiveBookUID())){
+            GnuCashApplication.activateBook(bookUID);
+        }
+
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
 

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

@@ -102,6 +102,11 @@ public final class UxArgument {
      */
     public static final String BUDGET_AMOUNT_LIST = "budget_amount_list";
 
+    /**
+     * GUID of a book which is relevant for a specific action
+     */
+    public static final String BOOK_UID = "book_uid";
+
     //prevent initialization of instances of this class
     private UxArgument(){
         //prevent even the native class from calling the ctor

app/src/main/java/org/gnucash/android/ui/homescreen/WidgetConfigurationActivity.java

@@ -25,29 +25,39 @@
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.support.v4.widget.SimpleCursorAdapter;
 import android.util.Log;
 import android.view.View;
+import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.RemoteViews;
 import android.widget.Spinner;
 import android.widget.Toast;
 
 import org.gnucash.android.R;
+import org.gnucash.android.db.BookDbHelper;
+import org.gnucash.android.db.DatabaseHelper;
+import org.gnucash.android.db.DatabaseSchema;
 import org.gnucash.android.db.adapter.AccountsDbAdapter;
+import org.gnucash.android.db.adapter.BooksDbAdapter;
 import org.gnucash.android.model.Account;
+import org.gnucash.android.model.Book;
 import org.gnucash.android.model.Money;
 import org.gnucash.android.receivers.TransactionAppWidgetProvider;
 import org.gnucash.android.ui.account.AccountsActivity;
 import org.gnucash.android.ui.common.FormActivity;
 import org.gnucash.android.ui.common.UxArgument;
+import org.gnucash.android.ui.settings.PreferenceActivity;
 import org.gnucash.android.ui.transaction.TransactionsActivity;
 import org.gnucash.android.util.QualifiedAccountNameCursorAdapter;
 
 import java.util.Locale;
 
+import butterknife.Bind;
+import butterknife.ButterKnife;
+
 /**
  * Activity for configuration which account to display on a widget.
  * The activity is opened each time a widget is added to the homescreen
@@ -57,19 +67,42 @@ public class WidgetConfigurationActivity extends Activity {
 	private AccountsDbAdapter mAccountsDbAdapter;
     private int mAppWidgetId;
 
-	private Spinner mAccountsSpinner;
-	private Button mOkButton;
-	private Button mCancelButton;
-	
+	@Bind(R.id.input_accounts_spinner) Spinner mAccountsSpinner;
+	@Bind(R.id.input_books_spinner) Spinner mBooksSpinner;
+
+	@Bind(R.id.btn_save) Button mOkButton;
+	@Bind(R.id.btn_cancel) Button mCancelButton;
+	private SimpleCursorAdapter mAccountsCursorAdapter;
+
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {		
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.widget_configuration);
 		setResult(RESULT_CANCELED);
-		
-		mAccountsSpinner = (Spinner) findViewById(R.id.input_accounts_spinner);
-		mOkButton 		= (Button) findViewById(R.id.btn_save);
-		mCancelButton 	= (Button) findViewById(R.id.btn_cancel);
+
+		ButterKnife.bind(this);
+
+		BooksDbAdapter booksDbAdapter = BooksDbAdapter.getInstance();
+		Cursor booksCursor = booksDbAdapter.fetchAllRecords();
+		String currentBookUID = booksDbAdapter.getActiveBookUID();
+
+		//determine the position of the currently active book in the cursor
+		int position = 0;
+		while (booksCursor.moveToNext()){
+			String bookUID = booksCursor.getString(booksCursor.getColumnIndexOrThrow(DatabaseSchema.BookEntry.COLUMN_UID));
+			if (bookUID.equals(currentBookUID))
+				break;
+			++position;
+		}
+
+		SimpleCursorAdapter booksCursorAdapter = new SimpleCursorAdapter(this,
+				android.R.layout.simple_spinner_item, booksCursor,
+				new String[]{DatabaseSchema.BookEntry.COLUMN_DISPLAY_NAME},
+				new int[]{android.R.id.text1}, 0);
+		booksCursorAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+		mBooksSpinner.setAdapter(booksCursorAdapter);
+		mBooksSpinner.setSelection(position);
 
 		mAccountsDbAdapter = AccountsDbAdapter.getInstance();
 		Cursor cursor = mAccountsDbAdapter.fetchAllRecordsOrderedByFullName();
@@ -79,10 +112,10 @@ public void onCreate(Bundle savedInstanceState) {
 			finish();
 		}
 
-        SimpleCursorAdapter cursorAdapter = new QualifiedAccountNameCursorAdapter(this, cursor);
+		mAccountsCursorAdapter = new QualifiedAccountNameCursorAdapter(this, cursor);
 		//without this line, the app crashes when a user tries to select an account
-		cursorAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-		mAccountsSpinner.setAdapter(cursorAdapter);
+		mAccountsCursorAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+		mAccountsSpinner.setAdapter(mAccountsCursorAdapter);
 
 		bindListeners();
 	}
@@ -91,6 +124,24 @@ public void onCreate(Bundle savedInstanceState) {
 	 * Sets click listeners for the buttons in the dialog
 	 */
 	private void bindListeners() {
+		mBooksSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+			@Override
+			public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+				Book book = BooksDbAdapter.getInstance().getRecord(id);
+				SQLiteDatabase db = new DatabaseHelper(WidgetConfigurationActivity.this, book.getUID()).getWritableDatabase();
+				mAccountsDbAdapter = new AccountsDbAdapter(db);
+
+				Cursor cursor = mAccountsDbAdapter.fetchAllRecordsOrderedByFullName();
+				mAccountsCursorAdapter.swapCursor(cursor);
+				mAccountsCursorAdapter.notifyDataSetChanged();
+			}
+
+			@Override
+			public void onNothingSelected(AdapterView<?> parent) {
+				//nothing to see here, move along
+			}
+		});
+
 		mOkButton.setOnClickListener(new View.OnClickListener() {
 
 			@Override
@@ -110,12 +161,17 @@ public void onClick(View v) {
 
 				long accountId = mAccountsSpinner.getSelectedItemId();
                 String accountUID = mAccountsDbAdapter.getUID(accountId);
-				SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(WidgetConfigurationActivity.this);
+
+				long bookId = mBooksSpinner.getSelectedItemId();
+				String bookUID = BooksDbAdapter.getInstance().getUID(bookId);
+
+				SharedPreferences prefs = PreferenceActivity.getBookSharedPreferences(bookUID);
+				//PreferenceManager.getDefaultSharedPreferences(WidgetConfigurationActivity.this);
 				Editor editor = prefs.edit();
 				editor.putString(UxArgument.SELECTED_ACCOUNT_UID + mAppWidgetId, accountUID);
-				editor.commit();	
+				editor.apply();
 
-				updateWidget(WidgetConfigurationActivity.this, mAppWidgetId, accountUID);
+				updateWidget(WidgetConfigurationActivity.this, mAppWidgetId, accountUID, bookUID);
 
 				Intent resultValue = new Intent();
 				resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId);
@@ -137,14 +193,16 @@ public void onClick(View v) {
 	 * Updates the widget with id <code>appWidgetId</code> with information from the 
 	 * account with record ID <code>accountId</code>
      * If the account has been deleted, then a notice is posted in the widget
-     * @param appWidgetId ID of the widget to be updated
+	 * @param appWidgetId ID of the widget to be updated
      * @param accountUID GUID of the account tied to the widget
+	 * @param bookUID GUID of the book with the relevant account
 	 */
-	public static void updateWidget(final Context context, int appWidgetId, String accountUID) {
+	public static void updateWidget(final Context context, int appWidgetId, String accountUID, String bookUID) {
 		Log.i("WidgetConfiguration", "Updating widget: " + appWidgetId);
 		AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
 
-		AccountsDbAdapter accountsDbAdapter = AccountsDbAdapter.getInstance();
+		AccountsDbAdapter accountsDbAdapter = new AccountsDbAdapter(BookDbHelper.getDatabase(bookUID));
+
 		final Account account;
         try {
             account = accountsDbAdapter.getRecord(accountUID);
@@ -161,9 +219,9 @@ public static void updateWidget(final Context context, int appWidgetId, String a
 			views.setOnClickPendingIntent(R.id.widget_layout, pendingIntent);
 			views.setOnClickPendingIntent(R.id.btn_new_transaction, pendingIntent);
 			appWidgetManager.updateAppWidget(appWidgetId, views);
-			Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
+			Editor editor = PreferenceActivity.getActiveBookSharedPreferences().edit(); //PreferenceManager.getDefaultSharedPreferences(context).edit();
 			editor.remove(UxArgument.SELECTED_ACCOUNT_UID + appWidgetId);
-			editor.commit();
+			editor.apply();
 			return;
 		}
 
@@ -183,6 +241,7 @@ public static void updateWidget(final Context context, int appWidgetId, String a
 		accountViewIntent.setAction(Intent.ACTION_VIEW);
 		accountViewIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
 		accountViewIntent.putExtra(UxArgument.SELECTED_ACCOUNT_UID, accountUID);
+		accountViewIntent.putExtra(UxArgument.BOOK_UID, bookUID);
 		PendingIntent accountPendingIntent = PendingIntent
 				.getActivity(context, appWidgetId, accountViewIntent, 0);
 		views.setOnClickPendingIntent(R.id.widget_layout, accountPendingIntent);
@@ -191,6 +250,7 @@ public static void updateWidget(final Context context, int appWidgetId, String a
 		newTransactionIntent.setAction(Intent.ACTION_INSERT_OR_EDIT);
 		newTransactionIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 		newTransactionIntent.putExtra(UxArgument.FORM_TYPE, FormActivity.FormType.TRANSACTION.name());
+		newTransactionIntent.putExtra(UxArgument.BOOK_UID, bookUID);
 		newTransactionIntent.putExtra(UxArgument.SELECTED_ACCOUNT_UID, accountUID);
 		PendingIntent pendingIntent = PendingIntent
 				.getActivity(context, appWidgetId, newTransactionIntent, 0);	            
@@ -212,7 +272,8 @@ public static void updateAllWidgets(final Context context){
 		//update widgets asynchronously so as not to block method which called the update
 		//inside the computation of the account balance
 		new Thread(new Runnable() {
-			SharedPreferences defaultSharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
+			SharedPreferences defaultSharedPrefs = PreferenceActivity.getActiveBookSharedPreferences();
+			//PreferenceManager.getDefaultSharedPreferences(context);
 
 			@Override
 			public void run() {
@@ -223,7 +284,7 @@ public void run() {
 					if (accountUID == null)
 						continue;
 
-					updateWidget(context, widgetId, accountUID);
+					updateWidget(context, widgetId, accountUID, BooksDbAdapter.getInstance().getActiveBookUID());
 				}
 			}
 		}).start();