soul-browser/sources/java/com/google/firebase/components/Component.java
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

104 lines
3.5 KiB
Java

package com.google.firebase.components;
import j$.util.DesugarCollections;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
/* loaded from: classes3.dex */
public final class Component<T> {
/* renamed from: a, reason: collision with root package name */
public final Set f12604a;
public final Set b;
/* renamed from: c, reason: collision with root package name */
public final int f12605c;
public final ComponentFactory d;
public final Set e;
/* loaded from: classes3.dex */
public static class Builder<T> {
/* renamed from: a, reason: collision with root package name */
public final HashSet f12607a;
public final HashSet b;
/* renamed from: c, reason: collision with root package name */
public int f12608c;
public ComponentFactory d;
public final HashSet e;
public Builder(Class cls, Class[] clsArr) {
HashSet hashSet = new HashSet();
this.f12607a = hashSet;
this.b = new HashSet();
this.f12608c = 0;
this.e = new HashSet();
hashSet.add(cls);
for (Class cls2 : clsArr) {
if (cls2 == null) {
throw new NullPointerException("Null interface");
}
}
Collections.addAll(this.f12607a, clsArr);
}
public final void a(Dependency dependency) {
if (!this.f12607a.contains(dependency.f12622a)) {
this.b.add(dependency);
return;
}
throw new IllegalArgumentException("Components are not allowed to depend on interfaces they themselves provide.");
}
public final Component b() {
boolean z;
if (this.d != null) {
z = true;
} else {
z = false;
}
if (z) {
return new Component(new HashSet(this.f12607a), new HashSet(this.b), this.f12608c, this.d, this.e);
}
throw new IllegalStateException("Missing required property: factory.");
}
}
public Component(HashSet hashSet, HashSet hashSet2, int i, ComponentFactory componentFactory, HashSet hashSet3) {
this.f12604a = DesugarCollections.unmodifiableSet(hashSet);
this.b = DesugarCollections.unmodifiableSet(hashSet2);
this.f12605c = i;
this.d = componentFactory;
this.e = DesugarCollections.unmodifiableSet(hashSet3);
}
public static Builder a(Class cls) {
return new Builder(cls, new Class[0]);
}
public static Component b(final Object obj, Class cls, Class... clsArr) {
Builder builder = new Builder(cls, clsArr);
builder.d = new ComponentFactory(obj) { // from class: com.google.firebase.components.Component$$Lambda$2
/* renamed from: a, reason: collision with root package name */
public final Object f12606a;
{
this.f12606a = obj;
}
@Override // com.google.firebase.components.ComponentFactory
public final Object a(ComponentContainer componentContainer) {
return this.f12606a;
}
};
return builder.b();
}
public final String toString() {
return "Component<" + Arrays.toString(this.f12604a.toArray()) + ">{0, type=" + this.f12605c + ", deps=" + Arrays.toString(this.b.toArray()) + "}";
}
}