From d11b0c2bebbfe8b84b9fa9096c642e2f4b16ae39 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Sat, 10 Jun 2023 19:55:43 +0100
Subject: [PATCH] Fixed issue with export data screen showing when selecting
 other menu items.  Fixes #93

---
 .../LogManagerControlActivity.java            | 34 +++++++++++++++++++
 .../res/menu/log_manager_activity_menu.xml    |  7 ++++
 .../main/res/menu/main_activity_actions.xml   |  4 +--
 app/src/main/res/values/strings.xml           |  3 --
 4 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java b/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java
index 43b5af1..f439649 100644
--- a/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/LogManagerControlActivity.java
@@ -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();
+    }
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/res/menu/log_manager_activity_menu.xml b/app/src/main/res/menu/log_manager_activity_menu.xml
index 8ec3fcb..c0cb01e 100644
--- a/app/src/main/res/menu/log_manager_activity_menu.xml
+++ b/app/src/main/res/menu/log_manager_activity_menu.xml
@@ -44,4 +44,11 @@
             app:showAsAction="never|withText"
             android:title="@string/export_data_menuItem" />
     </group>
+    <item
+        android:id="@+id/action_about_datasharing"
+        android:enabled="true"
+        android:icon="@drawable/ic_action_settings"
+        app:showAsAction="never|withText"
+        android:title="@string/about_data_sharing" />
+
 </menu>
diff --git a/app/src/main/res/menu/main_activity_actions.xml b/app/src/main/res/menu/main_activity_actions.xml
index 3cbb8c3..eb11bb2 100644
--- a/app/src/main/res/menu/main_activity_actions.xml
+++ b/app/src/main/res/menu/main_activity_actions.xml
@@ -35,14 +35,14 @@
             android:icon="@drawable/ic_action_settings"
             app:showAsAction="never|withText"
             android:title="@string/data_sharing_log_in" />
--->
+
         <item
             android:id="@+id/action_about_datasharing"
             android:enabled="true"
             android:icon="@drawable/ic_action_settings"
             app:showAsAction="never|withText"
             android:title="@string/about_data_sharing" />
-
+-->
     </group>
     <group android:id="@+id/grp4">
         <item
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2f108a3..4abb678 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -377,9 +377,6 @@
     <string name="datasharing_notification_title">OpenSeizureDetector Data Sharing Problem</string>
     <string name="datasharing_about_title">OpenSeizureDetector Data Sharing</string>
     <string name="datasharing_about_text">
-        Data Sharing is not working correctly.   \n
-        This might be because you have not registered an account and logged in to the data sharing system,\n
-        or it may be a networking problem. \n\n
         <b>Please register for Data Sharing and Log in using the App menu or button below</b>\n\n
         This will help with developing OpenSeizureDetector to increase the
         detection reliability and reduce the false alarm rate\n\n