soul-browser/app/smali/com/google/android/gms/common/BlockingServiceConnection.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

250 lines
5.8 KiB
Smali

.class public Lcom/google/android/gms/common/BlockingServiceConnection;
.super Ljava/lang/Object;
.source "SourceFile"
# interfaces
.implements Landroid/content/ServiceConnection;
# annotations
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
# instance fields
.field zza:Z
.field private final zzb:Ljava/util/concurrent/BlockingQueue;
# direct methods
.method public constructor <init>()V
.locals 1
.line 1
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
.line 2
.line 3
.line 4
const/4 v0, 0x0
.line 5
iput-boolean v0, p0, Lcom/google/android/gms/common/BlockingServiceConnection;->zza:Z
.line 6
.line 7
new-instance v0, Ljava/util/concurrent/LinkedBlockingQueue;
.line 8
.line 9
invoke-direct {v0}, Ljava/util/concurrent/LinkedBlockingQueue;-><init>()V
.line 10
.line 11
.line 12
iput-object v0, p0, Lcom/google/android/gms/common/BlockingServiceConnection;->zzb:Ljava/util/concurrent/BlockingQueue;
.line 13
.line 14
return-void
.end method
# virtual methods
.method public getService()Landroid/os/IBinder;
.locals 2
.annotation build Landroidx/annotation/NonNull;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.line 1
const-string v0, "BlockingServiceConnection.getService() called on main thread"
.line 2
.line 3
invoke-static {v0}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotMainThread(Ljava/lang/String;)V
.line 4
.line 5
.line 6
iget-boolean v0, p0, Lcom/google/android/gms/common/BlockingServiceConnection;->zza:Z
.line 7
.line 8
if-nez v0, :cond_0
.line 9
.line 10
const/4 v0, 0x1
.line 11
iput-boolean v0, p0, Lcom/google/android/gms/common/BlockingServiceConnection;->zza:Z
.line 12
.line 13
iget-object v0, p0, Lcom/google/android/gms/common/BlockingServiceConnection;->zzb:Ljava/util/concurrent/BlockingQueue;
.line 14
.line 15
invoke-interface {v0}, Ljava/util/concurrent/BlockingQueue;->take()Ljava/lang/Object;
.line 16
.line 17
.line 18
move-result-object v0
.line 19
check-cast v0, Landroid/os/IBinder;
.line 20
.line 21
return-object v0
.line 22
:cond_0
new-instance v0, Ljava/lang/IllegalStateException;
.line 23
.line 24
const-string v1, "Cannot call get on this connection more than once"
.line 25
.line 26
invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
.line 27
.line 28
.line 29
throw v0
.end method
.method public getServiceWithTimeout(JLjava/util/concurrent/TimeUnit;)Landroid/os/IBinder;
.locals 1
.param p3 # Ljava/util/concurrent/TimeUnit;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.annotation build Landroidx/annotation/NonNull;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.line 1
const-string v0, "BlockingServiceConnection.getServiceWithTimeout() called on main thread"
.line 2
.line 3
invoke-static {v0}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotMainThread(Ljava/lang/String;)V
.line 4
.line 5
.line 6
iget-boolean v0, p0, Lcom/google/android/gms/common/BlockingServiceConnection;->zza:Z
.line 7
.line 8
if-nez v0, :cond_1
.line 9
.line 10
const/4 v0, 0x1
.line 11
iput-boolean v0, p0, Lcom/google/android/gms/common/BlockingServiceConnection;->zza:Z
.line 12
.line 13
iget-object v0, p0, Lcom/google/android/gms/common/BlockingServiceConnection;->zzb:Ljava/util/concurrent/BlockingQueue;
.line 14
.line 15
invoke-interface {v0, p1, p2, p3}, Ljava/util/concurrent/BlockingQueue;->poll(JLjava/util/concurrent/TimeUnit;)Ljava/lang/Object;
.line 16
.line 17
.line 18
move-result-object p1
.line 19
check-cast p1, Landroid/os/IBinder;
.line 20
.line 21
if-eqz p1, :cond_0
.line 22
.line 23
return-object p1
.line 24
:cond_0
new-instance p1, Ljava/util/concurrent/TimeoutException;
.line 25
.line 26
const-string p2, "Timed out waiting for the service connection"
.line 27
.line 28
invoke-direct {p1, p2}, Ljava/util/concurrent/TimeoutException;-><init>(Ljava/lang/String;)V
.line 29
.line 30
.line 31
throw p1
.line 32
:cond_1
new-instance p1, Ljava/lang/IllegalStateException;
.line 33
.line 34
const-string p2, "Cannot call get on this connection more than once"
.line 35
.line 36
invoke-direct {p1, p2}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
.line 37
.line 38
.line 39
throw p1
.end method
.method public final onServiceConnected(Landroid/content/ComponentName;Landroid/os/IBinder;)V
.locals 0
.param p1 # Landroid/content/ComponentName;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p2 # Landroid/os/IBinder;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.line 1
iget-object p1, p0, Lcom/google/android/gms/common/BlockingServiceConnection;->zzb:Ljava/util/concurrent/BlockingQueue;
.line 2
.line 3
invoke-interface {p1, p2}, Ljava/util/concurrent/BlockingQueue;->add(Ljava/lang/Object;)Z
.line 4
.line 5
.line 6
return-void
.end method
.method public final onServiceDisconnected(Landroid/content/ComponentName;)V
.locals 0
.param p1 # Landroid/content/ComponentName;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
return-void
.end method