diff --git a/customize.sh b/customize.sh index 47b6d13..f232947 100644 --- a/customize.sh +++ b/customize.sh @@ -23,14 +23,19 @@ create_backup() { fi } -ui_print "-- Searching for NFC app in /system/app/ folder..." +ui_print "-- Searching for NFC app in /system/app/ and /system/system_ext/app/ folders..." set 'NfcNci' 'NQNfcNci' 'NxpNfcNci' for name do if [ -d "/system/app/$name" ]; then APK_NAME="$name" + APK_PATH="/system/app/$APK_NAME/$APK_NAME.apk" + fi + if [ -d "/system/system_ext/app/$name" ]; then + APK_NAME="$name" + APK_PATH="/system/system_ext/app/$APK_NAME/$APK_NAME.apk" 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/ or /system/system_ext/app/, your phone may not be compatible with NFC technology." ui_print "-- $APK_NAME.apk found!" # save device infos @@ -48,10 +53,10 @@ ui_print '-- Device info --' ui_print "$(cat $MODPATH/.env)" ui_print '-----------------' -APK_PATH="/system/app/$APK_NAME/$APK_NAME.apk" +# APK_PATH="/system/app/$APK_NAME/$APK_NAME.apk" APK_DIR="$(dirname $APK_PATH)" REPLACE=" -/system/app/$APK_NAME +$APK_DIR " mkdir "$MODPATH/$APK_NAME" diff --git a/module.prop b/module.prop index 4613070..043dab4 100644 --- a/module.prop +++ b/module.prop @@ -1,6 +1,6 @@ id=NFCScreenOff name=NFC Screen Off -version=v0.3.1 -versionCode=31 +version=v0.3.2 +versionCode=32 author=lapwat -description=Read NFC tags when screen is off. +description=Read NFC tags when screen is off. Disable NFC tagging sound. diff --git a/service.sh b/service.sh index 134b3cd..aabd970 100644 --- a/service.sh +++ b/service.sh @@ -5,21 +5,27 @@ set 'NfcNci' 'NQNfcNci' 'NxpNfcNci' for name do if [ -d "/system/app/$name" ]; then APK_NAME="$name" + APK_PATH="/system/app/$APK_NAME/$APK_NAME.apk" + fi + if [ -d "/system/system_ext/app/$name" ]; then + APK_NAME="$name" + APK_PATH="/system/system_ext/app/$APK_NAME/$APK_NAME.apk" fi done -APK_PATH="/system/app/$APK_NAME/$APK_NAME.apk" +# APK_PATH="/system/app/$APK_NAME/$APK_NAME.apk" +APK_DIR="$(dirname $APK_PATH)" # restore original apk cp "$MODDIR/${APK_NAME}_bak.apk" "$MODDIR/$APK_NAME/$APK_NAME.apk" -mount --bind "$MODDIR/$APK_NAME" "/system/app/$APK_NAME" +mount --bind "$MODDIR/$APK_NAME" "$APK_DIR" # wait for nfc service to start sleep 20 # inject modded apk cp "$MODDIR/${APK_NAME}_align.apk" "$MODDIR/$APK_NAME/$APK_NAME.apk" -mount --bind "$MODDIR/$APK_NAME" "/system/app/$APK_NAME" +mount --bind "$MODDIR/$APK_NAME" "$APK_DIR" # restart nfc service killall com.android.nfc