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

107 lines
4.3 KiB
Java

package com.google.mlkit.common.sdkinternal;
import com.google.android.gms.common.annotation.KeepForSdk;
import com.google.android.gms.common.internal.Preconditions;
import com.google.android.gms.tasks.CancellationToken;
import com.google.android.gms.tasks.CancellationTokenSource;
import com.google.android.gms.tasks.Task;
import com.google.android.gms.tasks.TaskCompletionSource;
import com.google.android.gms.tasks.Tasks;
import com.google.mlkit.common.MlKitException;
import java.util.concurrent.Callable;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@KeepForSdk
/* loaded from: classes3.dex */
public abstract class ModelResource {
/* renamed from: a, reason: collision with root package name */
public final TaskQueue f12774a;
public final AtomicInteger b = new AtomicInteger(0);
/* renamed from: c, reason: collision with root package name */
public final AtomicBoolean f12775c = new AtomicBoolean(false);
public ModelResource(TaskQueue taskQueue) {
this.f12774a = taskQueue;
}
public final Task a(final Executor executor, final Callable callable, final CancellationToken cancellationToken) {
boolean z;
if (this.b.get() > 0) {
z = true;
} else {
z = false;
}
Preconditions.checkState(z);
if (cancellationToken.a()) {
return Tasks.c();
}
final CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
final TaskCompletionSource taskCompletionSource = new TaskCompletionSource(cancellationTokenSource.f11603a);
Executor executor2 = new Executor() { // from class: com.google.mlkit.common.sdkinternal.zzm
@Override // java.util.concurrent.Executor
public final void execute(Runnable runnable) {
try {
executor.execute(runnable);
} catch (RuntimeException e) {
if (cancellationToken.a()) {
cancellationTokenSource.a();
} else {
taskCompletionSource.a(e);
}
throw e;
}
}
};
this.f12774a.a(new Runnable() { // from class: com.google.mlkit.common.sdkinternal.zzn
@Override // java.lang.Runnable
public final void run() {
Callable callable2 = callable;
TaskCompletionSource taskCompletionSource2 = taskCompletionSource;
ModelResource modelResource = ModelResource.this;
AtomicBoolean atomicBoolean = modelResource.f12775c;
CancellationToken cancellationToken2 = cancellationToken;
boolean a2 = cancellationToken2.a();
CancellationTokenSource cancellationTokenSource2 = cancellationTokenSource;
try {
if (a2) {
cancellationTokenSource2.a();
return;
}
try {
if (!atomicBoolean.get()) {
modelResource.b();
atomicBoolean.set(true);
}
if (cancellationToken2.a()) {
cancellationTokenSource2.a();
return;
}
Object call = callable2.call();
if (cancellationToken2.a()) {
cancellationTokenSource2.a();
} else {
taskCompletionSource2.b(call);
}
} catch (RuntimeException e) {
throw new MlKitException(e, "Internal error has occurred when executing ML Kit tasks");
}
} catch (Exception e2) {
if (cancellationToken2.a()) {
cancellationTokenSource2.a();
} else {
taskCompletionSource2.a(e2);
}
}
}
}, executor2);
return taskCompletionSource.f11605a;
}
public abstract void b();
public abstract void c();
}