Skip to content

Commit 8ede19f

Browse files
committed
Update widgets when all accounts or transactions are deleted
Fixed: Up arrow not displayed in secondary level activities Updated app version to 1.2.4
1 parent 1b224e5 commit 8ede19f

8 files changed

Lines changed: 15 additions & 8 deletions

File tree

app/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1919
package="org.gnucash.android"
2020
android:versionCode="14"
21-
android:versionName="1.2.4.beta" >
21+
android:versionName="1.2.4" >
2222

2323
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15"/>
2424

app/src/org/gnucash/android/ui/accounts/AccountsListFragment.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,11 @@ public void onActivityCreated(Bundle savedInstanceState) {
184184

185185
ActionBar actionbar = getSherlockActivity().getSupportActionBar();
186186
actionbar.setTitle(R.string.title_accounts);
187-
actionbar.setDisplayHomeAsUpEnabled(false);
187+
if (getActivity() instanceof TransactionsActivity){
188+
actionbar.setDisplayHomeAsUpEnabled(true);
189+
} else {
190+
actionbar.setDisplayHomeAsUpEnabled(false);
191+
}
188192

189193
if (!inSubAcccount())
190194
setHasOptionsMenu(true);

app/src/org/gnucash/android/ui/settings/DeleteAllAccountsConfirmationDialog.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import android.widget.Toast;
2626
import org.gnucash.android.R;
2727
import org.gnucash.android.db.AccountsDbAdapter;
28+
import org.gnucash.android.ui.widget.WidgetConfigurationActivity;
2829

2930
/**
3031
* Confirmation dialog for deleting all accounts from the system.
@@ -52,7 +53,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
5253
accountsDbAdapter.deleteAllRecords();
5354
accountsDbAdapter.close();
5455
Toast.makeText(context, R.string.toast_all_accounts_deleted, Toast.LENGTH_SHORT).show();
55-
56+
WidgetConfigurationActivity.updateAllWidgets(context);
5657
}
5758
}
5859
)

app/src/org/gnucash/android/ui/settings/DeleteAllTransacationsConfirmationDialog.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.widget.Toast;
1010
import org.gnucash.android.R;
1111
import org.gnucash.android.db.TransactionsDbAdapter;
12+
import org.gnucash.android.ui.widget.WidgetConfigurationActivity;
1213

1314
/**
1415
* Copyright (c) 2013 - gnucash-android
@@ -36,7 +37,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
3637
transactionsDbAdapter.deleteAllRecords();
3738
transactionsDbAdapter.close();
3839
Toast.makeText(context, R.string.toast_all_transactions_deleted, Toast.LENGTH_SHORT).show();
39-
40+
WidgetConfigurationActivity.updateAllWidgets(getActivity());
4041
}
4142
}
4243
)

app/src/org/gnucash/android/ui/transactions/TransactionsDeleteConfirmationDialog.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import android.os.Bundle;
1111

1212
import com.actionbarsherlock.app.SherlockDialogFragment;
13+
import org.gnucash.android.ui.widget.WidgetConfigurationActivity;
1314

1415
/**
1516
* Displays a delete confirmation dialog for transactions
@@ -47,7 +48,8 @@ public void onClick(DialogInterface dialog, int whichButton) {
4748
}
4849
if (getTargetFragment() instanceof AccountsListFragment){
4950
((AccountsListFragment)getTargetFragment()).refreshList();
50-
}
51+
}
52+
WidgetConfigurationActivity.updateAllWidgets(getActivity());
5153
}
5254
}
5355
)

app/src/org/gnucash/android/ui/widget/WidgetConfigurationActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public static void updateWidget(Context context, int appWidgetId, long accountId
156156

157157

158158
if (account == null){
159-
Log.i("WidgetConfiguration", "Account not found, updating widget " + appWidgetId);
159+
Log.i("WidgetConfiguration", "Account not found, resetting widget " + appWidgetId);
160160
//if account has been deleted, let the user know
161161
RemoteViews views = new RemoteViews(context.getPackageName(),
162162
R.layout.widget_4x1);

app/src/org/gnucash/android/util/OfxFormatter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ public class OfxFormatter {
8888
public OfxFormatter(Context context, boolean exportAll) {
8989
AccountsDbAdapter dbAdapter = new AccountsDbAdapter(context);
9090
mAccountsList = exportAll ? dbAdapter.getAllAccounts() : dbAdapter.getExportableAccounts();
91-
dbAdapter.close();
9291
mExportAll = exportAll;
9392
mContext = context;
9493
}

integration-tests/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="org.gnucash.android.test"
44
android:versionCode="3"
5-
android:versionName="1.2.3" >
5+
android:versionName="1.2.4" >
66

77
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15" />
88

0 commit comments

Comments
 (0)