soul-browser/sources/java/j$/util/i.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

296 lines
8.8 KiB
Java

package j$.util;
import j$.util.Map;
import j$.util.concurrent.ConcurrentMap;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.concurrent.ConcurrentMap;
import java.util.function.BiConsumer;
import java.util.function.BiFunction;
import java.util.function.Function;
/* loaded from: classes2.dex */
public final class i implements java.util.Map, Serializable, Map {
private static final long serialVersionUID = 1978198479659022715L;
/* renamed from: a, reason: collision with root package name */
public final java.util.Map f21351a;
public final i b = this;
/* renamed from: c, reason: collision with root package name */
public transient k f21352c;
public transient k d;
public transient g e;
public i(java.util.Map map) {
this.f21351a = (java.util.Map) Objects.requireNonNull(map);
}
@Override // java.util.Map
public final int size() {
int size;
synchronized (this.b) {
size = this.f21351a.size();
}
return size;
}
@Override // java.util.Map
public final boolean isEmpty() {
boolean isEmpty;
synchronized (this.b) {
isEmpty = this.f21351a.isEmpty();
}
return isEmpty;
}
@Override // java.util.Map
public final boolean containsKey(Object obj) {
boolean containsKey;
synchronized (this.b) {
containsKey = this.f21351a.containsKey(obj);
}
return containsKey;
}
@Override // java.util.Map
public final boolean containsValue(Object obj) {
boolean containsValue;
synchronized (this.b) {
containsValue = this.f21351a.containsValue(obj);
}
return containsValue;
}
@Override // java.util.Map
public final Object get(Object obj) {
Object obj2;
synchronized (this.b) {
obj2 = this.f21351a.get(obj);
}
return obj2;
}
@Override // java.util.Map
public final Object put(Object obj, Object obj2) {
Object put;
synchronized (this.b) {
put = this.f21351a.put(obj, obj2);
}
return put;
}
@Override // java.util.Map
public final Object remove(Object obj) {
Object remove;
synchronized (this.b) {
remove = this.f21351a.remove(obj);
}
return remove;
}
@Override // java.util.Map
public final void putAll(java.util.Map map) {
synchronized (this.b) {
this.f21351a.putAll(map);
}
}
@Override // java.util.Map
public final void clear() {
synchronized (this.b) {
this.f21351a.clear();
}
}
/* JADX WARN: Type inference failed for: r1v3, types: [j$.util.g, j$.util.k] */
@Override // java.util.Map
public final java.util.Set keySet() {
k kVar;
synchronized (this.b) {
try {
if (this.f21352c == null) {
this.f21352c = new g(this.f21351a.keySet(), this.b);
}
kVar = this.f21352c;
} catch (Throwable th) {
throw th;
}
}
return kVar;
}
/* JADX WARN: Type inference failed for: r1v3, types: [j$.util.g, j$.util.k] */
@Override // java.util.Map
public final java.util.Set entrySet() {
k kVar;
synchronized (this.b) {
try {
if (this.d == null) {
this.d = new g(this.f21351a.entrySet(), this.b);
}
kVar = this.d;
} catch (Throwable th) {
throw th;
}
}
return kVar;
}
@Override // java.util.Map
public final java.util.Collection values() {
g gVar;
synchronized (this.b) {
try {
if (this.e == null) {
this.e = new g(this.f21351a.values(), this.b);
}
gVar = this.e;
} catch (Throwable th) {
throw th;
}
}
return gVar;
}
@Override // java.util.Map
public final boolean equals(Object obj) {
boolean equals;
if (this == obj) {
return true;
}
synchronized (this.b) {
equals = this.f21351a.equals(obj);
}
return equals;
}
@Override // java.util.Map
public final int hashCode() {
int hashCode;
synchronized (this.b) {
hashCode = this.f21351a.hashCode();
}
return hashCode;
}
public final String toString() {
String obj;
synchronized (this.b) {
obj = this.f21351a.toString();
}
return obj;
}
@Override // java.util.Map, j$.util.Map
public final Object getOrDefault(Object obj, Object obj2) {
Object orDefault;
synchronized (this.b) {
orDefault = Map.EL.getOrDefault(this.f21351a, obj, obj2);
}
return orDefault;
}
@Override // java.util.Map, j$.util.Map
public final void forEach(BiConsumer biConsumer) {
synchronized (this.b) {
Map.EL.forEach(this.f21351a, biConsumer);
}
}
@Override // java.util.Map, j$.util.Map
public final void replaceAll(BiFunction biFunction) {
synchronized (this.b) {
java.util.Map map = this.f21351a;
if (map instanceof Map) {
((Map) map).replaceAll(biFunction);
} else if (map instanceof ConcurrentMap) {
ConcurrentMap.CC.$default$replaceAll((java.util.concurrent.ConcurrentMap) map, biFunction);
} else {
Map.CC.$default$replaceAll(map, biFunction);
}
}
}
@Override // java.util.Map, j$.util.Map
public final Object putIfAbsent(Object obj, Object obj2) {
Object a2;
synchronized (this.b) {
a2 = Map.EL.a(this.f21351a, obj, obj2);
}
return a2;
}
@Override // java.util.Map, j$.util.Map
public final boolean remove(Object obj, Object obj2) {
boolean remove;
synchronized (this.b) {
remove = Map.EL.remove(this.f21351a, obj, obj2);
}
return remove;
}
@Override // java.util.Map, j$.util.Map
public final boolean replace(Object obj, Object obj2, Object obj3) {
boolean replace;
synchronized (this.b) {
java.util.Map map = this.f21351a;
replace = map instanceof Map ? ((Map) map).replace(obj, obj2, obj3) : Map.CC.$default$replace(map, obj, obj2, obj3);
}
return replace;
}
@Override // java.util.Map, j$.util.Map
public final Object replace(Object obj, Object obj2) {
Object replace;
synchronized (this.b) {
java.util.Map map = this.f21351a;
replace = map instanceof Map ? ((Map) map).replace(obj, obj2) : Map.CC.$default$replace(map, obj, obj2);
}
return replace;
}
@Override // java.util.Map, j$.util.Map
public final Object computeIfAbsent(Object obj, Function function) {
Object computeIfAbsent;
synchronized (this.b) {
computeIfAbsent = Map.EL.computeIfAbsent(this.f21351a, obj, function);
}
return computeIfAbsent;
}
@Override // java.util.Map, j$.util.Map
public final Object computeIfPresent(Object obj, BiFunction biFunction) {
Object computeIfPresent;
synchronized (this.b) {
java.util.Map map = this.f21351a;
computeIfPresent = map instanceof Map ? ((Map) map).computeIfPresent(obj, biFunction) : map instanceof java.util.concurrent.ConcurrentMap ? ConcurrentMap.CC.$default$computeIfPresent((java.util.concurrent.ConcurrentMap) map, obj, biFunction) : Map.CC.$default$computeIfPresent(map, obj, biFunction);
}
return computeIfPresent;
}
@Override // java.util.Map, j$.util.Map
public final Object compute(Object obj, BiFunction biFunction) {
Object compute;
synchronized (this.b) {
compute = Map.EL.compute(this.f21351a, obj, biFunction);
}
return compute;
}
@Override // java.util.Map, j$.util.Map
public final Object merge(Object obj, Object obj2, BiFunction biFunction) {
Object merge;
synchronized (this.b) {
java.util.Map map = this.f21351a;
merge = map instanceof Map ? ((Map) map).merge(obj, obj2, biFunction) : map instanceof java.util.concurrent.ConcurrentMap ? ConcurrentMap.CC.$default$merge((java.util.concurrent.ConcurrentMap) map, obj, obj2, biFunction) : Map.CC.$default$merge(map, obj, obj2, biFunction);
}
return merge;
}
private void writeObject(ObjectOutputStream objectOutputStream) {
synchronized (this.b) {
objectOutputStream.defaultWriteObject();
}
}
}