Make service stopping more reliable

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 - Fix bug preventing callbacks after unbind/bind when using ScanJobs.  (#765, David G. Young)
 - Prevent NPE on access CycledLEScanner after OOM on Android 8+.  (#766, David G. Young)
+- Make switching back and forth between a foreground service and scan jobs more reliable
+(#767, David G. Young)
 - Disable BluetoothCrashResolver on Android 5+ as a it is not helpful can can create log noise.
    (#768, David G. Young)
 - Prevent NPE on start scan. (#780, Adrián Nieto Rodríguez)

src/main/java/org/altbeacon/beacon/BeaconManager.java

@@ -895,7 +895,9 @@ public void applySettings() {
 
     protected void syncSettingsToService() {
         if (mScheduledScanJobsEnabled) {
-            ScanJobScheduler.getInstance().applySettingsToScheduledJob(mContext, this);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                ScanJobScheduler.getInstance().applySettingsToScheduledJob(mContext, this);
+            }
             return;
         }
         try {

src/main/java/org/altbeacon/beacon/service/BeaconService.java

@@ -310,9 +310,12 @@ public IBinder onBind(Intent intent) {
         return mMessenger.getBinder();
     }
 
+    // called when the last bound client calls unbind
     @Override
     public boolean onUnbind(Intent intent) {
-        LogManager.i(TAG, "unbinding");
+        LogManager.i(TAG, "unbinding so destroying self");
+        this.stopForeground(true);
+        this.stopSelf();
         return false;
     }
 
@@ -327,7 +330,6 @@ public void onDestroy() {
         if (mBeaconNotificationProcessor != null) {
             mBeaconNotificationProcessor.unregister();
         }
-        stopForeground(true);
         bluetoothCrashResolver.stop();
         LogManager.i(TAG, "onDestroy called.  stopping scanning");
         handler.removeCallbacksAndMessages(null);

src/main/java/org/altbeacon/beacon/service/ScanJob.java

@@ -166,6 +166,9 @@ public boolean onStopJob(JobParameters params) {
 
     private void stopScanning() {
         mInitialized = false;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            mScanHelper.stopAndroidOBackgroundScan();
+        }
         if (mScanHelper.getCycledScanner() != null) {
             mScanHelper.getCycledScanner().stop();
             mScanHelper.getCycledScanner().destroy();