soul-browser/app/smali/androidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl.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

309 lines
8.3 KiB
Smali

.class final Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl;
.super Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager;
.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/appsetid/AppSetIdManager;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
accessFlags = 0x19
name = "Api33Ext4Impl"
.end annotation
.annotation runtime Lkotlin/Metadata;
d1 = {
"\u0000\u0010\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0008\u0003\u0008\u0003\u0018\u00002\u00020\u0001J\u0013\u0010\u0003\u001a\u00020\u0002H\u0097@\u00f8\u0001\u0000\u00a2\u0006\u0004\u0008\u0003\u0010\u0004\u0082\u0002\u0004\n\u0002\u0008\u0019\u00a8\u0006\u0005"
}
d2 = {
"Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl;",
"Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager;",
"Landroidx/privacysandbox/ads/adservices/appsetid/AppSetId;",
"a",
"(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\nAppSetIdManager.kt\nKotlin\n*S Kotlin\n*F\n+ 1 AppSetIdManager.kt\nandroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl\n+ 2 CancellableContinuation.kt\nkotlinx/coroutines/CancellableContinuationKt\n*L\n1#1,94:1\n314#2,11:95\n*S KotlinDebug\n*F\n+ 1 AppSetIdManager.kt\nandroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl\n*L\n59#1:95,11\n*E\n"
}
.end annotation
# virtual methods
.method public a(Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
.locals 4
.param p1 # Lkotlin/coroutines/Continuation;
.annotation build Lorg/jetbrains/annotations/NotNull;
.end annotation
.end param
.annotation build Landroidx/annotation/DoNotInline;
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
"Lkotlin/coroutines/Continuation<",
"-",
"Landroidx/privacysandbox/ads/adservices/appsetid/AppSetId;",
">;)",
"Ljava/lang/Object;"
}
.end annotation
.annotation build Lorg/jetbrains/annotations/Nullable;
.end annotation
.line 1
instance-of v0, p1, Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl$getAppSetId$1;
.line 2
.line 3
if-eqz v0, :cond_0
.line 4
.line 5
move-object v0, p1
.line 6
check-cast v0, Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl$getAppSetId$1;
.line 7
.line 8
iget v1, v0, Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl$getAppSetId$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/appsetid/AppSetIdManager$Api33Ext4Impl$getAppSetId$1;->h:I
.line 18
.line 19
goto :goto_0
.line 20
:cond_0
new-instance v0, Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl$getAppSetId$1;
.line 21
.line 22
invoke-direct {v0, p0, p1}, Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl$getAppSetId$1;-><init>(Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl;Lkotlin/coroutines/Continuation;)V
.line 23
.line 24
.line 25
:goto_0
iget-object p1, v0, Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl$getAppSetId$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
iget v1, v0, Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl$getAppSetId$1;->h:I
.line 31
.line 32
const/4 v2, 0x1
.line 33
if-eqz v1, :cond_3
.line 34
.line 35
if-ne v1, v2, :cond_2
.line 36
.line 37
iget-object v0, v0, Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl$getAppSetId$1;->c:Ljava/lang/Object;
.line 38
.line 39
check-cast v0, Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl;
.line 40
.line 41
invoke-static {p1}, Lkotlin/ResultKt;->throwOnFailure(Ljava/lang/Object;)V
.line 42
.line 43
.line 44
check-cast p1, Landroid/adservices/appsetid/AppSetId;
.line 45
.line 46
invoke-virtual {v0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
.line 47
.line 48
.line 49
invoke-virtual {p1}, Landroid/adservices/appsetid/AppSetId;->getScope()I
.line 50
.line 51
.line 52
move-result v0
.line 53
const-string v1, "response.id"
.line 54
.line 55
if-ne v0, v2, :cond_1
.line 56
.line 57
new-instance v0, Landroidx/privacysandbox/ads/adservices/appsetid/AppSetId;
.line 58
.line 59
invoke-virtual {p1}, Landroid/adservices/appsetid/AppSetId;->getId()Ljava/lang/String;
.line 60
.line 61
.line 62
move-result-object p1
.line 63
invoke-static {p1, v1}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
.line 64
.line 65
.line 66
invoke-direct {v0, p1, v2}, Landroidx/privacysandbox/ads/adservices/appsetid/AppSetId;-><init>(Ljava/lang/String;I)V
.line 67
.line 68
.line 69
return-object v0
.line 70
:cond_1
new-instance v0, Landroidx/privacysandbox/ads/adservices/appsetid/AppSetId;
.line 71
.line 72
invoke-virtual {p1}, Landroid/adservices/appsetid/AppSetId;->getId()Ljava/lang/String;
.line 73
.line 74
.line 75
move-result-object p1
.line 76
invoke-static {p1, v1}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullExpressionValue(Ljava/lang/Object;Ljava/lang/String;)V
.line 77
.line 78
.line 79
const/4 v1, 0x2
.line 80
invoke-direct {v0, p1, v1}, Landroidx/privacysandbox/ads/adservices/appsetid/AppSetId;-><init>(Ljava/lang/String;I)V
.line 81
.line 82
.line 83
return-object v0
.line 84
:cond_2
new-instance p1, Ljava/lang/IllegalStateException;
.line 85
.line 86
const-string v0, "call to \'resume\' before \'invoke\' with coroutine"
.line 87
.line 88
invoke-direct {p1, v0}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
.line 89
.line 90
.line 91
throw p1
.line 92
:cond_3
invoke-static {p1}, Lkotlin/ResultKt;->throwOnFailure(Ljava/lang/Object;)V
.line 93
.line 94
.line 95
iput-object p0, v0, Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl$getAppSetId$1;->c:Ljava/lang/Object;
.line 96
.line 97
iput v2, v0, Landroidx/privacysandbox/ads/adservices/appsetid/AppSetIdManager$Api33Ext4Impl$getAppSetId$1;->h:I
.line 98
.line 99
new-instance p1, Lkotlinx/coroutines/CancellableContinuationImpl;
.line 100
.line 101
invoke-static {v0}, Lkotlin/coroutines/intrinsics/IntrinsicsKt;->intercepted(Lkotlin/coroutines/Continuation;)Lkotlin/coroutines/Continuation;
.line 102
.line 103
.line 104
move-result-object v0
.line 105
invoke-direct {p1, v2, v0}, Lkotlinx/coroutines/CancellableContinuationImpl;-><init>(ILkotlin/coroutines/Continuation;)V
.line 106
.line 107
.line 108
invoke-virtual {p1}, Lkotlinx/coroutines/CancellableContinuationImpl;->r()V
.line 109
.line 110
.line 111
invoke-static {p1}, Landroidx/core/os/OutcomeReceiverKt;->a(Lkotlinx/coroutines/CancellableContinuationImpl;)Landroid/os/OutcomeReceiver;
.line 112
.line 113
.line 114
const/4 p1, 0x0
.line 115
throw p1
.end method