soul-browser/sources/java/com/google/api/client/http/UrlEncodedContent.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

107 lines
3.6 KiB
Java

package com.google.api.client.http;
import com.google.api.client.util.Data;
import com.google.api.client.util.FieldInfo;
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.Types;
import com.google.api.client.util.escape.CharEscapers;
import java.io.BufferedWriter;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
/* loaded from: classes3.dex */
public class UrlEncodedContent extends AbstractHttpContent {
private Object data;
private boolean uriPathEncodingFlag;
public UrlEncodedContent(Object obj) {
super(UrlEncodedParser.MEDIA_TYPE);
setData(obj);
this.uriPathEncodingFlag = false;
}
private static boolean appendParam(boolean z, Writer writer, String str, Object obj, boolean z2) {
String obj2;
String escapeUri;
if (obj != null && !Data.isNull(obj)) {
if (z) {
z = false;
} else {
writer.write("&");
}
writer.write(str);
if (obj instanceof Enum) {
obj2 = FieldInfo.of((Enum<?>) obj).getName();
} else {
obj2 = obj.toString();
}
if (z2) {
escapeUri = CharEscapers.escapeUriPath(obj2);
} else {
escapeUri = CharEscapers.escapeUri(obj2);
}
if (escapeUri.length() != 0) {
writer.write("=");
writer.write(escapeUri);
}
}
return z;
}
public static UrlEncodedContent getContent(HttpRequest httpRequest) {
HttpContent content = httpRequest.getContent();
if (content != null) {
return (UrlEncodedContent) content;
}
UrlEncodedContent urlEncodedContent = new UrlEncodedContent(new HashMap());
httpRequest.setContent(urlEncodedContent);
return urlEncodedContent;
}
public final Object getData() {
return this.data;
}
public UrlEncodedContent setData(Object obj) {
this.data = Preconditions.checkNotNull(obj);
return this;
}
@Override // com.google.api.client.http.HttpContent, com.google.api.client.util.StreamingContent
public void writeTo(OutputStream outputStream) {
BufferedWriter bufferedWriter = new BufferedWriter(new OutputStreamWriter(outputStream, getCharset()));
boolean z = true;
for (Map.Entry<String, Object> entry : Data.mapOf(this.data).entrySet()) {
Object value = entry.getValue();
if (value != null) {
String escapeUri = CharEscapers.escapeUri(entry.getKey());
Class<?> cls = value.getClass();
if (!(value instanceof Iterable) && !cls.isArray()) {
z = appendParam(z, bufferedWriter, escapeUri, value, this.uriPathEncodingFlag);
} else {
Iterator it = Types.iterableOf(value).iterator();
while (it.hasNext()) {
z = appendParam(z, bufferedWriter, escapeUri, it.next(), this.uriPathEncodingFlag);
}
}
}
}
bufferedWriter.flush();
}
@Override // com.google.api.client.http.AbstractHttpContent
public UrlEncodedContent setMediaType(HttpMediaType httpMediaType) {
super.setMediaType(httpMediaType);
return this;
}
public UrlEncodedContent(Object obj, boolean z) {
super(UrlEncodedParser.MEDIA_TYPE);
setData(obj);
this.uriPathEncodingFlag = z;
}
}