soul-browser/sources/java/androidx/work/ArrayCreatingInputMerger.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

76 lines
3.4 KiB
Java

package androidx.work;
import androidx.work.Data;
import j$.util.DesugarCollections;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
/* loaded from: classes.dex */
public final class ArrayCreatingInputMerger extends InputMerger {
@Override // androidx.work.InputMerger
public final Data a(ArrayList arrayList) {
Object newInstance;
Object newInstance2;
Data.Builder builder = new Data.Builder();
HashMap hashMap = new HashMap();
int size = arrayList.size();
int i = 0;
while (i < size) {
Object obj = arrayList.get(i);
i++;
for (Map.Entry entry : DesugarCollections.unmodifiableMap(((Data) obj).f1834a).entrySet()) {
String str = (String) entry.getKey();
Object value = entry.getValue();
Class<?> cls = value.getClass();
Object obj2 = hashMap.get(str);
if (obj2 == null) {
if (!cls.isArray()) {
newInstance2 = Array.newInstance(value.getClass(), 1);
Array.set(newInstance2, 0, value);
value = newInstance2;
hashMap.put(str, value);
} else {
hashMap.put(str, value);
}
} else {
Class<?> cls2 = obj2.getClass();
if (cls2.equals(cls)) {
if (cls2.isArray()) {
int length = Array.getLength(obj2);
int length2 = Array.getLength(value);
Object newInstance3 = Array.newInstance(obj2.getClass().getComponentType(), length + length2);
System.arraycopy(obj2, 0, newInstance3, 0, length);
System.arraycopy(value, 0, newInstance3, length, length2);
value = newInstance3;
} else {
newInstance2 = Array.newInstance(obj2.getClass(), 2);
Array.set(newInstance2, 0, obj2);
Array.set(newInstance2, 1, value);
value = newInstance2;
}
} else {
if (cls2.isArray() && cls2.getComponentType().equals(cls)) {
int length3 = Array.getLength(obj2);
newInstance = Array.newInstance(value.getClass(), length3 + 1);
System.arraycopy(obj2, 0, newInstance, 0, length3);
Array.set(newInstance, length3, value);
} else if (cls.isArray() && cls.getComponentType().equals(cls2)) {
int length4 = Array.getLength(value);
newInstance = Array.newInstance(obj2.getClass(), length4 + 1);
System.arraycopy(value, 0, newInstance, 0, length4);
Array.set(newInstance, length4, obj2);
} else {
throw new IllegalArgumentException();
}
value = newInstance;
}
hashMap.put(str, value);
}
}
}
builder.b(hashMap);
return builder.a();
}
}