Merge branch 'hotfix/4.0.1'

hushenghao · Jul 27, 2022 · a0194ca · a0194ca
2 parents 8063228 + 7b66d19
commit a0194ca
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -29,8 +29,8 @@ android {
         applicationId = "com.dede.nativetools"
         minSdk = 23
         targetSdk = 33
-        versionCode = 63
-        versionName = "4.0.0"
+        versionCode = 64
+        versionName = "4.0.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
         resourceConfigurations.addAll(

diff --git a/app/src/main/java/com/dede/nativetools/netspeed/service/NetSpeedService.kt b/app/src/main/java/com/dede/nativetools/netspeed/service/NetSpeedService.kt
@@ -183,7 +183,8 @@ class NetSpeedService : Service(), Runnable {
     override fun onDestroy() {
         lifecycleJob.cancel()
         netSpeedCompute.destroy()
-        stopForeground(STOP_FOREGROUND_REMOVE)
+        @Suppress("DEPRECATION")
+        stopForeground(true)
         notificationManager.cancel(NetSpeedNotificationHelper.NOTIFICATION_ID)
         broadcastHelper.unregister(this)
         super.onDestroy()

diff --git a/app/src/main/java/com/dede/nativetools/netspeed/typeface/TypefaceGetter.kt b/app/src/main/java/com/dede/nativetools/netspeed/typeface/TypefaceGetter.kt
@@ -36,7 +36,8 @@ interface TypefaceGetter {
                         if (fontList.contains(key)) {
                             DownloadTypefaceImpl(appContext, "$key.ttf")
                         } else {
-                            throw IllegalStateException("Unknown font name: $key")
+                            NormalTypeface()
+                            //throw IllegalStateException("Unknown font name: $key")
                         }
                     }
                 }