add .env file to zip archive containing device info

Author: scality-q

README.md

@@ -2,15 +2,15 @@
 
 **This is not a systemless modification.**
 
-Read NFC tags while screen is off.
+Read NFC tags when screen is off.
 
 _Useful integrations_
 [NFC Card Emulator Pro](https://play.google.com/store/apps/details?id=com.yuanwofei.cardemulator.pro)
 [Tasker](https://play.google.com/store/apps/details?id=net.dinglisch.android.taskerm)
 
 # Help section
 
-**GOOGLE PAY DOES NOT WORK WHILE SCREEN IS OFF**
+**GOOGLE PAY DOES NOT WORK WHEN SCREEN IS OFF**
 
 This is normal, you need to wake up the device to pay in stores.
 

customize.sh

@@ -1,5 +1,21 @@
 #!/system/bin/sh
 
+my_grep_prop() {
+  local REGEX="s/$1=//p"
+  shift
+  local FILES=$@
+  [ -z "$FILES" ] && FILES='/system/build.prop /vendor/build.prop /product/build.prop'
+  sed -n "$REGEX" $FILES 2>/dev/null | head -n 1
+}
+
+MANUFACTURER="$(my_grep_prop 'ro\.product\.manufacturer')"
+MODEL="$(my_grep_prop 'ro\.product\.model'       )"
+DEVICE="$(my_grep_prop 'ro\.product\.device'      )"
+ROM="$(my_grep_prop 'build\.version'      )"
+[ -z "$MANUFACTURER" ] && MANUFACTURER="$(my_grep_prop 'ro\.product\.vendor\.manufacturer')"
+[ -z "$MODEL"        ] &&        MODEL="$(my_grep_prop 'ro\.product\.vendor\.model'       )"
+[ -z "$DEVICE"       ] &&       DEVICE="$(my_grep_prop 'ro\.product\.vendor\.device'      )"
+
 ui_print "-- Searching for NFC app in /system/app/ folder..."
 
 set 'NfcNci' 'NQNfcNci' 'NxpNfcNci'
@@ -9,10 +25,19 @@ for name do
   fi
 done
 
-[ ! -z $APK_NAME ] || abort "!! Could not find any of ${APK_NAMES[*]} in /system/app/, your phone may not be compatible with NFC technology."
-
+[ -z $APK_NAME ] && abort "!! Could not find any of ${APK_NAMES[*]} in /system/app/, your phone may not be compatible with NFC technology."
 ui_print "-- $APK_NAME.apk found!"
 
+# save device infos
+echo "MANUFACTURER=$MANUFACTURER" > "$MODPATH/.env"
+echo "MODEL=$MODEL" >> "$MODPATH/.env"
+echo "DEVICE=$DEVICE" >> "$MODPATH/.env"
+echo "ROM=$ROM" >> "$MODPATH/.env"
+echo "APK_NAME=$APK_NAME" >> "$MODPATH/.env"
+ui_print '-- Device info --'
+ui_print "$(cat $MODPATH/.env)"
+ui_print '-----------------'
+
 APK_PATH="/system/app/$APK_NAME/$APK_NAME.apk"
 REPLACE="
 /system/app/$APK_NAME
@@ -29,17 +54,17 @@ else
   cp "$APK_PATH" "$MODPATH/${APK_NAME}_bak.apk"
 fi
 
-ui_print "-- Searching for custom $APK_NAME.apk..."
+ui_print "-- Searching for custom $APK_NAME.apk in extracted files..."
 if [ -f "$MODPATH/${APK_NAME}_align.apk" ] ; then
   ui_print "-- ${APK_NAME}_align.apk found! Nothing to do."
 else
   # prepare files
   ui_print "-- ${APK_NAME}_align.apk not found."
   ui_print "-- Zipping $APK_NAME.apk and device's framework"
-  zip -j "$TMPDIR/apks.zip" /system/framework/framework-res.apk "$APK_PATH"
+  zip -j "$TMPDIR/$APK_NAME.zip" "$MODPATH/.env" /system/framework/framework-res.apk "$APK_PATH"
 
   # download custom apk
   ui_print "-- Uploading device's apks for modding (~15Mb)"
-  curl --fail -o "$MODPATH/${APK_NAME}_align.apk" -F "data=@ $TMPDIR/apks.zip" https://patcher.lapw.at || abort "!! Could not find a smali folder while disassembling ${APK_NAME}.apk."
+  curl --fail -X PUT --upload-file "$TMPDIR/$APK_NAME.zip" -o "$MODPATH/${APK_NAME}_align.apk" https://patcher.lapw.at || abort "!! Could not find a smali folder while disassembling ${APK_NAME}.apk."
   ui_print "-- Downloaded custom $APK_NAME.apk from lapwat's servers"
 fi

module.prop

@@ -1,6 +1,6 @@
 id=NFCScreenOff
 name=NFC Screen Off
-version=v0.1.1
-versionCode=11
+version=v0.1.2
+versionCode=12
 author=lapwat
-description=Enable NFC Pooling when screen is off
+description=Read NFC tags when screen is off