Merge branch 'development' into Material3

seemoo-lab · Dec 25, 2024 · cf1fac1 · cf1fac1
2 parents 7701a68 + 363c78c
commit cf1fac1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/app/src/main/java/de/seemoo/at_tracking_detection/database/models/device/DeviceType.kt b/app/src/main/java/de/seemoo/at_tracking_detection/database/models/device/DeviceType.kt
@@ -93,12 +93,13 @@ enum class DeviceType {
 
     }
 
-    fun canBeIgnored(): Boolean {
+    fun canBeIgnored(cs: ConnectionState? = null): Boolean {
         // Only Devices with a constant identifier can be ignored
         return when (this) {
             TILE -> true
             CHIPOLO -> true
             PEBBLEBEE -> true
+            GOOGLE_FIND_MY_NETWORK -> cs == ConnectionState.OVERMATURE_OFFLINE
             else -> false
         }
     }

diff --git a/app/src/main/java/de/seemoo/at_tracking_detection/notifications/NotificationBuilder.kt b/app/src/main/java/de/seemoo/at_tracking_detection/notifications/NotificationBuilder.kt
@@ -13,6 +13,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import de.seemoo.at_tracking_detection.ATTrackingDetectionApplication
 import de.seemoo.at_tracking_detection.R
 import de.seemoo.at_tracking_detection.database.models.device.BaseDevice
+import de.seemoo.at_tracking_detection.database.models.device.ConnectionState
 import de.seemoo.at_tracking_detection.database.models.device.DeviceManager
 import de.seemoo.at_tracking_detection.database.models.device.DeviceType
 import de.seemoo.at_tracking_detection.database.models.device.types.GoogleFindMyNetworkType
@@ -161,7 +162,7 @@ class NotificationBuilder @Inject constructor(
                 )
             )
 
-        if (baseDevice.deviceType != null && baseDevice.deviceType.canBeIgnored()) {
+        if (baseDevice.deviceType != null && baseDevice.deviceType.canBeIgnored(ConnectionState.OVERMATURE_OFFLINE)) {
             notification = notification.addAction(
                 R.drawable.ic_warning,
                 context.getString(R.string.notification_ignore_device),

diff --git a/app/src/main/java/de/seemoo/at_tracking_detection/ui/tracking/TrackingViewModel.kt b/app/src/main/java/de/seemoo/at_tracking_detection/ui/tracking/TrackingViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.*
 import de.seemoo.at_tracking_detection.database.models.Beacon
 import de.seemoo.at_tracking_detection.database.models.device.BaseDevice
 import de.seemoo.at_tracking_detection.database.models.device.Connectable
+import de.seemoo.at_tracking_detection.database.models.device.ConnectionState
 import de.seemoo.at_tracking_detection.database.models.device.DeviceManager
 import de.seemoo.at_tracking_detection.database.models.device.DeviceType
 import de.seemoo.at_tracking_detection.database.repository.BeaconRepository
@@ -73,7 +74,7 @@ class TrackingViewModel @Inject constructor(
                 deviceIgnored.postValue(device.ignore)
                 noLocationsYet.postValue(false)
                 connectable.postValue(device.device is Connectable)
-                canBeIgnored.postValue(deviceType.value!!.canBeIgnored())
+                canBeIgnored.postValue(deviceType.value!!.canBeIgnored(ConnectionState.OVERMATURE_OFFLINE))
                 val notification = notificationRepository.notificationForDevice(device).firstOrNull()
                 notification?.let { notificationId.postValue(it.notificationId) }
             } else {