ReVanced-Mirror/revanced-manager
1
0
Fork 0
mirror of https://github.com/revanced/revanced-manager synced 2024-05-14 13:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Update the progress properly until installation finishes successfully

Browse Source
This commit is contained in:
oSumAtrIX 2023-12-23 22:08:58 +01:00
parent 1928b150ad
commit 1298a96b0e
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/app/src/main/kotlin/app/revanced/manager/flutter/MainActivity.kt
View File

@ -366,7 +366,7 @@ class MainActivity : FlutterActivity() {
return@Thread return@Thread
} }
updateProgress(0.8, "Building...", "") updateProgress(0.75, "Building...", "")
val res = patcher.get() val res = patcher.get()
patcher.close() patcher.close()
@ -399,7 +399,7 @@ class MainActivity : FlutterActivity() {
return@Thread return@Thread
} }
updateProgress(0.9, "Signing...", "Signing APK") updateProgress(0.8, "Signing...", "Signing APK")
try { try {
Signer("ReVanced", keystorePassword) Signer("ReVanced", keystorePassword)
@ -409,7 +409,7 @@ class MainActivity : FlutterActivity() {
e.printStackTrace() e.printStackTrace()
} }
updateProgress(1.0, "Patched", "Patched") updateProgress(.85, "Patched", "Patched")
} catch (ex: Throwable) { } catch (ex: Throwable) {
if (!cancel) { if (!cancel) {
val stack = ex.stackTraceToString() val stack = ex.stackTraceToString()

18
lib/ui/views/installer/installer_viewmodel.dart
View File

@ -13,6 +13,7 @@ import 'package:revanced_manager/services/manager_api.dart';
import 'package:revanced_manager/services/patcher_api.dart'; import 'package:revanced_manager/services/patcher_api.dart';
import 'package:revanced_manager/services/root_api.dart'; import 'package:revanced_manager/services/root_api.dart';
import 'package:revanced_manager/services/toast.dart'; import 'package:revanced_manager/services/toast.dart';
import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart'; import 'package:revanced_manager/ui/views/patcher/patcher_viewmodel.dart';
import 'package:revanced_manager/utils/about_info.dart'; import 'package:revanced_manager/utils/about_info.dart';
import 'package:screenshot_callback/screenshot_callback.dart'; import 'package:screenshot_callback/screenshot_callback.dart';
@ -103,7 +104,7 @@ class InstallerViewModel extends BaseViewModel {
isPatching = true; isPatching = true;
isInstalled = false; isInstalled = false;
hasErrors = false; hasErrors = false;
} else if (value == 1.0) { } else if (value == .85) {
isPatching = false; isPatching = false;
hasErrors = false; hasErrors = false;
await _managerAPI.savePatches( await _managerAPI.savePatches(
@ -126,10 +127,10 @@ class InstallerViewModel extends BaseViewModel {
if (logs[logs.length - 1] == '\n') { if (logs[logs.length - 1] == '\n') {
logs = logs.substring(0, logs.length - 1); logs = logs.substring(0, logs.length - 1);
} }
Future.delayed(const Duration(milliseconds: 500)).then((value) { Future.delayed(const Duration(milliseconds: 100)).then((value) {
scrollController.animateTo( scrollController.animateTo(
scrollController.position.maxScrollExtent, scrollController.position.maxScrollExtent,
duration: const Duration(milliseconds: 200), duration: const Duration(milliseconds: 100),
curve: Curves.fastOutSlowIn, curve: Curves.fastOutSlowIn,
); );
}); });
@ -455,7 +456,7 @@ class InstallerViewModel extends BaseViewModel {
_app.isRooted = installAsRoot; _app.isRooted = installAsRoot;
if (headerLogs != 'Installing...') { if (headerLogs != 'Installing...') {
update( update(
1.0, .85,
'Installing...', 'Installing...',
_app.isRooted ? 'Mounting patched app' : 'Installing patched app', _app.isRooted ? 'Mounting patched app' : 'Installing patched app',
); );
@ -482,20 +483,15 @@ class InstallerViewModel extends BaseViewModel {
update(1.0, 'Installed', 'Installed'); update(1.0, 'Installed', 'Installed');
} else if (response == 3) { } else if (response == 3) {
update( update(
1.0, .85,
'Installation canceled', 'Installation canceled',
'Installation canceled', 'Installation canceled',
); );
} else if (response == 10) { } else if (response == 10) {
installResult(context, installAsRoot); installResult(context, installAsRoot);
update(
1.0,
'',
'Starting installer',
);
} else { } else {
update( update(
1.0, .85,
'Installation failed', 'Installation failed',
'Installation failed', 'Installation failed',
); );