bogdan54/Revanced-And-Revanced-Extended-Non-Root
Template
1
0
Fork 0
mirror of https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root.git synced 2025-12-06 08:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue latest twitter

Browse Source 
Because latest version twitter use bundle file (apkm). So I use APKEditor to merge splits apk to one standalone apk
This commit is contained in:
siritami
2024-08-06 21:29:22 +07:00
parent 162e2afdf1
commit fd27b6926d
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -415,6 +415,8 @@ Download
</details> </details>
[Markdown Badges](https://github.com/Ileriayo/markdown-badges) - [MIT](https://github.com/Ileriayo/markdown-badges/blob/master/LICENSE) [Markdown Badges](https://github.com/Ileriayo/markdown-badges) - [MIT](https://github.com/Ileriayo/markdown-badges/blob/master/LICENSE)
[HTMLQ](https://github.com/mgdm/htmlq) - [MIT](https://github.com/mgdm/htmlq/blob/master/LICENSE.md)
[APKEditor](https://github.com/REAndroid/APKEditor) - [Apache-2.0](https://github.com/REAndroid/APKEditor/blob/master/LICENSE)
--- ---

2
src/build/Piko.sh
View File

@@ -13,7 +13,7 @@ patch_piko () {
v="prerelease" apk_name="beta" v="prerelease" apk_name="beta"
fi fi
dl_gh "piko revanced-integrations" "crimera" "$v" dl_gh "piko revanced-integrations" "crimera" "$v"
get_apk "com.twitter.android" "twitter-$apk_name" "twitter" "x-corp/twitter/twitter" get_apk "com.twitter.android" "twitter-$apk_name" "twitter" "x-corp/twitter/twitter" "Bundle"
patch "twitter-$apk_name" "piko" patch "twitter-$apk_name" "piko"
} }
patch_piko $1 patch_piko $1

2
src/build/Revanced-2.sh
View File

@@ -11,7 +11,7 @@ dl_gh "revanced-patches revanced-cli revanced-integrations" "revanced" "latest"
# Patch Twitter: # Patch Twitter:
get_patches_key "twitter" get_patches_key "twitter"
get_apk "com.twitter.android" "twitter" "twitter" "x-corp/twitter/twitter" get_apk "com.twitter.android" "twitter" "twitter" "x-corp/twitter/twitter" "Bundle"
patch "twitter" "revanced" patch "twitter" "revanced"
################################################# #################################################

2
src/build/Revanced-Beta-2.sh
View File

@@ -12,7 +12,7 @@ dl_gh "revanced-cli" "revanced" "latest"
# Patch Twitter: # Patch Twitter:
get_patches_key "twitter" get_patches_key "twitter"
get_apk "com.twitter.android" "twitter-beta" "twitter" "x-corp/twitter/twitter" get_apk "com.twitter.android" "twitter-beta" "twitter" "x-corp/twitter/twitter" "Bundle"
patch "twitter-beta" "revanced" patch "twitter-beta" "revanced"
################################################# #################################################

19
src/build/utils.sh
View File

@@ -2,10 +2,13 @@
mkdir ./release ./download mkdir ./release ./download
#Setup HTMLQ #Setup HTMLQ for download apk files
wget -q -O ./htmlq.tar.gz https://github.com/mgdm/htmlq/releases/latest/download/htmlq-x86_64-linux.tar.gz wget -q -O ./htmlq.tar.gz https://github.com/mgdm/htmlq/releases/latest/download/htmlq-x86_64-linux.tar.gz
tar -xf "./htmlq.tar.gz" -C "./" tar -xf "./htmlq.tar.gz" -C "./"
HTMLQ="./htmlq" HTMLQ="./htmlq"
#Setup APKEditor for install combine split apks
wget -q -O ./APKEditor.jar https://github.com/REAndroid/APKEditor/releases/download/V1.3.9/APKEditor-1.3.9.jar
APKEditor="./APKEditor.jar"
################################################# #################################################
@@ -124,6 +127,8 @@ dl_apk() {
get_apk() { get_apk() {
if [[ -z $5 ]]; then if [[ -z $5 ]]; then
url_regexp='APK</span>[^@]*@\([^#]*\)' url_regexp='APK</span>[^@]*@\([^#]*\)'
elif [[ $5 == "Bundle" ]]; then
url_regexp='BUNDLE</span>[^@]*@\([^#]*\)'
else else
case $5 in case $5 in
arm64-v8a) url_regexp='arm64-v8a'"[^@]*$7"''"[^@]*$6"'</div>[^@]*@\([^"]*\)' ;; arm64-v8a) url_regexp='arm64-v8a'"[^@]*$7"''"[^@]*$6"'</div>[^@]*@\([^"]*\)' ;;
@@ -150,11 +155,15 @@ get_apk() {
version=$(echo -e "${_versions[*]}" | sed -n "$((attempt + 1))p") version=$(echo -e "${_versions[*]}" | sed -n "$((attempt + 1))p")
fi fi
green_log "[+] Downloading $3 version: $version $5 $6 $7" green_log "[+] Downloading $3 version: $version $5 $6 $7"
local base_apk="$2.apk" if [[ $5 == "Bundle" ]]; then
local base_apk="$2.apkm"
else
local base_apk="$2.apk"
fi
local dl_url=$(dl_apk "https://www.apkmirror.com/apk/$4-${version//./-}-release/" \ local dl_url=$(dl_apk "https://www.apkmirror.com/apk/$4-${version//./-}-release/" \
"$url_regexp" \ "$url_regexp" \
"$base_apk") "$base_apk")
if [[ -f "./download/$2.apk" ]]; then if [[ -f "./download/$base_apk" ]]; then
green_log "[+] Successfully downloaded $2" green_log "[+] Successfully downloaded $2"
break break
else else
@@ -167,6 +176,10 @@ get_apk() {
red_log "[-] No more versions to try. Failed download" red_log "[-] No more versions to try. Failed download"
return 1 return 1
fi fi
if [[ $5 == "Bundle" ]]; then
green_log "[+] Merge splits apk to standalone apk"
java -jar $APKEditor m -i ./download/$2.apkm -o ./download/$2.apk > /dev/null 2>&1
fi
} }
################################################# #################################################