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

81 lines
2.4 KiB
Java

package j$.util;
import j$.util.Spliterator;
import j$.util.function.LongConsumer$CC;
import java.util.NoSuchElementException;
import java.util.function.Consumer;
import java.util.function.LongConsumer;
/* loaded from: classes2.dex */
public final class b1 implements PrimitiveIterator$OfLong, LongConsumer, a0 {
/* renamed from: a, reason: collision with root package name */
public boolean f21298a = false;
public long b;
/* renamed from: c, reason: collision with root package name */
public final /* synthetic */ Spliterator.OfLong f21299c;
public final /* synthetic */ LongConsumer andThen(LongConsumer longConsumer) {
return LongConsumer$CC.$default$andThen(this, longConsumer);
}
@Override // j$.util.o0
public final void forEachRemaining(LongConsumer longConsumer) {
Objects.requireNonNull(longConsumer);
while (hasNext()) {
longConsumer.accept(nextLong());
}
}
@Override // java.util.Iterator
public final Long next() {
if (o1.f21369a) {
o1.a(b1.class, "{0} calling PrimitiveIterator.OfLong.nextLong()");
throw null;
}
return Long.valueOf(nextLong());
}
@Override // j$.util.PrimitiveIterator$OfLong, java.util.Iterator
public final void forEachRemaining(Consumer consumer) {
if (consumer instanceof LongConsumer) {
forEachRemaining((LongConsumer) consumer);
return;
}
Objects.requireNonNull(consumer);
if (o1.f21369a) {
o1.a(b1.class, "{0} calling PrimitiveIterator.OfLong.forEachRemainingLong(action::accept)");
throw null;
}
Objects.requireNonNull(consumer);
forEachRemaining((LongConsumer) new l0(consumer, 0));
}
public b1(Spliterator.OfLong ofLong) {
this.f21299c = ofLong;
}
@Override // java.util.function.LongConsumer
public final void accept(long j) {
this.f21298a = true;
this.b = j;
}
@Override // java.util.Iterator
public final boolean hasNext() {
if (!this.f21298a) {
this.f21299c.tryAdvance((LongConsumer) this);
}
return this.f21298a;
}
@Override // j$.util.PrimitiveIterator$OfLong
public final long nextLong() {
if (!this.f21298a && !hasNext()) {
throw new NoSuchElementException();
}
this.f21298a = false;
return this.b;
}
}