Merge branch 'main' into gradle-versions-check

Author: pcolby

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## [Unreleased][]
 
+## [1.3.0][] (2023-10-21)
+
+Added tile update timer to solve race condition.
+
+## [1.2.2][] (2023-10-20)
+
+Fixed potential crash when tile is added to Quick Settings menu.
+
 ## [1.2.1][] (2023-10-20)
 
 Exclude devices without NFC hardware.
@@ -18,7 +26,9 @@ Added translations for 86 languages.
 
 Initial release.
 
-[Unreleased]: https://github.com/pcolby/nfc-quick-settings/compare/v1.2.1...HEAD
+[Unreleased]: https://github.com/pcolby/nfc-quick-settings/compare/v1.3.0...HEAD
+[1.3.0]: https://github.com/pcolby/nfc-quick-settings/releases/tag/v1.3.0
+[1.2.2]: https://github.com/pcolby/nfc-quick-settings/releases/tag/v1.2.2
 [1.2.1]: https://github.com/pcolby/nfc-quick-settings/releases/tag/v1.2.1
 [1.2.0]: https://github.com/pcolby/nfc-quick-settings/releases/tag/v1.2.0
 [1.1.0]: https://github.com/pcolby/nfc-quick-settings/releases/tag/v1.1.0

app/build.gradle

@@ -30,8 +30,8 @@ android {
         applicationId "au.id.colby.nfcquicksettings"
         minSdk 24
         targetSdk 34
-        versionCode 6
-        versionName "1.2.1-post"
+        versionCode 8
+        versionName "1.3.0-post"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

app/src/main/java/au/id/colby/nfcquicksettings/NfcTileService.kt

@@ -15,6 +15,8 @@ import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
 import android.util.Log
 import au.id.colby.nfcquicksettings.R.*
+import java.util.Timer
+import kotlin.concurrent.fixedRateTimer
 
 /**
  * A custom Quick Settings tile for NFC.
@@ -24,6 +26,7 @@ import au.id.colby.nfcquicksettings.R.*
  */
 class NfcTileService : TileService() {
     private val TAG = "NfcTileService"
+    private var updateTimer: Timer? = null
 
     /**
      * Called when this tile moves into a listening state.
@@ -34,18 +37,34 @@ class NfcTileService : TileService() {
     override fun onStartListening() {
         super.onStartListening()
         Log.d(TAG, "onStartListening")
-        if (qsTile == null) {
-            Log.i(TAG, "qsTile is null; won't update at this time.")
-            return
-        }
         val adapter: NfcAdapter? = NfcAdapter.getDefaultAdapter(this)
-        qsTile.state = if (adapter == null) Tile.STATE_UNAVAILABLE else
-            if (adapter.isEnabled) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) qsTile.subtitle = getText(
-            if (adapter == null) string.tile_subtitle_unavailable else
-                if (adapter.isEnabled) string.tile_subtitle_active else string.tile_subtitle_inactive
-        )
-        qsTile.updateTile()
+        updateTimer = fixedRateTimer("default", false, 0L, 500) {
+            Log.d(TAG, "updateTimer")
+            qsTile?.apply {
+                Log.d(TAG, "Updating tile")
+                state = if (adapter == null) Tile.STATE_INACTIVE else
+                    if (adapter.isEnabled) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) subtitle = getText(
+                    if (adapter == null) string.tile_subtitle_unavailable else
+                        if (adapter.isEnabled) string.tile_subtitle_active else string.tile_subtitle_inactive
+                )
+                updateTile()
+            }
+        }
+    }
+
+    /**
+     * Called when this tile moves out of the listening state.
+     *
+     * This override cancels the update timer, if any is running.
+     */
+    override fun onStopListening() {
+        Log.d(TAG, "onStopListening")
+        updateTimer?.apply {
+            Log.d(TAG, "Cancelling update timer")
+            cancel()
+        }
+        super.onStopListening()
     }
 
     /**