gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue with export data screen showing when selecting other menu items. Fixes #93

Browse Source
This commit is contained in:
Graham Jones
2023-06-10 19:55:43 +01:00
parent 72f73e4c3b
commit d11b0c2beb
4 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java
View File

@@ -512,6 +512,7 @@ public class LogManagerControlActivity extends AppCompatActivity {
})
.setNegativeButton(android.R.string.no, null)
.show();
return true;
case R.id.action_mark_false_alarm:
Log.i(TAG, "action_mark_false_alarm");
new AlertDialog.Builder(this)
@@ -525,6 +526,7 @@ public class LogManagerControlActivity extends AppCompatActivity {
})
.setNegativeButton(android.R.string.no, null)
.show();
return true;
case R.id.export_data_menuitem:
Log.i(TAG, "export data menu item");
try {
@@ -536,6 +538,10 @@ public class LogManagerControlActivity extends AppCompatActivity {
Log.i(TAG, "exception starting export data activity " + ex.toString());
}
return true;
case R.id.action_about_datasharing:
Log.i(TAG, "action_about_datasharing");
showDataSharingDialog();
return true;
default:
return super.onOptionsItemSelected(item);
@@ -765,4 +771,32 @@ public class LogManagerControlActivity extends AppCompatActivity {
}
}
private void showDataSharingDialog() {
mUtil.writeToSysLogFile("MainActivity.showDataSharingDialog()");
View aboutView = getLayoutInflater().inflate(R.layout.data_sharing_dialog_layout, null, false);
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setIcon(R.drawable.datasharing_fault_24x24);
builder.setTitle(R.string.data_sharing_dialog_title);
builder.setNegativeButton(getString(R.string.cancel), null);
builder.setPositiveButton(getString(R.string.login), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Log.i(TAG, "dataSharingDialog.positiveButton.onClick()");
try {
Intent i = new Intent(
LogManagerControlActivity.this,
AuthenticateActivity.class);
mContext.startActivity(i);
} catch (Exception ex) {
Log.i(TAG, "exception starting activity " + ex.toString());
}
}
});
builder.setView(aboutView);
builder.create();
builder.show();
}
}