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

795 lines
16 KiB
Smali

.class public Lcom/google/android/gms/common/api/GoogleApiActivity;
.super Landroid/app/Activity;
.source "SourceFile"
# interfaces
.implements Landroid/content/DialogInterface$OnCancelListener;
# annotations
.annotation build Lcom/google/android/gms/common/annotation/KeepName;
.end annotation
# instance fields
.field protected zaa:I
.annotation build Landroidx/annotation/VisibleForTesting;
.end annotation
.end field
# direct methods
.method public constructor <init>()V
.locals 1
.line 1
invoke-direct {p0}, Landroid/app/Activity;-><init>()V
.line 2
.line 3
.line 4
const/4 v0, 0x0
.line 5
iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->zaa:I
.line 6
.line 7
return-void
.end method
.method public static zaa(Landroid/content/Context;Landroid/app/PendingIntent;IZ)Landroid/content/Intent;
.locals 2
.param p0 # Landroid/content/Context;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.param p1 # Landroid/app/PendingIntent;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.annotation build Landroidx/annotation/NonNull;
.end annotation
.line 1
new-instance v0, Landroid/content/Intent;
.line 2
.line 3
const-class v1, Lcom/google/android/gms/common/api/GoogleApiActivity;
.line 4
.line 5
invoke-direct {v0, p0, v1}, Landroid/content/Intent;-><init>(Landroid/content/Context;Ljava/lang/Class;)V
.line 6
.line 7
.line 8
const-string p0, "pending_intent"
.line 9
.line 10
invoke-virtual {v0, p0, p1}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Landroid/os/Parcelable;)Landroid/content/Intent;
.line 11
.line 12
.line 13
const-string p0, "failing_client_id"
.line 14
.line 15
invoke-virtual {v0, p0, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;I)Landroid/content/Intent;
.line 16
.line 17
.line 18
const-string p0, "notify_manager"
.line 19
.line 20
invoke-virtual {v0, p0, p3}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent;
.line 21
.line 22
.line 23
return-object v0
.end method
.method private final zab()V
.locals 12
.line 1
invoke-virtual {p0}, Landroid/app/Activity;->getIntent()Landroid/content/Intent;
.line 2
.line 3
.line 4
move-result-object v0
.line 5
invoke-virtual {v0}, Landroid/content/Intent;->getExtras()Landroid/os/Bundle;
.line 6
.line 7
.line 8
move-result-object v1
.line 9
const-string v2, "GoogleApiActivity"
.line 10
.line 11
if-nez v1, :cond_0
.line 12
.line 13
const-string v0, "Activity started without extras"
.line 14
.line 15
invoke-static {v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
.line 16
.line 17
.line 18
invoke-virtual {p0}, Landroid/app/Activity;->finish()V
.line 19
.line 20
.line 21
return-void
.line 22
:cond_0
const-string v0, "pending_intent"
.line 23
.line 24
invoke-virtual {v1, v0}, Landroid/os/BaseBundle;->get(Ljava/lang/String;)Ljava/lang/Object;
.line 25
.line 26
.line 27
move-result-object v0
.line 28
move-object v3, v0
.line 29
check-cast v3, Landroid/app/PendingIntent;
.line 30
.line 31
const-string v0, "error_code"
.line 32
.line 33
invoke-virtual {v1, v0}, Landroid/os/BaseBundle;->get(Ljava/lang/String;)Ljava/lang/Object;
.line 34
.line 35
.line 36
move-result-object v0
.line 37
check-cast v0, Ljava/lang/Integer;
.line 38
.line 39
if-nez v3, :cond_2
.line 40
.line 41
if-eqz v0, :cond_1
.line 42
.line 43
goto :goto_0
.line 44
:cond_1
const-string v0, "Activity started without resolution"
.line 45
.line 46
invoke-static {v2, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;)I
.line 47
.line 48
.line 49
invoke-virtual {p0}, Landroid/app/Activity;->finish()V
.line 50
.line 51
.line 52
return-void
.line 53
:cond_2
:goto_0
const/4 v4, 0x1
.line 54
if-eqz v3, :cond_5
.line 55
.line 56
:try_start_0
invoke-virtual {v3}, Landroid/app/PendingIntent;->getIntentSender()Landroid/content/IntentSender;
.line 57
.line 58
.line 59
move-result-object v6
:try_end_0
.catch Landroid/content/ActivityNotFoundException; {:try_start_0 .. :try_end_0} :catch_3
.catch Landroid/content/IntentSender$SendIntentException; {:try_start_0 .. :try_end_0} :catch_2
.line 60
const/4 v10, 0x0
.line 61
const/4 v11, 0x0
.line 62
const/4 v7, 0x1
.line 63
const/4 v8, 0x0
.line 64
const/4 v9, 0x0
.line 65
move-object v5, p0
.line 66
:try_start_1
invoke-virtual/range {v5 .. v11}, Landroid/app/Activity;->startIntentSenderForResult(Landroid/content/IntentSender;ILandroid/content/Intent;III)V
.line 67
.line 68
.line 69
iput v4, v5, Lcom/google/android/gms/common/api/GoogleApiActivity;->zaa:I
:try_end_1
.catch Landroid/content/ActivityNotFoundException; {:try_start_1 .. :try_end_1} :catch_1
.catch Landroid/content/IntentSender$SendIntentException; {:try_start_1 .. :try_end_1} :catch_0
.line 70
.line 71
return-void
.line 72
:catch_0
move-exception v0
.line 73
goto :goto_1
.line 74
:catch_1
move-exception v0
.line 75
goto :goto_2
.line 76
:catch_2
move-exception v0
.line 77
move-object v5, p0
.line 78
:goto_1
const-string v1, "Failed to launch pendingIntent"
.line 79
.line 80
invoke-static {v2, v1, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
.line 81
.line 82
.line 83
invoke-virtual {p0}, Landroid/app/Activity;->finish()V
.line 84
.line 85
.line 86
return-void
.line 87
:catch_3
move-exception v0
.line 88
move-object v5, p0
.line 89
:goto_2
const-string v6, "notify_manager"
.line 90
.line 91
invoke-virtual {v1, v6, v4}, Landroid/os/BaseBundle;->getBoolean(Ljava/lang/String;Z)Z
.line 92
.line 93
.line 94
move-result v1
.line 95
if-eqz v1, :cond_3
.line 96
.line 97
invoke-static {p0}, Lcom/google/android/gms/common/api/internal/GoogleApiManager;->zaa(Landroid/content/Context;)Lcom/google/android/gms/common/api/internal/GoogleApiManager;
.line 98
.line 99
.line 100
move-result-object v0
.line 101
new-instance v1, Lcom/google/android/gms/common/ConnectionResult;
.line 102
.line 103
const/16 v2, 0x16
.line 104
.line 105
const/4 v3, 0x0
.line 106
invoke-direct {v1, v2, v3}, Lcom/google/android/gms/common/ConnectionResult;-><init>(ILandroid/app/PendingIntent;)V
.line 107
.line 108
.line 109
invoke-virtual {p0}, Landroid/app/Activity;->getIntent()Landroid/content/Intent;
.line 110
.line 111
.line 112
move-result-object v2
.line 113
const-string v3, "failing_client_id"
.line 114
.line 115
const/4 v6, -0x1
.line 116
invoke-virtual {v2, v3, v6}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I
.line 117
.line 118
.line 119
move-result v2
.line 120
invoke-virtual {v0, v1, v2}, Lcom/google/android/gms/common/api/internal/GoogleApiManager;->zaq(Lcom/google/android/gms/common/ConnectionResult;I)V
.line 121
.line 122
.line 123
goto :goto_3
.line 124
:cond_3
invoke-virtual {v3}, Ljava/lang/Object;->toString()Ljava/lang/String;
.line 125
.line 126
.line 127
move-result-object v1
.line 128
invoke-virtual {v1}, Ljava/lang/String;->length()I
.line 129
.line 130
.line 131
move-result v3
.line 132
new-instance v6, Ljava/lang/StringBuilder;
.line 133
.line 134
add-int/lit8 v3, v3, 0x24
.line 135
.line 136
invoke-direct {v6, v3}, Ljava/lang/StringBuilder;-><init>(I)V
.line 137
.line 138
.line 139
const-string v3, "Activity not found while launching "
.line 140
.line 141
const-string v7, "."
.line 142
.line 143
invoke-static {v6, v3, v1, v7}, Landroid/support/v4/media/a;->q(Ljava/lang/StringBuilder;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
.line 144
.line 145
.line 146
move-result-object v1
.line 147
sget-object v3, Landroid/os/Build;->FINGERPRINT:Ljava/lang/String;
.line 148
.line 149
const-string v6, "generic"
.line 150
.line 151
invoke-virtual {v3, v6}, Ljava/lang/String;->contains(Ljava/lang/CharSequence;)Z
.line 152
.line 153
.line 154
move-result v3
.line 155
if-eqz v3, :cond_4
.line 156
.line 157
const-string v3, " This may occur when resolving Google Play services connection issues on emulators with Google APIs but not Google Play Store."
.line 158
.line 159
invoke-virtual {v1, v3}, Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String;
.line 160
.line 161
.line 162
move-result-object v1
.line 163
:cond_4
invoke-static {v2, v1, v0}, Landroid/util/Log;->e(Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)I
.line 164
.line 165
.line 166
:goto_3
iput v4, v5, Lcom/google/android/gms/common/api/GoogleApiActivity;->zaa:I
.line 167
.line 168
invoke-virtual {p0}, Landroid/app/Activity;->finish()V
.line 169
.line 170
.line 171
return-void
.line 172
:cond_5
move-object v5, p0
.line 173
invoke-static {v0}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
.line 174
.line 175
.line 176
move-result-object v0
.line 177
check-cast v0, Ljava/lang/Integer;
.line 178
.line 179
invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
.line 180
.line 181
.line 182
move-result v0
.line 183
invoke-static {}, Lcom/google/android/gms/common/GoogleApiAvailability;->getInstance()Lcom/google/android/gms/common/GoogleApiAvailability;
.line 184
.line 185
.line 186
move-result-object v1
.line 187
const/4 v2, 0x2
.line 188
invoke-virtual {v1, p0, v0, v2, p0}, Lcom/google/android/gms/common/GoogleApiAvailability;->showErrorDialogFragment(Landroid/app/Activity;IILandroid/content/DialogInterface$OnCancelListener;)Z
.line 189
.line 190
.line 191
iput v4, v5, Lcom/google/android/gms/common/api/GoogleApiActivity;->zaa:I
.line 192
.line 193
return-void
.end method
# virtual methods
.method public final onActivityResult(IILandroid/content/Intent;)V
.locals 3
.param p3 # Landroid/content/Intent;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.line 1
invoke-super {p0, p1, p2, p3}, Landroid/app/Activity;->onActivityResult(IILandroid/content/Intent;)V
.line 2
.line 3
.line 4
const/4 v0, 0x0
.line 5
const/4 v1, 0x1
.line 6
if-ne p1, v1, :cond_2
.line 7
.line 8
invoke-virtual {p0}, Landroid/app/Activity;->getIntent()Landroid/content/Intent;
.line 9
.line 10
.line 11
move-result-object p1
.line 12
const-string v2, "notify_manager"
.line 13
.line 14
invoke-virtual {p1, v2, v1}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z
.line 15
.line 16
.line 17
move-result p1
.line 18
iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->zaa:I
.line 19
.line 20
invoke-virtual {p0, p2, p3}, Landroid/app/Activity;->setResult(ILandroid/content/Intent;)V
.line 21
.line 22
.line 23
if-eqz p1, :cond_3
.line 24
.line 25
invoke-static {p0}, Lcom/google/android/gms/common/api/internal/GoogleApiManager;->zaa(Landroid/content/Context;)Lcom/google/android/gms/common/api/internal/GoogleApiManager;
.line 26
.line 27
.line 28
move-result-object p1
.line 29
const/4 p3, -0x1
.line 30
if-eq p2, p3, :cond_1
.line 31
.line 32
if-eqz p2, :cond_0
.line 33
.line 34
goto :goto_0
.line 35
:cond_0
new-instance p2, Lcom/google/android/gms/common/ConnectionResult;
.line 36
.line 37
const/16 v0, 0xd
.line 38
.line 39
const/4 v1, 0x0
.line 40
invoke-direct {p2, v0, v1}, Lcom/google/android/gms/common/ConnectionResult;-><init>(ILandroid/app/PendingIntent;)V
.line 41
.line 42
.line 43
invoke-virtual {p0}, Landroid/app/Activity;->getIntent()Landroid/content/Intent;
.line 44
.line 45
.line 46
move-result-object v0
.line 47
const-string v1, "failing_client_id"
.line 48
.line 49
invoke-virtual {v0, v1, p3}, Landroid/content/Intent;->getIntExtra(Ljava/lang/String;I)I
.line 50
.line 51
.line 52
move-result p3
.line 53
invoke-virtual {p1, p2, p3}, Lcom/google/android/gms/common/api/internal/GoogleApiManager;->zaq(Lcom/google/android/gms/common/ConnectionResult;I)V
.line 54
.line 55
.line 56
goto :goto_0
.line 57
:cond_1
invoke-virtual {p1}, Lcom/google/android/gms/common/api/internal/GoogleApiManager;->zai()V
.line 58
.line 59
.line 60
goto :goto_0
.line 61
:cond_2
const/4 v1, 0x2
.line 62
if-ne p1, v1, :cond_3
.line 63
.line 64
iput v0, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->zaa:I
.line 65
.line 66
invoke-virtual {p0, p2, p3}, Landroid/app/Activity;->setResult(ILandroid/content/Intent;)V
.line 67
.line 68
.line 69
:cond_3
:goto_0
invoke-virtual {p0}, Landroid/app/Activity;->finish()V
.line 70
.line 71
.line 72
return-void
.end method
.method public final onCancel(Landroid/content/DialogInterface;)V
.locals 0
.param p1 # Landroid/content/DialogInterface;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.line 1
const/4 p1, 0x0
.line 2
iput p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->zaa:I
.line 3
.line 4
invoke-virtual {p0, p1}, Landroid/app/Activity;->setResult(I)V
.line 5
.line 6
.line 7
invoke-virtual {p0}, Landroid/app/Activity;->finish()V
.line 8
.line 9
.line 10
return-void
.end method
.method public final onCreate(Landroid/os/Bundle;)V
.locals 1
.param p1 # Landroid/os/Bundle;
.annotation build Landroidx/annotation/Nullable;
.end annotation
.end param
.line 1
invoke-super {p0, p1}, Landroid/app/Activity;->onCreate(Landroid/os/Bundle;)V
.line 2
.line 3
.line 4
if-eqz p1, :cond_0
.line 5
.line 6
const-string v0, "resolution"
.line 7
.line 8
invoke-virtual {p1, v0}, Landroid/os/BaseBundle;->getInt(Ljava/lang/String;)I
.line 9
.line 10
.line 11
move-result p1
.line 12
iput p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->zaa:I
.line 13
.line 14
:cond_0
iget p1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->zaa:I
.line 15
.line 16
const/4 v0, 0x1
.line 17
if-eq p1, v0, :cond_1
.line 18
.line 19
invoke-direct {p0}, Lcom/google/android/gms/common/api/GoogleApiActivity;->zab()V
.line 20
.line 21
.line 22
:cond_1
return-void
.end method
.method public final onSaveInstanceState(Landroid/os/Bundle;)V
.locals 2
.param p1 # Landroid/os/Bundle;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.line 1
const-string v0, "resolution"
.line 2
.line 3
iget v1, p0, Lcom/google/android/gms/common/api/GoogleApiActivity;->zaa:I
.line 4
.line 5
invoke-virtual {p1, v0, v1}, Landroid/os/BaseBundle;->putInt(Ljava/lang/String;I)V
.line 6
.line 7
.line 8
invoke-super {p0, p1}, Landroid/app/Activity;->onSaveInstanceState(Landroid/os/Bundle;)V
.line 9
.line 10
.line 11
return-void
.end method