soul-browser/sources/java/org/jsoup/helper/UrlBuilder.java
KaKi87 550ddb0413
Decompile and recreate Soul Browser v1.4.85 with APK CI builds (#1)
* Decompile and recreate Soul Browser v1.4.85 with APK CI builds

Co-authored-by: KaKi87 <KaKi87@pm.me>

* Fix CI build: include bundled google.jks and remove PR trigger

The apktool build failed in CI because app/unknown/.../google.jks was
excluded by the *.jks gitignore rule. Whitelist app-bundled JKS files
and commit the missing resource.

Also remove the redundant pull_request workflow trigger.

Co-authored-by: KaKi87 <KaKi87@pm.me>

* Change package ID to com.github.kaki87.soulbrowser

Rename the application ID so the rebuilt APK can be installed
alongside the original Soul Browser from Google Play.

- Update AndroidManifest package, permissions, providers, and actions
- Update R class references in smali (com/github/kaki87/soulbrowser/R)
- Update shortcuts.xml targetPackage
- Rename app label to "Soul Rebuild" for easy identification

Co-authored-by: KaKi87 <KaKi87@pm.me>

* Fix install compatibility: remove split APK metadata and bundle native libs

The rebuilt APK still declared requiredSplitTypes and Play Store split
metadata, causing Android to reject standalone installs as incompatible.

- Remove requiredSplitTypes and split-related manifest meta-data
- Merge native libs from all ABI splits with uncompressed storage
- Page-align before signing for extractNativeLibs=false
- Add .so to apktool doNotCompress list

Co-authored-by: KaKi87 <KaKi87@pm.me>

* Fix install failure: use apksigner v2/v3 and bundle arm64 native libs

Target SDK 36 requires APK Signature Scheme v2+, but jarsigner only
produces v1 signatures, causing Android to reject the install.

- Sign with apksigner (v1+v2+v3) instead of jarsigner
- Add arm64-v8a native libraries from universal Soul Browser 1.4.79
- Set extractNativeLibs=true for reliable sideload installs
- Commit stable debug keystore for consistent signatures across builds

Co-authored-by: KaKi87 <KaKi87@pm.me>

* Add committed debug keystore for consistent APK signatures

Co-authored-by: KaKi87 <KaKi87@pm.me>

* Fix startup crash: use original classes2.dex desugar libraries

Apktool recompiles smali_classes2 into a broken classes2.dex, causing
ClassNotFoundException for j$.com.android.tools.r8.a at ML Kit init.

Inject the original classes2.dex (Java 8+ desugar libs) after apktool
build instead of using the recompiled version.

Co-authored-by: KaKi87 <KaKi87@pm.me>

* Fix missing drawable resources from density split APKs

The base APK is an app bundle module; density-specific drawables like
seek_thumb_nor_b live in config.xhdpi.apk and were missing after rebuild,
causing Resources$NotFoundException at runtime.

- Merge non-9-patch resources from split APKs before apktool build
- Sync public.xml IDs from R smali only when backing files exist
- Add 713 density-specific resource IDs to public.xml

Co-authored-by: KaKi87 <KaKi87@pm.me>

---------

Co-authored-by: Cursor Agent <cursoragent@cursor.com>
2026-08-10 16:07:14 +02:00

106 lines
3.5 KiB
Java

package org.jsoup.helper;
import java.io.UnsupportedEncodingException;
import java.net.IDN;
import java.net.MalformedURLException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLDecoder;
import java.net.URLEncoder;
import org.jsoup.internal.StringUtil;
/* loaded from: classes4.dex */
final class UrlBuilder {
/* renamed from: a, reason: collision with root package name */
public URL f22542a;
public StringBuilder b;
public UrlBuilder(URL url) {
this.f22542a = url;
if (url.getQuery() != null) {
StringBuilder borrowBuilder = StringUtil.borrowBuilder();
borrowBuilder.append(this.f22542a.getQuery());
this.b = borrowBuilder;
}
}
public static void a(StringBuilder sb, String str, boolean z) {
Object obj;
int i = 0;
while (i < str.length()) {
int codePointAt = str.codePointAt(i);
if (codePointAt == 32) {
if (z) {
obj = '+';
} else {
obj = "%20";
}
sb.append(obj);
} else if (codePointAt == 37) {
if (i < str.length() - 2) {
int i2 = i + 1;
if (d(str.charAt(i2))) {
int i3 = i + 2;
if (d(str.charAt(i3))) {
sb.append('%');
sb.append(str.charAt(i2));
sb.append(str.charAt(i3));
i = i3;
}
}
}
sb.append("%25");
} else if (codePointAt <= 127 && "<>\"{}|\\^[]`".indexOf(codePointAt) == -1) {
sb.append((char) codePointAt);
} else {
sb.append(URLEncoder.encode(new String(Character.toChars(codePointAt)), DataUtil.UTF_8.name()));
if (Character.charCount(codePointAt) == 2) {
i++;
}
}
i++;
}
}
public static String c(String str) {
try {
return URLDecoder.decode(str, DataUtil.UTF_8.name());
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
}
public static boolean d(char c2) {
if (c2 >= '0' && c2 <= '9') {
return true;
}
if (c2 < 'A' || c2 > 'F') {
return c2 >= 'a' && c2 <= 'f';
}
return true;
}
public final URL b() {
try {
URI uri = new URI(this.f22542a.getProtocol(), this.f22542a.getUserInfo(), IDN.toASCII(c(this.f22542a.getHost())), this.f22542a.getPort(), null, null, null);
StringBuilder borrowBuilder = StringUtil.borrowBuilder();
borrowBuilder.append(uri.toASCIIString());
a(borrowBuilder, this.f22542a.getPath(), false);
if (this.b != null) {
borrowBuilder.append('?');
a(borrowBuilder, StringUtil.releaseBuilder(this.b), true);
}
if (this.f22542a.getRef() != null) {
borrowBuilder.append('#');
a(borrowBuilder, this.f22542a.getRef(), false);
}
URL url = new URL(StringUtil.releaseBuilder(borrowBuilder));
this.f22542a = url;
return url;
} catch (UnsupportedEncodingException | MalformedURLException | URISyntaxException unused) {
return this.f22542a;
}
}
}