seemoo-lab
diff --git a/‎api.properties‎
Lines changed: 1 addition & 1 deletion b/‎api.properties‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/build.gradle‎
Lines changed: 5 additions & 5 deletions b/‎app/build.gradle‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎app/src/main/java/de/seemoo/at_tracking_detection/detection/BackgroundBluetoothScanner.kt‎
Lines changed: 4 additions & 2 deletions b/‎app/src/main/java/de/seemoo/at_tracking_detection/detection/BackgroundBluetoothScanner.kt‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎app/src/main/java/de/seemoo/at_tracking_detection/detection/PermanentBluetoothScanner.kt‎
Lines changed: 7 additions & 2 deletions b/‎app/src/main/java/de/seemoo/at_tracking_detection/detection/PermanentBluetoothScanner.kt‎
Lines changed: 7 additions & 2 deletions
@@ -1,2 +1,2 @@
-API_KEY="ZKpHA5D3.93jD8IMBSeZW0mRI6815RTHlPkOLzWBx"
+API_KEY="cTVQynqM.2HoOaVM63F5MJo9o6Pm6g86DIn0ju6q9"
 API_BASE_ADDRESS="https://tpe.seemoo.tu-darmstadt.de/api/"
@@ -36,8 +36,8 @@ android {
         applicationId "de.seemoo.at_tracking_detection"
         minSdk = 28
         targetSdk = 36
-        versionCode 63
-        versionName "3.0.1"
+        versionCode 64
+        versionName "3.0.2"
         buildConfigField "String", "API_KEY", apiProperties["API_KEY"]
         buildConfigField "String", "API_BASE_ADDRESS", apiProperties["API_BASE_ADDRESS"]
 
@@ -182,13 +182,13 @@ dependencies {
     implementation 'androidx.compose.material3:material3:1.4.0'
     implementation 'androidx.compose.material3:material3-window-size-class:1.4.0'
     // Animations
-    implementation 'androidx.compose.animation:animation:1.10.5'
+    implementation 'androidx.compose.animation:animation:1.10.6'
     // Tooling support (Previews, etc.)
-    implementation 'androidx.compose.ui:ui-tooling:1.10.5'
+    implementation 'androidx.compose.ui:ui-tooling:1.10.6'
     // Integration with ViewModels
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0'
     // UI Tests
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.10.5'
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.10.6'
     // When using a MDC theme
     implementation "com.google.android.material:compose-theme-adapter:1.2.1"
 
 
@@ -36,14 +36,14 @@ import de.seemoo.at_tracking_detection.util.risk.RiskLevelEvaluator
 import de.seemoo.at_tracking_detection.worker.BackgroundWorkScheduler
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.time.LocalDateTime
 import java.util.concurrent.ConcurrentHashMap
 import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
 
 object BackgroundBluetoothScanner {
     private var bluetoothAdapter: BluetoothAdapter? = null
@@ -348,7 +348,7 @@ object BackgroundBluetoothScanner {
             return true
         }
 
-        return suspendCoroutine { cont ->
+        return suspendCancellableCoroutine { cont ->
             var coroutineFinished = false
 
             val handler = Handler(Looper.getMainLooper())
@@ -479,6 +479,8 @@ object BackgroundBluetoothScanner {
                     since = discoveryDate.minusMinutes(TIME_BETWEEN_BEACONS)
                 ) // sorted by newest first
 
+                // adding the beacons[0].locationId != locId check results in more than 1 beacon per 15 minutes if location is different
+                // if (beacons.isEmpty()) {
                 if (beacons.isEmpty() || beacons[0].locationId != locId) {
                     Timber.d("Add new Beacon to the database!")
 
 
@@ -32,13 +32,18 @@ import java.time.ZoneId
 import java.time.temporal.ChronoUnit
 import java.util.Date
 import java.util.concurrent.Executors
+import java.util.concurrent.ThreadFactory
 import kotlin.math.abs
 
 @RequiresApi(Build.VERSION_CODES.S)
 object PermanentBluetoothScanner: LocationHistoryListener {
     private var bluetoothAdapter: BluetoothAdapter? = null
 
-    private var executor = Executors.newSingleThreadExecutor()
+    private val daemonThreadFactory = ThreadFactory { r ->
+        Thread(r, "PermanentBleScanner").apply { isDaemon = true }
+    }
+
+    private var executor = Executors.newSingleThreadExecutor(daemonThreadFactory)
     @Volatile private var keepRunning = false
 
     private var pendingFoundDevices: ArrayList<BackgroundBluetoothScanner.DiscoveredDevice> =
@@ -174,7 +179,7 @@ object PermanentBluetoothScanner: LocationHistoryListener {
         executor.shutdown()
         // Optionally, replace the executor with a new one if you need to start again later
         if (executor.isShutdown || executor.isTerminated) {
-            executor = Executors.newSingleThreadExecutor()
+            executor = Executors.newSingleThreadExecutor(daemonThreadFactory)
         }
         // Ask orchestrator to stop only if we are the current callback
         try {
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-API_KEY="ZKpHA5D3.93jD8IMBSeZW0mRI6815RTHlPkOLzWBx"`
	`1`	`+API_KEY="cTVQynqM.2HoOaVM63F5MJo9o6Pm6g86DIn0ju6q9"`
`2`	`2`	`API_BASE_ADDRESS="https://tpe.seemoo.tu-darmstadt.de/api/"`