From df0074b5a77d0807665affc9ecd401527f66f4da Mon Sep 17 00:00:00 2001 From: Yawasau <229953100a@gmail.com> Date: Sun, 3 Nov 2024 18:28:38 +0800 Subject: [PATCH] bugfix --- tools/classes2.dex | Bin 1158880 -> 1158904 bytes tools/soc.json | 2 +- tools/tools.sh | 41 ++++++++++++++++++++++++++++------------- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/tools/classes2.dex b/tools/classes2.dex index 4adcbae05f551bd6126a9628c3a82cc6682a6c9f..2dd110c7952abd245de758a93d75dadf7a3f52be 100644 GIT binary patch delta 8409 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" SSAID_apk="$(echo "$name1 \"$name2\"")" @@ -1244,10 +1249,10 @@ Backup_data() { esac ;; esac - } || { - echoRgb "$1數據 $Filesize2太小" "0" && Set_back_1 - } echo_log "備份$1數據" "備份" "$name1" + } || { + echoRgb "$1數據 $Filesize2太小" "0" && result=1 + } if [[ $result = 0 ]]; then Validation_file "$Backup_folder/$1.tar"* if [[ $result = 0 ]]; then @@ -1683,11 +1688,21 @@ Set_screen_pause_seconds () { restore_permissions () { echoRgb "恢復權限" appops reset --user "$user" "$name2" &>/dev/null - true_permissions="$(jq -r 'to_entries[] | select(.value.permissions != null) | .value.permissions | to_entries | map(select(.value | startswith("true"))) | .[].key' "$app_details")" - false_permissions="$(jq -r 'to_entries[] | select(.value.permissions != null) | .value.permissions | to_entries | map(select(.value | startswith("false"))) | .[].key' "$app_details")" - [[ $true_permissions != "" ]] && Set_true_Permissions "$name2" "$(echo "$true_permissions" | xargs)" &>/dev/null - [[ $false_permissions != "" ]] && Set_false_Permissions "$name2" "$(echo "$false_permissions" | xargs)" &>/dev/null - Set_Ops "$name2" "$(jq -r '.[] | select(.permissions != null).permissions | to_entries | map(.value | split(" ")) | map(select(.[1] != "-1")) | map(.[1:]) | flatten | join(" ")' "$app_details")" + true_permissions="$(jq -r 'to_entries[] | select(.value.permissions != null) | .value.permissions | to_entries | map(select(.value | startswith("true")) | .key) | join(" ")' "$app_details")" + false_permissions="$(jq -r 'to_entries[] | select(.value.permissions != null) | .value.permissions | to_entries | map(select(.value | startswith("false")) | .key) | join(" ")' "$app_details")" + Set_Ops_permissions="$(jq -r '.[] | select(.permissions != null).permissions | to_entries | map(.value | split(" ")) | map(select(.[1] != "-1")) | map(.[1:]) | flatten | join(" ")' "$app_details")" + [[ $true_permissions != "" ]] && { + Set_true_Permissions "$name2" "$true_permissions" &>/dev/null + [[ $? != 0 ]] && echo_log "設置允許權限" "恢復" + } + [[ $false_permissions != "" ]] && { + Set_false_Permissions "$name2" "$false_permissions" &>/dev/null + [[ $? != 0 ]] && echo_log "設置拒絕權限" "恢復" + } + [[ $Set_Ops_permissions != "" ]] && { + Set_Ops "$name2" "$Set_Ops_permissions" + [[ $? != 0 ]] && echo_log "設置ops權限" "恢復" + } } Background_application_list() { if [[ $Background_apps_ignore = true ]]; then @@ -1891,7 +1906,7 @@ backup) Tmplist="$Tmplist\n$REPLY" fi done < "$txt" - } + } [[ $Tmplist != "" ]] && echo "$Tmplist" | sed -e '/^$/d' | sort>"$txt" if [[ $Tmplist2 != "" ]]; then if [[ $Update_backup != "" ]]; then