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>
204 lines
6.5 KiB
Smali
204 lines
6.5 KiB
Smali
.class public Lcom/google/android/gms/common/internal/PendingResultUtil;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation build Lcom/google/android/gms/common/annotation/KeepForSdk;
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/MemberClasses;
|
|
value = {
|
|
Lcom/google/android/gms/common/internal/PendingResultUtil$ResultConverter;
|
|
}
|
|
.end annotation
|
|
|
|
|
|
# static fields
|
|
.field private static final zaa:Lcom/google/android/gms/common/internal/zas;
|
|
|
|
|
|
# direct methods
|
|
.method static constructor <clinit>()V
|
|
.locals 1
|
|
|
|
new-instance v0, Lcom/google/android/gms/common/internal/zao;
|
|
|
|
invoke-direct {v0}, Lcom/google/android/gms/common/internal/zao;-><init>()V
|
|
|
|
sput-object v0, Lcom/google/android/gms/common/internal/PendingResultUtil;->zaa:Lcom/google/android/gms/common/internal/zas;
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public constructor <init>()V
|
|
.locals 0
|
|
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
return-void
|
|
.end method
|
|
|
|
.method public static toResponseTask(Lcom/google/android/gms/common/api/PendingResult;Lcom/google/android/gms/common/api/Response;)Lcom/google/android/gms/tasks/Task;
|
|
.locals 1
|
|
.param p0 # Lcom/google/android/gms/common/api/PendingResult;
|
|
.annotation build Landroidx/annotation/NonNull;
|
|
.end annotation
|
|
.end param
|
|
.param p1 # Lcom/google/android/gms/common/api/Response;
|
|
.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
|
|
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<R::",
|
|
"Lcom/google/android/gms/common/api/Result;",
|
|
"T:",
|
|
"Lcom/google/android/gms/common/api/Response<",
|
|
"TR;>;>(",
|
|
"Lcom/google/android/gms/common/api/PendingResult<",
|
|
"TR;>;TT;)",
|
|
"Lcom/google/android/gms/tasks/Task<",
|
|
"TT;>;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 1
|
|
new-instance v0, Lcom/google/android/gms/common/internal/zaq;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-direct {v0, p1}, Lcom/google/android/gms/common/internal/zaq;-><init>(Lcom/google/android/gms/common/api/Response;)V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
invoke-static {p0, v0}, Lcom/google/android/gms/common/internal/PendingResultUtil;->toTask(Lcom/google/android/gms/common/api/PendingResult;Lcom/google/android/gms/common/internal/PendingResultUtil$ResultConverter;)Lcom/google/android/gms/tasks/Task;
|
|
|
|
.line 7
|
|
.line 8
|
|
.line 9
|
|
move-result-object p0
|
|
|
|
.line 10
|
|
return-object p0
|
|
.end method
|
|
|
|
.method public static toTask(Lcom/google/android/gms/common/api/PendingResult;Lcom/google/android/gms/common/internal/PendingResultUtil$ResultConverter;)Lcom/google/android/gms/tasks/Task;
|
|
.locals 3
|
|
.param p0 # Lcom/google/android/gms/common/api/PendingResult;
|
|
.annotation build Landroidx/annotation/NonNull;
|
|
.end annotation
|
|
.end param
|
|
.param p1 # Lcom/google/android/gms/common/internal/PendingResultUtil$ResultConverter;
|
|
.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
|
|
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<R::",
|
|
"Lcom/google/android/gms/common/api/Result;",
|
|
"T:",
|
|
"Ljava/lang/Object;",
|
|
">(",
|
|
"Lcom/google/android/gms/common/api/PendingResult<",
|
|
"TR;>;",
|
|
"Lcom/google/android/gms/common/internal/PendingResultUtil$ResultConverter<",
|
|
"TR;TT;>;)",
|
|
"Lcom/google/android/gms/tasks/Task<",
|
|
"TT;>;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 1
|
|
sget-object v0, Lcom/google/android/gms/common/internal/PendingResultUtil;->zaa:Lcom/google/android/gms/common/internal/zas;
|
|
|
|
.line 2
|
|
.line 3
|
|
new-instance v1, Lcom/google/android/gms/tasks/TaskCompletionSource;
|
|
|
|
.line 4
|
|
.line 5
|
|
invoke-direct {v1}, Lcom/google/android/gms/tasks/TaskCompletionSource;-><init>()V
|
|
|
|
.line 6
|
|
.line 7
|
|
.line 8
|
|
new-instance v2, Lcom/google/android/gms/common/internal/zap;
|
|
|
|
.line 9
|
|
.line 10
|
|
invoke-direct {v2, p0, v1, p1, v0}, Lcom/google/android/gms/common/internal/zap;-><init>(Lcom/google/android/gms/common/api/PendingResult;Lcom/google/android/gms/tasks/TaskCompletionSource;Lcom/google/android/gms/common/internal/PendingResultUtil$ResultConverter;Lcom/google/android/gms/common/internal/zas;)V
|
|
|
|
.line 11
|
|
.line 12
|
|
.line 13
|
|
invoke-virtual {p0, v2}, Lcom/google/android/gms/common/api/PendingResult;->addStatusListener(Lcom/google/android/gms/common/api/PendingResult$StatusListener;)V
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
iget-object p0, v1, Lcom/google/android/gms/tasks/TaskCompletionSource;->a:Lcom/google/android/gms/tasks/zzw;
|
|
|
|
.line 17
|
|
.line 18
|
|
return-object p0
|
|
.end method
|
|
|
|
.method public static toVoidTask(Lcom/google/android/gms/common/api/PendingResult;)Lcom/google/android/gms/tasks/Task;
|
|
.locals 1
|
|
.param p0 # Lcom/google/android/gms/common/api/PendingResult;
|
|
.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
|
|
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<R::",
|
|
"Lcom/google/android/gms/common/api/Result;",
|
|
">(",
|
|
"Lcom/google/android/gms/common/api/PendingResult<",
|
|
"TR;>;)",
|
|
"Lcom/google/android/gms/tasks/Task<",
|
|
"Ljava/lang/Void;",
|
|
">;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 1
|
|
new-instance v0, Lcom/google/android/gms/common/internal/zar;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-direct {v0}, Lcom/google/android/gms/common/internal/zar;-><init>()V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
invoke-static {p0, v0}, Lcom/google/android/gms/common/internal/PendingResultUtil;->toTask(Lcom/google/android/gms/common/api/PendingResult;Lcom/google/android/gms/common/internal/PendingResultUtil$ResultConverter;)Lcom/google/android/gms/tasks/Task;
|
|
|
|
.line 7
|
|
.line 8
|
|
.line 9
|
|
move-result-object p0
|
|
|
|
.line 10
|
|
return-object p0
|
|
.end method
|