mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-23 16:53:04 +02:00
Code Issues Releases Wiki Activity

fix bug clear the correct scale data if an user is deleted.

Browse Source
This commit is contained in:
OliE
2015-01-24 15:46:11 +01:00
parent c9b8fb9ec7
commit 54cc48b72b
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
View File

@@ -229,11 +229,8 @@ public class OpenScale {
outputStream.close();
}
public void clearScaleData() {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int selectedUserId = prefs.getInt("selectedUserId", -1);
scaleDB.clearScaleData(selectedUserId);
public void clearScaleData(int userId) {
scaleDB.clearScaleData(userId);
updateScaleData();
}

5
android_app/app/src/main/java/com/health/openscale/gui/TableFragment.java
View File

@@ -277,7 +277,10 @@ public class TableFragment extends Fragment implements FragmentUpdateListener {
deleteAllDialog.setPositiveButton(getResources().getString(R.string.label_yes), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
OpenScale.getInstance(tableView.getContext()).clearScaleData();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(tableView.getContext());
int selectedUserId = prefs.getInt("selectedUserId", -1);
OpenScale.getInstance(tableView.getContext()).clearScaleData(selectedUserId);
Toast.makeText(tableView.getContext(), getResources().getString(R.string.info_data_all_deleted), Toast.LENGTH_SHORT).show();
updateOnView(OpenScale.getInstance(tableView.getContext()).getScaleDataList());

2
android_app/app/src/main/java/com/health/openscale/gui/UserSettingsActivity.java
View File

@@ -157,7 +157,7 @@ public class UserSettingsActivity extends Activity {
OpenScale openScale = OpenScale.getInstance(context);
openScale.deleteScaleUser(userId);
openScale.clearScaleData();
openScale.clearScaleData(userId);
ArrayList<ScaleUser> scaleUser = openScale.getScaleUserList();