mirror of
https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root.git
synced 2025-12-06 08:07:40 +00:00
Fix issue Tiktok
- Fix crash on startup - Fix warning old tiktok version
This commit is contained in:
@@ -234,7 +234,7 @@ Old patches, because latest patch not support split apks
|
|||||||
| Stable version | Beta version |
|
| Stable version | Beta version |
|
||||||
| ---------------------------------------------------------------------- | ------------------------------------------------------------------------- |
|
| ---------------------------------------------------------------------- | ------------------------------------------------------------------------- |
|
||||||
| [All Architectures](../../releases/download/all/tiktok-revanced.apk) | [All Architectures](../../releases/download/all/tiktok-beta-revanced.apk) |
|
| [All Architectures](../../releases/download/all/tiktok-revanced.apk) | [All Architectures](../../releases/download/all/tiktok-beta-revanced.apk) |
|
||||||
| [Arm64-v8a](../../releases/download/all/tiktok-arm64-v8a-revanced.apk) | [Arm64-v8a](../../releases/download/all/tiktok-arm64-v8a-beta-revanced.apk) |
|
| [Arm64-v8a](../../releases/download/all/tiktok-arm64-v8a-revanced.apk) | [Arm64-v8a](../../releases/download/all/tiktok-beta-arm64-v8a-revanced.apk) |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ revanced_dl(){
|
|||||||
# Patch Facebook:
|
# Patch Facebook:
|
||||||
# Arm64-v8a
|
# Arm64-v8a
|
||||||
get_patches_key "facebook"
|
get_patches_key "facebook"
|
||||||
version="490.0.0.63.82"
|
version="490.0.0.63.82" #Force this version because only patch in this version
|
||||||
get_apk "com.facebook.katana" "facebook-arm64-v8a-beta" "facebook" "facebook-2/facebook/facebook" "arm64-v8a" "nodpi" "Android 11+"
|
get_apk "com.facebook.katana" "facebook-arm64-v8a-beta" "facebook" "facebook-2/facebook/facebook" "arm64-v8a" "nodpi" "Android 11+"
|
||||||
patch "facebook-arm64-v8a-beta" "revanced"
|
patch "facebook-arm64-v8a-beta" "revanced"
|
||||||
}
|
}
|
||||||
@@ -58,11 +58,19 @@ revanced_dl(){
|
|||||||
patch "gg-photos-armeabi-v7a-beta" "revanced"
|
patch "gg-photos-armeabi-v7a-beta" "revanced"
|
||||||
}
|
}
|
||||||
4() {
|
4() {
|
||||||
revanced_dl
|
dl_gh "revanced-patches" "revanced" "v5.7.2" #Force version this because crash on startup lastest rv patches
|
||||||
|
dl_gh "revanced-cli" "revanced" "latest"
|
||||||
# Patch Tiktok:
|
# Patch Tiktok:
|
||||||
get_patches_key "tiktok"
|
get_patches_key "tiktok"
|
||||||
get_apk "com.zhiliaoapp.musically" "tiktok-beta" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly"
|
version="37.0.4" #Force this version beacause warning on old version but missing settings menu https://github.com/ReVanced/revanced-patches/issues/4221#issuecomment-2564776573
|
||||||
|
get_apk "com.zhiliaoapp.musically" "tiktok-beta" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly" "Bundle_extract"
|
||||||
|
split_editor "tiktok-beta" "tiktok-beta"
|
||||||
patch "tiktok-beta" "revanced"
|
patch "tiktok-beta" "revanced"
|
||||||
|
# Patch Tiktok Arm64-v8a:
|
||||||
|
split_editor "tiktok-beta" "tiktok-beta-arm64-v8a" "exclude" "split_config.armeabi_v7a"
|
||||||
|
patch "tiktok-beta-arm64-v8a" "revanced"
|
||||||
|
rm -f *.rvp *.jar
|
||||||
|
revanced_dl
|
||||||
# Patch Instagram:
|
# Patch Instagram:
|
||||||
# Arm64-v8a
|
# Arm64-v8a
|
||||||
get_patches_key "instagram"
|
get_patches_key "instagram"
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ revanced_dl(){
|
|||||||
# Patch Facebook:
|
# Patch Facebook:
|
||||||
# Arm64-v8a
|
# Arm64-v8a
|
||||||
get_patches_key "facebook"
|
get_patches_key "facebook"
|
||||||
version="490.0.0.63.82"
|
version="490.0.0.63.82" #Force this version because only patch in this version
|
||||||
get_apk "com.facebook.katana" "facebook-arm64-v8a" "facebook" "facebook-2/facebook/facebook" "arm64-v8a" "nodpi" "Android 11+"
|
get_apk "com.facebook.katana" "facebook-arm64-v8a" "facebook" "facebook-2/facebook/facebook" "arm64-v8a" "nodpi" "Android 11+"
|
||||||
patch "facebook-arm64-v8a" "revanced"
|
patch "facebook-arm64-v8a" "revanced"
|
||||||
}
|
}
|
||||||
@@ -57,12 +57,19 @@ revanced_dl(){
|
|||||||
patch "gg-photos-armeabi-v7a" "revanced"
|
patch "gg-photos-armeabi-v7a" "revanced"
|
||||||
}
|
}
|
||||||
4() {
|
4() {
|
||||||
revanced_dl
|
dl_gh "revanced-patches" "revanced" "v5.7.2" #Force version this because crash on startup lastest rv patches
|
||||||
|
dl_gh "revanced-cli" "revanced" "latest"
|
||||||
# Patch Tiktok:
|
# Patch Tiktok:
|
||||||
get_patches_key "tiktok"
|
get_patches_key "tiktok"
|
||||||
version="37.0.4"
|
version="37.0.4" #Force this version but missing settings https://github.com/ReVanced/revanced-patches/issues/4221#issuecomment-2564776573
|
||||||
get_apk "com.zhiliaoapp.musically" "tiktok" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly"
|
get_apk "com.zhiliaoapp.musically" "tiktok" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly" "Bundle_extract"
|
||||||
|
split_editor "tiktok" "tiktok"
|
||||||
patch "tiktok" "revanced"
|
patch "tiktok" "revanced"
|
||||||
|
# Patch Tiktok Arm64-v8a:
|
||||||
|
split_editor "tiktok" "tiktok-arm64-v8a" "exclude" "split_config.armeabi_v7a"
|
||||||
|
patch "tiktok-arm64-v8a" "revanced"
|
||||||
|
rm -f *.rvp *.jar
|
||||||
|
revanced_dl
|
||||||
# Patch Instagram:
|
# Patch Instagram:
|
||||||
# Arm64-v8a
|
# Arm64-v8a
|
||||||
get_patches_key "instagram"
|
get_patches_key "instagram"
|
||||||
|
|||||||
@@ -259,15 +259,15 @@ get_apk() {
|
|||||||
patch() {
|
patch() {
|
||||||
green_log "[+] Patching $1:"
|
green_log "[+] Patching $1:"
|
||||||
if [ -f "./download/$1.apk" ]; then
|
if [ -f "./download/$1.apk" ]; then
|
||||||
local p b m ks a pu opt
|
local p b m ks a pu opt force
|
||||||
if [ "$3" = inotia ]; then
|
if [ "$3" = inotia ]; then
|
||||||
p="patch " b="-p *.rvp" m="" a="" ks="_ks" pu="--purge=true" opt="--legacy-options=./src/options/$2.json"
|
p="patch " b="-p *.rvp" m="" a="" ks="_ks" pu="--purge=true" opt="--legacy-options=./src/options/$2.json" force=" --force"
|
||||||
echo "Patching with Revanced-cli inotia"
|
echo "Patching with Revanced-cli inotia"
|
||||||
else
|
else
|
||||||
if [[ $(ls revanced-cli-*.jar) =~ revanced-cli-([0-9]+) ]]; then
|
if [[ $(ls revanced-cli-*.jar) =~ revanced-cli-([0-9]+) ]]; then
|
||||||
num=${BASH_REMATCH[1]}
|
num=${BASH_REMATCH[1]}
|
||||||
if [ $num -ge 5 ]; then
|
if [ $num -ge 5 ]; then
|
||||||
p="patch " b="-p *.rvp" m="" a="" ks="ks" pu="--purge=true" opt=""
|
p="patch " b="-p *.rvp" m="" a="" ks="ks" pu="--purge=true" opt="" force=" --force"
|
||||||
echo "Patching with Revanced-cli version 5+"
|
echo "Patching with Revanced-cli version 5+"
|
||||||
elif [ $num -eq 4 ]; then
|
elif [ $num -eq 4 ]; then
|
||||||
p="patch " b="--patch-bundle *patch*.jar" m="--merge *integration*.apk " a="" ks="ks" pu="--purge=true" opt="--options=./src/options/$2.json "
|
p="patch " b="--patch-bundle *patch*.jar" m="--merge *integration*.apk " a="" ks="ks" pu="--purge=true" opt="--options=./src/options/$2.json "
|
||||||
@@ -284,7 +284,7 @@ patch() {
|
|||||||
if [ "$3" = inotia ]; then
|
if [ "$3" = inotia ]; then
|
||||||
unset CI GITHUB_ACTION GITHUB_ACTIONS GITHUB_ACTOR GITHUB_ENV GITHUB_EVENT_NAME GITHUB_EVENT_PATH GITHUB_HEAD_REF GITHUB_JOB GITHUB_REF GITHUB_REPOSITORY GITHUB_RUN_ID GITHUB_RUN_NUMBER GITHUB_SHA GITHUB_WORKFLOW GITHUB_WORKSPACE RUN_ID RUN_NUMBER
|
unset CI GITHUB_ACTION GITHUB_ACTIONS GITHUB_ACTOR GITHUB_ENV GITHUB_EVENT_NAME GITHUB_EVENT_PATH GITHUB_HEAD_REF GITHUB_JOB GITHUB_REF GITHUB_REPOSITORY GITHUB_RUN_ID GITHUB_RUN_NUMBER GITHUB_SHA GITHUB_WORKFLOW GITHUB_WORKSPACE RUN_ID RUN_NUMBER
|
||||||
fi
|
fi
|
||||||
eval java -jar *cli*.jar $p$b $m$opt --out=./release/$1-$2.apk$excludePatches$includePatches --keystore=./src/$ks.keystore $pu $a./download/$1.apk
|
eval java -jar *cli*.jar $p$b $m$opt --out=./release/$1-$2.apk$excludePatches$includePatches --keystore=./src/$ks.keystore $pu$force $a./download/$1.apk
|
||||||
unset version
|
unset version
|
||||||
unset lock_version
|
unset lock_version
|
||||||
unset excludePatches
|
unset excludePatches
|
||||||
|
|||||||
Reference in New Issue
Block a user