Fixed: Crash when bulk moving transactions

Fixed: Missing string for internationalization in ru_RU locale - fixes #143
Fixed: Random crashes when opening ScheduledTransactions list - fixes #141
Fixed: Blank screen after closing AccountFormFragment
Fixed: Correct normal balance of the different types of ASSET accounts
Fixed: Limit the target accounts for bulk transfers to same currency and non-placeholder accounts
Improved: Remember last opened tab in accounts list
Improved: Added version infomation for feedback email
Updated version for 1.3.1 beta release

Author: codinguser

CHANGELOG.md

@@ -1,5 +1,17 @@
 Change Log
 ===============================================================================
+Version 1.3.1 *(2014-02-14)*
+----------------------------
+* Fixed: Crash when bulk moving transactions
+* Fixed: Missing string for internationalization in ru_RU locale
+* Fixed: Random crashes when opening ScheduledTransactions list
+* Fixed: Blank screen after closing AccountFormFragment
+* Fixed: Correct normal balance of the different types of ASSET accounts
+* Fixed: Limit the target accounts for bulk transfers to same currency and non-placeholder accounts
+* Improved: Remember last opened tab in accounts list
+* Improved: Added version information for feedback email
+* Improved: Lists of accounts are now sorted by the fully qualified account name
+
 Version 1.3.0 *(2014-02-10)*
 ----------------------------
 * Fixed: Some file managers do not display all files available for import

app/AndroidManifest.xml

@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.gnucash.android"
-    android:versionCode="25"
-    android:versionName="1.3.0" >
+    android:versionCode="26"
+    android:versionName="@string/app_version_name" >
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15"/>
 

app/res/values-ru/strings.xml

@@ -336,7 +336,7 @@
     <string name="title_progress_importing_accounts">Импортируются счета</string>
     <string name="toast_tap_again_to_confirm_delete">Нажмите ещё раз для подтверждения. ВСЕ записи будут удалены!</string>
     <string name="section_header_transactions">Проводки</string>
-    <string name="section_header_accounts">Дочерние счета</string>
+    <string name="section_header_subaccounts">Дочерние счета</string>
     <string name="menu_search_accounts">Поиск</string>
     <string name="title_default_export_format">Формат экспорта по умолчанию</string>
     <string name="summary_default_export_format">Формат файла, используемый по умолчанию при экспорте</string>

app/res/values/strings.xml

@@ -17,6 +17,7 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">GnuCash</string>
+    <string name="app_version_name">1.3.1</string>
     <string name="title_add_account">Create Account</string>
     <string name="title_edit_account">Edit Account</string>
     <string name="info_details">Info</string>

app/res/xml/preference_headers.xml

@@ -29,6 +29,9 @@
     </header>
     <header android:title="Send feedback">
         <intent android:action="android.intent.action.VIEW"
-                android:data="mailto:gnucash.org@gmail.com?subject=GnuCash Android Feedback" />
+                android:data="mailto:gnucash.org@gmail.com" >
+            <extra android:name="android.intent.extra.SUBJECT" android:value="GnuCash Android Feedback" />
+            <extra android:name="android.intent.extra.TEXT" android:value="@string/app_version_name" />
+        </intent>
     </header>
 </preference-headers>

app/src/org/gnucash/android/model/Account.java

@@ -71,8 +71,9 @@ public class Account {
 	 * they are currently not used except for exporting
 	 */
 	public enum AccountType {
-        CASH(TransactionType.DEBIT), BANK, CREDIT, ASSET(TransactionType.DEBIT), LIABILITY, INCOME,
-        EXPENSE(TransactionType.DEBIT), PAYABLE, RECEIVABLE, EQUITY, CURRENCY, STOCK, MUTUAL, ROOT;
+        CASH(TransactionType.DEBIT), BANK(TransactionType.DEBIT), CREDIT, ASSET(TransactionType.DEBIT), LIABILITY,
+        INCOME, EXPENSE(TransactionType.DEBIT), PAYABLE, RECEIVABLE(TransactionType.DEBIT), EQUITY, CURRENCY,
+        STOCK(TransactionType.DEBIT), MUTUAL(TransactionType.DEBIT), ROOT;
 
         /**
          * Indicates that this type of normal balance the account type has

app/src/org/gnucash/android/ui/account/AccountsActivity.java

@@ -58,7 +58,9 @@
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.util.Currency;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 
 /**
  * Manages actions related to accounts, displaying, exporting and creating new accounts
@@ -123,12 +125,21 @@ public class AccountsActivity extends SherlockFragmentActivity implements OnAcco
      */
     public static final int INDEX_FAVORITE_ACCOUNTS_FRAGMENT = 2;
 
+    /**
+     * Used to save the index of the last open tab and restore the pager to that index
+     */
+    public static final String LAST_OPEN_TAB_INDEX = "last_open_tab";
+
     /**
      * Map containing fragments for the different tabs
      */
-    private SparseArray<Refreshable> mFragmentPageReferenceMap = new SparseArray<Refreshable>();
+    private Map<Integer,Refreshable> mFragmentPageReferenceMap = new HashMap<Integer, Refreshable>();
+
+    /**
+     * ViewPager which manages the different tabs
+     */
+    private ViewPager mPager;
 
-	
 	/**
 	 * Dialog which is shown to the user on first start prompting the user to create some accounts
 	 */
@@ -201,14 +212,14 @@ public void onCreate(Bundle savedInstanceState) {
 
         init();
 
-        ViewPager pager = (ViewPager) findViewById(R.id.pager);
+        mPager = (ViewPager) findViewById(R.id.pager);
         TitlePageIndicator titlePageIndicator = (TitlePageIndicator) findViewById(R.id.titles);
 
         final Intent intent = getIntent();
         String action = intent.getAction();
         if (action != null && action.equals(Intent.ACTION_INSERT_OR_EDIT)) {
             //enter account creation/edit mode if that was specified
-            pager.setVisibility(View.GONE);
+            mPager.setVisibility(View.GONE);
             titlePageIndicator.setVisibility(View.GONE);
 
             long accountId = intent.getLongExtra(UxArgument.SELECTED_ACCOUNT_ID, 0L);
@@ -219,15 +230,15 @@ public void onCreate(Bundle savedInstanceState) {
                 showAddAccountFragment(parentAccountId);
             }
         } else if (action != null && action.equals(ACTION_VIEW_RECURRING)) {
-            pager.setVisibility(View.GONE);
+            mPager.setVisibility(View.GONE);
             titlePageIndicator.setVisibility(View.GONE);
             showRecurringTransactionsFragment();
         } else {
             //show the simple accounts list
             PagerAdapter mPagerAdapter = new AccountViewPagerAdapter(getSupportFragmentManager());
-            pager.setAdapter(mPagerAdapter);
-            titlePageIndicator.setViewPager(pager);
-            pager.setCurrentItem(INDEX_TOP_LEVEL_ACCOUNTS_FRAGMENT);
+            mPager.setAdapter(mPagerAdapter);
+            titlePageIndicator.setViewPager(mPager);
+            mPager.setCurrentItem(INDEX_TOP_LEVEL_ACCOUNTS_FRAGMENT);
         }
 
 	}
@@ -268,6 +279,16 @@ private void init() {
     protected void onResume() {
         super.onResume();
         TransactionsActivity.sLastTitleColor = -1;
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        int lastTabIndex = preferences.getInt(LAST_OPEN_TAB_INDEX, INDEX_TOP_LEVEL_ACCOUNTS_FRAGMENT);
+        mPager.setCurrentItem(lastTabIndex);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onPause();
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        preferences.edit().putInt(LAST_OPEN_TAB_INDEX, mPager.getCurrentItem()).commit();
     }
 
     /**
@@ -276,25 +297,19 @@ protected void onResume() {
 	 * @return <code>true</code> if the minor version has been increased, <code>false</code> otherwise.
 	 */
 	private boolean hasNewFeatures(){
-		try {
-			PackageInfo packageInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
-			String versionName = packageInfo.versionName;			
-			int end = versionName.indexOf('.');
-			int currentMinor = Integer.parseInt(versionName.substring(0, end));
-			
-			SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-			int previousMinor = prefs.getInt(getString(R.string.key_previous_minor_version), 0);
-			if (currentMinor > previousMinor){
-				Editor editor = prefs.edit();
-				editor.putInt(getString(R.string.key_previous_minor_version), currentMinor);
-				editor.commit();
-				return true;
-			}
-		} catch (NameNotFoundException e) {
-			//do not show anything in that case
-			e.printStackTrace();			
-		}		
-		return false;
+        String versionName = getResources().getString(R.string.app_version_name);
+        int end = versionName.indexOf('.');
+        int currentMinor = Integer.parseInt(versionName.substring(0, end));
+
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        int previousMinor = prefs.getInt(getString(R.string.key_previous_minor_version), 0);
+        if (currentMinor > previousMinor){
+            Editor editor = prefs.edit();
+            editor.putInt(getString(R.string.key_previous_minor_version), currentMinor);
+            editor.commit();
+            return true;
+        }
+        return false;
 	}
 
 	/**
@@ -409,7 +424,6 @@ private void showAccountFormFragment(Bundle args){
         fragmentTransaction.replace(R.id.fragment_container,
                 accountFormFragment, AccountsActivity.FRAGMENT_NEW_ACCOUNT);
 
-        fragmentTransaction.addToBackStack(null);
         fragmentTransaction.commit();
     }
 

app/src/org/gnucash/android/ui/transaction/BulkMoveDialogFragment.java

@@ -18,8 +18,10 @@
 
 import org.gnucash.android.R;
 import org.gnucash.android.db.AccountsDbAdapter;
+import org.gnucash.android.db.DatabaseHelper;
 import org.gnucash.android.db.TransactionsDbAdapter;
 import org.gnucash.android.ui.UxArgument;
+import org.gnucash.android.ui.util.Refreshable;
 import org.gnucash.android.ui.widget.WidgetConfigurationActivity;
 
 import android.database.Cursor;
@@ -102,7 +104,12 @@ public void onActivityCreated(Bundle savedInstanceState) {
 		getDialog().setTitle(title);
 
 		mAccountsDbAdapter = new AccountsDbAdapter(getActivity());
-		Cursor cursor = mAccountsDbAdapter.fetchAllRecordsOrderedByFullName();
+        String conditions = "(" + DatabaseHelper.KEY_ROW_ID + " != " + mOriginAccountId + " AND "
+                + DatabaseHelper.KEY_CURRENCY_CODE + " = '" + mAccountsDbAdapter.getCurrencyCode(mOriginAccountId)
+                + "' AND " + DatabaseHelper.KEY_UID + " != '" + mAccountsDbAdapter.getGnuCashRootAccountUID()
+                + "' AND " + DatabaseHelper.KEY_PLACEHOLDER + " = 0"
+                + ")";
+		Cursor cursor = mAccountsDbAdapter.fetchAccountsOrderedByFullName(conditions);
 
 		SimpleCursorAdapter mCursorAdapter = new QualifiedAccountNameCursorAdapter(getActivity(),
                 android.R.layout.simple_spinner_item, cursor);
@@ -142,13 +149,9 @@ public void onClick(View v) {
 					trxnAdapter.moveTranscation(trxnId, dstAccountId);
 				}
 				trxnAdapter.close();
-				
-				Fragment f = getActivity()
-						.getSupportFragmentManager()
-						.findFragmentByTag(TransactionsActivity.FRAGMENT_TRANSACTIONS_LIST);
-					
+
 				WidgetConfigurationActivity.updateAllWidgets(getActivity());
-				((TransactionsListFragment)f).refresh();
+				((Refreshable)getTargetFragment()).refresh();
 				dismiss();
 			}			
 		});

app/src/org/gnucash/android/ui/transaction/ScheduledTransactionsListFragment.java

@@ -351,14 +351,16 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
             parentView.post(new Runnable() {
                 @Override
                 public void run() {
-                    float extraPadding = getResources().getDimension(R.dimen.edge_padding);
-                    final android.graphics.Rect hitRect = new Rect();
-                    checkBoxView.getHitRect(hitRect);
-                    hitRect.right   += extraPadding;
-                    hitRect.bottom  += 3*extraPadding;
-                    hitRect.top     -= extraPadding;
-                    hitRect.left    -= 2*extraPadding;
-                    parentView.setTouchDelegate(new TouchDelegate(hitRect, checkBoxView));
+                    if (isAdded()){ //may be run when fragment has been unbound from activity
+                        float extraPadding = getResources().getDimension(R.dimen.edge_padding);
+                        final android.graphics.Rect hitRect = new Rect();
+                        checkBoxView.getHitRect(hitRect);
+                        hitRect.right   += extraPadding;
+                        hitRect.bottom  += 3*extraPadding;
+                        hitRect.top     -= extraPadding;
+                        hitRect.left    -= 2*extraPadding;
+                        parentView.setTouchDelegate(new TouchDelegate(hitRect, checkBoxView));
+                    }
                 }
             });
 

app/src/org/gnucash/android/ui/transaction/TransactionsListFragment.java

@@ -341,6 +341,7 @@ protected void showBulkMoveDialog(){
 	    args.putLong(UxArgument.ORIGIN_ACCOUNT_ID, mAccountID);
 	    args.putLongArray(UxArgument.SELECTED_TRANSACTION_IDS, getListView().getCheckedItemIds());
 	    bulkMoveFragment.setArguments(args);
+        bulkMoveFragment.setTargetFragment(this, 0);
 	    bulkMoveFragment.show(ft, "bulk_move_dialog");
 	}