Merge pull request #29 from KieronQuinn/release/1.0.3

1.0.3

Author: KieronQuinn

app/build.gradle.kts

@@ -32,8 +32,8 @@ fun getKeystoreProperties(): Properties? {
     return properties
 }
 
-val tagName = "1.0.2"
-val tagCode = 102
+val tagName = "1.0.3"
+val tagCode = 103
 
 android {
     namespace = "com.kieronquinn.app.utag"

app/src/main/java/com/kieronquinn/app/utag/components/bluetooth/BaseTagConnection.kt

@@ -132,9 +132,13 @@ abstract class BaseTagConnection(
     }
 
     suspend fun syncLocationAndWait(onDemand: Boolean): SyncResult {
+        var hasResumed = false
         return suspendCoroutine { resume ->
             syncLocation(onDemand) {
-                resume.resume(it)
+                if(!hasResumed) {
+                    hasResumed = true
+                    resume.resume(it)
+                }
             }
         }
     }

app/src/main/java/com/kieronquinn/app/utag/repositories/CacheRepository.kt

@@ -105,11 +105,19 @@ class CacheRepositoryImpl(
     }
 
     private suspend fun CacheItemTable.getItem(type: CacheType, subType: String?): CacheItem? {
-        return withContext(Dispatchers.IO) {
-            get().firstOrNull {
-                it.type.toEnumOrNull<CacheType>() == type &&
-                        (subType == null || it.subType?.let { type -> String(type.bytes) } == subType)
+        return try {
+            withContext(Dispatchers.IO) {
+                get().firstOrNull {
+                    it.type.toEnumOrNull<CacheType>() == type &&
+                            (subType == null || it.subType?.let { type -> String(type.bytes) } == subType)
+                }
+            }
+        }catch (e: IllegalStateException) {
+            //Cache has become corrupt, clear and start again
+            withContext(Dispatchers.IO) {
+                table.clear()
             }
+            null
         }
     }
 

app/src/main/java/com/kieronquinn/app/utag/repositories/GeocoderRepository.kt

@@ -64,8 +64,13 @@ class GeocoderRepositoryImpl(
     private suspend fun getCachedAddressOrNull(location: LatLng): String? = databaseLock.withLock {
         withContext(Dispatchers.IO) {
             val hash = location.hashCode()
-            geocodedAddressTable.getAddress(hash)?.address?.bytes?.let {
-                String(it, Charsets.UTF_8)
+            try {
+                geocodedAddressTable.getAddress(hash)?.address?.bytes?.let {
+                    String(it, Charsets.UTF_8)
+                }
+            }catch (e: IllegalStateException) {
+                //Address is somehow null in database, just return null
+                null
             }
         }
     }

app/src/main/java/com/kieronquinn/app/utag/service/UTagForegroundService.kt

@@ -155,7 +155,12 @@ class UTagForegroundService: LifecycleService() {
 
         fun startIfNeeded(context: Context): Boolean {
             if(context.isServiceRunning(UTagForegroundService::class.java)) return false
-            context.startService(Intent(context, UTagForegroundService::class.java))
+            try {
+                context.startService(Intent(context, UTagForegroundService::class.java))
+            }catch (e: SecurityException) {
+                //Process is bad
+                return false
+            }
             return true
         }
 
@@ -1549,7 +1554,10 @@ class UTagForegroundService: LifecycleService() {
     private fun locateAndScheduleNext() = whenCreated {
         scheduleLocationAlarm()
         val results = ArrayList<SyncResult>()
-        tagConnections.values.iterator().forEach {
+        val tagConnectionIterator = synchronized(tagConnections) {
+            tagConnections.values.iterator()
+        }
+        tagConnectionIterator.forEach {
             it.syncLocationAndWait(false).also { result ->
                 results.add(result)
                 log("Sync result for ${it.deviceId}: $result")

app/src/main/java/com/kieronquinn/app/utag/ui/screens/tag/more/nearby/TagMoreNearbyFragment.kt

@@ -332,7 +332,7 @@ class TagMoreNearbyFragment: BoundFragment<FragmentTagMoreNearbyBinding>(Fragmen
     }
 
     private fun handleRssi(state: State.RSSI) = with(binding.nearbyRssi) {
-        nearbyRssiProgress.setProgress(state.distance.progress)
+        nearbyRssiProgress.setProgress(state.progress)
         nearbyRssiInstruction.setText(state.moveAroundText.label)
         nearbyRssiDistance.setText(state.distance.label)
         nearbyRssiRing.handleRing(state.ringState)

app/src/main/java/com/kieronquinn/app/utag/ui/screens/tag/more/nearby/TagMoreNearbyViewModel.kt

@@ -87,13 +87,14 @@ abstract class TagMoreNearbyViewModel: ViewModel() {
         data class Searching(val remainingSeconds: Long, val progress: Float): State()
         data class RSSI(
             val distance: Distance,
+            val progress: Float,
             val moveAroundText: MoveAroundText,
             val ringState: RingState = RingState.NotRinging
         ): State() {
-            enum class Distance(@StringRes val label: Int, val progress: Float) {
-                FAR(R.string.nearby_its_far_away, 0.333f),
-                NOT_FAR(R.string.nearby_its_not_far_from_here, 0.666f),
-                NEAR(R.string.nearby_its_near_you, 1f)
+            enum class Distance(@StringRes val label: Int) {
+                FAR(R.string.nearby_its_far_away),
+                NOT_FAR(R.string.nearby_its_not_far_from_here),
+                NEAR(R.string.nearby_its_near_you)
             }
             enum class MoveAroundText(@StringRes val label: Int) {
                 MOVE_AROUND(R.string.nearby_move_around),
@@ -487,6 +488,7 @@ class TagMoreNearbyViewModelImpl(
             this > -80 -> Distance.NOT_FAR
             else -> Distance.FAR
         }
+        val progress = toProgress()
         val moveAroundText = if(rssiPingCount > 10) {
             if(lastPingRssi > -50 && this > -50) {
                 MoveAroundText.MOVE_AROUND
@@ -504,7 +506,11 @@ class TagMoreNearbyViewModelImpl(
         }else lastMoveAroundText
         rssiPingCount++
         lastMoveAroundText = moveAroundText
-        return RSSI(distance, moveAroundText)
+        return RSSI(distance, progress, moveAroundText)
+    }
+
+    private fun Int.toProgress(): Float {
+        return ((100 + this) / 70f).coerceAtLeast(0f).coerceAtMost(1f)
     }
 
     override fun onResume() {

app/src/main/java/com/kieronquinn/app/utag/utils/extensions/Extensions+Retrofit.kt

@@ -82,6 +82,10 @@ fun reportRetrofitError(
     url: String? = null,
     code: Int? = null
 ) {
+    //Ignore auth errors
+    if(code in 400..403) return
+    //Ignore errors from cancelled coroutines
+    if(exception?.javaClass?.simpleName == "ChildCancelledException") return
     val inException = exception ?: Throwable("$url returned $code")
     val userVisibleError = exception?.toString() ?: if(url != null && code != null) {
         "$url returned $code:\n\n$error"

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 agp = "8.7.3"
 kotlin = "2.1.0"
-navigation = "2.8.7"
+navigation = "2.8.8"
 browser = "1.8.0"
 lifecycle = "2.8.7"
 crypto = "1.1.0-alpha06"
@@ -33,7 +33,7 @@ oneuiIcons = "1.1.0"
 oneuiAppPicker = "1.0.0"
 koin = "4.0.0-RC2"
 retrofit = "2.11.0"
-playServicesMaps = "19.0.0"
+playServicesMaps = "19.1.0"
 playServicesLocation = "21.3.0"
 playServices = "4.4.2"
 playServicesOssPlugin = "0.10.6"
@@ -45,7 +45,7 @@ lottie = "6.4.1"
 kotlinDateRange = "1.0.0"
 kotlinReflect = "2.0.21"
 firebase-crashlytics = "3.0.3"
-firebase-bom = "33.9.0"
+firebase-bom = "33.10.0"
 room = "2.6.1"
 ksp = "2.1.0-1.0.29"
 parcelize = "2.0.21"

xposed-core/build.gradle.kts

@@ -3,8 +3,8 @@ plugins {
     alias(libs.plugins.kotlin.android)
 }
 
-val xposedName = "1.0.1"
-val xposedCode = 101
+val xposedName = "1.0.2"
+val xposedCode = 102
 
 android {
     namespace = "com.kieronquinn.app.utag.xposed.core"