From 6fb70f63ffcd15da7b507d44211e87428116ecb0 Mon Sep 17 00:00:00 2001
From: Affif Mukhlashin <affif.bluemeda@gmail.com>
Date: Thu, 13 Sep 2018 12:02:36 +0700
Subject: [PATCH] v2.5.0 & magisk >= 17.0

---
 META-INF/com/google/android/update-binary  | 30 +++++++++++-----------
 META-INF/com/google/android/updater-script |  0
 README.md                                  |  3 ++-
 module.prop                                |  6 ++---
 4 files changed, 20 insertions(+), 19 deletions(-)
 mode change 100755 => 100644 META-INF/com/google/android/updater-script

diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary
index 3f069a4..d8499f2 100755
--- a/META-INF/com/google/android/update-binary
+++ b/META-INF/com/google/android/update-binary
@@ -6,13 +6,10 @@
 #
 ##########################################################################################
 
-# Detect whether in boot mode
-ps | grep zygote | grep -v grep >/dev/null && BOOTMODE=true || BOOTMODE=false
-$BOOTMODE || ps -A 2>/dev/null | grep zygote | grep -v grep >/dev/null && BOOTMODE=true
-
 TMPDIR=/dev/tmp
 INSTALLER=$TMPDIR/install
-MAGISKBIN=/data/adb/magisk
+# Always mount under tmp
+MOUNTPATH=$TMPDIR/magisk_img
 
 # Default permissions
 umask 022
@@ -26,7 +23,7 @@ ui_print() { echo "$1"; }
 
 require_new_magisk() {
   ui_print "*******************************"
-  ui_print " Please install Magisk v15.0+! "
+  ui_print " Please install Magisk v17.0+! "
   ui_print "*******************************"
   exit 1
 }
@@ -40,18 +37,21 @@ ZIP=$3
 
 mount /data 2>/dev/null
 
-# Utility functions must exist
-[ -f $MAGISKBIN/util_functions.sh ] || require_new_magisk
-# Load utility fuctions
-. $MAGISKBIN/util_functions.sh
+# Load utility functions
+if [ -f /data/adb/magisk/util_functions.sh ]; then
+  . /data/adb/magisk/util_functions.sh
+elif [ -f /data/magisk/util_functions.sh ]; then
+  NVBASE=/data
+  . /data/magisk/util_functions.sh
+else
+  require_new_magisk
+fi
 
-# We can't alter magisk image live, use alternative image if required
-$BOOTMODE && IMG=/data/adb/magisk_merge.img
-# Always mount under tmp
-MOUNTPATH=$TMPDIR/magisk_img
+# Use alternative image if in BOOTMODE
+$BOOTMODE && IMG=$NVBASE/magisk_merge.img
 
 # Preperation for flashable zips
-get_outfd
+setup_flashable
 
 # Mount partitions
 mount_partitions
diff --git a/META-INF/com/google/android/updater-script b/META-INF/com/google/android/updater-script
old mode 100755
new mode 100644
diff --git a/README.md b/README.md
index 981cadd..312ab03 100755
--- a/README.md
+++ b/README.md
@@ -36,7 +36,8 @@ Just flash and forget.
 ## Changelog
 ### v2.5.0
 - Update binary files to 2.0.16
-- add exception for cloudflare fallback resolver.
+- Add exception for cloudflare fallback resolver.
+- Update Magisk Module Template 17000
 ### v2.4.0
 - Update binary files to 2.0.14
 ### v2.3.0
diff --git a/module.prop b/module.prop
index d382a5f..0c332a4 100755
--- a/module.prop
+++ b/module.prop
@@ -1,7 +1,7 @@
 id=dnscrypt-proxy
 name=DNSCrypt-Proxy 2
-version=v2.4.0
-versionCode=13
+version=v2.5.0
+versionCode=14
 author=bluemeda
 description=A flexible DNS proxy, with support for modern encrypted DNS protocols such as DNSCrypt v2 and DNS-over-HTTP/2.
-minMagisk=1500
+minMagisk=1700