diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml index 3a4fed551d..8e6aa411e3 100644 --- a/.github/workflows/build_check.yml +++ b/.github/workflows/build_check.yml @@ -33,15 +33,18 @@ jobs: uses: Clouddark75/actions/gradle-setup@a4d662095a2f2af1ed24f1228eb6e55b0f9f1f29 with: java: 17 - distro: adopt + distro: temurin - name: Copy CI gradle.properties run: | mkdir -p ~/.gradle cp .github/runner-files/ci-gradle.properties ~/.gradle/gradle.properties - - name: Build and run tests - run: ./gradlew assembleStandardRelease testReleaseUnitTest testStandardReleaseUnitTest + - name: Build the app + run: ./gradlew assembleStandardRelease + + - name: Run unit tests + run: ./gradlew testReleaseUnitTest testStandardReleaseUnitTest - name: Publish test report uses: mikepenz/action-junit-report@v5 diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml index 6b52aad943..db7226f494 100644 --- a/.github/workflows/build_push.yml +++ b/.github/workflows/build_push.yml @@ -46,7 +46,7 @@ jobs: uses: Clouddark75/actions/gradle-setup@a4d662095a2f2af1ed24f1228eb6e55b0f9f1f29 with: java: 17 - distro: adopt + distro: temurin - name: Setup CHANGELOG parser uses: taiki-e/install-action@parse-changelog @@ -80,6 +80,7 @@ jobs: run: | set -x echo "VERSION_TAG=v${{github.event.inputs.version}}" >> $GITHUB_ENV + echo "BUILD_TYPE=StandardRelease" >> $GITHUB_ENV # BETA - name: Prepare beta build @@ -88,9 +89,14 @@ jobs: set -x BETA_COUNT=$(git tag -l --sort=refname "v${{github.event.inputs.version}}-b*" | tail -n1 | sed "s/^\S*-b//g") - [ "$BETA_COUNT" = "" ] && BETA_COUNT="1" || BETA_COUNT=$((BETA_COUNT+1)) + if [ -z "$BETA_COUNT" ]; then + BETA_COUNT="1" + else + BETA_COUNT=$((BETA_COUNT+1)) + fi echo "VERSION_TAG=v${{github.event.inputs.version}}-b${BETA_COUNT}" >> $GITHUB_ENV + echo "BUILD_TYPE=StandardBeta" >> $GITHUB_ENV # NIGHTLY - name: Prepare nightly build @@ -98,23 +104,17 @@ jobs: run: | set -x echo "VERSION_TAG=r$(git rev-list --count HEAD)" >> $GITHUB_ENV + echo "BUILD_TYPE=StandardNightly" >> $GITHUB_ENV echo "COMMIT_HASH=$(git rev-parse HEAD)" >> $GITHUB_ENV echo "COMMIT_SHORT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - # PROD - - name: Build release build and run tests - if: startsWith(env.VERSION_TAG, 'v') && github.event.inputs.beta != 'true' - run: ./gradlew assembleStandardRelease testReleaseUnitTest testStandardReleaseUnitTest - - # BETA - - name: Build beta build and run tests - if: startsWith(env.VERSION_TAG, 'v') && github.event.inputs.beta == 'true' - run: ./gradlew assembleStandardBeta testReleaseUnitTest testStandardBetaUnitTest + - name: Build the app + if: startsWith(env.BUILD_TYPE, 'Standard') + run: ./gradlew assemble${{ env.BUILD_TYPE }} - # NIGHTLY - - name: Build nightly build and run tests - if: startsWith(env.VERSION_TAG, 'r') - run: ./gradlew assembleStandardNightly testReleaseUnitTest testStandardNightlyUnitTest + - name: Run unit tests + if: startsWith(env.BUILD_TYPE, 'Standard') + run: ./gradlew testReleaseUnitTest test${{ env.BUILD_TYPE }}UnitTest - name: Upload R8 APK to artifact uses: actions/upload-artifact@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index bd401f7b76..db65ba09d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ The format is simplified version of [Keep a Changelog](https://keepachangelog.co - Allow users to bypass onboarding's permission step if Shizuku is installed - Fix Recents page shows "No recent chapters" instead of a loading screen - Fix not fully loaded entries can't be selected on Library page +- Fix certain Infinix devices being unable to use any "Open link in browser" actions, including tracker setup (@MajorTanya) ### Other - Refactor Library to utilize Flow even more diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt index 4e314f21de..8724eea63c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/controllers/SettingsAdvancedController.kt @@ -394,7 +394,7 @@ class SettingsAdvancedController : SettingsLegacyController() { onClick { LibraryUpdateJob.startNow(context, target = Target.TRACKING) } } - if (BuildConfig.FLAVOR == "dev" || BuildConfig.DEBUG || BuildConfig.NIGHTLY) { + if (BuildConfig.FLAVOR == "dev" || BuildConfig.DEBUG) { switchPreference { bindTo(basePreferences.composeLibrary()) title = context.getString(MR.strings.pref_use_compose_library).addBetaTag(context) diff --git a/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/DeviceUtil.kt b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/DeviceUtil.kt index 21ae2efd98..f02373cf79 100644 --- a/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/DeviceUtil.kt +++ b/core/main/src/androidMain/kotlin/eu/kanade/tachiyomi/util/system/DeviceUtil.kt @@ -67,9 +67,14 @@ object DeviceUtil { val invalidDefaultBrowsers = listOf( "android", + // Honor "com.hihonor.android.internal.app", + // Huawei "com.huawei.android.internal.app", + // Lenovo "com.zui.resolver", + // Infinix + "com.transsion.resolver", ) @SuppressLint("PrivateApi")