Fixes #556 - If currency exchange dialog is opened during transaction save, immediately resume the save operation after the dialog is closed.

Removes the need for the user to manually restart the save process

Author: codinguser

app/src/androidTest/java/org/gnucash/android/test/ui/TransactionsActivityTest.java

@@ -309,8 +309,6 @@ public void testAddMultiCurrencyTransaction(){
 		Espresso.closeSoftKeyboard();
 		onView(withId(R.id.btn_save)).perform(click());
 
-		onView(withId(R.id.menu_save)).perform(click());
-
 		List<Transaction> allTransactions = mTransactionsDbAdapter.getAllTransactionsForAccount(TRANSACTIONS_ACCOUNT_UID);
 		assertThat(allTransactions).hasSize(transactionCount+1);
 		Transaction multiTrans = allTransactions.get(0);

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

@@ -235,6 +235,13 @@ public class TransactionFormFragment extends Fragment implements
 
     private boolean mEditMode = false;
 
+    /**
+     * Flag which is set if another action is triggered during a transaction save (which interrrupts the save process).
+     * Allows the fragment to check and resume the save operation.
+     * Primarily used for multicurrency transactions when the currency transfer dialog is opened during save
+     */
+    private boolean onSaveAttempt = false;
+
     /**
      * Split quantity which will be set from the funds transfer dialog
      */
@@ -828,6 +835,7 @@ private void saveNewTransaction() {
         //determine whether we need to do currency conversion
 
         if (isMultiCurrencyTransaction() && !splitEditorUsed() && !mCurrencyConversionDone){
+            onSaveAttempt = true;
             startTransferFunds();
             return;
         }
@@ -1034,6 +1042,11 @@ public static String stripCurrencyFormatting(String s){
     public void transferComplete(Money amount) {
         mCurrencyConversionDone = true;
         mSplitQuantity = amount;
+
+        //The transfer dialog was called while attempting to save. So try saving again
+        if (onSaveAttempt)
+            saveNewTransaction();
+        onSaveAttempt = false;
     }
 
     @Override