From aa3d159fec51aaa5ebd74b49bc3a7bee90ef0342 Mon Sep 17 00:00:00 2001 From: Graham Jones Date: Tue, 15 Dec 2015 22:32:50 +0000 Subject: [PATCH] Reinstated display of MainActivity when Alarm state entered. --- .../java/uk/org/openseizuredetector/SdServer.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java index b05a7e7..8a3febd 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java @@ -284,6 +284,13 @@ public class SdServer extends Service implements SdDataReceiver { mNM.notify(NOTIFICATION_ID, notification); } + // Show the main activity on the user's screen. + private void showMainActivity() { + Log.v(TAG, "showMainActivity()"); + Intent i = new Intent(getApplicationContext(),MainActivity.class); + i.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_NEW_TASK); + this.startActivity(i); + } /** * Process the data received from the SdData source. @@ -329,6 +336,8 @@ public class SdServer extends Service implements SdDataReceiver { } // Make alarm beep tone alarmBeep(); + // Display MainActvity + showMainActivity(); // Send SMS Alarm. if (mSMSAlarm) { Time tnow = new Time(Time.getCurrentTimezone()); @@ -354,6 +363,8 @@ public class SdServer extends Service implements SdDataReceiver { } // Make alarm beep tone alarmBeep(); + // Display MainActvity + showMainActivity(); // Send SMS Alarm. if (mSMSAlarm) { Time tnow = new Time(Time.getCurrentTimezone());