Release 2.6.1

api.properties

@@ -1,2 +1,2 @@
-API_KEY="0pGhFp5V.3Me6ZeM4hqFnu8FDMrqZwpaau1fdE98Y"
+API_KEY="3acPl2TP.lAyeGkWWlqPrgfWI9WbzqKKHejOmahJ3"
 API_BASE_ADDRESS="https://tpe.seemoo.tu-darmstadt.de/api/"

app/build.gradle

@@ -28,8 +28,8 @@ android {
         applicationId "de.seemoo.at_tracking_detection"
         minSdkVersion 28
         targetSdk = 36
-        versionCode 54
-        versionName "2.6.0"
+        versionCode 55
+        versionName "2.6.1"
         buildConfigField "String", "API_KEY", apiProperties["API_KEY"]
         buildConfigField "String", "API_BASE_ADDRESS", apiProperties["API_BASE_ADDRESS"]
 
@@ -92,23 +92,23 @@ dependencies {
     implementation 'com.google.android.material:material:1.13.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.9.3'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.9.3'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.9.3'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.3'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.9.4'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.9.4'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.9.4'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.4'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.4.0'
     implementation "androidx.profileinstaller:profileinstaller:1.4.1"
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
 
-    implementation "androidx.activity:activity-ktx:1.10.1"
+    implementation "androidx.activity:activity-ktx:1.11.0"
     implementation 'com.squareup.retrofit2:retrofit:3.0.0'
     implementation 'com.squareup.retrofit2:converter-gson:3.0.0'
     implementation 'com.squareup.okhttp3:okhttp:5.1.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:5.1.0'
-    implementation 'com.google.code.gson:gson:2.13.1'
+    implementation 'com.google.code.gson:gson:2.13.2'
     implementation "androidx.work:work-testing:$work_version"
     implementation 'androidx.core:core-ktx:1.17.0'
     debugImplementation 'com.squareup.okhttp3:logging-interceptor:5.1.0'
@@ -128,7 +128,7 @@ dependencies {
 
     implementation 'com.github.mukeshsolanki:MarkdownView-Android:2.0.0'
 
-    implementation 'com.github.bumptech.glide:glide:5.0.4'
+    implementation 'com.github.bumptech.glide:glide:5.0.5'
 
     ksp "com.google.dagger:hilt-compiler:$hilt_compiler_version"
     ksp "androidx.hilt:hilt-compiler:$hilt_version"
@@ -157,20 +157,25 @@ dependencies {
 
     //Compose
     // Integration with activities
-    implementation 'androidx.activity:activity-compose:1.10.1'
+    implementation 'androidx.activity:activity-compose:1.11.0'
     // Compose Material3 Design
     implementation 'androidx.compose.material3:material3:1.3.2'
     implementation 'androidx.compose.material3:material3-window-size-class:1.3.2'
     // Animations
-    implementation 'androidx.compose.animation:animation:1.9.0'
+    implementation 'androidx.compose.animation:animation:1.9.1'
     // Tooling support (Previews, etc.)
-    implementation 'androidx.compose.ui:ui-tooling:1.9.0'
+    implementation 'androidx.compose.ui:ui-tooling:1.9.1'
     // Integration with ViewModels
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.9.3'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4'
     // UI Tests
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.9.0'
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.9.1'
     // When using a MDC theme
     implementation "com.google.android.material:compose-theme-adapter:1.2.1"
+
+    // Google Review Handling
+    implementation("com.google.android.play:review:2.0.2")
+    implementation("com.google.android.play:review-ktx:2.0.2")
+    implementation("com.google.android.gms:play-services-base:18.8.0")
 }
 
 ksp {

app/src/main/java/de/seemoo/at_tracking_detection/ATTrackingDetectionApplication.kt

@@ -170,7 +170,23 @@ class ATTrackingDetectionApplication : Application(), Configuration.Provider {
             requiredPermissions.add(Manifest.permission.BLUETOOTH_CONNECT)
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            requiredPermissions.add(Manifest.permission.POST_NOTIFICATIONS)
+            // requiredPermissions.add(Manifest.permission.POST_NOTIFICATIONS)
+            SharedPrefs.showMissingNotificationPermissionWarning =
+                ContextCompat.checkSelfPermission(
+                    applicationContext,
+                    Manifest.permission.POST_NOTIFICATIONS
+                ) != PackageManager.PERMISSION_GRANTED
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            val backgroundLocationPermission =
+                ContextCompat.checkSelfPermission(
+                    applicationContext,
+                    Manifest.permission.ACCESS_BACKGROUND_LOCATION
+                ) == PackageManager.PERMISSION_GRANTED
+            SharedPrefs.showMissingBackgroundLocationPermissionWarning = !backgroundLocationPermission
+            if (backgroundLocationPermission) {
+                SharedPrefs.useLocationInTrackingDetection = true
+            }
         }
 
         for (permission in requiredPermissions) {
@@ -217,7 +233,7 @@ class ATTrackingDetectionApplication : Application(), Configuration.Provider {
         fun getCurrentApp(): ATTrackingDetectionApplication {
             return instance
         }
-        //TODO: Add real survey URL
+
         const val SURVEY_URL = "https://survey.seemoo.tu-darmstadt.de/index.php/117478?G06Q39=AirGuardAppAndroid&newtest=Y&lang=en"
         const val SURVEY_IS_RUNNING = false
     }

app/src/main/java/de/seemoo/at_tracking_detection/database/daos/NotificationDao.kt

@@ -62,6 +62,9 @@ interface NotificationDao {
     @Query("SELECT COUNT(*) FROM notification WHERE deviceAddress == :deviceAddress AND createdAt >= :since AND falseAlarm = 1")
     fun getFalseAlarmForDeviceSinceCount(deviceAddress: String, since: LocalDateTime): Int
 
+    @Query("SELECT COUNT(*) FROM notification WHERE deviceAddress == :deviceAddress AND falseAlarm = 1")
+    fun getFalseAlarmForDeviceCount(deviceAddress: String): Int
+
     @Transaction
     @RewriteQueriesToDropUnusedColumns
     @Query("SELECT * FROM notification")

app/src/main/java/de/seemoo/at_tracking_detection/database/repository/NotificationRepository.kt

@@ -50,6 +50,8 @@ class NotificationRepository @Inject constructor(
 
     fun getFalseAlarmForDeviceSinceCount(deviceAddress: String, since: LocalDateTime): Int = notificationDao.getFalseAlarmForDeviceSinceCount(deviceAddress, since)
 
+    fun getFalseAlarmForDeviceCount(deviceAddress: String): Int = notificationDao.getFalseAlarmForDeviceCount(deviceAddress)
+
     fun existsNotificationForDevice(deviceAddress: String): Boolean = notificationDao.existsNotificationForDevice(deviceAddress)
 
     fun getAllNotifications(): List<Notification> = notificationDao.getAllNotifications()

app/src/main/java/de/seemoo/at_tracking_detection/notifications/NotificationActionReceiver.kt

@@ -38,6 +38,15 @@ class NotificationActionReceiver : BroadcastReceiver() {
             Timber.e("Notification id missing!")
             return
         }
+        val notificationTag = intent.getStringExtra("notificationTag")
+
+        fun cancelNotification() {
+            if (notificationTag.isNullOrEmpty()) {
+                notificationManagerCompat.cancel(notificationId)
+            } else {
+                notificationManagerCompat.cancel(notificationTag, notificationId)
+            }
+        }
 
         when (intent.action) {
             NotificationConstants.FALSE_ALARM_ACTION -> {
@@ -46,7 +55,8 @@ class NotificationActionReceiver : BroadcastReceiver() {
                     notificationRepository.setFalseAlarm(notificationId, true)
                 }
                 // Dismiss the notification immediately for this action.
-                notificationManagerCompat.cancel(notificationId)
+                cancelNotification()
+                backgroundWorkScheduler.scheduleFalseAlarm(notificationId, notificationTag)
             }
             NotificationConstants.IGNORE_DEVICE_ACTION -> {
                 val deviceAddress = intent.getStringExtra("deviceAddress")
@@ -59,13 +69,14 @@ class NotificationActionReceiver : BroadcastReceiver() {
                     deviceRepository.setIgnoreFlag(deviceAddress, true)
                 }
                 // Dismiss the notification immediately for this action.
-                notificationManagerCompat.cancel(notificationId)
+                cancelNotification()
+                backgroundWorkScheduler.scheduleIgnoreDevice(deviceAddress, notificationId, notificationTag)
             }
             NotificationConstants.CLICKED_ACTION -> {
                 GlobalScope.launch(Dispatchers.IO) {
                     notificationRepository.setClicked(notificationId, true)
                 }
-                notificationManagerCompat.cancel(notificationId)
+                cancelNotification()
             }
             NotificationConstants.DISMISSED_ACTION -> {
                 GlobalScope.launch(Dispatchers.IO) {
@@ -75,4 +86,3 @@ class NotificationActionReceiver : BroadcastReceiver() {
         }
     }
 }
-

app/src/main/java/de/seemoo/at_tracking_detection/notifications/NotificationBuilder.kt

@@ -9,6 +9,7 @@ import android.os.Build
 import android.os.Bundle
 import android.os.SystemClock
 import androidx.core.app.NotificationCompat
+import androidx.core.net.toUri
 import dagger.hilt.android.qualifiers.ApplicationContext
 import de.seemoo.at_tracking_detection.ATTrackingDetectionApplication
 import de.seemoo.at_tracking_detection.R
@@ -29,7 +30,7 @@ import javax.inject.Singleton
 
 @Singleton
 class NotificationBuilder @Inject constructor(
-    @ApplicationContext private val context: Context
+    @param:ApplicationContext private val context: Context
 ) {
 
     private fun pendingNotificationIntent(bundle: Bundle, notificationId: Int): PendingIntent {
@@ -83,11 +84,14 @@ class NotificationBuilder @Inject constructor(
     private fun buildPendingIntent(
         bundle: Bundle,
         notificationAction: String,
+        notificationId: Int,
         code: Int
     ): PendingIntent {
         val intent = Intent(context, NotificationActionReceiver::class.java).apply {
             action = notificationAction
             putExtras(bundle)
+            val tag = bundle.getString("notificationTag") ?: "none"
+            data = "airguard://notif/$tag/$notificationId/$notificationAction".toUri()
         }
 
         val flags = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
@@ -96,9 +100,11 @@ class NotificationBuilder @Inject constructor(
             PendingIntent.FLAG_UPDATE_CURRENT
         }
 
+        val uniqueRequestCode = (notificationId and 0x7FFFFFFF) xor (code shl 16)
+
         return PendingIntent.getBroadcast(
             context,
-            code,
+            uniqueRequestCode,
             intent,
             flags
         )
@@ -118,7 +124,10 @@ class NotificationBuilder @Inject constructor(
         }
             ?: "UNKNOWN"
 
-        val bundle: Bundle = packBundle(deviceAddress, deviceTypeString, notificationId)
+        val bundle: Bundle = packBundle(deviceAddress, deviceTypeString, notificationId).apply {
+            // Provide the tag so the receiver can cancel using tag+id
+            putString("notificationTag", NotificationService.TRACKING_NOTIFICATION_TAG)
+        }
         val device = baseDevice.device
         val notificationText: String
         val notificationTitle: String
@@ -165,6 +174,7 @@ class NotificationBuilder @Inject constructor(
                 buildPendingIntent(
                     bundle,
                     NotificationConstants.FALSE_ALARM_ACTION,
+                    notificationId,
                     NotificationConstants.FALSE_ALARM_CODE
                 )
             ).setAutoCancel(true)
@@ -176,6 +186,7 @@ class NotificationBuilder @Inject constructor(
                 buildPendingIntent(
                     bundle,
                     NotificationConstants.IGNORE_DEVICE_ACTION,
+                    notificationId,
                     NotificationConstants.IGNORE_DEVICE_CODE
                 )
             ).setAutoCancel(true)
@@ -185,6 +196,7 @@ class NotificationBuilder @Inject constructor(
             buildPendingIntent(
                 bundle,
                 NotificationConstants.DISMISSED_ACTION,
+                notificationId,
                 NotificationConstants.DISMISSED_CODE
             )
         ).setAutoCancel(true)
@@ -200,7 +212,9 @@ class NotificationBuilder @Inject constructor(
         observationPositive: Boolean
     ): Notification {
         Timber.d("Notification with id $notificationId for device $deviceAddress has been build!")
-        val bundle: Bundle = packBundle(deviceAddress, deviceTypeString, notificationId)
+        val bundle: Bundle = packBundle(deviceAddress, deviceTypeString, notificationId).apply {
+            putString("notificationTag", NotificationService.OBSERVE_TRACKER_NOTIFICATION_TAG)
+        }
 
         val notifyText = if (observationPositive) {
             context.resources.getQuantityString(
@@ -227,6 +241,7 @@ class NotificationBuilder @Inject constructor(
             buildPendingIntent(
                 bundle,
                 NotificationConstants.DISMISSED_ACTION,
+                notificationId,
                 NotificationConstants.DISMISSED_CODE
             )
         ).setAutoCancel(true)
@@ -236,7 +251,10 @@ class NotificationBuilder @Inject constructor(
     }
 
     fun buildObserveTrackerFailedNotification(notificationId: Int): Notification {
-        val bundle: Bundle = Bundle().apply { putInt("notificationId", notificationId) }
+        val bundle: Bundle = Bundle().apply {
+            putInt("notificationId", notificationId)
+            putString("notificationTag", NotificationService.OBSERVE_TRACKER_NOTIFICATION_TAG)
+        }
 
         return NotificationCompat.Builder(context, NotificationConstants.CHANNEL_ID)
             .setContentTitle(context.getString(R.string.notification_observe_tracker_title_base))
@@ -251,7 +269,10 @@ class NotificationBuilder @Inject constructor(
 
     fun buildBluetoothErrorNotification(): Notification {
         val notificationId = -100
-        val bundle: Bundle = Bundle().apply { putInt("notificationId", notificationId) }
+        val bundle: Bundle = Bundle().apply {
+            putInt("notificationId", notificationId)
+            putString("notificationTag", NotificationService.BLE_SCAN_ERROR_TAG)
+        }
 
         return NotificationCompat.Builder(context, NotificationConstants.CHANNEL_ID)
             .setContentTitle(context.getString(R.string.notification_title_ble_error))

app/src/main/java/de/seemoo/at_tracking_detection/notifications/NotificationService.kt

@@ -29,8 +29,7 @@ class NotificationService @Inject constructor(
 ) {
     @SuppressLint("MissingPermission")
     suspend fun sendTrackingNotification(baseDevice: BaseDevice) {
-        val notificationId = generateUniqueNotificationId()
-        notificationViewModel.insertToDb(deviceAddress = baseDevice.address)
+        val notificationId = notificationViewModel.insertToDb(deviceAddress = baseDevice.address)
         with(notificationManagerCompat) {
             if (this.areNotificationsEnabled() && !SharedPrefs.deactivateBackgroundScanning) {
                 notify(
@@ -175,7 +174,7 @@ class NotificationService @Inject constructor(
             "de.seemoo.at_tracking_detection.ble_scan_error_notification"
         const val OBSERVE_TRACKER_NOTIFICATION_TAG =
             "de.seemoo.at_tracking_detection.observe_tracker_notification"
-        // const val SURVEY_INFO_TAG = "de.seemoo.at_tracking_detection.survey_info"
+        const val SURVEY_INFO_TAG = "de.seemoo.at_tracking_detection.survey_info"
 
         fun generateUniqueNotificationId(): Int {
             return Random.nextInt()

app/src/main/java/de/seemoo/at_tracking_detection/notifications/worker/FalseAlarmWorker.kt

@@ -17,17 +17,23 @@ class FalseAlarmWorker @AssistedInject constructor(
     private val notificationViewModel: NotificationViewModel,
     private val notificationManagerCompat: NotificationManagerCompat
 ) : CoroutineWorker(appContext, workerParams) {
-
     override suspend fun doWork(): Result {
         val notificationId = inputData.getInt("notificationId", -1)
         if (notificationId == -1) {
             Timber.e("No notification id passed!")
             return Result.failure()
         }
+        val notificationTag = inputData.getString("notificationTag")
+
         notificationViewModel.setFalseAlarm(notificationId, true)
-        //TODO: cancel specific notification by calling cancel(notificationId) which somehow doesn't work...
-        notificationManagerCompat.cancelAll()
-        Timber.d("Marked notification $notificationId as false alarm!")
+
+        if (notificationTag.isNullOrEmpty()) {
+            notificationManagerCompat.cancel(notificationId)
+        } else {
+            notificationManagerCompat.cancel(notificationTag, notificationId)
+        }
+
+        Timber.d("Marked notification $notificationId as false alarm and canceled it!")
         return Result.success()
     }
 }

app/src/main/java/de/seemoo/at_tracking_detection/notifications/worker/IgnoreDeviceWorker.kt

@@ -29,9 +29,16 @@ class IgnoreDeviceWorker @AssistedInject constructor(
             Timber.e("No notification id passed!")
             return Result.failure()
         }
+        val notificationTag = inputData.getString("notificationTag")
+
         deviceViewModel.setIgnoreFlag(deviceAddress, true)
-        //TODO: cancel specific notification by calling cancel(notificationId) which somehow doesn't work...
-        notificationManagerCompat.cancelAll()
+
+        if (notificationTag.isNullOrEmpty()) {
+            notificationManagerCompat.cancel(notificationId)
+        } else {
+            notificationManagerCompat.cancel(notificationTag, notificationId)
+        }
+
         Timber.d("Added device $deviceAddress to the ignored devices list!")
         return Result.success()
     }