* 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>
237 lines
6.3 KiB
Smali
237 lines
6.3 KiB
Smali
.class final Lkotlin/sequences/DistinctIterator;
|
|
.super Lkotlin/collections/AbstractIterator;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<T:",
|
|
"Ljava/lang/Object;",
|
|
"K:",
|
|
"Ljava/lang/Object;",
|
|
">",
|
|
"Lkotlin/collections/AbstractIterator<",
|
|
"TT;>;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation runtime Lkotlin/Metadata;
|
|
d1 = {
|
|
"\u0000.\n\u0002\u0018\u0002\n\u0002\u0008\u0002\n\u0002\u0018\u0002\n\u0000\n\u0002\u0010(\n\u0000\n\u0002\u0018\u0002\n\u0002\u0008\u0003\n\u0002\u0018\u0002\n\u0002\u0018\u0002\n\u0002\u0008\u0002\n\u0002\u0010\u0002\n\u0000\u0008\u0002\u0018\u0000*\u0004\u0008\u0000\u0010\u0001*\u0004\u0008\u0001\u0010\u00022\u0008\u0012\u0004\u0012\u0002H\u00010\u0003B)\u0012\u000c\u0010\u0004\u001a\u0008\u0012\u0004\u0012\u00028\u00000\u0005\u0012\u0012\u0010\u0006\u001a\u000e\u0012\u0004\u0012\u00028\u0000\u0012\u0004\u0012\u00028\u00010\u0007\u00a2\u0006\u0004\u0008\u0008\u0010\tJ\u0008\u0010\u000e\u001a\u00020\u000fH\u0014R\u0014\u0010\u0004\u001a\u0008\u0012\u0004\u0012\u00028\u00000\u0005X\u0082\u0004\u00a2\u0006\u0002\n\u0000R\u001a\u0010\u0006\u001a\u000e\u0012\u0004\u0012\u00028\u0000\u0012\u0004\u0012\u00028\u00010\u0007X\u0082\u0004\u00a2\u0006\u0002\n\u0000R \u0010\n\u001a\u0012\u0012\u0004\u0012\u00028\u00010\u000bj\u0008\u0012\u0004\u0012\u00028\u0001`\u000cX\u0082\u0004\u00a2\u0006\u0004\n\u0002\u0010\r\u00a8\u0006\u0010"
|
|
}
|
|
d2 = {
|
|
"Lkotlin/sequences/DistinctIterator;",
|
|
"T",
|
|
"K",
|
|
"Lkotlin/collections/AbstractIterator;",
|
|
"source",
|
|
"",
|
|
"keySelector",
|
|
"Lkotlin/Function1;",
|
|
"<init>",
|
|
"(Ljava/util/Iterator;Lkotlin/jvm/functions/Function1;)V",
|
|
"observed",
|
|
"Ljava/util/HashSet;",
|
|
"Lkotlin/collections/HashSet;",
|
|
"Ljava/util/HashSet;",
|
|
"computeNext",
|
|
"",
|
|
"kotlin-stdlib"
|
|
}
|
|
k = 0x1
|
|
mv = {
|
|
0x2,
|
|
0x2,
|
|
0x0
|
|
}
|
|
xi = 0x30
|
|
.end annotation
|
|
|
|
|
|
# instance fields
|
|
.field private final keySelector:Lkotlin/jvm/functions/Function1;
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"Lkotlin/jvm/functions/Function1<",
|
|
"TT;TK;>;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end field
|
|
|
|
.field private final observed:Ljava/util/HashSet;
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"Ljava/util/HashSet<",
|
|
"TK;>;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end field
|
|
|
|
.field private final source:Ljava/util/Iterator;
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"Ljava/util/Iterator<",
|
|
"TT;>;"
|
|
}
|
|
.end annotation
|
|
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end field
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Ljava/util/Iterator;Lkotlin/jvm/functions/Function1;)V
|
|
.locals 1
|
|
.param p1 # Ljava/util/Iterator;
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end param
|
|
.param p2 # Lkotlin/jvm/functions/Function1;
|
|
.annotation build Lorg/jetbrains/annotations/NotNull;
|
|
.end annotation
|
|
.end param
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"(",
|
|
"Ljava/util/Iterator<",
|
|
"+TT;>;",
|
|
"Lkotlin/jvm/functions/Function1<",
|
|
"-TT;+TK;>;)V"
|
|
}
|
|
.end annotation
|
|
|
|
.line 1
|
|
const-string v0, "source"
|
|
|
|
.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
|
|
const-string v0, "keySelector"
|
|
|
|
.line 7
|
|
.line 8
|
|
invoke-static {p2, v0}, Lkotlin/jvm/internal/Intrinsics;->checkNotNullParameter(Ljava/lang/Object;Ljava/lang/String;)V
|
|
|
|
.line 9
|
|
.line 10
|
|
.line 11
|
|
invoke-direct {p0}, Lkotlin/collections/AbstractIterator;-><init>()V
|
|
|
|
.line 12
|
|
.line 13
|
|
.line 14
|
|
iput-object p1, p0, Lkotlin/sequences/DistinctIterator;->source:Ljava/util/Iterator;
|
|
|
|
.line 15
|
|
.line 16
|
|
iput-object p2, p0, Lkotlin/sequences/DistinctIterator;->keySelector:Lkotlin/jvm/functions/Function1;
|
|
|
|
.line 17
|
|
.line 18
|
|
new-instance p1, Ljava/util/HashSet;
|
|
|
|
.line 19
|
|
.line 20
|
|
invoke-direct {p1}, Ljava/util/HashSet;-><init>()V
|
|
|
|
.line 21
|
|
.line 22
|
|
.line 23
|
|
iput-object p1, p0, Lkotlin/sequences/DistinctIterator;->observed:Ljava/util/HashSet;
|
|
|
|
.line 24
|
|
.line 25
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public computeNext()V
|
|
.locals 3
|
|
|
|
.line 1
|
|
:cond_0
|
|
iget-object v0, p0, Lkotlin/sequences/DistinctIterator;->source:Ljava/util/Iterator;
|
|
|
|
.line 2
|
|
.line 3
|
|
invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
|
|
|
|
.line 4
|
|
.line 5
|
|
.line 6
|
|
move-result v0
|
|
|
|
.line 7
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 8
|
|
.line 9
|
|
iget-object v0, p0, Lkotlin/sequences/DistinctIterator;->source:Ljava/util/Iterator;
|
|
|
|
.line 10
|
|
.line 11
|
|
invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
|
|
|
|
.line 12
|
|
.line 13
|
|
.line 14
|
|
move-result-object v0
|
|
|
|
.line 15
|
|
iget-object v1, p0, Lkotlin/sequences/DistinctIterator;->keySelector:Lkotlin/jvm/functions/Function1;
|
|
|
|
.line 16
|
|
.line 17
|
|
invoke-interface {v1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object;
|
|
|
|
.line 18
|
|
.line 19
|
|
.line 20
|
|
move-result-object v1
|
|
|
|
.line 21
|
|
iget-object v2, p0, Lkotlin/sequences/DistinctIterator;->observed:Ljava/util/HashSet;
|
|
|
|
.line 22
|
|
.line 23
|
|
invoke-virtual {v2, v1}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
|
|
|
|
.line 24
|
|
.line 25
|
|
.line 26
|
|
move-result v1
|
|
|
|
.line 27
|
|
if-eqz v1, :cond_0
|
|
|
|
.line 28
|
|
.line 29
|
|
invoke-virtual {p0, v0}, Lkotlin/collections/AbstractIterator;->setNext(Ljava/lang/Object;)V
|
|
|
|
.line 30
|
|
.line 31
|
|
.line 32
|
|
return-void
|
|
|
|
.line 33
|
|
:cond_1
|
|
invoke-virtual {p0}, Lkotlin/collections/AbstractIterator;->done()V
|
|
|
|
.line 34
|
|
.line 35
|
|
.line 36
|
|
return-void
|
|
.end method
|