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

Reinstated display of MainActivity when Alarm state entered.

Browse Source
This commit is contained in:
Graham Jones
2015-12-15 22:32:50 +00:00
parent db2d40879d
commit aa3d159fec
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/uk/org/openseizuredetector/SdServer.java
View File

@@ -284,6 +284,13 @@ public class SdServer extends Service implements SdDataReceiver {
mNM.notify(NOTIFICATION_ID, notification); 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. * Process the data received from the SdData source.
@@ -329,6 +336,8 @@ public class SdServer extends Service implements SdDataReceiver {
} }
// Make alarm beep tone // Make alarm beep tone
alarmBeep(); alarmBeep();
// Display MainActvity
showMainActivity();
// Send SMS Alarm. // Send SMS Alarm.
if (mSMSAlarm) { if (mSMSAlarm) {
Time tnow = new Time(Time.getCurrentTimezone()); Time tnow = new Time(Time.getCurrentTimezone());
@@ -354,6 +363,8 @@ public class SdServer extends Service implements SdDataReceiver {
} }
// Make alarm beep tone // Make alarm beep tone
alarmBeep(); alarmBeep();
// Display MainActvity
showMainActivity();
// Send SMS Alarm. // Send SMS Alarm.
if (mSMSAlarm) { if (mSMSAlarm) {
Time tnow = new Time(Time.getCurrentTimezone()); Time tnow = new Time(Time.getCurrentTimezone());