diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary index 0ec26ba..28b48e5 100644 --- a/META-INF/com/google/android/update-binary +++ b/META-INF/com/google/android/update-binary @@ -11,7 +11,7 @@ ui_print() { echo "$1"; } require_new_magisk() { ui_print "*******************************" - ui_print " Please install Magisk v19.0+! " + ui_print " Please install Magisk v20.4+! " ui_print "*******************************" exit 1 } @@ -27,164 +27,7 @@ mount /data 2>/dev/null [ -f /data/adb/magisk/util_functions.sh ] || require_new_magisk . /data/adb/magisk/util_functions.sh -[ $MAGISK_VER_CODE -lt 19000 ] && require_new_magisk +[ $MAGISK_VER_CODE -lt 20400 ] && require_new_magisk -if [ $MAGISK_VER_CODE -ge 20400 ]; then - # New Magisk have complete installation logic within util_functions.sh - install_module - exit 0 -fi - -################# -# Legacy Support -################# - -TMPDIR=/dev/tmp -PERSISTDIR=/sbin/.magisk/mirror/persist - -is_legacy_script() { - unzip -l "$ZIPFILE" install.sh | grep -q install.sh - return $? -} - -print_modname() { - local len - len=`echo -n $MODNAME | wc -c` - len=$((len + 2)) - local pounds=`printf "%${len}s" | tr ' ' '*'` - ui_print "$pounds" - ui_print " $MODNAME " - ui_print "$pounds" - ui_print "*******************" - ui_print " Powered by Magisk " - ui_print "*******************" -} - -# Override abort as old scripts have some issues -abort() { - ui_print "$1" - $BOOTMODE || recovery_cleanup - [ -n $MODPATH ] && rm -rf $MODPATH - rm -rf $TMPDIR - exit 1 -} - -rm -rf $TMPDIR 2>/dev/null -mkdir -p $TMPDIR - -# Preperation for flashable zips -setup_flashable - -# Mount partitions -mount_partitions - -# Detect version and architecture -api_level_arch_detect - -# Setup busybox and binaries -$BOOTMODE && boot_actions || recovery_actions - -############## -# Preparation -############## - -# Extract prop file -unzip -o "$ZIPFILE" module.prop -d $TMPDIR >&2 -[ ! -f $TMPDIR/module.prop ] && abort "! Unable to extract zip file!" - -$BOOTMODE && MODDIRNAME=modules_update || MODDIRNAME=modules -MODULEROOT=$NVBASE/$MODDIRNAME -MODID=`grep_prop id $TMPDIR/module.prop` -MODPATH=$MODULEROOT/$MODID -MODNAME=`grep_prop name $TMPDIR/module.prop` - -# Create mod paths -rm -rf $MODPATH 2>/dev/null -mkdir -p $MODPATH - -########## -# Install -########## - -if is_legacy_script; then - unzip -oj "$ZIPFILE" module.prop install.sh uninstall.sh 'common/*' -d $TMPDIR >&2 - - # Load install script - . $TMPDIR/install.sh - - # Callbacks - print_modname - on_install - - # Custom uninstaller - [ -f $TMPDIR/uninstall.sh ] && cp -af $TMPDIR/uninstall.sh $MODPATH/uninstall.sh - - # Skip mount - $SKIPMOUNT && touch $MODPATH/skip_mount - - # prop file - $PROPFILE && cp -af $TMPDIR/system.prop $MODPATH/system.prop - - # Module info - cp -af $TMPDIR/module.prop $MODPATH/module.prop - - # post-fs-data scripts - $POSTFSDATA && cp -af $TMPDIR/post-fs-data.sh $MODPATH/post-fs-data.sh - - # service scripts - $LATESTARTSERVICE && cp -af $TMPDIR/service.sh $MODPATH/service.sh - - ui_print "- Setting permissions" - set_permissions -else - print_modname - - unzip -o "$ZIPFILE" customize.sh -d $MODPATH >&2 - - if ! grep -q '^SKIPUNZIP=1$' $MODPATH/customize.sh 2>/dev/null; then - ui_print "- Extracting module files" - unzip -o "$ZIPFILE" -x 'META-INF/*' -d $MODPATH >&2 - - # Default permissions - set_perm_recursive $MODPATH 0 0 0755 0644 - fi - - # Load customization script - [ -f $MODPATH/customize.sh ] && . $MODPATH/customize.sh -fi - -# Handle replace folders -for TARGET in $REPLACE; do - ui_print "- Replace target: $TARGET" - mktouch $MODPATH$TARGET/.replace -done - -if $BOOTMODE; then - # Update info for Magisk Manager - mktouch $NVBASE/modules/$MODID/update - cp -af $MODPATH/module.prop $NVBASE/modules/$MODID/module.prop -fi - -# Copy over custom sepolicy rules -if [ -f $MODPATH/sepolicy.rule -a -e $PERSISTDIR ]; then - ui_print "- Installing custom sepolicy patch" - PERSISTMOD=$PERSISTDIR/magisk/$MODID - mkdir -p $PERSISTMOD - cp -af $MODPATH/sepolicy.rule $PERSISTMOD/sepolicy.rule -fi - -# Remove stuffs that don't belong to modules -rm -rf \ -$MODPATH/system/placeholder $MODPATH/customize.sh \ -$MODPATH/README.md $MODPATH/.git* 2>/dev/null - -############# -# Finalizing -############# - -cd / -$BOOTMODE || recovery_cleanup -rm -rf $TMPDIR - -ui_print "- Done" +install_module exit 0 diff --git a/README.md b/README.md index 95c7caf..6759a69 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,8 @@ Call Recorder by axet: [f-droid link](https://f-droid.org/en/packages/com.github Repo mirrors: [Magisk-Modules-Repo](https://github.com/Magisk-Modules-Repo/callrecorder-axet), -[di72nn](https://github.com/di72nn/callrecorder-axet). +[di72nn](https://github.com/di72nn/callrecorder-axet), +[D-Jy-lab](https://github.com/D-Jy-lab/callrecorder-axet),. ## License diff --git a/customize.sh b/customize.sh index a669cb0..f330e4e 100644 --- a/customize.sh +++ b/customize.sh @@ -5,7 +5,7 @@ install_apk() { fi ui_print '- Installing CallRecorder APK' - pm install -r "$MODPATH/system/priv-app/com.github.axet.callrecorder/com.github.axet.callrecorder_219.apk" || true + pm install -r "$MODPATH/system/priv-app/com.github.axet.callrecorder/com.github.axet.callrecorder_230.apk" || true } diff --git a/module.prop b/module.prop index dcc398a..f5ba30b 100644 --- a/module.prop +++ b/module.prop @@ -1,6 +1,6 @@ id=callrecorder-axet name=Axet's Call Recorder -version=v1.0.1 -versionCode=10010 -author=di72nn +version=v1.0.4 +versionCode=10040 +author=di72nn,D-Jy description=Record calls with axet's Call Recorder (compatible with F-Droid updates) diff --git a/system/etc/permissions/privapp-permissions-com.github.axet.callrecorder.xml b/system/etc/permissions/privapp-permissions-com.github.axet.callrecorder.xml index f953307..046a462 100644 --- a/system/etc/permissions/privapp-permissions-com.github.axet.callrecorder.xml +++ b/system/etc/permissions/privapp-permissions-com.github.axet.callrecorder.xml @@ -1,6 +1,17 @@ + + + + + + + + + + + diff --git a/system/priv-app/com.github.axet.callrecorder/com.github.axet.callrecorder_219.apk b/system/priv-app/com.github.axet.callrecorder/com.github.axet.callrecorder_230.apk similarity index 65% rename from system/priv-app/com.github.axet.callrecorder/com.github.axet.callrecorder_219.apk rename to system/priv-app/com.github.axet.callrecorder/com.github.axet.callrecorder_230.apk index 38fab52..85ae64e 100644 Binary files a/system/priv-app/com.github.axet.callrecorder/com.github.axet.callrecorder_219.apk and b/system/priv-app/com.github.axet.callrecorder/com.github.axet.callrecorder_230.apk differ