build: Bump version to v0.0.18

fix: TikTok integrations and settings patches should be merged if needed
fix: Prevent printing of denied root permission exceptions for unrooted users
2026-01-11 21:56:17 +00:00 · 2022-09-22 14:04:59 +01:00 · 2022-09-22 14:02:07 +01:00 · 2022-09-22 14:01:05 +01:00 · 2022-09-22 09:46:28 +01:00
5 changed files with 74 additions and 59 deletions
--- a/lib/services/patcher_api.dart
+++ b/lib/services/patcher_api.dart
@@ -89,19 +89,25 @@ class PatcherAPI {

  Future<bool> needsIntegrations(List<Patch> selectedPatches) async {
    return selectedPatches.any(
-      (patch) => patch.dependencies.contains('integrations'),
+      (patch) => patch.dependencies.any(
+        (dep) => dep.contains('integrations'),
+      ),
    );
  }

  Future<bool> needsResourcePatching(List<Patch> selectedPatches) async {
    return selectedPatches.any(
-      (patch) => patch.dependencies.any((dep) => dep.contains('resource-')),
+      (patch) => patch.dependencies.any(
+        (dep) => dep.contains('resource-'),
+      ),
    );
  }

  Future<bool> needsSettingsPatch(List<Patch> selectedPatches) async {
    return selectedPatches.any(
-      (patch) => patch.dependencies.contains('settings'),
+      (patch) => patch.dependencies.any(
+        (dep) => dep.contains('settings'),
+      ),
    );
  }

--- a/lib/services/root_api.dart
+++ b/lib/services/root_api.dart
@@ -7,8 +7,12 @@ class RootAPI {

  Future<bool> hasRootPermissions() async {
    try {
-      bool? isRooted = await Root.isRooted();
-      return isRooted != null && isRooted;
+      bool? isRooted = await Root.isRootAvailable();
+      if (isRooted != null && isRooted) {
+        isRooted = await Root.isRooted();
+        return isRooted != null && isRooted;
+      }
+      return false;
    } on Exception {
      return false;
    }
--- a/lib/ui/widgets/appInfoView/app_info_view.dart
+++ b/lib/ui/widgets/appInfoView/app_info_view.dart
@@ -104,52 +104,50 @@ class AppInfoView extends StatelessWidget {
                                  ),
                                ),
                              ),
-                              if (app.isRooted)
-                                VerticalDivider(
-                                  color: Theme.of(context).canvasColor,
-                                  indent: 12.0,
-                                  endIndent: 12.0,
-                                  width: 1.0,
-                                ),
-                              if (app.isRooted)
-                                Expanded(
-                                  child: Material(
-                                    type: MaterialType.transparency,
-                                    child: InkWell(
-                                      borderRadius: BorderRadius.circular(16.0),
-                                      onTap: () => model.showUninstallDialog(
-                                        context,
-                                        app,
-                                        false,
-                                      ),
-                                      child: Column(
-                                        mainAxisAlignment:
-                                            MainAxisAlignment.center,
-                                        children: <Widget>[
-                                          Icon(
-                                            Icons.delete_outline,
-                                            color: Theme.of(context)
-                                                .colorScheme
-                                                .primary,
-                                          ),
-                                          const SizedBox(height: 10),
-                                          I18nText(
-                                            'appInfoView.uninstallButton',
-                                            child: Text(
-                                              '',
-                                              style: TextStyle(
-                                                color: Theme.of(context)
-                                                    .colorScheme
-                                                    .primary,
-                                                fontWeight: FontWeight.bold,
-                                              ),
+                              VerticalDivider(
+                                color: Theme.of(context).canvasColor,
+                                indent: 12.0,
+                                endIndent: 12.0,
+                                width: 1.0,
+                              ),
+                              Expanded(
+                                child: Material(
+                                  type: MaterialType.transparency,
+                                  child: InkWell(
+                                    borderRadius: BorderRadius.circular(16.0),
+                                    onTap: () => model.showUninstallDialog(
+                                      context,
+                                      app,
+                                      false,
+                                    ),
+                                    child: Column(
+                                      mainAxisAlignment:
+                                          MainAxisAlignment.center,
+                                      children: <Widget>[
+                                        Icon(
+                                          Icons.delete_outline,
+                                          color: Theme.of(context)
+                                              .colorScheme
+                                              .primary,
+                                        ),
+                                        const SizedBox(height: 10),
+                                        I18nText(
+                                          'appInfoView.uninstallButton',
+                                          child: Text(
+                                            '',
+                                            style: TextStyle(
+                                              color: Theme.of(context)
+                                                  .colorScheme
+                                                  .primary,
+                                              fontWeight: FontWeight.bold,
                                            ),
                                          ),
-                                        ],
-                                      ),
+                                        ),
+                                      ],
                                    ),
                                  ),
                                ),
+                              ),
                              VerticalDivider(
                                color: Theme.of(context).canvasColor,
                                indent: 12.0,
--- a/lib/ui/widgets/appInfoView/app_info_viewmodel.dart
+++ b/lib/ui/widgets/appInfoView/app_info_viewmodel.dart
@@ -20,20 +20,26 @@ class AppInfoViewModel extends BaseViewModel {
  final PatcherAPI _patcherAPI = locator<PatcherAPI>();
  final RootAPI _rootAPI = RootAPI();

-  Future<void> uninstallApp(PatchedApplication app, bool onlyUnpatch) async {
+  Future<void> uninstallApp(
+    BuildContext context,
+    PatchedApplication app,
+    bool onlyUnpatch,
+  ) async {
+    bool isUninstalled = true;
    if (app.isRooted) {
      bool hasRootPermissions = await _rootAPI.hasRootPermissions();
      if (hasRootPermissions) {
-        _rootAPI.deleteApp(app.packageName, app.apkFilePath);
-        _managerAPI.deletePatchedApp(app);
+        await _rootAPI.deleteApp(app.packageName, app.apkFilePath);
        if (!onlyUnpatch) {
-          DeviceApps.uninstallApp(app.packageName);
+          await DeviceApps.uninstallApp(app.packageName);
        }
      }
    } else {
-      DeviceApps.uninstallApp(app.packageName).then(
-        (value) => _managerAPI.deletePatchedApp(app),
-      );
+      isUninstalled = await DeviceApps.uninstallApp(app.packageName);
+    }
+    if (isUninstalled) {
+      await _managerAPI.deletePatchedApp(app);
+      locator<HomeViewModel>().initialize(context);
    }
  }

@@ -87,8 +93,7 @@ class AppInfoViewModel extends BaseViewModel {
              CustomMaterialButton(
                label: I18nText('yesButton'),
                onPressed: () {
-                  uninstallApp(app, onlyUnpatch);
-                  locator<HomeViewModel>().initialize(context);
+                  uninstallApp(context, app, onlyUnpatch);
                  Navigator.of(context).pop();
                  Navigator.of(context).pop();
                },
@@ -97,8 +102,7 @@ class AppInfoViewModel extends BaseViewModel {
          ),
        );
      } else {
-        uninstallApp(app, onlyUnpatch);
-        locator<HomeViewModel>().initialize(context);
+        uninstallApp(context, app, onlyUnpatch);
        Navigator.of(context).pop();
      }
    }
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -4,7 +4,7 @@ homepage: https://github.com/revanced/revanced-manager

 publish_to: 'none'

-version: 0.0.17+17
+version: 0.0.18+18

 environment:
  sdk: ">=2.17.5 <3.0.0"
@@ -54,7 +54,10 @@ dependencies:
  path_provider: ^2.0.11
  permission_handler: ^10.0.0
  pull_to_refresh: ^2.0.0
-  root: ^2.0.2
+  root:
+    git:
+      url: https://github.com/gokul1630/root
+      ref: main
  share_extend: ^2.0.0
  shared_preferences: ^2.0.15
  skeletons: ^0.0.3
Author	SHA1	Message	Date
Alberto Ponces	f9242c1958	build: Bump version to v0.0.18	2022-09-22 14:04:59 +01:00
Alberto Ponces	f9865166b0	fix: TikTok integrations and settings patches should be merged if needed	2022-09-22 14:02:07 +01:00
Alberto Ponces	f0f934f6a1	fix: Prevent printing of denied root permission exceptions for unrooted users	2022-09-22 14:01:05 +01:00
Alberto Ponces	3d25655851	fix: Uninstall button should always be shown	2022-09-22 09:46:28 +01:00