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

Moved notification display to onCreate rather than onStartCommand to try to avoid crash - might fix #106

Browse Source
This commit is contained in:
Graham Jones
2023-06-18 19:16:55 +01:00
parent f1fa38214e
commit c539247c48
9 changed files with 835 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:versionCode="122"
android:versionName="4.1.8">
android:versionCode="123"
android:versionName="4.1.9">
<!-- android:allowBackup="false" -->
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

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

@@ -216,6 +216,33 @@ public class SdServer extends Service implements SdDataReceiver {
PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE);
mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
"OSD:WakeLock");
// Initialise Notification channel for API level 26 and over
// from https://stackoverflow.com/questions/44443690/notificationcompat-with-api-26
mNM = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
mNotificationBuilder = new NotificationCompat.Builder(this, mNotChId);
if (Build.VERSION.SDK_INT >= 26) {
NotificationChannel channel = new NotificationChannel(mNotChId,
mNotChName,
NotificationManager.IMPORTANCE_DEFAULT);
channel.setDescription(mNotChDesc);
mNM.createNotificationChannel(channel);
}
// Display a notification icon in the status bar of the phone to
// show the service is running.
if (Build.VERSION.SDK_INT >= 26) {
Log.v(TAG, "showing Notification and calling startForeground (Android 8 and higher)");
mUtil.writeToSysLogFile("SdServer.onStartCommand() - showing Notification and calling startForeground (Android 8 and higher)");
showNotification(0);
startForeground(NOTIFICATION_ID, mNotification);
} else {
Log.v(TAG, "showing Notification");
mUtil.writeToSysLogFile("SdServer.onStartCommand() - showing Notification");
showNotification(0);
}
}
/**
@@ -227,6 +254,7 @@ public class SdServer extends Service implements SdDataReceiver {
Log.i(TAG, "onStartCommand() - SdServer service starting");
mUtil.writeToSysLogFile("SdServer.onStartCommand()");
// Update preferences.
Log.v(TAG, "onStartCommand() - calling updatePrefs()");
updatePrefs();
@@ -286,31 +314,8 @@ public class SdServer extends Service implements SdDataReceiver {
mUtil.writeToSysLogFile("SdServer.onStartCommand() - starting SdDataSource");
mSdDataSource.start();
// Initialise Notification channel for API level 26 and over
// from https://stackoverflow.com/questions/44443690/notificationcompat-with-api-26
mNM = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
mNotificationBuilder = new NotificationCompat.Builder(this, mNotChId);
if (Build.VERSION.SDK_INT >= 26) {
NotificationChannel channel = new NotificationChannel(mNotChId,
mNotChName,
NotificationManager.IMPORTANCE_DEFAULT);
channel.setDescription(mNotChDesc);
mNM.createNotificationChannel(channel);
}
// Display a notification icon in the status bar of the phone to
// show the service is running.
if (Build.VERSION.SDK_INT >= 26) {
Log.v(TAG, "showing Notification and calling startForeground (Android 8 and higher)");
mUtil.writeToSysLogFile("SdServer.onStartCommand() - showing Notification and calling startForeground (Android 8 and higher)");
showNotification(0);
startForeground(NOTIFICATION_ID, mNotification);
} else {
Log.v(TAG, "showing Notification");
mUtil.writeToSysLogFile("SdServer.onStartCommand() - showing Notification");
showNotification(0);
}
// Record last time we sent an SMS so we can limit rate of SMS
// sending to one per minute. We set it to one minute ago (60000 milliseconds)
mSMSTime = new Time(Time.getCurrentTimezone());