Skip to content

Commit d4e74e3

Browse files
authored
fix: Shizuku installer couldn't update an already installed app (#454)
1 parent 92ee197 commit d4e74e3

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

.github/workflows/release.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ name: Release
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
send_fcm:
7+
description: 'Send FCM push notification'
8+
type: boolean
9+
default: true
510
push:
611
branches:
712
- main
@@ -89,17 +94,17 @@ jobs:
8994
})
9095
9196
- name: Wait before sending FCM
92-
if: steps.release.outputs.new_release_published == 'true'
97+
if: steps.release.outputs.new_release_published == 'true' && inputs.send_fcm != false
9398
run: sleep 480
9499

95100
- name: Setup Python for FCM
96-
if: steps.release.outputs.new_release_published == 'true'
101+
if: steps.release.outputs.new_release_published == 'true' && inputs.send_fcm != false
97102
uses: actions/setup-python@v5
98103
with:
99104
python-version: '3.12'
100105

101106
- name: Send FCM push notification
102-
if: steps.release.outputs.new_release_published == 'true'
107+
if: steps.release.outputs.new_release_published == 'true' && inputs.send_fcm != false
103108
env:
104109
FCM_PROJECT_ID: ${{ secrets.FCM_PROJECT_ID }}
105110
FCM_SERVICE_ACCOUNT_JSON: ${{ secrets.FCM_SERVICE_ACCOUNT_JSON }}

app/src/main/java/app/morphe/manager/domain/installer/AckpineInstaller.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import ru.solrudev.ackpine.installer.parameters.InstallerType
1515
import ru.solrudev.ackpine.session.await
1616
import ru.solrudev.ackpine.session.Session
1717
import ru.solrudev.ackpine.session.parameters.Confirmation
18+
import ru.solrudev.ackpine.shizuku.ShizukuPlugin
1819
import ru.solrudev.ackpine.uninstaller.PackageUninstaller
1920
import ru.solrudev.ackpine.uninstaller.parameters.UninstallParameters
2021
import java.io.File
@@ -105,8 +106,10 @@ class AckpineInstaller(private val app: Application) {
105106
.setConfirmation(Confirmation.IMMEDIATE)
106107
.setName(apkFile.name)
107108
.registerPlugin(
108-
ru.solrudev.ackpine.shizuku.ShizukuPlugin::class.java,
109-
ru.solrudev.ackpine.shizuku.ShizukuPlugin.InstallParameters.DEFAULT
109+
ShizukuPlugin::class.java,
110+
ShizukuPlugin.InstallParameters.Builder()
111+
.setReplaceExisting(true)
112+
.build()
110113
)
111114
.build()
112115
)

0 commit comments

Comments
 (0)