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>
532 lines
14 KiB
Smali
532 lines
14 KiB
Smali
.class public Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon;
|
|
.super Landroidx/privacysandbox/ads/adservices/topics/TopicsManager;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation build Landroid/annotation/SuppressLint;
|
|
value = {
|
|
"NewApi"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Landroidx/annotation/RequiresExtension;
|
|
.end annotation
|
|
|
|
.annotation build Landroidx/annotation/RestrictTo;
|
|
.end annotation
|
|
|
|
.annotation runtime Lkotlin/Metadata;
|
|
d1 = {
|
|
"\u0000\u0016\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0018\u0002\n\u0002\u0008\u0003\u0008\u0017\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\u0006\u0082\u0002\u0004\n\u0002\u0008\u0019\u00a8\u0006\u0007"
|
|
}
|
|
d2 = {
|
|
"Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon;",
|
|
"Landroidx/privacysandbox/ads/adservices/topics/TopicsManager;",
|
|
"Landroidx/privacysandbox/ads/adservices/topics/GetTopicsRequest;",
|
|
"request",
|
|
"Landroidx/privacysandbox/ads/adservices/topics/GetTopicsResponse;",
|
|
"b",
|
|
"(Landroidx/privacysandbox/ads/adservices/topics/GetTopicsRequest;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\nTopicsManagerImplCommon.kt\nKotlin\n*S Kotlin\n*F\n+ 1 TopicsManagerImplCommon.kt\nandroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon\n+ 2 CancellableContinuation.kt\nkotlinx/coroutines/CancellableContinuationKt\n*L\n1#1,54:1\n314#2,11:55\n*S KotlinDebug\n*F\n+ 1 TopicsManagerImplCommon.kt\nandroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon\n*L\n28#1:55,11\n*E\n"
|
|
}
|
|
.end annotation
|
|
|
|
|
|
# instance fields
|
|
.field public final a:Landroid/adservices/topics/TopicsManager;
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Landroid/adservices/topics/TopicsManager;)V
|
|
.locals 1
|
|
|
|
.line 1
|
|
const-string v0, "mTopicsManager"
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 7
|
|
.line 8
|
|
.line 9
|
|
iput-object p1, p0, Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon;->a:Landroid/adservices/topics/TopicsManager;
|
|
|
|
.line 10
|
|
.line 11
|
|
return-void
|
|
.end method
|
|
|
|
.method public static c(Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon;Landroidx/privacysandbox/ads/adservices/topics/GetTopicsRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
|
.locals 6
|
|
.annotation build Landroidx/annotation/DoNotInline;
|
|
.end annotation
|
|
|
|
.annotation build Landroidx/annotation/RequiresPermission;
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"(",
|
|
"Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon;",
|
|
"Landroidx/privacysandbox/ads/adservices/topics/GetTopicsRequest;",
|
|
"Lkotlin/coroutines/Continuation<",
|
|
"-",
|
|
"Landroidx/privacysandbox/ads/adservices/topics/GetTopicsResponse;",
|
|
">;)",
|
|
"Ljava/lang/Object;"
|
|
}
|
|
.end annotation
|
|
|
|
.line 1
|
|
instance-of v0, p2, Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon$getTopics$1;
|
|
|
|
.line 2
|
|
.line 3
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 4
|
|
.line 5
|
|
move-object v0, p2
|
|
|
|
.line 6
|
|
check-cast v0, Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon$getTopics$1;
|
|
|
|
.line 7
|
|
.line 8
|
|
iget v1, v0, Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon$getTopics$1;->h:I
|
|
|
|
.line 9
|
|
.line 10
|
|
const/high16 v2, -0x80000000
|
|
|
|
.line 11
|
|
.line 12
|
|
and-int v3, v1, v2
|
|
|
|
.line 13
|
|
.line 14
|
|
if-eqz v3, :cond_0
|
|
|
|
.line 15
|
|
.line 16
|
|
sub-int/2addr v1, v2
|
|
|
|
.line 17
|
|
iput v1, v0, Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon$getTopics$1;->h:I
|
|
|
|
.line 18
|
|
.line 19
|
|
goto :goto_0
|
|
|
|
.line 20
|
|
:cond_0
|
|
new-instance v0, Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon$getTopics$1;
|
|
|
|
.line 21
|
|
.line 22
|
|
invoke-direct {v0, p0, p2}, Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon$getTopics$1;-><init>(Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon;Lkotlin/coroutines/Continuation;)V
|
|
|
|
.line 23
|
|
.line 24
|
|
.line 25
|
|
:goto_0
|
|
iget-object p2, v0, Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon$getTopics$1;->f:Ljava/lang/Object;
|
|
|
|
.line 26
|
|
.line 27
|
|
invoke-static {}, Lkotlin/coroutines/intrinsics/IntrinsicsKt;->getCOROUTINE_SUSPENDED()Ljava/lang/Object;
|
|
|
|
.line 28
|
|
.line 29
|
|
.line 30
|
|
move-result-object v1
|
|
|
|
.line 31
|
|
iget v2, v0, Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon$getTopics$1;->h:I
|
|
|
|
.line 32
|
|
.line 33
|
|
const/4 v3, 0x1
|
|
|
|
.line 34
|
|
if-eqz v2, :cond_2
|
|
|
|
.line 35
|
|
.line 36
|
|
if-ne v2, v3, :cond_1
|
|
|
|
.line 37
|
|
.line 38
|
|
iget-object p0, v0, Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon$getTopics$1;->c:Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon;
|
|
|
|
.line 39
|
|
.line 40
|
|
invoke-static {p2}, Lkotlin/ResultKt;->throwOnFailure(Ljava/lang/Object;)V
|
|
|
|
.line 41
|
|
.line 42
|
|
.line 43
|
|
goto :goto_1
|
|
|
|
.line 44
|
|
:cond_1
|
|
new-instance p0, Ljava/lang/IllegalStateException;
|
|
|
|
.line 45
|
|
.line 46
|
|
const-string p1, "call to \'resume\' before \'invoke\' with coroutine"
|
|
|
|
.line 47
|
|
.line 48
|
|
invoke-direct {p0, p1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 49
|
|
.line 50
|
|
.line 51
|
|
throw p0
|
|
|
|
.line 52
|
|
:cond_2
|
|
invoke-static {p2}, Lkotlin/ResultKt;->throwOnFailure(Ljava/lang/Object;)V
|
|
|
|
.line 53
|
|
.line 54
|
|
.line 55
|
|
invoke-virtual {p0, p1}, Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon;->a(Landroidx/privacysandbox/ads/adservices/topics/GetTopicsRequest;)Landroid/adservices/topics/GetTopicsRequest;
|
|
|
|
.line 56
|
|
.line 57
|
|
.line 58
|
|
move-result-object p1
|
|
|
|
.line 59
|
|
iput-object p0, v0, Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon$getTopics$1;->c:Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon;
|
|
|
|
.line 60
|
|
.line 61
|
|
iput v3, v0, Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon$getTopics$1;->h:I
|
|
|
|
.line 62
|
|
.line 63
|
|
new-instance p2, Lkotlinx/coroutines/CancellableContinuationImpl;
|
|
|
|
.line 64
|
|
.line 65
|
|
invoke-static {v0}, Lkotlin/coroutines/intrinsics/IntrinsicsKt;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
|
|
|
|
.line 66
|
|
.line 67
|
|
.line 68
|
|
move-result-object v2
|
|
|
|
.line 69
|
|
invoke-direct {p2, v3, v2}, Lkotlinx/coroutines/CancellableContinuationImpl;-><init>(ILkotlin/coroutines/Continuation;)V
|
|
|
|
.line 70
|
|
.line 71
|
|
.line 72
|
|
invoke-virtual {p2}, Lkotlinx/coroutines/CancellableContinuationImpl;->r()V
|
|
|
|
.line 73
|
|
.line 74
|
|
.line 75
|
|
iget-object v2, p0, Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon;->a:Landroid/adservices/topics/TopicsManager;
|
|
|
|
.line 76
|
|
.line 77
|
|
new-instance v3, Landroidx/arch/core/executor/a;
|
|
|
|
.line 78
|
|
.line 79
|
|
const/4 v4, 0x1
|
|
|
|
.line 80
|
|
invoke-direct {v3, v4}, Landroidx/arch/core/executor/a;-><init>(I)V
|
|
|
|
.line 81
|
|
.line 82
|
|
.line 83
|
|
invoke-static {p2}, Landroidx/core/os/OutcomeReceiverKt;->a(Lkotlinx/coroutines/CancellableContinuationImpl;)Landroid/os/OutcomeReceiver;
|
|
|
|
.line 84
|
|
.line 85
|
|
.line 86
|
|
move-result-object v4
|
|
|
|
.line 87
|
|
invoke-virtual {v2, p1, v3, v4}, Landroid/adservices/topics/TopicsManager;->getTopics(Landroid/adservices/topics/GetTopicsRequest;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V
|
|
|
|
.line 88
|
|
.line 89
|
|
.line 90
|
|
invoke-virtual {p2}, Lkotlinx/coroutines/CancellableContinuationImpl;->q()Ljava/lang/Object;
|
|
|
|
.line 91
|
|
.line 92
|
|
.line 93
|
|
move-result-object p2
|
|
|
|
.line 94
|
|
invoke-static {}, Lkotlin/coroutines/intrinsics/IntrinsicsKt;->getCOROUTINE_SUSPENDED()Ljava/lang/Object;
|
|
|
|
.line 95
|
|
.line 96
|
|
.line 97
|
|
move-result-object p1
|
|
|
|
.line 98
|
|
if-ne p2, p1, :cond_3
|
|
|
|
.line 99
|
|
.line 100
|
|
invoke-static {v0}, Lkotlin/coroutines/jvm/internal/DebugProbesKt;->probeCoroutineSuspended(Lkotlin/coroutines/Continuation;)V
|
|
|
|
.line 101
|
|
.line 102
|
|
.line 103
|
|
:cond_3
|
|
if-ne p2, v1, :cond_4
|
|
|
|
.line 104
|
|
.line 105
|
|
return-object v1
|
|
|
|
.line 106
|
|
:cond_4
|
|
:goto_1
|
|
check-cast p2, Landroid/adservices/topics/GetTopicsResponse;
|
|
|
|
.line 107
|
|
.line 108
|
|
invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
|
|
|
|
.line 109
|
|
.line 110
|
|
.line 111
|
|
const-string p0, "response"
|
|
|
|
.line 112
|
|
.line 113
|
|
invoke-static {p2, p0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 114
|
|
.line 115
|
|
.line 116
|
|
new-instance p0, Ljava/util/ArrayList;
|
|
|
|
.line 117
|
|
.line 118
|
|
invoke-direct {p0}, Ljava/util/ArrayList;-><init>()V
|
|
|
|
.line 119
|
|
.line 120
|
|
.line 121
|
|
invoke-virtual {p2}, Landroid/adservices/topics/GetTopicsResponse;->getTopics()Ljava/util/List;
|
|
|
|
.line 122
|
|
.line 123
|
|
.line 124
|
|
move-result-object p1
|
|
|
|
.line 125
|
|
invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
|
|
|
|
.line 126
|
|
.line 127
|
|
.line 128
|
|
move-result-object p1
|
|
|
|
.line 129
|
|
:goto_2
|
|
invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
|
|
|
|
.line 130
|
|
.line 131
|
|
.line 132
|
|
move-result p2
|
|
|
|
.line 133
|
|
if-eqz p2, :cond_5
|
|
|
|
.line 134
|
|
.line 135
|
|
invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
|
|
|
|
.line 136
|
|
.line 137
|
|
.line 138
|
|
move-result-object p2
|
|
|
|
.line 139
|
|
check-cast p2, Landroid/adservices/topics/Topic;
|
|
|
|
.line 140
|
|
.line 141
|
|
new-instance v0, Landroidx/privacysandbox/ads/adservices/topics/Topic;
|
|
|
|
.line 142
|
|
.line 143
|
|
invoke-virtual {p2}, Landroid/adservices/topics/Topic;->getTaxonomyVersion()J
|
|
|
|
.line 144
|
|
.line 145
|
|
.line 146
|
|
move-result-wide v1
|
|
|
|
.line 147
|
|
invoke-virtual {p2}, Landroid/adservices/topics/Topic;->getModelVersion()J
|
|
|
|
.line 148
|
|
.line 149
|
|
.line 150
|
|
move-result-wide v3
|
|
|
|
.line 151
|
|
invoke-virtual {p2}, Landroid/adservices/topics/Topic;->getTopicId()I
|
|
|
|
.line 152
|
|
.line 153
|
|
.line 154
|
|
move-result v5
|
|
|
|
.line 155
|
|
invoke-direct/range {v0 .. v5}, Landroidx/privacysandbox/ads/adservices/topics/Topic;-><init>(JJI)V
|
|
|
|
.line 156
|
|
.line 157
|
|
.line 158
|
|
invoke-virtual {p0, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
|
|
|
|
.line 159
|
|
.line 160
|
|
.line 161
|
|
goto :goto_2
|
|
|
|
.line 162
|
|
:cond_5
|
|
new-instance p1, Landroidx/privacysandbox/ads/adservices/topics/GetTopicsResponse;
|
|
|
|
.line 163
|
|
.line 164
|
|
invoke-direct {p1, p0}, Landroidx/privacysandbox/ads/adservices/topics/GetTopicsResponse;-><init>(Ljava/util/List;)V
|
|
|
|
.line 165
|
|
.line 166
|
|
.line 167
|
|
return-object p1
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public a(Landroidx/privacysandbox/ads/adservices/topics/GetTopicsRequest;)Landroid/adservices/topics/GetTopicsRequest;
|
|
.locals 1
|
|
|
|
.line 1
|
|
const-string v0, "request"
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
new-instance v0, Landroid/adservices/topics/GetTopicsRequest$Builder;
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-direct {v0}, Landroid/adservices/topics/GetTopicsRequest$Builder;-><init>()V
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
iget-object p1, p1, Landroidx/privacysandbox/ads/adservices/topics/GetTopicsRequest;->a:Ljava/lang/String;
|
|
|
|
.line 12
|
|
.line 13
|
|
invoke-virtual {v0, p1}, Landroid/adservices/topics/GetTopicsRequest$Builder;->setAdsSdkName(Ljava/lang/String;)Landroid/adservices/topics/GetTopicsRequest$Builder;
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
move-result-object p1
|
|
|
|
.line 17
|
|
invoke-virtual {p1}, Landroid/adservices/topics/GetTopicsRequest$Builder;->build()Landroid/adservices/topics/GetTopicsRequest;
|
|
|
|
.line 18
|
|
.line 19
|
|
.line 20
|
|
move-result-object p1
|
|
|
|
.line 21
|
|
const-string v0, "Builder()\n .s\u2026ame)\n .build()"
|
|
|
|
.line 22
|
|
.line 23
|
|
invoke-static {p1, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 24
|
|
.line 25
|
|
.line 26
|
|
return-object p1
|
|
.end method
|
|
|
|
.method public b(Landroidx/privacysandbox/ads/adservices/topics/GetTopicsRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
|
.locals 0
|
|
.param p1 # Landroidx/privacysandbox/ads/adservices/topics/GetTopicsRequest;
|
|
.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/topics/GetTopicsRequest;",
|
|
"Lkotlin/coroutines/Continuation<",
|
|
"-",
|
|
"Landroidx/privacysandbox/ads/adservices/topics/GetTopicsResponse;",
|
|
">;)",
|
|
"Ljava/lang/Object;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Lorg/jetbrains/annotations/Nullable;
|
|
.end annotation
|
|
|
|
.line 1
|
|
invoke-static {p0, p1, p2}, Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon;->c(Landroidx/privacysandbox/ads/adservices/topics/TopicsManagerImplCommon;Landroidx/privacysandbox/ads/adservices/topics/GetTopicsRequest;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
|
|
|
move-result-object p1
|
|
|
|
return-object p1
|
|
.end method
|