diff --git a/app/src/main/java/app/revanced/manager/patcher/Session.kt b/app/src/main/java/app/revanced/manager/patcher/Session.kt index da6d9a40..4393794d 100644 --- a/app/src/main/java/app/revanced/manager/patcher/Session.kt +++ b/app/src/main/java/app/revanced/manager/patcher/Session.kt @@ -47,7 +47,7 @@ class Session( var nextPatchIndex = 0 updateProgress( - name = androidContext.getString(R.string.applying_patch, selectedPatches[nextPatchIndex]), + name = androidContext.getString(R.string.executing_patch, selectedPatches[nextPatchIndex]), state = State.RUNNING ) @@ -56,7 +56,7 @@ class Session( if (exception != null) { updateProgress( - name = androidContext.getString(R.string.failed_to_apply_patch, patch.name), + name = androidContext.getString(R.string.failed_to_execute_patch, patch.name), state = State.FAILED, message = exception.stackTraceToString() ) @@ -72,7 +72,7 @@ class Session( selectedPatches.getOrNull(nextPatchIndex)?.let { nextPatch -> updateProgress( - name = androidContext.getString(R.string.applying_patch, nextPatch.name) + name = androidContext.getString(R.string.executing_patch, nextPatch.name) ) } @@ -82,7 +82,7 @@ class Session( updateProgress( state = State.COMPLETED, name = androidContext.resources.getQuantityString( - R.plurals.patches_applied, + R.plurals.patches_executed, selectedPatches.size, selectedPatches.size ) @@ -105,7 +105,6 @@ class Session( logger.info("Merging integrations") acceptIntegrations(integrations.toSet()) acceptPatches(selectedPatches.toSet()) - updateProgress(state = State.COMPLETED) // Merging logger.info("Applying patches...") applyPatchesVerbose(selectedPatches.sortedBy { it.name }) diff --git a/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt b/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt index d825a18e..bb91cf11 100644 --- a/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt +++ b/app/src/main/java/app/revanced/manager/patcher/worker/PatcherWorker.kt @@ -184,11 +184,11 @@ class PatcherWorker( Log.i(tag, "Patching succeeded".logFmt()) Result.success() } catch (e: ProcessRuntime.RemoteFailureException) { - Log.e(tag, "An exception occured in the remote process while patching. ${e.originalStackTrace}".logFmt()) + Log.e(tag, "An exception occurred in the remote process while patching. ${e.originalStackTrace}".logFmt()) updateProgress(state = State.FAILED, message = e.originalStackTrace) Result.failure() } catch (e: Exception) { - Log.e(tag, "An exception occured while patching".logFmt(), e) + Log.e(tag, "An exception occurred while patching".logFmt(), e) updateProgress(state = State.FAILED, message = e.stackTraceToString()) Result.failure() } finally { diff --git a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt index 8b504dfb..15a51a20 100644 --- a/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt +++ b/app/src/main/java/app/revanced/manager/ui/viewmodel/PatcherViewModel.kt @@ -316,13 +316,9 @@ class PatcherViewModel( context.getString(R.string.patcher_step_unpack), StepCategory.PREPARING ), - Step( - context.getString(R.string.patcher_step_integrations), - StepCategory.PREPARING - ), Step( - context.getString(R.string.apply_patches), + context.getString(R.string.execute_patches), StepCategory.PATCHING ), diff --git a/app/src/main/res/values/plurals.xml b/app/src/main/res/values/plurals.xml index 7ea3d8c6..798c83ef 100644 --- a/app/src/main/res/values/plurals.xml +++ b/app/src/main/res/values/plurals.xml @@ -4,8 +4,8 @@ %d patch %d patches - - Applied %d patch - Applied %d patches + + Executed %d patch + Executed %d patches \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index db49a9d6..f77fc91e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -162,7 +162,7 @@ Continue anyways Download another version Download app - Download APK + Download APK file Failed to download patch bundle: %s Failed to load updated patch bundle: %s Failed to update integrations: %s @@ -248,16 +248,15 @@ Preparing Load patches - Unpack APK - Merge Integrations + Read APK file Patching Saving - Write patched APK - Sign APK + Write patched APK file + Sign patched APK file Patching in progress… - Apply patches - Applying %s - Failed to apply %s + Execute patches + Execute %s + Failed to execute %s completed failed