Merge pull request #435 from this-Aditya/exception

Updated exception-handling for unregisterReceiver
RADAR-base · May 9, 2024 · 4256245 · 4256245
2 parents f7e4092 + 9aed432
commit 4256245
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...droid-google-sleep/src/main/java/org.radarbase.passive.google.sleep/GoogleSleepManager.kt b/...droid-google-sleep/src/main/java/org.radarbase.passive.google.sleep/GoogleSleepManager.kt
@@ -1,4 +1,4 @@
-/*
+/* 
  * Copyright 2017 The Hyve
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -134,7 +134,7 @@ class GoogleSleepManager(context: GoogleSleepService) : AbstractSourceManager<Go
         try {
             service.unregisterReceiver(sleepBroadcastReceiver)
             logger.info("Unregistered from sleep receiver ")
-        } catch (ex: IllegalStateException) {
+        } catch (ex: IllegalArgumentException) {
             logger.error("Exception when unregistering from sleep receiver", ex)
         }
     }
@@ -170,4 +170,4 @@ class GoogleSleepManager(context: GoogleSleepService) : AbstractSourceManager<Go
             else -> SleepClassificationStatus.UNKNOWN
         }
     }
-}
+}
diff --git a/...ns/radar-android-phone/src/main/java/org/radarbase/passive/phone/PhoneBluetoothManager.kt b/...ns/radar-android-phone/src/main/java/org/radarbase/passive/phone/PhoneBluetoothManager.kt
@@ -180,7 +180,7 @@ class PhoneBluetoothManager(service: PhoneBluetoothService) : AbstractSourceMana
         bluetoothBroadcastReceiver?.let {
             try {
                 service.unregisterReceiver(it)
-            } catch (ex: IllegalStateException) {
+            } catch (ex: IllegalArgumentException) {
                 logger.warn("Bluetooth receiver already unregistered in broadcast")
             }
             bluetoothBroadcastReceiver = null

diff --git a/radar-commons-android/src/main/java/org/radarbase/android/util/BatteryLevelReceiver.kt b/radar-commons-android/src/main/java/org/radarbase/android/util/BatteryLevelReceiver.kt
@@ -62,7 +62,7 @@ class BatteryLevelReceiver(
     override fun unregister() {
         try {
             context.unregisterReceiver(receiver)
-        } catch (ex: IllegalStateException) {
+        } catch (ex: IllegalArgumentException) {
             logger.warn(
                 "Cannot unregister BatteryLevelReceiver. It probably was incompletely registered: {}",
                 ex.message,

diff --git a/radar-commons-android/src/main/java/org/radarbase/android/util/OfflineProcessor.kt b/radar-commons-android/src/main/java/org/radarbase/android/util/OfflineProcessor.kt
@@ -195,7 +195,7 @@ class OfflineProcessor(
                 alarmManager.cancel(pendingIntent)
                 try {
                     context.unregisterReceiver(receiver)
-                } catch (ex: IllegalStateException) {
+                } catch (ex: IllegalArgumentException) {
                     logger.warn(
                         "Cannot unregister OfflineProcessor {}, it was most likely not completely started: {}",
                         config.requestName,