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

207 lines
6 KiB
Java

package j$.util;
import j$.util.Collection;
import j$.util.Spliterator;
import j$.util.stream.Stream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.Iterator;
import java.util.function.Consumer;
import java.util.function.IntFunction;
import java.util.function.Predicate;
/* loaded from: classes2.dex */
public class g implements java.util.Collection, Serializable, Collection {
private static final long serialVersionUID = 3053995032091335093L;
/* renamed from: a, reason: collision with root package name */
public final java.util.Collection f21347a;
public final Object b;
@Override // java.util.Collection, j$.util.Collection
public final /* synthetic */ Object[] toArray(IntFunction intFunction) {
return Collection.CC.$default$toArray(this, intFunction);
}
public g(java.util.Collection collection) {
this.f21347a = (java.util.Collection) Objects.requireNonNull(collection);
this.b = this;
}
public g(java.util.Collection collection, Object obj) {
this.f21347a = (java.util.Collection) Objects.requireNonNull(collection);
this.b = Objects.requireNonNull(obj);
}
@Override // java.util.Collection
public final int size() {
int size;
synchronized (this.b) {
size = this.f21347a.size();
}
return size;
}
@Override // java.util.Collection
public final boolean isEmpty() {
boolean isEmpty;
synchronized (this.b) {
isEmpty = this.f21347a.isEmpty();
}
return isEmpty;
}
@Override // java.util.Collection
public final boolean contains(Object obj) {
boolean contains;
synchronized (this.b) {
contains = this.f21347a.contains(obj);
}
return contains;
}
@Override // java.util.Collection
public final Object[] toArray() {
Object[] array;
synchronized (this.b) {
array = this.f21347a.toArray();
}
return array;
}
@Override // java.util.Collection
public final Object[] toArray(Object[] objArr) {
Object[] array;
synchronized (this.b) {
array = this.f21347a.toArray(objArr);
}
return array;
}
@Override // java.util.Collection, java.lang.Iterable
public final Iterator iterator() {
return this.f21347a.iterator();
}
@Override // java.util.Collection
public final boolean add(Object obj) {
boolean add;
synchronized (this.b) {
add = this.f21347a.add(obj);
}
return add;
}
@Override // java.util.Collection
public final boolean remove(Object obj) {
boolean remove;
synchronized (this.b) {
remove = this.f21347a.remove(obj);
}
return remove;
}
@Override // java.util.Collection
public final boolean containsAll(java.util.Collection collection) {
boolean containsAll;
synchronized (this.b) {
containsAll = this.f21347a.containsAll(collection);
}
return containsAll;
}
@Override // java.util.Collection
public final boolean addAll(java.util.Collection collection) {
boolean addAll;
synchronized (this.b) {
addAll = this.f21347a.addAll(collection);
}
return addAll;
}
@Override // java.util.Collection
public final boolean removeAll(java.util.Collection collection) {
boolean removeAll;
synchronized (this.b) {
removeAll = this.f21347a.removeAll(collection);
}
return removeAll;
}
@Override // java.util.Collection
public final boolean retainAll(java.util.Collection collection) {
boolean retainAll;
synchronized (this.b) {
retainAll = this.f21347a.retainAll(collection);
}
return retainAll;
}
@Override // java.util.Collection
public final void clear() {
synchronized (this.b) {
this.f21347a.clear();
}
}
public final String toString() {
String obj;
synchronized (this.b) {
obj = this.f21347a.toString();
}
return obj;
}
@Override // java.lang.Iterable, j$.util.Collection, j$.lang.Iterable
public final void forEach(Consumer consumer) {
synchronized (this.b) {
Collection.EL.a(this.f21347a, consumer);
}
}
@Override // java.util.Collection, j$.util.Collection
public final boolean removeIf(Predicate predicate) {
boolean removeIf;
synchronized (this.b) {
java.util.Collection collection = this.f21347a;
removeIf = collection instanceof Collection ? ((Collection) collection).removeIf(predicate) : Collection.CC.$default$removeIf(collection, predicate);
}
return removeIf;
}
@Override // java.util.Collection, java.lang.Iterable, j$.util.Collection, j$.lang.Iterable
public final Spliterator spliterator() {
return Collection.EL.c(this.f21347a);
}
@Override // java.util.Collection, java.lang.Iterable
public final java.util.Spliterator spliterator() {
return Spliterator.Wrapper.convert(Collection.EL.c(this.f21347a));
}
@Override // java.util.Collection, j$.util.Collection
public final Stream stream() {
return Collection.EL.stream(this.f21347a);
}
@Override // java.util.Collection
public final java.util.stream.Stream stream() {
return Stream.Wrapper.convert(Collection.EL.stream(this.f21347a));
}
@Override // java.util.Collection, j$.util.Collection
public final Stream parallelStream() {
return Collection.EL.b(this.f21347a);
}
@Override // java.util.Collection
public final java.util.stream.Stream parallelStream() {
return Stream.Wrapper.convert(Collection.EL.b(this.f21347a));
}
private void writeObject(ObjectOutputStream objectOutputStream) {
synchronized (this.b) {
objectOutputStream.defaultWriteObject();
}
}
}