* 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>
89 lines
2.6 KiB
Java
89 lines
2.6 KiB
Java
package j$.util.stream;
|
|
|
|
import j$.util.Spliterator;
|
|
import j$.util.concurrent.ConcurrentHashMap;
|
|
import j$.util.function.Consumer$CC;
|
|
import java.util.Comparator;
|
|
import java.util.function.Consumer;
|
|
|
|
/* loaded from: classes2.dex */
|
|
public final class q7 implements Spliterator, Consumer {
|
|
public static final Object d = new Object();
|
|
|
|
/* renamed from: a, reason: collision with root package name */
|
|
public final Spliterator f21483a;
|
|
public final ConcurrentHashMap b;
|
|
|
|
/* renamed from: c, reason: collision with root package name */
|
|
public Object f21484c;
|
|
|
|
public final /* synthetic */ Consumer andThen(Consumer consumer) {
|
|
return Consumer$CC.$default$andThen(this, consumer);
|
|
}
|
|
|
|
@Override // j$.util.Spliterator
|
|
public final /* synthetic */ long getExactSizeIfKnown() {
|
|
return Spliterator.CC.$default$getExactSizeIfKnown(this);
|
|
}
|
|
|
|
@Override // j$.util.Spliterator
|
|
public final /* synthetic */ boolean hasCharacteristics(int i) {
|
|
return Spliterator.CC.$default$hasCharacteristics(this, i);
|
|
}
|
|
|
|
public q7(Spliterator spliterator, ConcurrentHashMap concurrentHashMap) {
|
|
this.f21483a = spliterator;
|
|
this.b = concurrentHashMap;
|
|
}
|
|
|
|
@Override // java.util.function.Consumer
|
|
/* renamed from: accept */
|
|
public final void n(Object obj) {
|
|
this.f21484c = obj;
|
|
}
|
|
|
|
@Override // j$.util.Spliterator
|
|
public final boolean tryAdvance(Consumer consumer) {
|
|
while (this.f21483a.tryAdvance(this)) {
|
|
Object obj = this.f21484c;
|
|
if (obj == null) {
|
|
obj = d;
|
|
}
|
|
if (this.b.putIfAbsent(obj, Boolean.TRUE) == null) {
|
|
consumer.n(this.f21484c);
|
|
this.f21484c = null;
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
@Override // j$.util.Spliterator
|
|
public final void forEachRemaining(Consumer consumer) {
|
|
this.f21483a.forEachRemaining(new j$.util.concurrent.t(8, this, consumer));
|
|
}
|
|
|
|
@Override // j$.util.Spliterator
|
|
public final Spliterator trySplit() {
|
|
Spliterator trySplit = this.f21483a.trySplit();
|
|
if (trySplit != null) {
|
|
return new q7(trySplit, this.b);
|
|
}
|
|
return null;
|
|
}
|
|
|
|
@Override // j$.util.Spliterator
|
|
public final long estimateSize() {
|
|
return this.f21483a.estimateSize();
|
|
}
|
|
|
|
@Override // j$.util.Spliterator
|
|
public final int characteristics() {
|
|
return (this.f21483a.characteristics() & (-16469)) | 1;
|
|
}
|
|
|
|
@Override // j$.util.Spliterator
|
|
public final Comparator getComparator() {
|
|
return this.f21483a.getComparator();
|
|
}
|
|
}
|