fix scheduling issue with determining which buttons visible on ScanDi…

…stanceFragment
seemoo-lab · Dec 11, 2024 · 78c4359 · 78c4359
1 parent f1f6063
commit 78c4359
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 19 deletions.
diff --git a/app/src/main/java/de/seemoo/at_tracking_detection/ui/scan/ScanDistanceFragment.kt b/app/src/main/java/de/seemoo/at_tracking_detection/ui/scan/ScanDistanceFragment.kt
@@ -181,20 +181,10 @@ class ScanDistanceFragment : Fragment() {
     }
 
     private fun determineDeviceTypeButtonVisible() {
-        if (latestWrappedScanResult != null) {
-            val savedGoogleSubType = ScanFragment.googleSubDeviceTypeMap[latestWrappedScanResult!!.uniqueIdentifier]
-            if (deviceType == DeviceType.GOOGLE_FIND_MY_NETWORK && savedGoogleSubType != null) {
-                binding.performActionButton.visibility = View.GONE
-                binding.retrieveOwnerInformationButton.visibility = if (savedGoogleSubType == GoogleFindMyNetworkType.TAG) {
-                    defineRetrieveOwnerOnClickBehaviour()
-                    View.VISIBLE
-                } else {
-                    View.GONE
-                }
-                return
-            }
-        } else {
+        if (latestWrappedScanResult == null) {
+            binding.performActionButton.visibility = View.GONE
             binding.retrieveOwnerInformationButton.visibility = View.GONE
+            return
         }
 
         binding.performActionButton.visibility = if (deviceType == DeviceType.SAMSUNG_TRACKER) {
@@ -227,17 +217,22 @@ class ScanDistanceFragment : Fragment() {
             }
         } else if (deviceType == DeviceType.GOOGLE_FIND_MY_NETWORK) {
             val deviceName = ScanFragment.deviceNameMap[latestWrappedScanResult!!.uniqueIdentifier]
-
-            if (deviceName == null || deviceName == "") {
-                if (latestWrappedScanResult!!.connectionState !in DeviceManager.unsafeConnectionState && ScanFragment.googleSubDeviceTypeMap[latestWrappedScanResult!!.uniqueIdentifier] == null) {
-                    binding.performActionButton.text = getString(R.string.tracker_or_phone)
-                    View.VISIBLE
-                } else if (latestWrappedScanResult!!.connectionState in DeviceManager.unsafeConnectionState) {
+            val subType = GoogleFindMyNetwork.getSubType(latestWrappedScanResult!!)
+            ScanFragment.googleSubDeviceTypeMap[latestWrappedScanResult!!.uniqueIdentifier] = subType
+
+            if (subType == GoogleFindMyNetworkType.TAG) {
+                val savedGoogleExactTag = ScanFragment.googleExactTagDeterminedMap[latestWrappedScanResult!!.uniqueIdentifier]
+                val deviceNameEmpty = deviceName == null || deviceName == ""
+                val showPerformActionButton = deviceNameEmpty || savedGoogleExactTag == null || savedGoogleExactTag == false
+                if (showPerformActionButton) {
+                    binding.retrieveOwnerInformationButton.visibility = View.GONE
                     View.VISIBLE
                 } else {
+                    binding.retrieveOwnerInformationButton.visibility = View.VISIBLE
                     View.GONE
                 }
             } else {
+                binding.retrieveOwnerInformationButton.visibility = View.GONE
                 View.GONE
             }
         } else {
@@ -471,6 +466,7 @@ class ScanDistanceFragment : Fragment() {
                     } else {
                         viewModel.displayName.postValue(deviceName)
                         if (subTypeGoogle == GoogleFindMyNetworkType.TAG) {
+                            ScanFragment.googleExactTagDeterminedMap[latestWrappedScanResult!!.uniqueIdentifier] = true
                             defineRetrieveOwnerOnClickBehaviour()
                             binding.retrieveOwnerInformationButton.visibility = View.VISIBLE
                         }

diff --git a/app/src/main/java/de/seemoo/at_tracking_detection/ui/scan/ScanFragment.kt b/app/src/main/java/de/seemoo/at_tracking_detection/ui/scan/ScanFragment.kt
@@ -178,6 +178,7 @@ class ScanFragment : Fragment() {
         private const val SCAN_DURATION = 60_000L
         val samsungSubDeviceTypeMap: MutableMap<String, SamsungTrackerType> = HashMap()
         val googleSubDeviceTypeMap: MutableMap<String, GoogleFindMyNetworkType> = HashMap()
+        val googleExactTagDeterminedMap: MutableMap<String, Boolean> = HashMap()
         val deviceNameMap: MutableMap<String, String> = HashMap()
     }
 }