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

113 lines
5 KiB
Java

package com.google.firebase.components;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
import android.os.Bundle;
import android.support.v4.media.a;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.google.firebase.inject.Provider;
import com.google.mlkit.common.internal.MlKitComponentDiscoveryService;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collections;
import kotlin.uuid.Uuid;
/* loaded from: classes3.dex */
public final class ComponentDiscovery<T> {
/* renamed from: a, reason: collision with root package name */
public final Context f12609a;
/* loaded from: classes3.dex */
public static class MetadataRegistrarNameRetriever implements RegistrarNameRetriever<Context> {
}
@VisibleForTesting
/* loaded from: classes3.dex */
public interface RegistrarNameRetriever<T> {
}
public ComponentDiscovery(Context context, MetadataRegistrarNameRetriever metadataRegistrarNameRetriever) {
this.f12609a = context;
}
/* JADX WARN: Type inference failed for: r1v0, types: [com.google.firebase.components.ComponentDiscovery$MetadataRegistrarNameRetriever, java.lang.Object] */
public static ComponentDiscovery b(Context context) {
return new ComponentDiscovery(context, new Object());
}
/* JADX WARN: Multi-variable type inference failed */
/* JADX WARN: Type inference failed for: r1v2, types: [java.util.ArrayList] */
/* JADX WARN: Type inference failed for: r1v3, types: [java.util.List] */
/* JADX WARN: Type inference failed for: r1v6, types: [java.util.List] */
public final ArrayList a() {
?? arrayList;
ArrayList arrayList2 = new ArrayList();
Context context = this.f12609a;
Bundle bundle = null;
try {
PackageManager packageManager = context.getPackageManager();
if (packageManager == null) {
Log.w("ComponentDiscovery", "Context has no PackageManager.");
} else {
ServiceInfo serviceInfo = packageManager.getServiceInfo(new ComponentName(context, (Class<?>) MlKitComponentDiscoveryService.class), Uuid.SIZE_BITS);
if (serviceInfo == null) {
Log.w("ComponentDiscovery", MlKitComponentDiscoveryService.class + " has no service info.");
} else {
bundle = serviceInfo.metaData;
}
}
} catch (PackageManager.NameNotFoundException unused) {
Log.w("ComponentDiscovery", "Application info not found.");
}
if (bundle == null) {
Log.w("ComponentDiscovery", "Could not retrieve metadata, returning empty list of registrars.");
arrayList = Collections.EMPTY_LIST;
} else {
arrayList = new ArrayList();
for (String str : bundle.keySet()) {
if ("com.google.firebase.components.ComponentRegistrar".equals(bundle.get(str)) && str.startsWith("com.google.firebase.components:")) {
arrayList.add(str.substring(31));
}
}
}
for (final String str2 : arrayList) {
arrayList2.add(new Provider(str2) { // from class: com.google.firebase.components.ComponentDiscovery$$Lambda$1
/* renamed from: a, reason: collision with root package name */
public final String f12610a;
{
this.f12610a = str2;
}
@Override // com.google.firebase.inject.Provider
public final Object get() {
String str3 = this.f12610a;
try {
Class<?> cls = Class.forName(str3);
if (ComponentRegistrar.class.isAssignableFrom(cls)) {
return (ComponentRegistrar) cls.getDeclaredConstructor(null).newInstance(null);
}
throw new RuntimeException("Class " + str3 + " is not an instance of com.google.firebase.components.ComponentRegistrar");
} catch (ClassNotFoundException unused2) {
Log.w("ComponentDiscovery", "Class " + str3 + " is not an found.");
return null;
} catch (IllegalAccessException e) {
throw new RuntimeException(a.l("Could not instantiate ", str3, "."), e);
} catch (InstantiationException e2) {
throw new RuntimeException(a.l("Could not instantiate ", str3, "."), e2);
} catch (NoSuchMethodException e3) {
throw new RuntimeException(a.C("Could not instantiate ", str3), e3);
} catch (InvocationTargetException e4) {
throw new RuntimeException(a.C("Could not instantiate ", str3), e4);
}
}
});
}
return arrayList2;
}
}