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

110 lines
3.8 KiB
Java

package com.google.firebase.components;
import com.google.firebase.events.Publisher;
import com.google.firebase.inject.Provider;
import j$.util.DesugarCollections;
import java.util.HashSet;
import java.util.Set;
/* loaded from: classes3.dex */
final class RestrictedComponentContainer extends AbstractComponentContainer {
/* renamed from: a, reason: collision with root package name */
public final Set f12634a;
public final Set b;
/* renamed from: c, reason: collision with root package name */
public final Set f12635c;
public final Set d;
public final ComponentContainer e;
/* loaded from: classes3.dex */
public static class RestrictedPublisher implements Publisher {
/* renamed from: a, reason: collision with root package name */
public final Publisher f12636a;
public RestrictedPublisher(Publisher publisher) {
this.f12636a = publisher;
}
}
public RestrictedComponentContainer(Component component, ComponentContainer componentContainer) {
boolean z;
HashSet hashSet = new HashSet();
HashSet hashSet2 = new HashSet();
HashSet hashSet3 = new HashSet();
HashSet hashSet4 = new HashSet();
HashSet hashSet5 = new HashSet();
Set<Dependency> set = component.b;
Set set2 = component.e;
for (Dependency dependency : set) {
int i = dependency.f12623c;
int i2 = dependency.b;
if (i == 0) {
z = true;
} else {
z = false;
}
Class cls = dependency.f12622a;
if (z) {
if (i2 == 2) {
hashSet4.add(cls);
} else {
hashSet.add(cls);
}
} else if (i == 2) {
hashSet3.add(cls);
} else if (i2 == 2) {
hashSet5.add(cls);
} else {
hashSet2.add(cls);
}
}
if (!set2.isEmpty()) {
hashSet.add(Publisher.class);
}
this.f12634a = DesugarCollections.unmodifiableSet(hashSet);
this.b = DesugarCollections.unmodifiableSet(hashSet2);
DesugarCollections.unmodifiableSet(hashSet3);
this.f12635c = DesugarCollections.unmodifiableSet(hashSet4);
this.d = DesugarCollections.unmodifiableSet(hashSet5);
this.e = componentContainer;
}
@Override // com.google.firebase.components.AbstractComponentContainer, com.google.firebase.components.ComponentContainer
public final Object a(Class cls) {
if (this.f12634a.contains(cls)) {
Object a2 = this.e.a(cls);
if (!cls.equals(Publisher.class)) {
return a2;
}
return new RestrictedPublisher((Publisher) a2);
}
throw new RuntimeException("Attempting to request an undeclared dependency " + cls + ".");
}
@Override // com.google.firebase.components.ComponentContainer
public final Provider b(Class cls) {
if (this.b.contains(cls)) {
return this.e.b(cls);
}
throw new RuntimeException("Attempting to request an undeclared dependency Provider<" + cls + ">.");
}
@Override // com.google.firebase.components.ComponentContainer
public final Provider c(Class cls) {
if (this.d.contains(cls)) {
return this.e.c(cls);
}
throw new RuntimeException("Attempting to request an undeclared dependency Provider<Set<" + cls + ">>.");
}
@Override // com.google.firebase.components.AbstractComponentContainer, com.google.firebase.components.ComponentContainer
public final Set d(Class cls) {
if (this.f12635c.contains(cls)) {
return this.e.d(cls);
}
throw new RuntimeException("Attempting to request an undeclared dependency Set<" + cls + ">.");
}
}