From e53e2f73f7531324d27fe3b088a8bbc7e288f6ba Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Sat, 15 Sep 2018 22:05:45 +0200
Subject: [PATCH] CommonInstaller: install DroidGuard as user app, improve
 custom Magisk migration

---
 CommonInstaller | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CommonInstaller b/CommonInstaller
index a0bff85..b91cbd4 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -242,7 +242,12 @@ migrate_magisk_custom () {
 		chown root:root /data/adb
 		chmod 0644 /data/adb
 	fi
+
 	cp -r ${1} /data/adb/magisk
+
+	mkdir -p /data/app/com.topjohnwu.magisk-1
+	cp ${1}/magisk.apk /data/app/com.topjohnwu.magisk-1/base.apk
+	set_perm_data /data/app/com.topjohnwu.magisk-1
 }
 
 detect_mode () {
@@ -655,6 +660,13 @@ install_microg () {
 			nanodroid_install_apk ${app}
 		done
 
+		if [ "${NANODROID_UPGRADE}" -eq 0 ]; then
+			cp -r "${INSTALLER}/system/priv-app/DroidGuard/" \
+				/data/app/org.microg.gms.droidguard-1
+
+			set_perm_data /data/app/org.microg.gms.droidguard-1
+		fi
+
 		nanodroid_install_file etc/permissions/features.xml
 		nanodroid_install_file etc/permissions/privapp-permissions-google.xml
 		nanodroid_install_file etc/default-permissions/microg-permissions.xml