From dc311ae079f922005ea081e4c929ef1332b53a95 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Wed, 30 Mar 2016 20:56:39 +0100
Subject: [PATCH] fixex problem with multiple versions of MainActvity being
 started by StartUpActivity

---
 app/src/main/AndroidManifest.xml              |  4 ++-
 .../uk/org/openseizuredetector/SdServer.java  |  4 ++-
 .../openseizuredetector/StartupActivity.java  | 28 +++++++++++--------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ad6fd55..93ff47a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,7 +34,9 @@
         <activity
             android:name=".MainActivity"
             android:icon="@drawable/star_of_life_48x48"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:exported="true"
+            >
         </activity>
         <activity
             android:name=".PrefActivity"
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
index 9c93c36..158e0ed 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
@@ -311,7 +311,9 @@ public class SdServer extends Service implements SdDataReceiver {
         }
         Intent i = new Intent(getApplicationContext(), MainActivity.class);
         i.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-        PendingIntent contentIntent = PendingIntent.getActivity(this, 0, i, PendingIntent.FLAG_UPDATE_CURRENT);
+        PendingIntent contentIntent =
+                PendingIntent.getActivity(this,
+                        0, i, PendingIntent.FLAG_UPDATE_CURRENT);
         NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
         Notification notification = builder.setContentIntent(contentIntent)
                 .setSmallIcon(iconId)
diff --git a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
index ba98ff1..66a64d8 100644
--- a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
@@ -60,6 +60,7 @@ public class StartupActivity extends Activity {
     private OsdUtil mUtil;
     private Timer mUiTimer;
     private SdServiceConnection mConnection;
+    private boolean mStartedMainActivity = false;
     final Handler mServerStatusHandler = new Handler();   // used to update ui from mUiTimer
 
 
@@ -282,18 +283,23 @@ public class StartupActivity extends Activity {
             // If all the parameters are ok, close this activity and open the main
             // user interface activity instead.
             if (allOk) {
-                Log.v(TAG, "starting main activity...");
-                try {
-                    Intent intent = new Intent(
-                            getApplicationContext(),
-                            MainActivity.class);
-                    intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
-                    startActivity(intent);
-                    finish();
-                } catch (Exception ex) {
-                    Log.v(TAG, "exception starting settings activity " + ex.toString());
+                if (!mStartedMainActivity) {
+                    Log.v(TAG, "starting main activity...");
+                    try {
+                        Intent intent = new Intent(
+                                getApplicationContext(),
+                                MainActivity.class);
+                        intent.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+                        startActivity(intent);
+                        mStartedMainActivity = true;
+                        finish();
+                    } catch (Exception ex) {
+                        mStartedMainActivity = false;
+                        Log.v(TAG, "exception starting main activity " + ex.toString());
+                    }
+                } else {
+                    Log.v(TAG,"allOk, but already started MainActivity so not doing anything");
                 }
-
             }
         }
     };