v.1.3.0

v.1.3.0
- Added back Magisk v20.0 - 20.3 support.

*Magisk v20.4+ users won't require seperate busybox module.
**Magisk v20.0-20.3 users will have to install Busybox for Android NDK module.

README.md

@@ -4,10 +4,10 @@
 
 <div align="center">
   <!-- Version -->
-    <img src="https://img.shields.io/badge/Version-1.2.5-blue.svg?longCache=true&style=flat-square"
+    <img src="https://img.shields.io/badge/Version-1.3.0-blue.svg?longCache=true&style=flat-square"
       alt="Version" />
   <!-- Magisk -->
-    <img src="https://img.shields.io/badge/Magisk-20.4-green.svg?longCache=true&style=flat-square"
+    <img src="https://img.shields.io/badge/Magisk-20.0+-green.svg?longCache=true&style=flat-square"
       alt="Version" />  
   <!-- Last Updated -->
     <img src="https://img.shields.io/badge/Updated-May 24, 2020-orange.svg?longCache=true&style=flat-square"
@@ -68,6 +68,7 @@
 Requirements
 ------
  - Use Magisk v20.4 for better compatibility.
+ - Magisk v20.0 - 20.3 users are required to install `Busybox for Android NDK` module, unless the module won't work.
 
 Run
 ------
@@ -187,9 +188,16 @@ Uninstall
 Changelog
 ------
 
+v.1.3.0
+- Added back Magisk v20.0 - 20.3 support.
+
+ _***Magisk v20.4+ users won't require seperate busybox module.**_
+
+ _***Magisk v20.0-20.3 users will have to install Busybox for Android NDK module.**_
+
 v.1.2.5
 - Added CLI Flag support.
-- No more separate busybox required. Magisk Busybox will be used by default.
+- No more separate busybox required for Magisk v20.4+. Magisk Busybox will be used by default.
 - Updated Magisk Template to v20.0+. No more support for Magisk <v20.0.
 - Added user config support.
 - Improved blacklist, whitelist and redirectlist functions.

module.prop

@@ -1,6 +1,6 @@
 id=energizedprotection
 name=Energized Protection
-version=1.2.5
-versionCode=200524125
+version=1.3.0
+versionCode=200524130
 author=AdroitAdorKhan
 description=Let's make an annoyance free better open internet, altogether! https://energized.pro

system/bin/energized

@@ -96,7 +96,7 @@ currentIP=$(grep -o -m 1 '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}
 # ----------------------------------------
 # Versioning & Date
 # ----------------------------------------
-version=$Y'1.2.5'$N > /dev/null 2>&1
+version=$Y'1.3.0'$N > /dev/null 2>&1
 releaseDate=$G'May 24, 2020'$N > /dev/null 2>&1
 date=$(date "+%d.%m.%Y %H:%M:%S")
 # ----------------------------------------

system/bin/mainMenu.sh

@@ -207,7 +207,7 @@ showMenu() {
     echo ''
     echo -e $Y"      P   R   O   T   E   C   T   I   O   N"$N; sleep 0.05;
     echo -e $W"$divider"$N; sleep 0.05;
-    echo "     Version: $version | Updated: $releaseDate"; sleep 0.05;
+    echo "      Version: $version | Updated: $releaseDate"; sleep 0.05;
     echo -e $W"$divider"$N; sleep 0.05;
     echo ""; sleep 0.05;
     echo -e $Y'                  energized.pro'$N; sleep 0.05;

system/bin/setupFiles.sh

@@ -7,13 +7,18 @@ checkMagisk() {
     printMagiskVersion=$(magisk -c | cut -d':' -f1)
     magiskVersion=$(magisk -V)
     case "$magiskVersion" in
-        '20'[0-9a-zA-Z]*) # Version 20.x
+        '20'[0-3a-zA-Z]*) # Version 20.0-20.3
+            hosts=/sbin/.magisk/img/hosts/system/etc/hosts
+            busyboxPath=/sbin/.magisk/img/busybox-ndk
+            return 1
+            ;;
+        '20'[4-9a-zA-Z]*) # Version 20.4+
             hosts=/data/adb/modules/hosts/system/etc/hosts
             busyboxPath=/data/adb/magisk
             return 1
             ;;
         *)
-            echo -e $R"Unknown Version: $printMagiskVersion"$N; sleep 5;
+            echo -e "\n >Version: $printMagiskVersion - not supported.\n > Exiting..."
             exit
             return 0
             ;;
@@ -25,8 +30,8 @@ checkMagisk() {
 # Check busybox
 # ----------------------------------------
 checkBusybox() {
-    #busybox=$(ls "$busyboxPath/system/bin/busybox" || ls "$busyboxPath/system/xbin/busybox" || ls "$busyboxPath/busybox") 2>/dev/null
-    busybox=$(ls "$busyboxPath/busybox") 2>/dev/null
+    busybox=$(ls "$busyboxPath/system/bin/busybox" || ls "$busyboxPath/system/xbin/busybox" || ls "$busyboxPath/busybox") 2>/dev/null
+    #busybox=$(ls "$busyboxPath/busybox") 2>/dev/null
     busyboxAuto=$(ls /system/bin/busybox || ls /system/sbin/busybox || ls /system/xbin/busybox || ls /sbin/busybox) 2>/dev/null
     busyboxManualGzip=$(ls /system/bin/gzip || ls /system/sbin/gzip || ls /system/xbin/gzip || ls /sbin/gzip) 2>/dev/null
     busyboxManualWget=$(ls /system/bin/wget || ls /system/sbin/wget || ls /system/xbin/wget || ls /sbin/wget) 2>/dev/null