AirGuard 2.6.2

.github/workflows/android.yml

@@ -10,16 +10,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Set up JDK
-        uses: actions/setup-java@v2
+      - name: Set up JDK 17 with Gradle cache
+        uses: actions/setup-java@v3
         with:
-          java-version: '11'
-          distribution: 'adopt'
+          distribution: temurin
+          java-version: 17
           cache: gradle
 
-      - name: Build app
-        uses: gradle/gradle-command-action@v2
-        with:
-          arguments: build
+      - name: Grant execute permission for Gradle wrapper
+        run: chmod +x ./gradlew
+
+      - name: Build (assemble & test)
+        run: ./gradlew build --no-daemon

api.properties

@@ -1,2 +1,2 @@
-API_KEY="3acPl2TP.lAyeGkWWlqPrgfWI9WbzqKKHejOmahJ3"
+API_KEY="VVZZfRjk.Ijo01HvEAbi7XpcNIrlQLyhnj0S3OLwh"
 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 55
-        versionName "2.6.1"
+        versionCode 56
+        versionName "2.6.2"
         buildConfigField "String", "API_KEY", apiProperties["API_KEY"]
         buildConfigField "String", "API_BASE_ADDRESS", apiProperties["API_BASE_ADDRESS"]
 
@@ -92,8 +92,8 @@ 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.4'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.9.4'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.9.5'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.9.5'
     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'
@@ -159,23 +159,23 @@ dependencies {
     // Integration with activities
     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'
+    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.9.1'
+    implementation 'androidx.compose.animation:animation:1.9.2'
     // Tooling support (Previews, etc.)
-    implementation 'androidx.compose.ui:ui-tooling:1.9.1'
+    implementation 'androidx.compose.ui:ui-tooling:1.9.2'
     // Integration with ViewModels
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.9.4'
     // UI Tests
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.9.1'
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.9.2'
     // 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")
+    // Google Review Handling (only active in Google Play Builds done from the googlePlyStore Branch)
+    // 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.9.0")
 }
 
 ksp {

app/src/main/AndroidManifest.xml

@@ -11,6 +11,8 @@
     <uses-permission
         android:name="android.permission.ACCESS_NETWORK_STATE"
         android:required="true" />
+<!-- Receive boot completed to re-establish schedules after reboot -->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 <!--  Required for finding Bluetooth trackers  -->
     <uses-permission
         android:name="android.permission.BLUETOOTH"

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

@@ -31,10 +31,14 @@ import de.seemoo.at_tracking_detection.util.Utility
 import de.seemoo.at_tracking_detection.worker.BackgroundWorkScheduler
 import de.seemoo.at_tracking_detection.worker.SetExactAlarmPermissionChangedReceiver
 import fr.bipi.treessence.file.FileLoggerTree
+import kotlinx.coroutines.DelicateCoroutinesApi
 import timber.log.Timber
 import java.io.File
 import java.time.LocalDateTime
 import javax.inject.Inject
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 
 
 @HiltAndroidApp
@@ -78,6 +82,7 @@ class ATTrackingDetectionApplication : Application(), Configuration.Provider {
             .setWorkerFactory(workerFactory)
             .build()
 
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onCreate() {
         instance = this
         super.onCreate()
@@ -116,7 +121,13 @@ class ATTrackingDetectionApplication : Application(), Configuration.Provider {
 //        }
 
         if (SharedPrefs.shareData) {
-            backgroundWorkScheduler.scheduleShareData()
+            GlobalScope.launch(Dispatchers.Default) {
+                try {
+                    backgroundWorkScheduler.scheduleShareData()
+                } catch (t: Throwable) {
+                    Timber.w(t, "Failed scheduling share data on startup")
+                }
+            }
         }
 
         if (SharedPrefs.lastDataDonation == null) {
@@ -129,32 +140,12 @@ class ATTrackingDetectionApplication : Application(), Configuration.Provider {
 
         registerBroadcastReceiver()
 
-        if (BuildConfig.DEBUG) {
-//            // Get a location for testing
-//            Timber.d("Request location")
-//            val startTime = Date()
-//            val locationRequester: LocationRequester = object  : LocationRequester() {
-//                override fun receivedAccurateLocationUpdate(location: Location) {
-//                    val endTime = Date()
-//                    val duration = (endTime.time - startTime.time) / 1000
-//                    Timber.d("Got location $location after $duration s")
-//                }
-//            }
-//            val location =  locationProvider.lastKnownOrRequestLocationUpdates(locationRequester, 20_000L)
-//            if (location != null) {
-//                Timber.d("Using last known location")
-//            }
-//
-//            // Printing time zone and user agent
-//            Timber.d("Timezone: ${Api.TIME_ZONE} useragent ${Api.USER_AGENT}")
-        }
-
         Thread.setDefaultUncaughtExceptionHandler { thread, throwable ->
             Timber.e(throwable, "Uncaught exception on thread ${thread.name}")
         }
 
         // Initiate the permanent background scan
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && SharedPrefs.usePermanentBluetoothScanner) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && Build.VERSION.SDK_INT <= Build.VERSION_CODES.UPSIDE_DOWN_CAKE && SharedPrefs.usePermanentBluetoothScanner) {
             PermanentBluetoothScanner.scan()
         }
 

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

@@ -35,6 +35,9 @@ interface BeaconDao {
     @Query("SELECT * FROM beacon WHERE deviceAddress LIKE :deviceAddress ORDER BY receivedAt DESC")
     fun getDeviceBeacons(deviceAddress: String): List<Beacon>
 
+    @Query("SELECT * FROM beacon WHERE deviceAddress LIKE :deviceAddress ORDER BY receivedAt DESC")
+    fun observeDeviceBeacons(deviceAddress: String): Flow<List<Beacon>>
+
     @Query("SELECT * FROM beacon WHERE deviceAddress LIKE :deviceAddress AND receivedAt >= :since ORDER BY receivedAt DESC")
     fun getDeviceBeaconsSince(deviceAddress: String, since: LocalDateTime): List<Beacon>
 

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

@@ -129,4 +129,7 @@ interface DeviceDao {
 
     @Query("SELECT * FROM device WHERE deviceType = :deviceType AND lastSeen >= :since AND connectable = :connectableState LIMIT 1")
     fun getDeviceWithConnectableStateSince(deviceType: String, since: LocalDateTime, connectableState: Boolean): BaseDevice?
+
+    @Query("SELECT * FROM device WHERE address LIKE :address LIMIT 1")
+    fun observeByAddress(address: String): Flow<BaseDevice?>
 }

app/src/main/java/de/seemoo/at_tracking_detection/database/models/device/BaseDevice.kt

@@ -23,6 +23,7 @@ import de.seemoo.at_tracking_detection.database.models.device.types.SamsungTrack
 import de.seemoo.at_tracking_detection.database.models.device.types.SamsungTrackerType
 import de.seemoo.at_tracking_detection.database.models.device.types.Tile
 import de.seemoo.at_tracking_detection.database.models.device.types.Unknown
+import de.seemoo.at_tracking_detection.ui.scan.ScanFragment
 import de.seemoo.at_tracking_detection.ui.scan.ScanResultWrapper
 import de.seemoo.at_tracking_detection.util.Utility
 import de.seemoo.at_tracking_detection.util.converter.DateTimeConverter
@@ -129,8 +130,14 @@ data class BaseDevice(
     } else if (deviceType == DeviceType.GOOGLE_FIND_MY_NETWORK && subDeviceType != "UNKNOWN") {
         val subType = GoogleFindMyNetworkType.stringToSubType(subDeviceType)
         AppCompatResources.getDrawable(ATTrackingDetectionApplication.getAppContext(), GoogleFindMyNetworkType.drawableForSubType(subType, name))
-    }
-    else {
+    } else if (ScanFragment.samsungSubDeviceTypeMap.containsKey(uniqueId)) {
+        val subType = ScanFragment.samsungSubDeviceTypeMap[uniqueId]!!
+        AppCompatResources.getDrawable(ATTrackingDetectionApplication.getAppContext(), SamsungTrackerType.drawableForSubType(subType))
+    } else if (ScanFragment.googleSubDeviceTypeMap.containsKey(uniqueId)) {
+        val subType = ScanFragment.googleSubDeviceTypeMap[uniqueId]!!
+        val deviceNameFromCache = ScanFragment.deviceNameMap[uniqueId]
+        AppCompatResources.getDrawable(ATTrackingDetectionApplication.getAppContext(), GoogleFindMyNetworkType.drawableForSubType(subType, deviceNameFromCache))
+    } else {
         device.getDrawable()
     }
 

app/src/main/java/de/seemoo/at_tracking_detection/database/models/device/DeviceType.kt

@@ -2,6 +2,7 @@ package de.seemoo.at_tracking_detection.database.models.device
 
 import de.seemoo.at_tracking_detection.R
 import de.seemoo.at_tracking_detection.database.models.device.types.*
+import de.seemoo.at_tracking_detection.ui.scan.ScanFragment
 import de.seemoo.at_tracking_detection.ui.scan.ScanResultWrapper
 import de.seemoo.at_tracking_detection.util.SharedPrefs
 
@@ -35,23 +36,6 @@ enum class DeviceType {
             }
         }
 
-        fun userReadableName(wrappedScanResult: ScanResultWrapper): String {
-            val deviceType: DeviceType = wrappedScanResult.deviceType
-            return when (deviceType) {
-                UNKNOWN -> Unknown.defaultDeviceName
-                AIRPODS -> AirPods.defaultDeviceName
-                AIRTAG -> AirTag.defaultDeviceName
-                APPLE -> AppleDevice.defaultDeviceName
-                FIND_MY -> AppleFindMy.defaultDeviceName
-                TILE -> Tile.defaultDeviceName
-                CHIPOLO -> Chipolo.defaultDeviceName
-                PEBBLEBEE -> PebbleBee.defaultDeviceName
-                SAMSUNG_TRACKER -> SamsungTracker.defaultDeviceName
-                SAMSUNG_FIND_MY_MOBILE -> SamsungFindMyMobile.defaultDeviceName
-                GOOGLE_FIND_MY_NETWORK -> GoogleFindMyNetwork.defaultDeviceName
-            }
-        }
-
         fun getImageDrawable(wrappedScanResult: ScanResultWrapper): Int {
             val deviceType: DeviceType = wrappedScanResult.deviceType
             return when (deviceType) {
@@ -63,9 +47,28 @@ enum class DeviceType {
                 TILE -> R.drawable.ic_tile
                 CHIPOLO -> R.drawable.ic_chipolo
                 PEBBLEBEE -> R.drawable.ic_pebblebee_clip
-                SAMSUNG_TRACKER -> R.drawable.ic_smarttag_icon
+                SAMSUNG_TRACKER -> getSamsungDrawable(wrappedScanResult)
                 SAMSUNG_FIND_MY_MOBILE -> R.drawable.ic_baseline_device_unknown_24
-                GOOGLE_FIND_MY_NETWORK -> R.drawable.ic_chipolo
+                GOOGLE_FIND_MY_NETWORK -> getGoogleDrawable(wrappedScanResult)
+            }
+        }
+
+        private fun getSamsungDrawable(wrappedScanResult: ScanResultWrapper): Int {
+            return if (ScanFragment.samsungSubDeviceTypeMap.containsKey(wrappedScanResult.uniqueIdentifier)) {
+                val subType = ScanFragment.samsungSubDeviceTypeMap[wrappedScanResult.uniqueIdentifier]!!
+                SamsungTrackerType.drawableForSubType(subType)
+            } else {
+                R.drawable.ic_smarttag_icon
+            }
+        }
+
+        private fun getGoogleDrawable(wrappedScanResult: ScanResultWrapper): Int {
+            return if (ScanFragment.googleSubDeviceTypeMap.containsKey(wrappedScanResult.uniqueIdentifier)) {
+                val subType = ScanFragment.googleSubDeviceTypeMap[wrappedScanResult.uniqueIdentifier]!!
+                val deviceNameFromCache = ScanFragment.deviceNameMap[wrappedScanResult.uniqueIdentifier]
+                GoogleFindMyNetworkType.drawableForSubType(subType, deviceNameFromCache)
+            } else {
+                R.drawable.ic_chipolo
             }
         }
 

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

@@ -37,6 +37,9 @@ class BeaconRepository @Inject constructor(
     fun getDeviceBeacons(deviceAddress: String): List<Beacon> =
         beaconDao.getDeviceBeacons(deviceAddress)
 
+    fun getDeviceBeaconsFlow(deviceAddress: String): Flow<List<Beacon>> =
+        beaconDao.observeDeviceBeacons(deviceAddress)
+
     fun getDeviceBeaconsSince(deviceAddress: String, since: LocalDateTime): List<Beacon> =
         beaconDao.getDeviceBeaconsSince(deviceAddress, since)
 

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

@@ -47,6 +47,8 @@ class DeviceRepository @Inject constructor(private val deviceDao: DeviceDao) {
 
     fun getDevice(deviceAddress: String): BaseDevice? = deviceDao.getByAddress(deviceAddress)
 
+    fun observeDevice(deviceAddress: String): Flow<BaseDevice?> = deviceDao.observeByAddress(deviceAddress)
+
     val countNotTracking = deviceDao.getCountNotTracking(RiskLevelEvaluator.relevantTrackingDateForRiskCalculation)
 
     val countIgnored = deviceDao.getCountIgnored()

app/src/main/java/de/seemoo/at_tracking_detection/ui/OnboardingActivity.kt

@@ -9,6 +9,8 @@ import android.os.Build
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
 import com.github.appintro.AppIntro
 import com.github.appintro.AppIntroFragment
@@ -37,6 +39,15 @@ class OnboardingActivity : AppIntro() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        MainActivity.configureSystemBars(this, edgeToEdge = true, applyRootPadding = true)
+
+        try {
+            WindowCompat.getInsetsController(window, window.decorView).show(WindowInsetsCompat.Type.systemBars())
+        } catch (e: Exception) {
+            Timber.w(e, "Failed to disable immersive mode or show system bars")
+        }
+
         permission = intent.getStringExtra("permission")
         Timber.d("Onboarding started with: $permission")
         if (permission != null) {
@@ -52,6 +63,15 @@ class OnboardingActivity : AppIntro() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        try {
+            WindowCompat.getInsetsController(window, window.decorView).show(WindowInsetsCompat.Type.systemBars())
+        } catch (e: Exception) {
+            Timber.w(e, "Failed to disable immersive mode or show system bars in onResume")
+        }
+    }
+
     override fun onDonePressed(currentFragment: Fragment?) {
         //Checks which permissions have given to store the default value for location access
         val locationPermissionState =

app/src/main/java/de/seemoo/at_tracking_detection/ui/dashboard/DashboardRiskFragment.kt

@@ -38,8 +38,9 @@ class DashboardRiskFragment : Fragment() {
     private var _binding: FragmentDashboardRiskBinding? = null
     private val binding get() = _binding!!
 
-    @Inject
-    lateinit var reviewController: ReviewController
+    // Google Play Review Controller: Only active in Google Play builds
+    // @Inject
+    // lateinit var reviewController: ReviewController
 
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
@@ -62,8 +63,9 @@ class DashboardRiskFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        // Google Play Review Controller: Only active in Google Play builds
         // Increment app open count
-        reviewController.incrementAppOpenCount()
+        // reviewController.incrementAppOpenCount()
 
         val riskCard: MaterialCardView = view.findViewById(R.id.risk_card)
         riskCard.setOnClickListener {
@@ -204,19 +206,21 @@ class DashboardRiskFragment : Fragment() {
             }
         }
 
+        // Google Play Review Controller: Only active in Google Play builds
         // Check if we should show review after data is loaded
-        checkAndShowReview()
+        // checkAndShowReview()
     }
 
-    private fun checkAndShowReview() {
-        Timber.d("Checking if review should be shown")
-        if (BuildConfig.DEBUG) {
-            reviewController.debugReviewStatus()
-        }
-        reviewController.requestReviewDialog(requireActivity()) {
-            Timber.d("Review dialog request completed")
-        }
-    }
+    // Google Play Review Controller: Only active in Google Play builds
+//    private fun checkAndShowReview() {
+//        Timber.d("Checking if review should be shown")
+//        if (BuildConfig.DEBUG) {
+//            reviewController.debugReviewStatus()
+//        }
+//        reviewController.requestReviewDialog(requireActivity()) {
+//            Timber.d("Review dialog request completed")
+//        }
+//    }
 
     override fun onStart() {
         super.onStart()