improve GApps removal mechanism

ChangeLog.md

@@ -33,6 +33,9 @@
     * users that had Adaway installed, will be auto-migrated to Blokada
     * VPN users can't use Blokada, but can still install Adaway from F-Droid
 
+* Full, microG packages
+  * improve GApps removal mechanism
+
 * NanoDroid-UPD script
   * removed in favour of NanoDroid F-Droid Repository
 

CommonInstaller

@@ -47,6 +47,10 @@ com.qualcomm.location
 org.microg.nlp
 org.microg.unifiednlp"
 
+GOOGLE_DATA_DIRTY="com.google.android.gms
+com.google.android.gsf
+com.android.vending"
+
 ##########################################################################################
 # Misc. Functions
 ##########################################################################################
@@ -605,6 +609,7 @@ install_microg () {
 			rm -rf /data/user/*/${app}
 			rm -rf /data/user_de/*/${app}
 			rm -rf /data/app/${app}-*
+			rm -rf /mnt/asec/${app}-*
 		done
 
 		if [ "${NANODROID_UPGRADE}" -eq 0 ]; then
@@ -612,17 +617,16 @@ install_microg () {
 			# only if this is a fresh NanoDroid installation
 			rm -rf /data/dalvik-cache/*/system"@priv-app@GmsCore"[@\.]*@classes.*
 
-			for app in com.google.android.gms \
-					com.google.android.gsf \
-					com.android.vending; do
+			for app in ${GOOGLE_DATA_DIRTY}; do
 				rm -rf /data/data/${app}
 				rm -rf /data/user/*/${app}
 				rm -rf /data/user_de/*/${app}
 				rm -rf /data/app/${app}-*
+				rm -rf /mnt/asec/${app}-*
 			done
 
 			for file in /data/system/users/*/runtime-permissions.xml; do
-				if grep -q "com.google.android.gms" "${file}"; then
+				if grep -q "com.google.android" "${file}"; then
 					rm -f "${file}"
 					echo "  upgrade: removing ${file}"
 				fi