VibedByKaKi/soul-browser
1
3
Fork 0
Code Issues Pull requests Releases 12 Activity
soul-browser/app/smali/com/google/android/gms/common/data/EntityBuffer.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

847 lines
17 KiB
Smali
Raw Permalink Blame History

.class public abstract Lcom/google/android/gms/common/data/EntityBuffer;
.super Lcom/google/android/gms/common/data/AbstractDataBuffer;
.source "SourceFile"
# annotations
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
"<T:",
"Ljava/lang/Object;",
">",
"Lcom/google/android/gms/common/data/AbstractDataBuffer<",
"TT;>;"
}
.end annotation
# instance fields
.field private zaa:Z
.field private zab:Ljava/util/ArrayList;
# direct methods
.method public constructor <init>(Lcom/google/android/gms/common/data/DataHolder;)V
.locals 0
.param p1 # Lcom/google/android/gms/common/data/DataHolder;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
invoke-direct {p0, p1}, Lcom/google/android/gms/common/data/AbstractDataBuffer;-><init>(Lcom/google/android/gms/common/data/DataHolder;)V
const/4 p1, 0x0
iput-boolean p1, p0, Lcom/google/android/gms/common/data/EntityBuffer;->zaa:Z
return-void
.end method
.method private final zab()V
.locals 10
.line 1
const-string v0, ", for window: "
.line 2
.line 3
const-string v1, ", at row: "
.line 4
.line 5
const-string v2, "Missing value for markerColumn: "
.line 6
.line 7
monitor-enter p0
.line 8
:try_start_0
iget-boolean v3, p0, Lcom/google/android/gms/common/data/EntityBuffer;->zaa:Z
.line 9
.line 10
if-nez v3, :cond_3
.line 11
.line 12
iget-object v3, p0, Lcom/google/android/gms/common/data/AbstractDataBuffer;->mDataHolder:Lcom/google/android/gms/common/data/DataHolder;
.line 13
.line 14
invoke-static {v3}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
.line 15
.line 16
.line 17
move-result-object v3
.line 18
check-cast v3, Lcom/google/android/gms/common/data/DataHolder;
.line 19
.line 20
invoke-virtual {v3}, Lcom/google/android/gms/common/data/DataHolder;->getCount()I
.line 21
.line 22
.line 23
move-result v3
.line 24
new-instance v4, Ljava/util/ArrayList;
.line 25
.line 26
invoke-direct {v4}, Ljava/util/ArrayList;-><init>()V
.line 27
.line 28
.line 29
iput-object v4, p0, Lcom/google/android/gms/common/data/EntityBuffer;->zab:Ljava/util/ArrayList;
.line 30
.line 31
const/4 v5, 0x1
.line 32
if-lez v3, :cond_2
.line 33
.line 34
const/4 v6, 0x0
.line 35
invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
.line 36
.line 37
.line 38
move-result-object v7
.line 39
invoke-virtual {v4, v7}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
.line 40
.line 41
.line 42
invoke-virtual {p0}, Lcom/google/android/gms/common/data/EntityBuffer;->getPrimaryDataMarkerColumn()Ljava/lang/String;
.line 43
.line 44
.line 45
move-result-object v4
.line 46
iget-object v7, p0, Lcom/google/android/gms/common/data/AbstractDataBuffer;->mDataHolder:Lcom/google/android/gms/common/data/DataHolder;
.line 47
.line 48
invoke-virtual {v7, v6}, Lcom/google/android/gms/common/data/DataHolder;->getWindowIndex(I)I
.line 49
.line 50
.line 51
move-result v7
.line 52
iget-object v8, p0, Lcom/google/android/gms/common/data/AbstractDataBuffer;->mDataHolder:Lcom/google/android/gms/common/data/DataHolder;
.line 53
.line 54
invoke-virtual {v8, v4, v6, v7}, Lcom/google/android/gms/common/data/DataHolder;->getString(Ljava/lang/String;II)Ljava/lang/String;
.line 55
.line 56
.line 57
move-result-object v6
.line 58
move v7, v5
.line 59
:goto_0
if-ge v7, v3, :cond_2
.line 60
.line 61
iget-object v8, p0, Lcom/google/android/gms/common/data/AbstractDataBuffer;->mDataHolder:Lcom/google/android/gms/common/data/DataHolder;
.line 62
.line 63
invoke-virtual {v8, v7}, Lcom/google/android/gms/common/data/DataHolder;->getWindowIndex(I)I
.line 64
.line 65
.line 66
move-result v8
.line 67
iget-object v9, p0, Lcom/google/android/gms/common/data/AbstractDataBuffer;->mDataHolder:Lcom/google/android/gms/common/data/DataHolder;
.line 68
.line 69
invoke-virtual {v9, v4, v7, v8}, Lcom/google/android/gms/common/data/DataHolder;->getString(Ljava/lang/String;II)Ljava/lang/String;
.line 70
.line 71
.line 72
move-result-object v9
.line 73
if-eqz v9, :cond_1
.line 74
.line 75
invoke-virtual {v9, v6}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
.line 76
.line 77
.line 78
move-result v8
.line 79
if-nez v8, :cond_0
.line 80
.line 81
iget-object v6, p0, Lcom/google/android/gms/common/data/EntityBuffer;->zab:Ljava/util/ArrayList;
.line 82
.line 83
invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
.line 84
.line 85
.line 86
move-result-object v8
.line 87
invoke-virtual {v6, v8}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
.line 88
.line 89
.line 90
move-object v6, v9
.line 91
goto :goto_1
.line 92
:catchall_0
move-exception v0
.line 93
goto :goto_2
.line 94
:cond_0
:goto_1
add-int/lit8 v7, v7, 0x1
.line 95
.line 96
goto :goto_0
.line 97
:cond_1
new-instance v3, Ljava/lang/NullPointerException;
.line 98
.line 99
invoke-static {v4}, Ljava/lang/String;->valueOf(Ljava/lang/Object;)Ljava/lang/String;
.line 100
.line 101
.line 102
move-result-object v5
.line 103
invoke-virtual {v5}, Ljava/lang/String;->length()I
.line 104
.line 105
.line 106
move-result v5
.line 107
add-int/lit8 v5, v5, 0x2a
.line 108
.line 109
invoke-static {v7}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
.line 110
.line 111
.line 112
move-result-object v6
.line 113
invoke-virtual {v6}, Ljava/lang/String;->length()I
.line 114
.line 115
.line 116
move-result v6
.line 117
add-int/2addr v5, v6
.line 118
add-int/lit8 v5, v5, 0xe
.line 119
.line 120
invoke-static {v8}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
.line 121
.line 122
.line 123
move-result-object v6
.line 124
invoke-virtual {v6}, Ljava/lang/String;->length()I
.line 125
.line 126
.line 127
move-result v6
.line 128
add-int/2addr v5, v6
.line 129
new-instance v6, Ljava/lang/StringBuilder;
.line 130
.line 131
invoke-direct {v6, v5}, Ljava/lang/StringBuilder;-><init>(I)V
.line 132
.line 133
.line 134
invoke-virtual {v6, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
.line 135
.line 136
.line 137
invoke-virtual {v6, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
.line 138
.line 139
.line 140
invoke-virtual {v6, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
.line 141
.line 142
.line 143
invoke-virtual {v6, v7}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
.line 144
.line 145
.line 146
invoke-virtual {v6, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
.line 147
.line 148
.line 149
invoke-virtual {v6, v8}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder;
.line 150
.line 151
.line 152
invoke-virtual {v6}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
.line 153
.line 154
.line 155
move-result-object v0
.line 156
invoke-direct {v3, v0}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
.line 157
.line 158
.line 159
throw v3
.line 160
:cond_2
iput-boolean v5, p0, Lcom/google/android/gms/common/data/EntityBuffer;->zaa:Z
.line 161
.line 162
:cond_3
monitor-exit p0
.line 163
return-void
.line 164
:goto_2
monitor-exit p0
:try_end_0
.catchall {:try_start_0 .. :try_end_0} :catchall_0
.line 165
throw v0
.end method
# virtual methods
.method public final get(I)Ljava/lang/Object;
.locals 6
.annotation build Landroidx/annotation/NonNull;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
"(I)TT;"
}
.end annotation
.line 1
invoke-direct {p0}, Lcom/google/android/gms/common/data/EntityBuffer;->zab()V
.line 2
.line 3
.line 4
invoke-virtual {p0, p1}, Lcom/google/android/gms/common/data/EntityBuffer;->zaa(I)I
.line 5
.line 6
.line 7
move-result v0
.line 8
const/4 v1, 0x0
.line 9
if-ltz p1, :cond_4
.line 10
.line 11
iget-object v2, p0, Lcom/google/android/gms/common/data/EntityBuffer;->zab:Ljava/util/ArrayList;
.line 12
.line 13
invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
.line 14
.line 15
.line 16
move-result v2
.line 17
if-ne p1, v2, :cond_0
.line 18
.line 19
goto :goto_2
.line 20
:cond_0
iget-object v2, p0, Lcom/google/android/gms/common/data/EntityBuffer;->zab:Ljava/util/ArrayList;
.line 21
.line 22
invoke-virtual {v2}, Ljava/util/ArrayList;->size()I
.line 23
.line 24
.line 25
move-result v2
.line 26
add-int/lit8 v2, v2, -0x1
.line 27
.line 28
if-ne p1, v2, :cond_1
.line 29
.line 30
iget-object v2, p0, Lcom/google/android/gms/common/data/AbstractDataBuffer;->mDataHolder:Lcom/google/android/gms/common/data/DataHolder;
.line 31
.line 32
invoke-static {v2}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
.line 33
.line 34
.line 35
move-result-object v2
.line 36
check-cast v2, Lcom/google/android/gms/common/data/DataHolder;
.line 37
.line 38
invoke-virtual {v2}, Lcom/google/android/gms/common/data/DataHolder;->getCount()I
.line 39
.line 40
.line 41
move-result v2
.line 42
iget-object v3, p0, Lcom/google/android/gms/common/data/EntityBuffer;->zab:Ljava/util/ArrayList;
.line 43
.line 44
invoke-virtual {v3, p1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
.line 45
.line 46
.line 47
move-result-object v3
.line 48
check-cast v3, Ljava/lang/Integer;
.line 49
.line 50
invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I
.line 51
.line 52
.line 53
move-result v3
.line 54
:goto_0
sub-int/2addr v2, v3
.line 55
goto :goto_1
.line 56
:cond_1
iget-object v2, p0, Lcom/google/android/gms/common/data/EntityBuffer;->zab:Ljava/util/ArrayList;
.line 57
.line 58
add-int/lit8 v3, p1, 0x1
.line 59
.line 60
invoke-virtual {v2, v3}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
.line 61
.line 62
.line 63
move-result-object v2
.line 64
check-cast v2, Ljava/lang/Integer;
.line 65
.line 66
invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I
.line 67
.line 68
.line 69
move-result v2
.line 70
iget-object v3, p0, Lcom/google/android/gms/common/data/EntityBuffer;->zab:Ljava/util/ArrayList;
.line 71
.line 72
invoke-virtual {v3, p1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
.line 73
.line 74
.line 75
move-result-object v3
.line 76
check-cast v3, Ljava/lang/Integer;
.line 77
.line 78
invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I
.line 79
.line 80
.line 81
move-result v3
.line 82
goto :goto_0
.line 83
:goto_1
const/4 v3, 0x1
.line 84
if-ne v2, v3, :cond_3
.line 85
.line 86
invoke-virtual {p0, p1}, Lcom/google/android/gms/common/data/EntityBuffer;->zaa(I)I
.line 87
.line 88
.line 89
move-result p1
.line 90
iget-object v2, p0, Lcom/google/android/gms/common/data/AbstractDataBuffer;->mDataHolder:Lcom/google/android/gms/common/data/DataHolder;
.line 91
.line 92
invoke-static {v2}, Lcom/google/android/gms/common/internal/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
.line 93
.line 94
.line 95
move-result-object v2
.line 96
check-cast v2, Lcom/google/android/gms/common/data/DataHolder;
.line 97
.line 98
invoke-virtual {v2, p1}, Lcom/google/android/gms/common/data/DataHolder;->getWindowIndex(I)I
.line 99
.line 100
.line 101
move-result v2
.line 102
invoke-virtual {p0}, Lcom/google/android/gms/common/data/EntityBuffer;->getChildDataMarkerColumn()Ljava/lang/String;
.line 103
.line 104
.line 105
move-result-object v4
.line 106
if-eqz v4, :cond_2
.line 107
.line 108
iget-object v5, p0, Lcom/google/android/gms/common/data/AbstractDataBuffer;->mDataHolder:Lcom/google/android/gms/common/data/DataHolder;
.line 109
.line 110
invoke-virtual {v5, v4, p1, v2}, Lcom/google/android/gms/common/data/DataHolder;->getString(Ljava/lang/String;II)Ljava/lang/String;
.line 111
.line 112
.line 113
move-result-object p1
.line 114
if-nez p1, :cond_2
.line 115
.line 116
goto :goto_2
.line 117
:cond_2
move v1, v3
.line 118
goto :goto_2
.line 119
:cond_3
move v1, v2
.line 120
:cond_4
:goto_2
invoke-virtual {p0, v0, v1}, Lcom/google/android/gms/common/data/EntityBuffer;->getEntry(II)Ljava/lang/Object;
.line 121
.line 122
.line 123
move-result-object p1
.line 124
return-object p1
.end method
.method public getChildDataMarkerColumn()Ljava/lang/String;
.locals 1
.annotation build Landroidx/annotation/Nullable;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
const/4 v0, 0x0
return-object v0
.end method
.method public getCount()I
.locals 1
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.line 1
invoke-direct {p0}, Lcom/google/android/gms/common/data/EntityBuffer;->zab()V
.line 2
.line 3
.line 4
iget-object v0, p0, Lcom/google/android/gms/common/data/EntityBuffer;->zab:Ljava/util/ArrayList;
.line 5
.line 6
invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
.line 7
.line 8
.line 9
move-result v0
.line 10
return v0
.end method
.method public abstract getEntry(II)Ljava/lang/Object;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
"(II)TT;"
}
.end annotation
.end method
.method public abstract getPrimaryDataMarkerColumn()Ljava/lang/String;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
.end annotation
.end method
.method public final zaa(I)I
.locals 4
.line 1
if-ltz p1, :cond_0
.line 2
.line 3
iget-object v0, p0, Lcom/google/android/gms/common/data/EntityBuffer;->zab:Ljava/util/ArrayList;
.line 4
.line 5
invoke-virtual {v0}, Ljava/util/ArrayList;->size()I
.line 6
.line 7
.line 8
move-result v0
.line 9
if-ge p1, v0, :cond_0
.line 10
.line 11
iget-object v0, p0, Lcom/google/android/gms/common/data/EntityBuffer;->zab:Ljava/util/ArrayList;
.line 12
.line 13
invoke-virtual {v0, p1}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object;
.line 14
.line 15
.line 16
move-result-object p1
.line 17
check-cast p1, Ljava/lang/Integer;
.line 18
.line 19
invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
.line 20
.line 21
.line 22
move-result p1
.line 23
return p1
.line 24
:cond_0
new-instance v0, Ljava/lang/IllegalArgumentException;
.line 25
.line 26
invoke-static {p1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String;
.line 27
.line 28
.line 29
move-result-object v1
.line 30
invoke-virtual {v1}, Ljava/lang/String;->length()I
.line 31
.line 32
.line 33
move-result v1
.line 34
new-instance v2, Ljava/lang/StringBuilder;
.line 35
.line 36
add-int/lit8 v1, v1, 0x2a
.line 37
.line 38
invoke-direct {v2, v1}, Ljava/lang/StringBuilder;-><init>(I)V
.line 39
.line 40
.line 41
const-string v1, "Position "
.line 42
.line 43
const-string v3, " is out of bounds for this buffer"
.line 44
.line 45
invoke-static {v2, v1, p1, v3}, Landroidx/work/impl/workers/a;->t(Ljava/lang/StringBuilder;Ljava/lang/String;ILjava/lang/String;)Ljava/lang/String;
.line 46
.line 47
.line 48
move-result-object p1
.line 49
invoke-direct {v0, p1}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
.line 50
.line 51
.line 52
throw v0
.end method
View git blame Copy permalink