From b3b8c941f8d3aaa73b9baacd80723a72cdef8dc3 Mon Sep 17 00:00:00 2001
From: Graham Jones <grahamjones139@gmail.com>
Date: Wed, 23 Dec 2015 23:07:28 +0000
Subject: [PATCH] Notification icon colour changes for warning and alarm
 levels.  Fixed issue with multiple versions of mainactivity starting on
 alarm.

---
 app/src/main/AndroidManifest.xml              |   1 +
 .../org/openseizuredetector/MainActivity.java |   3 +-
 .../uk/org/openseizuredetector/SdServer.java  |  58 ++++++++++++++----
 .../res/drawable/star_of_life_red_24x24.png   | Bin 0 -> 221 bytes
 .../drawable/star_of_life_yellow_24x24.png    | Bin 0 -> 231 bytes
 5 files changed, 48 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/res/drawable/star_of_life_red_24x24.png
 create mode 100644 app/src/main/res/drawable/star_of_life_yellow_24x24.png

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3194086..c6e99d9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
 
     <uses-feature
         android:name="android.hardware.telephony"
diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
index 7b91c9f..8f32c55 100644
--- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java
@@ -298,7 +298,8 @@ public class MainActivity extends Activity {
             TextView tv;
             if (mUtil.isServerRunning()) {
                 tv = (TextView) findViewById(R.id.serverStatusTv);
-                tv.setText("Server Running OK");
+                if (mConnection.mBound)
+                    tv.setText("Server Running OK\n"+mConnection.mSdServer.mSdDataSourceName+" Data Source");
                 tv.setBackgroundColor(okColour);
                 tv.setTextColor(okTextColour);
                 tv = (TextView) findViewById(R.id.serverIpTv);
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
index 9c9d9c1..cb0562f 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
@@ -30,14 +30,17 @@ import java.util.Map;
 
 import fi.iki.elonen.NanoHTTPD;
 
+import android.app.ActivityManager;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.AssetManager;
 import android.content.SharedPreferences;
+import android.graphics.drawable.Drawable;
 import android.media.AudioManager;
 import android.media.ToneGenerator;
 import android.os.CountDownTimer;
@@ -93,7 +96,7 @@ public class SdServer extends Service implements SdDataReceiver {
     private WakeLock mWakeLock = null;
     public SdDataSource mSdDataSource;
     public SdData mSdData;
-    private String mSdDataSourceName = "undefined";  // The name of the data soruce specified in the preferences.
+    public String mSdDataSourceName = "undefined";  // The name of the data soruce specified in the preferences.
     private boolean mLatchAlarms = false;
     private boolean mCancelAudible = false;
     public boolean mAudibleAlarm = false;
@@ -137,7 +140,9 @@ public class SdServer extends Service implements SdDataReceiver {
         return mBinder;
     }
 
-    /** used to make suer timers run on UI thread */
+    /**
+     * used to make suer timers run on UI thread
+     */
     private void runOnUiThread(Runnable runnable) {
         mHandler.post(runnable);
     }
@@ -192,7 +197,7 @@ public class SdServer extends Service implements SdDataReceiver {
         // Display a notification icon in the status bar of the phone to
         // show the service is running.
         Log.v(TAG, "showing Notification");
-        showNotification();
+        showNotification(0);
 
         // Record last time we sent an SMS so we can limit rate of SMS
         // sending to one per minute.
@@ -281,18 +286,32 @@ public class SdServer extends Service implements SdDataReceiver {
     /**
      * Show a notification while this service is running.
      */
-    private void showNotification() {
+    private void showNotification(int alarmLevel) {
         Log.v(TAG, "showNotification()");
+        int iconId;
+        switch (alarmLevel) {
+            case 0:
+                iconId = R.drawable.star_of_life_24x24;
+                break;
+            case 1:
+                iconId = R.drawable.star_of_life_yellow_24x24;
+                break;
+            case 2:
+                iconId = R.drawable.star_of_life_red_24x24;
+                break;
+            default:
+                iconId = R.drawable.star_of_life_24x24;
+        }
         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);
         NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
         Notification notification = builder.setContentIntent(contentIntent)
-                .setSmallIcon(R.drawable.star_of_life_24x24)
+                .setSmallIcon(iconId)
                 .setTicker("OpenSeizureDetector")
                 .setAutoCancel(false)
                 .setContentTitle("OpenSeizureDetector")
-                .setContentText("osdtext")
+                .setContentText(mSdDataSourceName + " Data Source")
                 .build();
 
         mNM = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
@@ -302,9 +321,19 @@ public class SdServer extends Service implements SdDataReceiver {
     // 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);
+
+        ActivityManager manager = (ActivityManager) getSystemService(ACTIVITY_SERVICE);
+        List<ActivityManager.RunningTaskInfo> runningTaskInfo = manager.getRunningTasks(1);
+        ComponentName componentInfo = runningTaskInfo.get(0).topActivity;
+
+        if (componentInfo.getPackageName().equals("uk.org.openseizuredetector")) {
+            Log.v(TAG,"showMainActivity(): OpenSeizureDetector Activity is already shown on top - not doing anything");
+        } else {
+            Log.v(TAG,"showMainActivity(): Showing Main Activity");
+            Intent i = new Intent(getApplicationContext(), MainActivity.class);
+            i.setFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT | Intent.FLAG_ACTIVITY_NEW_TASK);
+            this.startActivity(i);
+        }
     }
 
     /**
@@ -321,6 +350,7 @@ public class SdServer extends Service implements SdDataReceiver {
                 sdData.alarmPhrase = "OK";
                 sdData.alarmStanding = false;
                 sdData.fallAlarmStanding = false;
+                showNotification(0);
             }
         }
         if (sdData.alarmState == 1) {
@@ -339,6 +369,7 @@ public class SdServer extends Service implements SdDataReceiver {
                 Log.v(TAG, "WARNING");
             }
             warningBeep();
+            showNotification(1);
         }
         if ((sdData.alarmState == 2) || (sdData.alarmStanding)) {
             sdData.alarmPhrase = "ALARM";
@@ -352,6 +383,7 @@ public class SdServer extends Service implements SdDataReceiver {
             }
             // Make alarm beep tone
             alarmBeep();
+            showNotification(2);
             // Display MainActvity
             showMainActivity();
             // Send SMS Alarm.
@@ -460,7 +492,7 @@ public class SdServer extends Service implements SdDataReceiver {
             Log.v(TAG, "alarmBeep() - CancelAudible Active - silent beep...");
         } else {
             if (mAudibleAlarm) {
-                beep(1000);
+                beep(3000);
                 Log.v(TAG, "alarmBeep()");
             } else {
                 Log.v(TAG, "alarmBeep() - silent...");
@@ -716,9 +748,9 @@ public class SdServer extends Service implements SdDataReceiver {
     }
 
     /*
- * Temporary cancel audible alarms, for the period specified by the
- * CancelAudiblePeriod setting.
- */
+    * Temporary cancel audible alarms, for the period specified by the
+    * CancelAudiblePeriod setting.
+    */
     private class CancelAudibleTimer extends CountDownTimer {
         public CancelAudibleTimer(long startTime, long interval) {
             super(startTime, interval);
diff --git a/app/src/main/res/drawable/star_of_life_red_24x24.png b/app/src/main/res/drawable/star_of_life_red_24x24.png
new file mode 100644
index 0000000000000000000000000000000000000000..22175c75553be4bd8e2f0b355ac3e6488088aba8
GIT binary patch
literal 221
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9Y)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHj@CxR|1p-<7RuK%p#87sn8b(|1E0xegd`WFProZ@Igd
zZ_RAeX2X877PsVM0-}@5!!9iQb&=bpXUmgA>3iCX56T`bx{>pq+jrXJ(?{$sdAu%2
zd>Z=hUdzjTUxl~Pucr$=EDTWf<rZ9_zEE7~b5~;C33=DGYxwpi3g}$#VJ`*R%HZkh
K=d#Wzp$PyL8&0nP

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/star_of_life_yellow_24x24.png b/app/src/main/res/drawable/star_of_life_yellow_24x24.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e8fcf25bce399ef7a12e1790ab10f35b64a9c26
GIT binary patch
literal 231
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1SIoCSFHz9Y)RhkE)4%caKYZ?lYt_f1s;*b
zKpodXn9)gNb_Gz7y~NYkmHj@CxR{10|4QM1K%o*(7sn8b(|1E0`3@*>2tN}4^Pl<W
zk-R*`tru^oy7gT!xxlov<B*50QhJnhQ|#4?{4RnCVs<~o;}`0=aId(l{VhoU0^{wJ
zmoa+xl+R{Z$J`a0UDy)bAs%FPEApFn=Y!O>YO+cvF7|nq{$p43`6VpAKPu8@uDrs9
UvRd68K>HayUHx3vIVCg!0RB`@0{{R3

literal 0
HcmV?d00001