ReVanced/revanced-manager
1
0
Fork 0
mirror of https://github.com/revanced/revanced-manager.git synced 2025-04-29 21:44:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'compose-dev' into compose/fix/patcher-screen-process-death

Browse Source
This commit is contained in:
Ax333l 2024-12-22 22:20:44 +01:00
commit c7b86178c8
No known key found for this signature in database
GPG Key ID: D2B4D85271127D23
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt
View File

@ -13,7 +13,6 @@ import android.os.Build
import android.os.Parcelable import android.os.Parcelable
import android.os.PowerManager import android.os.PowerManager
import android.util.Log import android.util.Log
import android.view.WindowManager
import androidx.activity.result.ActivityResult import androidx.activity.result.ActivityResult
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.work.ForegroundInfo import androidx.work.ForegroundInfo
@ -122,7 +121,7 @@ class PatcherWorker(
val wakeLock: PowerManager.WakeLock = val wakeLock: PowerManager.WakeLock =
(applicationContext.getSystemService(Context.POWER_SERVICE) as PowerManager) (applicationContext.getSystemService(Context.POWER_SERVICE) as PowerManager)
.newWakeLock(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON, "$tag::Patcher") .newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::Patcher")
.apply { .apply {
acquire(10 * 60 * 1000L) acquire(10 * 60 * 1000L)
Log.d(tag, "Acquired wakelock.") Log.d(tag, "Acquired wakelock.")

13
app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
View File

@ -1,5 +1,7 @@
package app.revanced.manager.ui.screen package app.revanced.manager.ui.screen
import android.app.Activity
import android.view.WindowManager
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.result.contract.ActivityResultContracts
@ -15,6 +17,7 @@ import androidx.compose.material.icons.outlined.PostAdd
import androidx.compose.material.icons.outlined.Save import androidx.compose.material.icons.outlined.Save
import androidx.compose.material3.* import androidx.compose.material3.*
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.livedata.observeAsState
@ -65,6 +68,16 @@ fun PatcherScreen(
} }
} }
if (patcherSucceeded == null) {
DisposableEffect(Unit) {
val window = (context as Activity).window
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
onDispose {
window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
}
}
}
if (showInstallPicker) if (showInstallPicker)
InstallPickerDialog( InstallPickerDialog(
onDismiss = { showInstallPicker = false }, onDismiss = { showInstallPicker = false },