soul-browser/sources/java/com/google/mlkit/common/sdkinternal/MlKitContext.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

85 lines
3 KiB
Java

package com.google.mlkit.common.sdkinternal;
import android.content.Context;
import com.google.android.gms.common.annotation.KeepForSdk;
import com.google.android.gms.common.internal.Preconditions;
import com.google.firebase.components.Component;
import com.google.firebase.components.ComponentDiscovery;
import com.google.firebase.components.ComponentRuntime;
import com.google.firebase.inject.Provider;
import java.util.ArrayList;
import java.util.concurrent.Executor;
@KeepForSdk
/* loaded from: classes3.dex */
public class MlKitContext {
public static final Object b = new Object();
/* renamed from: c, reason: collision with root package name */
public static MlKitContext f12771c;
/* renamed from: a, reason: collision with root package name */
public ComponentRuntime f12772a;
public static MlKitContext c() {
boolean z;
MlKitContext mlKitContext;
synchronized (b) {
if (f12771c != null) {
z = true;
} else {
z = false;
}
Preconditions.checkState(z, "MlKitContext has not been initialized");
mlKitContext = (MlKitContext) Preconditions.checkNotNull(f12771c);
}
return mlKitContext;
}
/* JADX WARN: Type inference failed for: r1v3, types: [java.lang.Object, com.google.mlkit.common.sdkinternal.MlKitContext] */
public static MlKitContext d(Context context, Executor executor) {
boolean z;
MlKitContext mlKitContext;
synchronized (b) {
if (f12771c == null) {
z = true;
} else {
z = false;
}
Preconditions.checkState(z, "MlKitContext is already initialized");
?? obj = new Object();
f12771c = obj;
Context applicationContext = context.getApplicationContext();
if (applicationContext != null) {
context = applicationContext;
}
ArrayList a2 = ComponentDiscovery.b(context).a();
Provider provider = ComponentRuntime.f;
ComponentRuntime.Builder builder = new ComponentRuntime.Builder(executor);
builder.b.addAll(a2);
builder.f12618c.add(Component.b(context, Context.class, new Class[0]));
builder.f12618c.add(Component.b(obj, MlKitContext.class, new Class[0]));
ComponentRuntime componentRuntime = new ComponentRuntime(builder.f12617a, builder.b, builder.f12618c);
obj.f12772a = componentRuntime;
componentRuntime.f();
mlKitContext = f12771c;
}
return mlKitContext;
}
public final Object a(Class cls) {
boolean z;
if (f12771c == this) {
z = true;
} else {
z = false;
}
Preconditions.checkState(z, "MlKitContext has been deleted");
Preconditions.checkNotNull(this.f12772a);
return this.f12772a.a(cls);
}
public final Context b() {
return (Context) a(Context.class);
}
}