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>
413 lines
7.6 KiB
Smali
413 lines
7.6 KiB
Smali
.class final Lcom/google/api/client/util/ByteStreams$LimitedInputStream;
|
|
.super Ljava/io/FilterInputStream;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation system Ldalvik/annotation/EnclosingClass;
|
|
value = Lcom/google/api/client/util/ByteStreams;
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/InnerClass;
|
|
accessFlags = 0x19
|
|
name = "LimitedInputStream"
|
|
.end annotation
|
|
|
|
|
|
# instance fields
|
|
.field private left:J
|
|
|
|
.field private mark:J
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Ljava/io/InputStream;J)V
|
|
.locals 2
|
|
|
|
.line 1
|
|
invoke-direct {p0, p1}, Ljava/io/FilterInputStream;-><init>(Ljava/io/InputStream;)V
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
const-wide/16 v0, -0x1
|
|
|
|
.line 5
|
|
.line 6
|
|
iput-wide v0, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->mark:J
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-static {p1}, Lcom/google/api/client/util/Preconditions;->checkNotNull(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
const-wide/16 v0, 0x0
|
|
|
|
.line 12
|
|
.line 13
|
|
cmp-long p1, p2, v0
|
|
|
|
.line 14
|
|
.line 15
|
|
if-ltz p1, :cond_0
|
|
|
|
.line 16
|
|
.line 17
|
|
const/4 p1, 0x1
|
|
|
|
.line 18
|
|
goto :goto_0
|
|
|
|
.line 19
|
|
:cond_0
|
|
const/4 p1, 0x0
|
|
|
|
.line 20
|
|
:goto_0
|
|
const-string v0, "limit must be non-negative"
|
|
|
|
.line 21
|
|
.line 22
|
|
invoke-static {p1, v0}, Lcom/google/api/client/util/Preconditions;->checkArgument(ZLjava/lang/Object;)V
|
|
|
|
.line 23
|
|
.line 24
|
|
.line 25
|
|
iput-wide p2, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->left:J
|
|
|
|
.line 26
|
|
.line 27
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public available()I
|
|
.locals 4
|
|
|
|
.line 1
|
|
iget-object v0, p0, Ljava/io/FilterInputStream;->in:Ljava/io/InputStream;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-virtual {v0}, Ljava/io/InputStream;->available()I
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
move-result v0
|
|
|
|
.line 7
|
|
int-to-long v0, v0
|
|
|
|
.line 8
|
|
iget-wide v2, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->left:J
|
|
|
|
.line 9
|
|
.line 10
|
|
invoke-static {v0, v1, v2, v3}, Ljava/lang/Math;->min(JJ)J
|
|
|
|
.line 11
|
|
.line 12
|
|
.line 13
|
|
move-result-wide v0
|
|
|
|
.line 14
|
|
long-to-int v0, v0
|
|
|
|
.line 15
|
|
return v0
|
|
.end method
|
|
|
|
.method public declared-synchronized mark(I)V
|
|
.locals 2
|
|
|
|
.line 1
|
|
monitor-enter p0
|
|
|
|
.line 2
|
|
:try_start_0
|
|
iget-object v0, p0, Ljava/io/FilterInputStream;->in:Ljava/io/InputStream;
|
|
|
|
.line 3
|
|
.line 4
|
|
invoke-virtual {v0, p1}, Ljava/io/InputStream;->mark(I)V
|
|
|
|
.line 5
|
|
.line 6
|
|
.line 7
|
|
iget-wide v0, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->left:J
|
|
|
|
.line 8
|
|
.line 9
|
|
iput-wide v0, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->mark:J
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
.line 10
|
|
.line 11
|
|
monitor-exit p0
|
|
|
|
.line 12
|
|
return-void
|
|
|
|
.line 13
|
|
:catchall_0
|
|
move-exception p1
|
|
|
|
.line 14
|
|
:try_start_1
|
|
monitor-exit p0
|
|
:try_end_1
|
|
.catchall {:try_start_1 .. :try_end_1} :catchall_0
|
|
|
|
.line 15
|
|
throw p1
|
|
.end method
|
|
|
|
.method public read()I
|
|
.locals 5
|
|
|
|
.line 1
|
|
iget-wide v0, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->left:J
|
|
|
|
const-wide/16 v2, 0x0
|
|
|
|
cmp-long v0, v0, v2
|
|
|
|
const/4 v1, -0x1
|
|
|
|
if-nez v0, :cond_0
|
|
|
|
return v1
|
|
|
|
.line 2
|
|
:cond_0
|
|
iget-object v0, p0, Ljava/io/FilterInputStream;->in:Ljava/io/InputStream;
|
|
|
|
invoke-virtual {v0}, Ljava/io/InputStream;->read()I
|
|
|
|
move-result v0
|
|
|
|
if-eq v0, v1, :cond_1
|
|
|
|
.line 3
|
|
iget-wide v1, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->left:J
|
|
|
|
const-wide/16 v3, 0x1
|
|
|
|
sub-long/2addr v1, v3
|
|
|
|
iput-wide v1, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->left:J
|
|
|
|
:cond_1
|
|
return v0
|
|
.end method
|
|
|
|
.method public read([BII)I
|
|
.locals 6
|
|
|
|
.line 4
|
|
iget-wide v0, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->left:J
|
|
|
|
const-wide/16 v2, 0x0
|
|
|
|
cmp-long v2, v0, v2
|
|
|
|
const/4 v3, -0x1
|
|
|
|
if-nez v2, :cond_0
|
|
|
|
return v3
|
|
|
|
:cond_0
|
|
int-to-long v4, p3
|
|
|
|
.line 5
|
|
invoke-static {v4, v5, v0, v1}, Ljava/lang/Math;->min(JJ)J
|
|
|
|
move-result-wide v0
|
|
|
|
long-to-int p3, v0
|
|
|
|
.line 6
|
|
iget-object v0, p0, Ljava/io/FilterInputStream;->in:Ljava/io/InputStream;
|
|
|
|
invoke-virtual {v0, p1, p2, p3}, Ljava/io/InputStream;->read([BII)I
|
|
|
|
move-result p1
|
|
|
|
if-eq p1, v3, :cond_1
|
|
|
|
.line 7
|
|
iget-wide p2, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->left:J
|
|
|
|
int-to-long v0, p1
|
|
|
|
sub-long/2addr p2, v0
|
|
|
|
iput-wide p2, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->left:J
|
|
|
|
:cond_1
|
|
return p1
|
|
.end method
|
|
|
|
.method public declared-synchronized reset()V
|
|
.locals 4
|
|
|
|
.line 1
|
|
monitor-enter p0
|
|
|
|
.line 2
|
|
:try_start_0
|
|
iget-object v0, p0, Ljava/io/FilterInputStream;->in:Ljava/io/InputStream;
|
|
|
|
.line 3
|
|
.line 4
|
|
invoke-virtual {v0}, Ljava/io/InputStream;->markSupported()Z
|
|
|
|
.line 5
|
|
.line 6
|
|
.line 7
|
|
move-result v0
|
|
|
|
.line 8
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 9
|
|
.line 10
|
|
iget-wide v0, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->mark:J
|
|
|
|
.line 11
|
|
.line 12
|
|
const-wide/16 v2, -0x1
|
|
|
|
.line 13
|
|
.line 14
|
|
cmp-long v0, v0, v2
|
|
|
|
.line 15
|
|
.line 16
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 17
|
|
.line 18
|
|
iget-object v0, p0, Ljava/io/FilterInputStream;->in:Ljava/io/InputStream;
|
|
|
|
.line 19
|
|
.line 20
|
|
invoke-virtual {v0}, Ljava/io/InputStream;->reset()V
|
|
|
|
.line 21
|
|
.line 22
|
|
.line 23
|
|
iget-wide v0, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->mark:J
|
|
|
|
.line 24
|
|
.line 25
|
|
iput-wide v0, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->left:J
|
|
:try_end_0
|
|
.catchall {:try_start_0 .. :try_end_0} :catchall_0
|
|
|
|
.line 26
|
|
.line 27
|
|
monitor-exit p0
|
|
|
|
.line 28
|
|
return-void
|
|
|
|
.line 29
|
|
:catchall_0
|
|
move-exception v0
|
|
|
|
.line 30
|
|
goto :goto_0
|
|
|
|
.line 31
|
|
:cond_0
|
|
:try_start_1
|
|
new-instance v0, Ljava/io/IOException;
|
|
|
|
.line 32
|
|
.line 33
|
|
const-string v1, "Mark not set"
|
|
|
|
.line 34
|
|
.line 35
|
|
invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 36
|
|
.line 37
|
|
.line 38
|
|
throw v0
|
|
|
|
.line 39
|
|
:cond_1
|
|
new-instance v0, Ljava/io/IOException;
|
|
|
|
.line 40
|
|
.line 41
|
|
const-string v1, "Mark not supported"
|
|
|
|
.line 42
|
|
.line 43
|
|
invoke-direct {v0, v1}, Ljava/io/IOException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 44
|
|
.line 45
|
|
.line 46
|
|
throw v0
|
|
|
|
.line 47
|
|
:goto_0
|
|
monitor-exit p0
|
|
:try_end_1
|
|
.catchall {:try_start_1 .. :try_end_1} :catchall_0
|
|
|
|
.line 48
|
|
throw v0
|
|
.end method
|
|
|
|
.method public skip(J)J
|
|
.locals 2
|
|
|
|
.line 1
|
|
iget-wide v0, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->left:J
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {p1, p2, v0, v1}, Ljava/lang/Math;->min(JJ)J
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
move-result-wide p1
|
|
|
|
.line 7
|
|
iget-object v0, p0, Ljava/io/FilterInputStream;->in:Ljava/io/InputStream;
|
|
|
|
.line 8
|
|
.line 9
|
|
invoke-virtual {v0, p1, p2}, Ljava/io/InputStream;->skip(J)J
|
|
|
|
.line 10
|
|
.line 11
|
|
.line 12
|
|
move-result-wide p1
|
|
|
|
.line 13
|
|
iget-wide v0, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->left:J
|
|
|
|
.line 14
|
|
.line 15
|
|
sub-long/2addr v0, p1
|
|
|
|
.line 16
|
|
iput-wide v0, p0, Lcom/google/api/client/util/ByteStreams$LimitedInputStream;->left:J
|
|
|
|
.line 17
|
|
.line 18
|
|
return-wide p1
|
|
.end method
|