services.jar backup: append ro.build.flavor and ro.build.id

ChangeLog.md

@@ -33,6 +33,12 @@
   * support both /data/adb/magisk and /data/magisk
   * remove old code regarding Magisk
 
+* CommonPatcher
+  * when creating a backup of `services.jar` append `ro.build.flavor` and `ro.build.id`
+
+* Uninstaller
+  * when restoring a backup of `services.jar` look for new-style named backup
+
 * NanoDroid-Prop, NanoDroid-Font
   * improve check whether Magisk is installed or not
 

patcher/CommonPatcher

@@ -491,8 +491,10 @@ patch_services () {
 
 backup_services_jar () {
 	ui_print " << backing up services.jar to: /sdcard/nanodroid_backups"
+	services_name="services.jar_$(grep_prop ro.build.flavor)_$(grep_prop ro.build.id)"
+
 	mkdir -p /sdcard/nanodroid_backups
-	cp /system/framework/services.jar /sdcard/nanodroid_backups || \
+	cp /system/framework/services.jar "/sdcard/nanodroid_backups/${services_name}" || \
 		error "failed to backup services.jar"
 }
 

uninstaller/META-INF/com/google/android/update-binary

@@ -225,10 +225,16 @@ system_mode_uninstall () {
 
 patcher_uninstall () {
 	if [ -f /data/adb/.nanodroid-patcher -o -f /data/adb/NanoDroid_Patched ]; then
+		services_name="services.jar_$(grep_prop ro.build.flavor)_$(grep_prop ro.build.id)"
+
 		if [ -f /sdcard/nanodroid_backups/services.jar ]; then
 			ui_print " << restoring: unpatched services.jar"
 			mv /sdcard/nanodroid_backups/services.jar /system/framework/services.jar \
 				|| error " failed to restore services.jar"
+		elif [ -f /sdcard/nanodroid_backups/${services_name} ]; then
+			ui_print " << restoring: unpatched services.jar"
+			mv "/sdcard/nanodroid_backups/${services_name}" /system/framework/services.jar \
+				|| error " failed to restore services.jar"
 		else	ui_print " << can't restore unpatched services.jar"
 		fi
 	fi