diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 879f692..4bef74f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -25,7 +25,7 @@ android { defaultConfig { minSdk = 28 targetSdk = 36 - versionCode = 10_10_00 + versionCode = 10_11_00 versionName = "1.1.0" vectorDrawables { useSupportLibrary = true diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeModel.kt index 3b878e9..8d3089a 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/home/HomeModel.kt @@ -224,7 +224,11 @@ class HomeModel( }, screenModelScope.launch(Dispatchers.IO) { wtGithub.getLatestXposedRelease().fold( - success = { latestShiggyXposedVersion = SemVer.parse(it.name) }, + success = { + val versionName = it.name + val truncatedVersion = versionName.split(".").take(3).joinToString(".") + latestShiggyXposedVersion = SemVer.parse(truncatedVersion) + }, fail = { Log.w(BuildConfig.TAG, "Failed to fetch latest ShiggyXposed version", it) }, ) }, diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsModel.kt index 420f168..97ffb68 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsModel.kt @@ -73,6 +73,10 @@ class PatchOptionsModel( var showNetworkWarningDialog by mutableStateOf(!alreadyShownNetworkWarning && isNetworkDangerous()) private set + // Expose current installer option + val currentInstaller: com.aliucord.manager.manager.InstallerSetting + get() = prefs.installer + fun hideNetworkWarning(neverShow: Boolean) { showNetworkWarningDialog = false alreadyShownNetworkWarning = true diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsScreen.kt index 0308a9f..d104288 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screens/patchopts/PatchOptionsScreen.kt @@ -73,7 +73,9 @@ class PatchOptionsScreen( ) } - UnknownSourcesPermissionDialog() + if (model.currentInstaller == com.aliucord.manager.manager.InstallerSetting.PM) { + UnknownSourcesPermissionDialog() + } PatchOptionsScreenContent( isUpdate = prefilledOptions != null,