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>
221 lines
7.3 KiB
Smali
221 lines
7.3 KiB
Smali
.class final Landroidx/privacysandbox/ads/adservices/customaudience/CustomAudienceManager$Api33Ext4Impl;
|
|
.super Landroidx/privacysandbox/ads/adservices/customaudience/CustomAudienceManager;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation build Landroid/annotation/SuppressLint;
|
|
value = {
|
|
"ClassVerificationFailure",
|
|
"NewApi"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Landroidx/annotation/RequiresExtension;
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/EnclosingClass;
|
|
value = Landroidx/privacysandbox/ads/adservices/customaudience/CustomAudienceManager;
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/InnerClass;
|
|
accessFlags = 0x19
|
|
name = "Api33Ext4Impl"
|
|
.end annotation
|
|
|
|
.annotation runtime Lkotlin/Metadata;
|
|
d1 = {
|
|
"\u0000\u001e\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0010\u0002\n\u0002\u0008\u0002\n\u0002\u0018\u0002\n\u0002\u0008\u0003\u0008\u0003\u0018\u00002\u00020\u0001J\u001b\u0010\u0005\u001a\u00020\u00042\u0006\u0010\u0003\u001a\u00020\u0002H\u0097@\u00f8\u0001\u0000\u00a2\u0006\u0004\u0008\u0005\u0010\u0006J\u001b\u0010\u0008\u001a\u00020\u00042\u0006\u0010\u0003\u001a\u00020\u0007H\u0097@\u00f8\u0001\u0000\u00a2\u0006\u0004\u0008\u0008\u0010\t\u0082\u0002\u0004\n\u0002\u0008\u0019\u00a8\u0006\n"
|
|
}
|
|
d2 = {
|
|
"Landroidx/privacysandbox/ads/adservices/customaudience/CustomAudienceManager$Api33Ext4Impl;",
|
|
"Landroidx/privacysandbox/ads/adservices/customaudience/CustomAudienceManager;",
|
|
"Landroidx/privacysandbox/ads/adservices/customaudience/JoinCustomAudienceRequest;",
|
|
"request",
|
|
"",
|
|
"a",
|
|
"(Landroidx/privacysandbox/ads/adservices/customaudience/JoinCustomAudienceRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;",
|
|
"Landroidx/privacysandbox/ads/adservices/customaudience/LeaveCustomAudienceRequest;",
|
|
"b",
|
|
"(Landroidx/privacysandbox/ads/adservices/customaudience/LeaveCustomAudienceRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;",
|
|
"ads-adservices_release"
|
|
}
|
|
k = 0x1
|
|
mv = {
|
|
0x1,
|
|
0x8,
|
|
0x0
|
|
}
|
|
xi = 0x30
|
|
.end annotation
|
|
|
|
.annotation build Lkotlin/jvm/internal/SourceDebugExtension;
|
|
value = {
|
|
"SMAP\nCustomAudienceManager.kt\nKotlin\n*S Kotlin\n*F\n+ 1 CustomAudienceManager.kt\nandroidx/privacysandbox/ads/adservices/customaudience/CustomAudienceManager$Api33Ext4Impl\n+ 2 CancellableContinuation.kt\nkotlinx/coroutines/CancellableContinuationKt\n*L\n1#1,220:1\n314#2,11:221\n314#2,11:232\n*S KotlinDebug\n*F\n+ 1 CustomAudienceManager.kt\nandroidx/privacysandbox/ads/adservices/customaudience/CustomAudienceManager$Api33Ext4Impl\n*L\n111#1:221,11\n123#1:232,11\n*E\n"
|
|
}
|
|
.end annotation
|
|
|
|
|
|
# virtual methods
|
|
.method public a(Landroidx/privacysandbox/ads/adservices/customaudience/JoinCustomAudienceRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
|
.locals 2
|
|
.param p1 # Landroidx/privacysandbox/ads/adservices/customaudience/JoinCustomAudienceRequest;
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end param
|
|
.param p2 # Lkotlin/coroutines/Continuation;
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end param
|
|
.annotation build Landroidx/annotation/DoNotInline;
|
|
.end annotation
|
|
|
|
.annotation build Landroidx/annotation/RequiresPermission;
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"(",
|
|
"Landroidx/privacysandbox/ads/adservices/customaudience/JoinCustomAudienceRequest;",
|
|
"Lkotlin/coroutines/Continuation<",
|
|
"-",
|
|
"Lkotlin/Unit;",
|
|
">;)",
|
|
"Ljava/lang/Object;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Lorg/jetbrains/annotations/Nullable;
|
|
.end annotation
|
|
|
|
.line 1
|
|
new-instance v0, Lkotlinx/coroutines/CancellableContinuationImpl;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {p2}, Lkotlin/coroutines/intrinsics/IntrinsicsKt;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
move-result-object p2
|
|
|
|
.line 7
|
|
const/4 v1, 0x1
|
|
|
|
.line 8
|
|
invoke-direct {v0, v1, p2}, Lkotlinx/coroutines/CancellableContinuationImpl;-><init>(ILkotlin/coroutines/Continuation;)V
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
invoke-virtual {v0}, Lkotlinx/coroutines/CancellableContinuationImpl;->r()V
|
|
|
|
.line 12
|
|
.line 13
|
|
.line 14
|
|
new-instance p2, Landroid/adservices/customaudience/JoinCustomAudienceRequest$Builder;
|
|
|
|
.line 15
|
|
.line 16
|
|
invoke-direct {p2}, Landroid/adservices/customaudience/JoinCustomAudienceRequest$Builder;-><init>()V
|
|
|
|
.line 17
|
|
.line 18
|
|
.line 19
|
|
invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
|
|
|
|
.line 20
|
|
.line 21
|
|
.line 22
|
|
new-instance p1, Landroid/adservices/customaudience/CustomAudience$Builder;
|
|
|
|
.line 23
|
|
.line 24
|
|
invoke-direct {p1}, Landroid/adservices/customaudience/CustomAudience$Builder;-><init>()V
|
|
|
|
.line 25
|
|
.line 26
|
|
.line 27
|
|
const/4 p1, 0x0
|
|
|
|
.line 28
|
|
throw p1
|
|
.end method
|
|
|
|
.method public b(Landroidx/privacysandbox/ads/adservices/customaudience/LeaveCustomAudienceRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
|
.locals 2
|
|
.param p1 # Landroidx/privacysandbox/ads/adservices/customaudience/LeaveCustomAudienceRequest;
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end param
|
|
.param p2 # Lkotlin/coroutines/Continuation;
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end param
|
|
.annotation build Landroidx/annotation/DoNotInline;
|
|
.end annotation
|
|
|
|
.annotation build Landroidx/annotation/RequiresPermission;
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"(",
|
|
"Landroidx/privacysandbox/ads/adservices/customaudience/LeaveCustomAudienceRequest;",
|
|
"Lkotlin/coroutines/Continuation<",
|
|
"-",
|
|
"Lkotlin/Unit;",
|
|
">;)",
|
|
"Ljava/lang/Object;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Lorg/jetbrains/annotations/Nullable;
|
|
.end annotation
|
|
|
|
.line 1
|
|
new-instance v0, Lkotlinx/coroutines/CancellableContinuationImpl;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {p2}, Lkotlin/coroutines/intrinsics/IntrinsicsKt;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
move-result-object p2
|
|
|
|
.line 7
|
|
const/4 v1, 0x1
|
|
|
|
.line 8
|
|
invoke-direct {v0, v1, p2}, Lkotlinx/coroutines/CancellableContinuationImpl;-><init>(ILkotlin/coroutines/Continuation;)V
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
invoke-virtual {v0}, Lkotlinx/coroutines/CancellableContinuationImpl;->r()V
|
|
|
|
.line 12
|
|
.line 13
|
|
.line 14
|
|
new-instance p2, Landroid/adservices/customaudience/LeaveCustomAudienceRequest$Builder;
|
|
|
|
.line 15
|
|
.line 16
|
|
invoke-direct {p2}, Landroid/adservices/customaudience/LeaveCustomAudienceRequest$Builder;-><init>()V
|
|
|
|
.line 17
|
|
.line 18
|
|
.line 19
|
|
invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
|
|
|
|
.line 20
|
|
.line 21
|
|
.line 22
|
|
const/4 p1, 0x0
|
|
|
|
.line 23
|
|
throw p1
|
|
.end method
|