KaKi87
550ddb0413
* 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>
302 lines
6.1 KiB
Smali
302 lines
6.1 KiB
Smali
.class public final Lcom/google/android/gms/common/internal/zal;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# instance fields
|
|
.field private final zaa:Landroid/util/SparseIntArray;
|
|
|
|
.field private zab:Lcom/google/android/gms/common/GoogleApiAvailabilityLight;
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>()V
|
|
.locals 1
|
|
|
|
.line 1
|
|
invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->getInstance()Lcom/google/android/gms/common/GoogleApiAvailability;
|
|
|
|
move-result-object v0
|
|
|
|
invoke-direct {p0, v0}, Lcom/google/android/gms/common/internal/zal;-><init>(Lcom/google/android/gms/common/GoogleApiAvailabilityLight;)V
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>(Lcom/google/android/gms/common/GoogleApiAvailabilityLight;)V
|
|
.locals 1
|
|
.param p1 # Lcom/google/android/gms/common/GoogleApiAvailabilityLight;
|
|
.annotation build Landroidx/annotation/NonNull;
|
|
.end annotation
|
|
.end param
|
|
|
|
.line 2
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
new-instance v0, Landroid/util/SparseIntArray;
|
|
|
|
invoke-direct {v0}, Landroid/util/SparseIntArray;-><init>()V
|
|
|
|
iput-object v0, p0, Lcom/google/android/gms/common/internal/zal;->zaa:Landroid/util/SparseIntArray;
|
|
|
|
.line 3
|
|
invoke-static {p1}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
iput-object p1, p0, Lcom/google/android/gms/common/internal/zal;->zab:Lcom/google/android/gms/common/GoogleApiAvailabilityLight;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final zaa(Landroid/content/Context;Lcom/google/android/gms/common/api/Api$Client;)I
|
|
.locals 5
|
|
.param p1 # Landroid/content/Context;
|
|
.annotation build Landroidx/annotation/NonNull;
|
|
.end annotation
|
|
.end param
|
|
.param p2 # Lcom/google/android/gms/common/api/Api$Client;
|
|
.annotation build Landroidx/annotation/NonNull;
|
|
.end annotation
|
|
.end param
|
|
|
|
.line 1
|
|
invoke-static {p1}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
invoke-static {p2}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 5
|
|
.line 6
|
|
.line 7
|
|
invoke-interface {p2}, Lcom/google/android/gms/common/api/Api$Client;->requiresGooglePlayServices()Z
|
|
|
|
.line 8
|
|
.line 9
|
|
.line 10
|
|
move-result v0
|
|
|
|
.line 11
|
|
const/4 v1, 0x0
|
|
|
|
.line 12
|
|
if-nez v0, :cond_0
|
|
|
|
.line 13
|
|
.line 14
|
|
return v1
|
|
|
|
.line 15
|
|
:cond_0
|
|
invoke-interface {p2}, Lcom/google/android/gms/common/api/Api$Client;->getMinApkVersion()I
|
|
|
|
.line 16
|
|
.line 17
|
|
.line 18
|
|
move-result p2
|
|
|
|
.line 19
|
|
invoke-virtual {p0, p1, p2}, Lcom/google/android/gms/common/internal/zal;->zab(Landroid/content/Context;I)I
|
|
|
|
.line 20
|
|
.line 21
|
|
.line 22
|
|
move-result v0
|
|
|
|
.line 23
|
|
const/4 v2, -0x1
|
|
|
|
.line 24
|
|
if-eq v0, v2, :cond_1
|
|
|
|
.line 25
|
|
.line 26
|
|
return v0
|
|
|
|
.line 27
|
|
:cond_1
|
|
iget-object v0, p0, Lcom/google/android/gms/common/internal/zal;->zaa:Landroid/util/SparseIntArray;
|
|
|
|
.line 28
|
|
.line 29
|
|
monitor-enter v0
|
|
|
|
.line 30
|
|
move v3, v1
|
|
|
|
.line 31
|
|
:goto_0
|
|
:try_start_0
|
|
invoke-virtual {v0}, Landroid/util/SparseIntArray;->size()I
|
|
|
|
.line 32
|
|
.line 33
|
|
.line 34
|
|
move-result v4
|
|
|
|
.line 35
|
|
if-ge v3, v4, :cond_3
|
|
|
|
.line 36
|
|
.line 37
|
|
invoke-virtual {v0, v3}, Landroid/util/SparseIntArray;->keyAt(I)I
|
|
|
|
.line 38
|
|
.line 39
|
|
.line 40
|
|
move-result v4
|
|
|
|
.line 41
|
|
if-le v4, p2, :cond_2
|
|
|
|
.line 42
|
|
.line 43
|
|
invoke-virtual {v0, v4}, Landroid/util/SparseIntArray;->get(I)I
|
|
|
|
.line 44
|
|
.line 45
|
|
.line 46
|
|
move-result v4
|
|
|
|
.line 47
|
|
if-nez v4, :cond_2
|
|
|
|
.line 48
|
|
.line 49
|
|
goto :goto_1
|
|
|
|
.line 50
|
|
:catchall_0
|
|
move-exception p1
|
|
|
|
.line 51
|
|
goto :goto_2
|
|
|
|
.line 52
|
|
:cond_2
|
|
add-int/lit8 v3, v3, 0x1
|
|
|
|
.line 53
|
|
.line 54
|
|
goto :goto_0
|
|
|
|
.line 55
|
|
:cond_3
|
|
move v1, v2
|
|
|
|
.line 56
|
|
:goto_1
|
|
if-ne v1, v2, :cond_4
|
|
|
|
.line 57
|
|
.line 58
|
|
iget-object v1, p0, Lcom/google/android/gms/common/internal/zal;->zab:Lcom/google/android/gms/common/GoogleApiAvailabilityLight;
|
|
|
|
.line 59
|
|
.line 60
|
|
invoke-virtual {v1, p1, p2}, Lcom/google/android/gms/common/GoogleApiAvailabilityLight;->isGooglePlayServicesAvailable(Landroid/content/Context;I)I
|
|
|
|
.line 61
|
|
.line 62
|
|
.line 63
|
|
move-result v1
|
|
|
|
.line 64
|
|
:cond_4
|
|
invoke-virtual {v0, p2, v1}, Landroid/util/SparseIntArray;->put(II)V
|
|
|
|
.line 65
|
|
.line 66
|
|
.line 67
|
|
monitor-exit v0
|
|
|
|
.line 68
|
|
return v1
|
|
|
|
.line 69
|
|
:goto_2
|
|
monitor-exit v0
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
.line 70
|
|
throw p1
|
|
.end method
|
|
|
|
.method public final zab(Landroid/content/Context;I)I
|
|
.locals 1
|
|
|
|
.line 1
|
|
iget-object p1, p0, Lcom/google/android/gms/common/internal/zal;->zaa:Landroid/util/SparseIntArray;
|
|
|
|
.line 2
|
|
.line 3
|
|
monitor-enter p1
|
|
|
|
.line 4
|
|
const/4 v0, -0x1
|
|
|
|
.line 5
|
|
:try_start_0
|
|
invoke-virtual {p1, p2, v0}, Landroid/util/SparseIntArray;->get(II)I
|
|
|
|
.line 6
|
|
.line 7
|
|
.line 8
|
|
move-result p2
|
|
|
|
.line 9
|
|
monitor-exit p1
|
|
|
|
.line 10
|
|
return p2
|
|
|
|
.line 11
|
|
:catchall_0
|
|
move-exception p2
|
|
|
|
.line 12
|
|
monitor-exit p1
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
.line 13
|
|
throw p2
|
|
.end method
|
|
|
|
.method public final zac()V
|
|
.locals 2
|
|
|
|
.line 1
|
|
iget-object v0, p0, Lcom/google/android/gms/common/internal/zal;->zaa:Landroid/util/SparseIntArray;
|
|
|
|
.line 2
|
|
.line 3
|
|
monitor-enter v0
|
|
|
|
.line 4
|
|
:try_start_0
|
|
invoke-virtual {v0}, Landroid/util/SparseIntArray;->clear()V
|
|
|
|
.line 5
|
|
.line 6
|
|
.line 7
|
|
monitor-exit v0
|
|
|
|
.line 8
|
|
return-void
|
|
|
|
.line 9
|
|
:catchall_0
|
|
move-exception v1
|
|
|
|
.line 10
|
|
monitor-exit v0
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
.line 11
|
|
throw v1
|
|
.end method
|