From 52137fd64f06156160ac67256e63b872dde5293d Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 29 Dec 2018 14:14:29 +0800
Subject: [PATCH] Remove useless service

---
 app/src/full/AndroidManifest.xml              |  5 ---
 app/src/full/java/a/j.java                    |  4 +--
 .../java/com/topjohnwu/magisk/ClassMap.java   |  2 --
 .../magisk/receivers/GeneralReceiver.java     | 17 ++++++++--
 .../magisk/services/OnBootService.java        | 33 -------------------
 5 files changed, 15 insertions(+), 46 deletions(-)
 delete mode 100644 app/src/full/java/com/topjohnwu/magisk/services/OnBootService.java

diff --git a/app/src/full/AndroidManifest.xml b/app/src/full/AndroidManifest.xml
index 0c15f3eef..58fe76ab0 100644
--- a/app/src/full/AndroidManifest.xml
+++ b/app/src/full/AndroidManifest.xml
@@ -71,11 +71,6 @@
 
         <!-- Service -->
 
-        <service
-            android:name="a.j"
-            android:exported="true"
-            android:permission="android.permission.BIND_JOB_SERVICE" />
-
         <!-- Hardcode GMS version -->
         <meta-data
             android:name="com.google.android.gms.version"
diff --git a/app/src/full/java/a/j.java b/app/src/full/java/a/j.java
index 8585eaf01..e89db4321 100644
--- a/app/src/full/java/a/j.java
+++ b/app/src/full/java/a/j.java
@@ -1,7 +1,5 @@
 package a;
 
-import com.topjohnwu.magisk.services.OnBootService;
-
-public class j extends OnBootService {
+public class j {
     /* stub */
 }
diff --git a/app/src/full/java/com/topjohnwu/magisk/ClassMap.java b/app/src/full/java/com/topjohnwu/magisk/ClassMap.java
index b77dc36b3..c5920d418 100644
--- a/app/src/full/java/com/topjohnwu/magisk/ClassMap.java
+++ b/app/src/full/java/com/topjohnwu/magisk/ClassMap.java
@@ -4,7 +4,6 @@ import com.topjohnwu.core.App;
 import com.topjohnwu.magisk.components.AboutCardRow;
 import com.topjohnwu.magisk.receivers.GeneralReceiver;
 import com.topjohnwu.magisk.receivers.ShortcutReceiver;
-import com.topjohnwu.magisk.services.OnBootService;
 import com.topjohnwu.magisk.services.UpdateCheckService;
 
 import java.util.HashMap;
@@ -23,7 +22,6 @@ public class ClassMap {
         classMap.put(UpdateCheckService.class, a.g.class);
         classMap.put(GeneralReceiver.class, a.h.class);
         classMap.put(ShortcutReceiver.class, a.i.class);
-        classMap.put(OnBootService.class, a.j.class);
         classMap.put(AboutCardRow.class, a.l.class);
         classMap.put(SuRequestActivity.class, a.m.class);
     }
diff --git a/app/src/full/java/com/topjohnwu/magisk/receivers/GeneralReceiver.java b/app/src/full/java/com/topjohnwu/magisk/receivers/GeneralReceiver.java
index e1e63323e..f1a6e5e6f 100644
--- a/app/src/full/java/com/topjohnwu/magisk/receivers/GeneralReceiver.java
+++ b/app/src/full/java/com/topjohnwu/magisk/receivers/GeneralReceiver.java
@@ -3,16 +3,18 @@ package com.topjohnwu.magisk.receivers;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.os.AsyncTask;
 
 import com.topjohnwu.core.App;
 import com.topjohnwu.core.Const;
 import com.topjohnwu.core.Data;
 import com.topjohnwu.magisk.ClassMap;
 import com.topjohnwu.magisk.SuRequestActivity;
-import com.topjohnwu.magisk.services.OnBootService;
+import com.topjohnwu.magisk.components.Notifications;
 import com.topjohnwu.magisk.utils.DownloadApp;
 import com.topjohnwu.magisk.utils.SuConnector;
 import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
 
 public class GeneralReceiver extends BroadcastReceiver {
 
@@ -48,8 +50,17 @@ public class GeneralReceiver extends BroadcastReceiver {
                         break;
                     case "boot":
                     default:
-                        /* The actual on-boot trigger */
-                        OnBootService.enqueueWork(app);
+                        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
+                            /* Devices with DTBO might want to patch dtbo.img.
+                             * However, that is not possible if Magisk is installed by
+                             * patching boot image with Magisk Manager and flashed via
+                             * fastboot, since at that time we do not have root.
+                             * Check for dtbo status every boot time, and prompt user
+                             * to reboot if dtbo wasn't patched and patched by Magisk Manager.
+                             * */
+                            if (Shell.rootAccess() && ShellUtils.fastCmdResult("mm_patch_dtbo"))
+                                Notifications.dtboPatched();
+                        });
                         break;
                 }
                 break;
diff --git a/app/src/full/java/com/topjohnwu/magisk/services/OnBootService.java b/app/src/full/java/com/topjohnwu/magisk/services/OnBootService.java
deleted file mode 100644
index 4699c250c..000000000
--- a/app/src/full/java/com/topjohnwu/magisk/services/OnBootService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.topjohnwu.magisk.services;
-
-import android.content.Context;
-import android.content.Intent;
-
-import com.topjohnwu.core.Const;
-import com.topjohnwu.magisk.ClassMap;
-import com.topjohnwu.magisk.components.Notifications;
-import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
-
-import androidx.annotation.NonNull;
-import androidx.core.app.JobIntentService;
-
-public class OnBootService extends JobIntentService {
-
-    public static void enqueueWork(Context context) {
-        enqueueWork(context, ClassMap.get(OnBootService.class), Const.ID.ONBOOT_SERVICE_ID, new Intent());
-    }
-
-    @Override
-    protected void onHandleWork(@NonNull Intent intent) {
-        /* Devices with DTBO might want to patch dtbo.img.
-         * However, that is not possible if Magisk is installed by
-         * patching boot image with Magisk Manager and flashed via
-         * fastboot, since at that time we do not have root.
-         * Check for dtbo status every boot time, and prompt user
-         * to reboot if dtbo wasn't patched and patched by Magisk Manager.
-         * */
-        if (Shell.rootAccess() && ShellUtils.fastCmdResult("mm_patch_dtbo"))
-            Notifications.dtboPatched();
-    }
-}