Merge branch 'gedoor:master' into master

gedoor · Dec 14, 2024 · 356a1ea · 356a1ea
2 parents fb59b5c + 34f706e
commit 356a1ea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/app/src/main/java/io/legado/app/help/update/AppReleaseInfo.kt b/app/src/main/java/io/legado/app/help/update/AppReleaseInfo.kt
@@ -13,7 +13,7 @@ data class AppReleaseInfo(
     val downloadUrl: String,
     val assetUrl: String
 ) {
-    val versionName: String = name.split("_").getOrNull(2)?.removeSuffix(".apk") ?: ""
+    val versionName: String = name.split("_").getOrNull(2)?.dropLast(2) ?: ""
 }
 
 enum class AppVariant {

diff --git a/app/src/main/java/io/legado/app/service/WebTileService.kt b/app/src/main/java/io/legado/app/service/WebTileService.kt
@@ -40,12 +40,13 @@ class WebTileService : TileService() {
 
     override fun onStartListening() {
         super.onStartListening()
-        if (WebService.isRun) {
-            qsTile.state = Tile.STATE_ACTIVE
-            qsTile.updateTile()
-        } else {
-            qsTile.state = Tile.STATE_INACTIVE
-            qsTile.updateTile()
+        qsTile?.run {
+            state = if (WebService.isRun) {
+                Tile.STATE_ACTIVE
+            } else {
+                Tile.STATE_INACTIVE
+            }
+            updateTile()
         }
     }