* 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>
299 lines
6.2 KiB
Smali
299 lines
6.2 KiB
Smali
.class public Lcom/google/firebase/components/Component$Builder;
|
|
.super Ljava/lang/Object;
|
|
.source "SourceFile"
|
|
|
|
|
|
# annotations
|
|
.annotation system Ldalvik/annotation/EnclosingClass;
|
|
value = Lcom/google/firebase/components/Component;
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/InnerClass;
|
|
accessFlags = 0x9
|
|
name = "Builder"
|
|
.end annotation
|
|
|
|
.annotation system Ldalvik/annotation/Signature;
|
|
value = {
|
|
"<T:",
|
|
"Ljava/lang/Object;",
|
|
">",
|
|
"Ljava/lang/Object;"
|
|
}
|
|
.end annotation
|
|
|
|
|
|
# instance fields
|
|
.field public final a:Ljava/util/HashSet;
|
|
|
|
.field public final b:Ljava/util/HashSet;
|
|
|
|
.field public c:I
|
|
|
|
.field public d:Lcom/google/firebase/components/ComponentFactory;
|
|
|
|
.field public final e:Ljava/util/HashSet;
|
|
|
|
|
|
# direct methods
|
|
.method public constructor <init>(Ljava/lang/Class;[Ljava/lang/Class;)V
|
|
.locals 3
|
|
|
|
.line 1
|
|
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
|
|
|
|
.line 2
|
|
.line 3
|
|
.line 4
|
|
new-instance v0, Ljava/util/HashSet;
|
|
|
|
.line 5
|
|
.line 6
|
|
invoke-direct {v0}, Ljava/util/HashSet;-><init>()V
|
|
|
|
.line 7
|
|
.line 8
|
|
.line 9
|
|
iput-object v0, p0, Lcom/google/firebase/components/Component$Builder;->a:Ljava/util/HashSet;
|
|
|
|
.line 10
|
|
.line 11
|
|
new-instance v1, Ljava/util/HashSet;
|
|
|
|
.line 12
|
|
.line 13
|
|
invoke-direct {v1}, Ljava/util/HashSet;-><init>()V
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
iput-object v1, p0, Lcom/google/firebase/components/Component$Builder;->b:Ljava/util/HashSet;
|
|
|
|
.line 17
|
|
.line 18
|
|
const/4 v1, 0x0
|
|
|
|
.line 19
|
|
iput v1, p0, Lcom/google/firebase/components/Component$Builder;->c:I
|
|
|
|
.line 20
|
|
.line 21
|
|
new-instance v2, Ljava/util/HashSet;
|
|
|
|
.line 22
|
|
.line 23
|
|
invoke-direct {v2}, Ljava/util/HashSet;-><init>()V
|
|
|
|
.line 24
|
|
.line 25
|
|
.line 26
|
|
iput-object v2, p0, Lcom/google/firebase/components/Component$Builder;->e:Ljava/util/HashSet;
|
|
|
|
.line 27
|
|
.line 28
|
|
invoke-virtual {v0, p1}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
|
|
|
|
.line 29
|
|
.line 30
|
|
.line 31
|
|
array-length p1, p2
|
|
|
|
.line 32
|
|
:goto_0
|
|
if-ge v1, p1, :cond_1
|
|
|
|
.line 33
|
|
.line 34
|
|
aget-object v0, p2, v1
|
|
|
|
.line 35
|
|
.line 36
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 37
|
|
.line 38
|
|
add-int/lit8 v1, v1, 0x1
|
|
|
|
.line 39
|
|
.line 40
|
|
goto :goto_0
|
|
|
|
.line 41
|
|
:cond_0
|
|
new-instance p1, Ljava/lang/NullPointerException;
|
|
|
|
.line 42
|
|
.line 43
|
|
const-string p2, "Null interface"
|
|
|
|
.line 44
|
|
.line 45
|
|
invoke-direct {p1, p2}, Ljava/lang/NullPointerException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 46
|
|
.line 47
|
|
.line 48
|
|
throw p1
|
|
|
|
.line 49
|
|
:cond_1
|
|
iget-object p1, p0, Lcom/google/firebase/components/Component$Builder;->a:Ljava/util/HashSet;
|
|
|
|
.line 50
|
|
.line 51
|
|
invoke-static {p1, p2}, Ljava/util/Collections;->addAll(Ljava/util/Collection;[Ljava/lang/Object;)Z
|
|
|
|
.line 52
|
|
.line 53
|
|
.line 54
|
|
return-void
|
|
.end method
|
|
|
|
|
|
# virtual methods
|
|
.method public final a(Lcom/google/firebase/components/Dependency;)V
|
|
.locals 2
|
|
|
|
.line 1
|
|
iget-object v0, p1, Lcom/google/firebase/components/Dependency;->a:Ljava/lang/Class;
|
|
|
|
.line 2
|
|
.line 3
|
|
iget-object v1, p0, Lcom/google/firebase/components/Component$Builder;->a:Ljava/util/HashSet;
|
|
|
|
.line 4
|
|
.line 5
|
|
invoke-virtual {v1, v0}, Ljava/util/HashSet;->contains(Ljava/lang/Object;)Z
|
|
|
|
.line 6
|
|
.line 7
|
|
.line 8
|
|
move-result v0
|
|
|
|
.line 9
|
|
if-nez v0, :cond_0
|
|
|
|
.line 10
|
|
.line 11
|
|
iget-object v0, p0, Lcom/google/firebase/components/Component$Builder;->b:Ljava/util/HashSet;
|
|
|
|
.line 12
|
|
.line 13
|
|
invoke-virtual {v0, p1}, Ljava/util/HashSet;->add(Ljava/lang/Object;)Z
|
|
|
|
.line 14
|
|
.line 15
|
|
.line 16
|
|
return-void
|
|
|
|
.line 17
|
|
:cond_0
|
|
new-instance p1, Ljava/lang/IllegalArgumentException;
|
|
|
|
.line 18
|
|
.line 19
|
|
const-string v0, "Components are not allowed to depend on interfaces they themselves provide."
|
|
|
|
.line 20
|
|
.line 21
|
|
invoke-direct {p1, v0}, Ljava/lang/IllegalArgumentException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 22
|
|
.line 23
|
|
.line 24
|
|
throw p1
|
|
.end method
|
|
|
|
.method public final b()Lcom/google/firebase/components/Component;
|
|
.locals 7
|
|
|
|
.line 1
|
|
iget-object v0, p0, Lcom/google/firebase/components/Component$Builder;->d:Lcom/google/firebase/components/ComponentFactory;
|
|
|
|
.line 2
|
|
.line 3
|
|
if-eqz v0, :cond_0
|
|
|
|
.line 4
|
|
.line 5
|
|
const/4 v0, 0x1
|
|
|
|
.line 6
|
|
goto :goto_0
|
|
|
|
.line 7
|
|
:cond_0
|
|
const/4 v0, 0x0
|
|
|
|
.line 8
|
|
:goto_0
|
|
if-eqz v0, :cond_1
|
|
|
|
.line 9
|
|
.line 10
|
|
new-instance v1, Lcom/google/firebase/components/Component;
|
|
|
|
.line 11
|
|
.line 12
|
|
new-instance v2, Ljava/util/HashSet;
|
|
|
|
.line 13
|
|
.line 14
|
|
iget-object v0, p0, Lcom/google/firebase/components/Component$Builder;->a:Ljava/util/HashSet;
|
|
|
|
.line 15
|
|
.line 16
|
|
invoke-direct {v2, v0}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
|
|
|
|
.line 17
|
|
.line 18
|
|
.line 19
|
|
new-instance v3, Ljava/util/HashSet;
|
|
|
|
.line 20
|
|
.line 21
|
|
iget-object v0, p0, Lcom/google/firebase/components/Component$Builder;->b:Ljava/util/HashSet;
|
|
|
|
.line 22
|
|
.line 23
|
|
invoke-direct {v3, v0}, Ljava/util/HashSet;-><init>(Ljava/util/Collection;)V
|
|
|
|
.line 24
|
|
.line 25
|
|
.line 26
|
|
iget v4, p0, Lcom/google/firebase/components/Component$Builder;->c:I
|
|
|
|
.line 27
|
|
.line 28
|
|
iget-object v5, p0, Lcom/google/firebase/components/Component$Builder;->d:Lcom/google/firebase/components/ComponentFactory;
|
|
|
|
.line 29
|
|
.line 30
|
|
iget-object v6, p0, Lcom/google/firebase/components/Component$Builder;->e:Ljava/util/HashSet;
|
|
|
|
.line 31
|
|
.line 32
|
|
invoke-direct/range {v1 .. v6}, Lcom/google/firebase/components/Component;-><init>(Ljava/util/HashSet;Ljava/util/HashSet;ILcom/google/firebase/components/ComponentFactory;Ljava/util/HashSet;)V
|
|
|
|
.line 33
|
|
.line 34
|
|
.line 35
|
|
return-object v1
|
|
|
|
.line 36
|
|
:cond_1
|
|
new-instance v0, Ljava/lang/IllegalStateException;
|
|
|
|
.line 37
|
|
.line 38
|
|
const-string v1, "Missing required property: factory."
|
|
|
|
.line 39
|
|
.line 40
|
|
invoke-direct {v0, v1}, Ljava/lang/IllegalStateException;-><init>(Ljava/lang/String;)V
|
|
|
|
.line 41
|
|
.line 42
|
|
.line 43
|
|
throw v0
|
|
.end method
|