Release 1.8.9.0-gms

.github/workflows/releases.yml

@@ -45,7 +45,6 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           body: Bump Version
-          discussion_category_name: Announcements
           files: |
             app/build/outputs/apk/release/EhViewer-universal.apk
             app/build/outputs/apk/release/EhViewer-arm64-v8a.apk
@@ -53,24 +52,3 @@ jobs:
             app/build/outputs/apk/release/EhViewer-x86.apk
             app/build/outputs/apk/release/EhViewer-armeabi-v7a.apk
             app/build/outputs/mapping/release/mapping.txt
-
-      - name: Collect Apks
-        run: |
-          mkdir app/build/outputs/apk/release/fdroid
-          cp app/build/outputs/apk/release/app-arm64-v8a-release.apk app/build/outputs/apk/release/fdroid/EhViewer-v$GITHUB_REF_NAME.apk
-          cp app/build/outputs/apk/release/app-armeabi-v7a-release.apk app/build/outputs/apk/release/fdroid/EhViewer-v$GITHUB_REF_NAME-armv7.apk
-
-      - name: Push Apks
-        uses: Ehviewer-Overhauled/github-action-push-to-another-repository@main
-        env:
-          SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
-        with:
-          source-directory: app/build/outputs/apk/release/fdroid
-          destination-github-username: Ehviewer-Overhauled
-          destination-repository-name: fdroid-repo
-          user-name: 'github-actions[bot]'
-          user-email: 'github-actions[bot]@users.noreply.github.com'
-          target-branch: deploy
-          create-target-branch: true
-          commit-message: Add apks from $GITHUB_REF
-          target-directory: fdroid/tmp-apks

app/build.gradle.kts

@@ -63,8 +63,8 @@ android {
         applicationId = "moe.tarsin.ehviewer"
         minSdk = 28
         targetSdk = 34
-        versionCode = 180042
-        versionName = "1.8.9.0-SNAPSHOT"
+        versionCode = 180043
+        versionName = "1.8.9.0-gms"
         resourceConfigurations.addAll(
             listOf(
                 "zh",
@@ -250,7 +250,8 @@ dependencies {
     implementation("io.ktor:ktor-io-jvm:$ktor")
     implementation("io.ktor:ktor-utils-jvm:$ktor")
 
-    implementation("org.chromium.net:cronet-embedded:113.5672.61")
+    implementation("org.chromium.net:cronet-api:113.5672.61")
+    implementation("com.google.android.gms:play-services-cronet:18.0.1")
 
     val serialization = "1.5.1"
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-cbor:$serialization")

app/src/main/java/com/hippo/ehviewer/EhApplication.kt

@@ -25,6 +25,7 @@ import androidx.lifecycle.coroutineScope
 import coil.ImageLoaderFactory
 import coil.decode.ImageDecoderDecoder
 import coil.util.DebugLogger
+import com.google.android.gms.net.CronetProviderInstaller
 import com.hippo.ehviewer.client.EhCookieStore
 import com.hippo.ehviewer.client.EhTagDatabase
 import com.hippo.ehviewer.client.data.GalleryDetail
@@ -77,6 +78,7 @@ class EhApplication : Application(), ImageLoaderFactory {
             handler?.uncaughtException(t, e)
         }
         super.onCreate()
+        CronetProviderInstaller.installProvider(appCtx)
         System.loadLibrary("ehviewer")
         System.loadLibrary("ehviewer_rust")
         ReadableTime.initialize(this)

app/src/main/java/com/hippo/ehviewer/util/CronetUtils.kt

@@ -1,6 +1,7 @@
 package com.hippo.ehviewer.util
 
+import com.google.android.gms.net.CronetProviderInstaller
 import com.hippo.ehviewer.Settings
 
 val isCronetSupported: Boolean
-    get() = Settings.enableQuic && isAtLeastQ
+    get() = Settings.enableQuic && isAtLeastQ && CronetProviderInstaller.isInstalled()