Merge pull request #161 from fefe982/develop

Fixed: refresh accounts view after exporting and deleting all transactions
Fixed: Some more minor leaks and one zh translation error

Author: codinguser

app/res/values-zh/strings.xml

@@ -46,7 +46,7 @@
     <string name="title_edit_transaction">修改交易</string>
     <string name="label_transaction_description">备注</string>
     <string name="menu_move">移动</string>
-    <string name="title_selected">%1$d 已删除</string>
+    <string name="title_selected">%1$d 已选中</string>
     <string name="label_transactions_total">合计：</string>
     <string name="label_export_destination">导出到</string>
     <string name="title_export_dialog">导出交易资料</string>
@@ -351,7 +351,6 @@
     <string name="label_default_transfer_account">默认的转账帐户</string>
     <string name="label_account_color_and_type">科目颜色和类型</string>
     <plurals name="label_sub_accounts">
-        <item quantity="one">%d 子科目</item>
         <item quantity="other">%d 子科目</item>
     </plurals>
     <string-array name="account_type_entry_values">

app/src/org/gnucash/android/db/AccountsDbAdapter.java

@@ -165,6 +165,7 @@ public boolean destructiveDeleteAccount(long rowId){
 			result &= mTransactionsAdapter.deleteRecord(id);
 		}
 		result &= deleteRecord(DatabaseHelper.ACCOUNTS_TABLE_NAME, rowId);
+        c.close();
 		return result;
 	}
 

app/src/org/gnucash/android/export/ExporterTask.java

@@ -167,8 +167,8 @@ protected void onPostExecute(Boolean exportResult) {
 
         if (mExportParams.shouldDeleteTransactionsAfterExport()){
             android.support.v4.app.FragmentManager fragmentManager = ((FragmentActivity)mContext).getSupportFragmentManager();
-            Fragment currentFragment = fragmentManager
-                    .findFragmentByTag(AccountsActivity.FRAGMENT_ACCOUNTS_LIST);
+            Fragment currentFragment = ((AccountsActivity)mContext).getCurrentAccountListFragment();
+
             TransactionsDeleteConfirmationDialogFragment alertFragment =
                     TransactionsDeleteConfirmationDialogFragment.newInstance(R.string.title_confirm_delete, 0);
             alertFragment.setTargetFragment(currentFragment, 0);
@@ -218,6 +218,7 @@ private void writeQifExternalStorage(String qif) throws IOException {
         writer.write(qif);
 
         writer.flush();
+        writer.close();
     }
 
     /**

app/src/org/gnucash/android/export/ofx/OfxExporter.java

@@ -59,6 +59,7 @@ public OfxExporter(Context context, boolean exportAll) {
 		mAccountsList = exportAll ? dbAdapter.getAllAccounts() : dbAdapter.getExportableAccounts();
 		mExportAll = exportAll;
 		mContext = context;
+        dbAdapter.close();
 	}
 
     /**

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

@@ -80,6 +80,12 @@ public class AccountFormFragment extends SherlockFragment {
 	 * Accounts database adapter
 	 */
 	private AccountsDbAdapter mAccountsDbAdapter;
+
+    /**
+     * Whether the AccountsDbAdapter is created inside this class.
+     * If so, it should be also closed by this class
+     */
+    private boolean mReleaseDbAdapter = false;
 
 	/**
 	 * List of all currency codes (ISO 4217) supported by the app
@@ -191,6 +197,7 @@ public AccountFormFragment() {
 	static public AccountFormFragment newInstance(AccountsDbAdapter dbAdapter){
 		AccountFormFragment f = new AccountFormFragment();
 		f.mAccountsDbAdapter = dbAdapter;
+        f.mReleaseDbAdapter = false;
 		return f;
 	}
 
@@ -199,6 +206,7 @@ public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setHasOptionsMenu(true);
         if (mAccountsDbAdapter == null){
+            mReleaseDbAdapter = true;
             mAccountsDbAdapter = new AccountsDbAdapter(getSherlockActivity());
         }
 
@@ -660,8 +668,14 @@ public void onDestroy() {
 		super.onDestroyView();
 		if (mParentAccountCursor != null)
 			mParentAccountCursor.close();
-		//do not close the database adapter. We got it from the activity, 
-		//the activity will take care of it.
+        // The mAccountsDbAdapter should only be closed when it is not passed in
+        // by other Activities.
+		if (mReleaseDbAdapter == true && mAccountsDbAdapter != null) {
+            mAccountsDbAdapter.close();
+        }
+        if (mDefaultTransferAccountCursorAdapter != null) {
+            mDefaultTransferAccountCursorAdapter.getCursor().close();
+        }
 	}
 
 	private void saveAccount() {

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

@@ -205,6 +205,11 @@ public int getCount() {
         }
     }
 
+    public AccountsListFragment getCurrentAccountListFragment(){
+        int index = mPager.getCurrentItem();
+        return (AccountsListFragment)(mFragmentPageReferenceMap.get(index));
+    }
+
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {

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

@@ -420,6 +420,9 @@ private void updateTransferAccountsList(){
                             + "' AND " + DatabaseHelper.KEY_PLACEHOLDER + " = 0"
                             + ")";
 
+        if (mCursor != null) {
+            mCursor.close();
+        }
 		mCursor = mAccountsDbAdapter.fetchAccountsOrderedByFullName(conditions);
 
         mCursorAdapter = new QualifiedAccountNameCursorAdapter(getActivity(),
@@ -543,6 +546,8 @@ public void onAccountChanged(long newAccountId){
         }
 
 		updateTransferAccountsList();
+
+        accountsDbAdapter.close();
 	}
 
 	/**

app/src/org/gnucash/android/ui/transaction/dialog/TransactionsDeleteConfirmationDialogFragment.java

@@ -62,6 +62,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
                             } else {
                             	adapter.deleteRecord(rowId);
                             }
+                            adapter.close();
                             if (getTargetFragment() instanceof AccountsListFragment){                            	
                             	((AccountsListFragment)getTargetFragment()).refresh();
                             }