From 35d8f3c1ce7baf84d5a61ff0005139b5f2589e36 Mon Sep 17 00:00:00 2001
From: vvb2060 <vvb2060@gmail.com>
Date: Mon, 16 Aug 2021 14:57:23 +0800
Subject: [PATCH] [app] Dynamic registration receiver (#918)

---
 app/src/main/AndroidManifest.xml                     | 12 ------------
 app/src/main/java/org/lsposed/manager/App.java       | 11 ++++++++++-
 .../org/lsposed/lspd/service/LSPosedService.java     |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8067627e..7b91e06a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -59,18 +59,6 @@
             android:name=".ui.activity.CrashReportActivity"
             android:process=":error_activity" />
 
-        <receiver
-            android:name=".receivers.ServiceReceiver"
-            android:exported="true"
-            android:permission="android.permission.INTERACT_ACROSS_USERS_FULL">
-            <intent-filter>
-                <action android:name="org.lsposed.action.MODULE_UPDATED" />
-                <action android:name="org.lsposed.action.MODULE_NOT_ACTIVATAED" />
-
-                <data android:scheme="package" />
-            </intent-filter>
-        </receiver>
-
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.fileprovider"
diff --git a/app/src/main/java/org/lsposed/manager/App.java b/app/src/main/java/org/lsposed/manager/App.java
index b5c7504c..dbaf344f 100644
--- a/app/src/main/java/org/lsposed/manager/App.java
+++ b/app/src/main/java/org/lsposed/manager/App.java
@@ -20,9 +20,11 @@
 
 package org.lsposed.manager;
 
+import android.Manifest;
 import android.annotation.SuppressLint;
 import android.app.Application;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.util.Log;
@@ -33,6 +35,7 @@ import androidx.preference.PreferenceManager;
 import com.google.gson.JsonParser;
 
 import org.lsposed.hiddenapibypass.HiddenApiBypass;
+import org.lsposed.manager.receivers.ServiceReceiver;
 import org.lsposed.manager.repo.RepoLoader;
 import org.lsposed.manager.ui.activity.CrashReportActivity;
 import org.lsposed.manager.util.DoHDNS;
@@ -121,8 +124,14 @@ public class App extends Application {
         }
         DayNightDelegate.setApplicationContext(this);
         DayNightDelegate.setDefaultNightMode(ThemeUtil.getDarkTheme());
-        RepoLoader.getInstance().loadRemoteData();
+
+        var filter = new IntentFilter();
+        filter.addAction("org.lsposed.action.MODULE_UPDATED");
+        filter.addAction("org.lsposed.action.MODULE_NOT_ACTIVATAED");
+        registerReceiver(new ServiceReceiver(), filter, Manifest.permission.ACCOUNT_MANAGER, null);
+
         loadRemoteVersion();
+        RepoLoader.getInstance().loadRemoteData();
     }
 
     @NonNull
diff --git a/core/src/main/java/org/lsposed/lspd/service/LSPosedService.java b/core/src/main/java/org/lsposed/lspd/service/LSPosedService.java
index 271dfbfd..ea71d9da 100644
--- a/core/src/main/java/org/lsposed/lspd/service/LSPosedService.java
+++ b/core/src/main/java/org/lsposed/lspd/service/LSPosedService.java
@@ -145,7 +145,7 @@ public class LSPosedService extends ILSPosedService.Stub {
             broadcastIntent.setData(intent.getData());
             broadcastIntent.putExtras(intent.getExtras());
             broadcastIntent.putExtra(Intent.EXTRA_USER, userId);
-            broadcastIntent.setComponent(ComponentName.unflattenFromString(ConfigManager.getInstance().getManagerPackageName() + "/.receivers.ServiceReceiver"));
+            broadcastIntent.setPackage(ConfigManager.getInstance().getManagerPackageName());
 
             try {
                 ActivityManagerService.broadcastIntentWithFeature(null, broadcastIntent,