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

68 lines
2.1 KiB
Java

package com.google.api.client.util;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Map;
/* loaded from: classes3.dex */
public final class ArrayValueMap {
private final Object destination;
private final Map<String, ArrayValue> keyMap = ArrayMap.create();
private final Map<Field, ArrayValue> fieldMap = ArrayMap.create();
/* loaded from: classes3.dex */
public static class ArrayValue {
final Class<?> componentType;
final ArrayList<Object> values = new ArrayList<>();
public ArrayValue(Class<?> cls) {
this.componentType = cls;
}
public void addValue(Class<?> cls, Object obj) {
boolean z;
if (cls == this.componentType) {
z = true;
} else {
z = false;
}
Preconditions.checkArgument(z);
this.values.add(obj);
}
public Object toArray() {
return Types.toArray(this.values, this.componentType);
}
}
public ArrayValueMap(Object obj) {
this.destination = obj;
}
public void put(Field field, Class<?> cls, Object obj) {
ArrayValue arrayValue = this.fieldMap.get(field);
if (arrayValue == null) {
arrayValue = new ArrayValue(cls);
this.fieldMap.put(field, arrayValue);
}
arrayValue.addValue(cls, obj);
}
public void setValues() {
for (Map.Entry<String, ArrayValue> entry : this.keyMap.entrySet()) {
((Map) this.destination).put(entry.getKey(), entry.getValue().toArray());
}
for (Map.Entry<Field, ArrayValue> entry2 : this.fieldMap.entrySet()) {
FieldInfo.setFieldValue(entry2.getKey(), this.destination, entry2.getValue().toArray());
}
}
public void put(String str, Class<?> cls, Object obj) {
ArrayValue arrayValue = this.keyMap.get(str);
if (arrayValue == null) {
arrayValue = new ArrayValue(cls);
this.keyMap.put(str, arrayValue);
}
arrayValue.addValue(cls, obj);
}
}