From 86a3fc8c4500aee4f7e80a9027c9513379f1ca52 Mon Sep 17 00:00:00 2001
From: solohsu <hsushulong@gmail.com>
Date: Fri, 15 Mar 2019 15:28:20 +0800
Subject: [PATCH] Write verbose logs to a separate file all.log

Reserve a switch to disable verbose logs
---
 Core/build.gradle                             |  2 +-
 Core/template_override/common/post-fs-data.sh |  2 +-
 .../common/util_functions.sh                  | 47 +++++++++++++------
 Core/template_override/config.sh              |  2 +-
 Core/template_override/module.prop            |  4 +-
 Core/template_override/riru_module.prop       |  4 +-
 .../system/framework/edconfig.dex             |  2 +-
 7 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/Core/build.gradle b/Core/build.gradle
index bdb1faaf..199077d5 100644
--- a/Core/build.gradle
+++ b/Core/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'com.android.library'
-version "v0.3.1.2_beta"
+version "v0.3.1.3_beta-SNAPSHOT"
 extensions["module_name"] = "EdXposed"
 android {
     compileSdkVersion 28
diff --git a/Core/template_override/common/post-fs-data.sh b/Core/template_override/common/post-fs-data.sh
index 513beb64..bf60a151 100644
--- a/Core/template_override/common/post-fs-data.sh
+++ b/Core/template_override/common/post-fs-data.sh
@@ -22,4 +22,4 @@ supolicy --live "allow zygote apk_data_file * *"
 
 . ${MODDIR}/util_functions.sh
 
-start_verbose_log_catcher
+start_log_catchers
diff --git a/Core/template_override/common/util_functions.sh b/Core/template_override/common/util_functions.sh
index 7c479901..f5dc0267 100644
--- a/Core/template_override/common/util_functions.sh
+++ b/Core/template_override/common/util_functions.sh
@@ -1,6 +1,6 @@
 #!/system/bin/sh
 
-EDXP_VERSION="0.3.1.2_beta (3120)"
+EDXP_VERSION="0.3.1.3_beta-SNAPSHOT (3130)"
 ANDROID_SDK=`getprop ro.build.version.sdk`
 BUILD_DESC=`getprop ro.build.description`
 PRODUCT=`getprop ro.build.product`
@@ -23,32 +23,40 @@ setup_log_path () {
   else
     PATH_PREFIX=${PATH_PREFIX_LEGACY}
   fi
-  BASE_PATH=${PATH_PREFIX}${EDXP_INSTALLER}
-  if [[ -d ${BASE_PATH} ]]
+  DEFAULT_BASE_PATH=${PATH_PREFIX}${EDXP_INSTALLER}
+  BASE_PATH=${DEFAULT_BASE_PATH}
+  if [[ ! -d ${BASE_PATH} ]]
   then
-      LOG_PATH=${BASE_PATH}/log
-  else
     BASE_PATH=${PATH_PREFIX}${EDXP_MANAGER}
-    if [[ -d ${BASE_PATH} ]]
+    if [[ ! -d ${BASE_PATH} ]]
     then
-        LOG_PATH=${BASE_PATH}/log
-    else
       BASE_PATH=${PATH_PREFIX}${XP_INSTALLER}
-      if [[ -d ${BASE_PATH} ]]
+      if [[ ! -d ${BASE_PATH} ]]
       then
-        LOG_PATH=${BASE_PATH}/log
-      else
-        LOG_PATH=${BASE_PATH}/log
+        BASE_PATH=${DEFAULT_BASE_PATH}
       fi
     fi
   fi
+  LOG_PATH=${BASE_PATH}/log
+  CONF_PATH=${BASE_PATH}/conf
+  DISABLE_VERBOSE_LOG_FILE=${CONF_PATH}/disable_verbose_log
+  LOG_VERBOSE=true
+  if [[ -f ${DISABLE_VERBOSE_LOG_FILE} ]]; then LOG_VERBOSE=false; fi
 }
 
 start_log_cather () {
   LOG_FILE_NAME=$1
+  LOG_TAG_FILTERS=$2
+  CLEAN_OLD=$3
+  START_NEW=$4
   LOG_FILE=${LOG_PATH}/${LOG_FILE_NAME}
   mkdir -p ${LOG_PATH}
-  rm -rf ${LOG_FILE}
+  if [[ ${CLEAN_OLD} = true ]]; then
+    rm -rf ${LOG_FILE}
+  fi
+  if [[ ${START_NEW} = false ]]; then
+    return
+  fi
   touch ${LOG_FILE}
   chmod 777 ${LOG_FILE}
   echo "--------- beginning of head">>${LOG_FILE}
@@ -67,11 +75,20 @@ start_log_cather () {
   echo "Manufacture: ${MANUFACTURE}">>${LOG_FILE}
   echo "Brand: ${BRAND}">>${LOG_FILE}
   echo "Product: ${PRODUCT}">>${LOG_FILE}
-  logcat -f ${LOG_FILE} *:S logcatcher-xposed-mlgmxyysd:S EdXposed-Fwk:V EdXposed-dexmaker:V XSharedPreferences:V EdXposed-Bridge:V EdXposed-YAHFA:V EdXposed-Core-Native:V xhook:V Riru:V RiruManager:V EdXposed-Manager:V XposedInstaller:V &
+  logcat -f ${LOG_FILE} *:S ${LOG_TAG_FILTERS} &
 }
 
 start_verbose_log_catcher () {
-  start_log_cather error.log
+  start_log_cather all.log "EdXposed-Fwk:V EdXposed-dexmaker:V XSharedPreferences:V EdXposed-Bridge:V EdXposed-YAHFA:V EdXposed-Core-Native:V EdXposed-Manager:V XposedInstaller:V" true ${LOG_VERBOSE}
+}
+
+start_bridge_log_catcher () {
+  start_log_cather error.log "XSharedPreferences:V EdXposed-Bridge:V" true true
+}
+
+start_log_catchers () {
+  start_bridge_log_catcher
+  start_verbose_log_catcher
 }
 
 setup_log_path
diff --git a/Core/template_override/config.sh b/Core/template_override/config.sh
index a40195e6..c5547e6f 100644
--- a/Core/template_override/config.sh
+++ b/Core/template_override/config.sh
@@ -41,7 +41,7 @@ LATESTARTSERVICE=false
 
 print_modname() {
   ui_print "************************************"
-  ui_print " Riru - Ed Xposed v0.3.1.2          "
+  ui_print " Riru - Ed Xposed v0.3.1.3          "
   ui_print "************************************"
 }
 
diff --git a/Core/template_override/module.prop b/Core/template_override/module.prop
index 01b6b215..2dc811c3 100644
--- a/Core/template_override/module.prop
+++ b/Core/template_override/module.prop
@@ -1,7 +1,7 @@
 id=riru_edxposed
 name=Riru - Ed Xposed
-version=v0.3.1.2_beta
-versionCode=3120
+version=v0.3.1.3_beta-SNAPSHOT
+versionCode=3130
 author=solohsu & MlgmXyysd
 description=Magisk version of Xposed. Require Riru - Core installed.
 minMagisk=17000
diff --git a/Core/template_override/riru_module.prop b/Core/template_override/riru_module.prop
index 7e166e69..d492fd8a 100644
--- a/Core/template_override/riru_module.prop
+++ b/Core/template_override/riru_module.prop
@@ -1,5 +1,5 @@
 name=Ed Xposed
-version=v0.3.1.2_beta
-versionCode=3120
+version=v0.3.1.3_beta-SNAPSHOT
+versionCode=3130
 author=solohsu & MlgmXyysd
 description=Magisk version of Xposed. Require Riru - Core installed.
diff --git a/Core/template_override/system/framework/edconfig.dex b/Core/template_override/system/framework/edconfig.dex
index 55c27bee..ab51e4ed 100644
--- a/Core/template_override/system/framework/edconfig.dex
+++ b/Core/template_override/system/framework/edconfig.dex
@@ -1,4 +1,4 @@
-version=90.0-0.3.1.2-beta
+version=90.0-0.3.1.3-beta-SNAPSHOT
 arch=arm64
 minsdk=23
 maxsdk=28