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

Merge branch 'V3.1' of https://github.com/OpenSeizureDetector/Android_Pebble_SD into V3.1

Browse Source
This commit is contained in:
Graham Jones
2019-04-27 21:36:33 +01:00
parent be942b7798 6c31fa8aea
commit 350f48c167
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -767,7 +767,14 @@ public class SdServer extends Service implements SdDataReceiver {
} }
} else { } else {
Log.i(TAG, "sendSMSAlarm() - Cancel Audible Active - not sending SMS"); Log.i(TAG, "sendSMSAlarm() - Cancel Audible Active - not sending SMS");
<<<<<<< HEAD
mUtil.showToast("Cancel Audible Active - not sending SMS"); mUtil.showToast("Cancel Audible Active - not sending SMS");
=======
Toast toast = Toast.makeText(getApplicationContext(),
"Cancel Audible Active - not sending SMS",
Toast.LENGTH_SHORT);
toast.show();
>>>>>>> 6c31fa8aea6a9815f626c17dd29b721c88e9a8c2
} }
} else { } else {
Log.i(TAG, "sendSMSAlarm() - SMS Alarms Disabled - not doing anything!"); Log.i(TAG, "sendSMSAlarm() - SMS Alarms Disabled - not doing anything!");