soul-browser/sources/java/com/google/mlkit/common/sdkinternal/TaskQueue.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

74 lines
2.3 KiB
Java

package com.google.mlkit.common.sdkinternal;
import com.google.android.gms.common.annotation.KeepForSdk;
import java.util.ArrayDeque;
import java.util.concurrent.Executor;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.atomic.AtomicReference;
@KeepForSdk
/* loaded from: classes3.dex */
public class TaskQueue {
public boolean b;
/* renamed from: a, reason: collision with root package name */
public final Object f12780a = new Object();
/* renamed from: c, reason: collision with root package name */
public final ArrayDeque f12781c = new ArrayDeque();
public final AtomicReference d = new AtomicReference();
public final void a(Runnable runnable, Executor executor) {
synchronized (this.f12780a) {
try {
if (this.b) {
this.f12781c.add(new zzv(runnable, executor));
} else {
this.b = true;
c(runnable, executor);
}
} catch (Throwable th) {
throw th;
}
}
}
public final void b() {
synchronized (this.f12780a) {
try {
if (this.f12781c.isEmpty()) {
this.b = false;
return;
}
zzv zzvVar = (zzv) this.f12781c.remove();
c(zzvVar.b, zzvVar.f12797a);
} catch (Throwable th) {
throw th;
}
}
}
public final void c(final Runnable runnable, Executor executor) {
try {
executor.execute(new Runnable() { // from class: com.google.mlkit.common.sdkinternal.zzt
@Override // java.lang.Runnable
public final void run() {
zzx zzxVar = new zzx(TaskQueue.this);
try {
runnable.run();
zzxVar.close();
} catch (Throwable th) {
try {
zzxVar.close();
} catch (Throwable th2) {
th.addSuppressed(th2);
}
throw th;
}
}
});
} catch (RejectedExecutionException unused) {
b();
}
}
}