soul-browser/app/smali_classes3/com/google/mlkit/common/sdkinternal/ModelResource.smali
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

196 lines
5 KiB
Smali

.class public abstract Lcom/google/mlkit/common/sdkinternal/ModelResource;
.super Ljava/lang/Object;
.source "SourceFile"
# annotations
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
# instance fields
.field public final a:Lcom/google/mlkit/common/sdkinternal/TaskQueue;
.field public final b:Ljava/util/concurrent/atomic/AtomicInteger;
.field public final c:Ljava/util/concurrent/atomic/AtomicBoolean;
# direct methods
.method public constructor <init>(Lcom/google/mlkit/common/sdkinternal/TaskQueue;)V
.locals 2
.line 1
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
.line 2
.line 3
.line 4
new-instance v0, Ljava/util/concurrent/atomic/AtomicInteger;
.line 5
.line 6
const/4 v1, 0x0
.line 7
invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicInteger;-><init>(I)V
.line 8
.line 9
.line 10
iput-object v0, p0, Lcom/google/mlkit/common/sdkinternal/ModelResource;->b:Ljava/util/concurrent/atomic/AtomicInteger;
.line 11
.line 12
new-instance v0, Ljava/util/concurrent/atomic/AtomicBoolean;
.line 13
.line 14
invoke-direct {v0, v1}, Ljava/util/concurrent/atomic/AtomicBoolean;-><init>(Z)V
.line 15
.line 16
.line 17
iput-object v0, p0, Lcom/google/mlkit/common/sdkinternal/ModelResource;->c:Ljava/util/concurrent/atomic/AtomicBoolean;
.line 18
.line 19
iput-object p1, p0, Lcom/google/mlkit/common/sdkinternal/ModelResource;->a:Lcom/google/mlkit/common/sdkinternal/TaskQueue;
.line 20
.line 21
return-void
.end method
# virtual methods
.method public final a(Ljava/util/concurrent/Executor;Ljava/util/concurrent/Callable;Lcom/google/android/gms/tasks/CancellationToken;)Lcom/google/android/gms/tasks/Task;
.locals 7
.line 1
iget-object v0, p0, Lcom/google/mlkit/common/sdkinternal/ModelResource;->b:Ljava/util/concurrent/atomic/AtomicInteger;
.line 2
.line 3
invoke-virtual {v0}, Ljava/util/concurrent/atomic/AtomicInteger;->get()I
.line 4
.line 5
.line 6
move-result v0
.line 7
if-lez v0, :cond_0
.line 8
.line 9
const/4 v0, 0x1
.line 10
goto :goto_0
.line 11
:cond_0
const/4 v0, 0x0
.line 12
:goto_0
invoke-static {v0}, Lcom/google/android/gms/common/internal/Preconditions;->checkState(Z)V
.line 13
.line 14
.line 15
invoke-virtual {p3}, Lcom/google/android/gms/tasks/CancellationToken;->a()Z
.line 16
.line 17
.line 18
move-result v0
.line 19
if-eqz v0, :cond_1
.line 20
.line 21
invoke-static {}, Lcom/google/android/gms/tasks/Tasks;->c()Lcom/google/android/gms/tasks/Task;
.line 22
.line 23
.line 24
move-result-object p1
.line 25
return-object p1
.line 26
:cond_1
new-instance v3, Lcom/google/android/gms/tasks/CancellationTokenSource;
.line 27
.line 28
invoke-direct {v3}, Lcom/google/android/gms/tasks/CancellationTokenSource;-><init>()V
.line 29
.line 30
.line 31
new-instance v5, Lcom/google/android/gms/tasks/TaskCompletionSource;
.line 32
.line 33
iget-object v0, v3, Lcom/google/android/gms/tasks/CancellationTokenSource;->a:Lcom/google/android/gms/tasks/zzb;
.line 34
.line 35
invoke-direct {v5, v0}, Lcom/google/android/gms/tasks/TaskCompletionSource;-><init>(Lcom/google/android/gms/tasks/CancellationToken;)V
.line 36
.line 37
.line 38
new-instance v6, Lcom/google/mlkit/common/sdkinternal/zzm;
.line 39
.line 40
invoke-direct {v6, p1, p3, v3, v5}, Lcom/google/mlkit/common/sdkinternal/zzm;-><init>(Ljava/util/concurrent/Executor;Lcom/google/android/gms/tasks/CancellationToken;Lcom/google/android/gms/tasks/CancellationTokenSource;Lcom/google/android/gms/tasks/TaskCompletionSource;)V
.line 41
.line 42
.line 43
new-instance v0, Lcom/google/mlkit/common/sdkinternal/zzn;
.line 44
.line 45
move-object v1, p0
.line 46
move-object v4, p2
.line 47
move-object v2, p3
.line 48
invoke-direct/range {v0 .. v5}, Lcom/google/mlkit/common/sdkinternal/zzn;-><init>(Lcom/google/mlkit/common/sdkinternal/ModelResource;Lcom/google/android/gms/tasks/CancellationToken;Lcom/google/android/gms/tasks/CancellationTokenSource;Ljava/util/concurrent/Callable;Lcom/google/android/gms/tasks/TaskCompletionSource;)V
.line 49
.line 50
.line 51
iget-object p1, v1, Lcom/google/mlkit/common/sdkinternal/ModelResource;->a:Lcom/google/mlkit/common/sdkinternal/TaskQueue;
.line 52
.line 53
invoke-virtual {p1, v0, v6}, Lcom/google/mlkit/common/sdkinternal/TaskQueue;->a(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)V
.line 54
.line 55
.line 56
iget-object p1, v5, Lcom/google/android/gms/tasks/TaskCompletionSource;->a:Lcom/google/android/gms/tasks/zzw;
.line 57
.line 58
return-object p1
.end method
.method public abstract b()V
.end method
.method public abstract c()V
.end method