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

83 lines
2.7 KiB
Java

package com.google.api.client.json;
import com.google.api.client.util.ObjectParser;
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.Sets;
import java.io.InputStream;
import java.io.Reader;
import java.lang.reflect.Type;
import java.nio.charset.Charset;
import java.util.Collection;
import java.util.HashSet;
/* loaded from: classes3.dex */
public class JsonObjectParser implements ObjectParser {
/* renamed from: a, reason: collision with root package name */
public final JsonFactory f12079a;
public final HashSet b;
/* loaded from: classes3.dex */
public static class Builder {
/* renamed from: a, reason: collision with root package name */
public final JsonFactory f12080a;
public Collection b = Sets.newHashSet();
public Builder(JsonFactory jsonFactory) {
this.f12080a = (JsonFactory) Preconditions.checkNotNull(jsonFactory);
}
}
public JsonObjectParser(JsonFactory jsonFactory) {
this(new Builder(jsonFactory));
}
public final void a(JsonParser jsonParser) {
boolean z;
HashSet hashSet = this.b;
if (hashSet.isEmpty()) {
return;
}
try {
if (jsonParser.L(hashSet) != null && jsonParser.f() != JsonToken.h) {
z = true;
} else {
z = false;
}
Preconditions.checkArgument(z, "wrapper key(s) not found: %s", hashSet);
} catch (Throwable th) {
jsonParser.close();
throw th;
}
}
@Override // com.google.api.client.util.ObjectParser
public final Object parseAndClose(InputStream inputStream, Charset charset, Class cls) {
return parseAndClose(inputStream, charset, (Type) cls);
}
public JsonObjectParser(Builder builder) {
this.f12079a = builder.f12080a;
this.b = new HashSet(builder.b);
}
@Override // com.google.api.client.util.ObjectParser
public final Object parseAndClose(InputStream inputStream, Charset charset, Type type) {
JsonParser createJsonParser = this.f12079a.createJsonParser(inputStream, charset);
a(createJsonParser);
return createJsonParser.z(type, true);
}
@Override // com.google.api.client.util.ObjectParser
public final Object parseAndClose(Reader reader, Class cls) {
return parseAndClose(reader, (Type) cls);
}
@Override // com.google.api.client.util.ObjectParser
public final Object parseAndClose(Reader reader, Type type) {
JsonParser createJsonParser = this.f12079a.createJsonParser(reader);
a(createJsonParser);
return createJsonParser.z(type, true);
}
}