* 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>
92 lines
4.5 KiB
Java
92 lines
4.5 KiB
Java
package com.google.mlkit.vision.text.internal;
|
|
|
|
import com.google.android.gms.common.Feature;
|
|
import com.google.android.gms.common.internal.Preconditions;
|
|
import com.google.android.gms.internal.mlkit_vision_common.zzlx;
|
|
import com.google.android.gms.internal.mlkit_vision_text_common.zzot;
|
|
import com.google.android.gms.internal.mlkit_vision_text_common.zzov;
|
|
import com.google.android.gms.internal.mlkit_vision_text_common.zzrz;
|
|
import com.google.android.gms.internal.mlkit_vision_text_common.zzsd;
|
|
import com.google.android.gms.internal.mlkit_vision_text_common.zztw;
|
|
import com.google.android.gms.internal.mlkit_vision_text_common.zzuc;
|
|
import com.google.android.gms.internal.mlkit_vision_text_common.zzuf;
|
|
import com.google.android.gms.tasks.Task;
|
|
import com.google.android.gms.tasks.Tasks;
|
|
import com.google.mlkit.common.MlKitException;
|
|
import com.google.mlkit.common.sdkinternal.MLTaskExecutor;
|
|
import com.google.mlkit.vision.common.InputImage;
|
|
import com.google.mlkit.vision.common.internal.MobileVisionBase;
|
|
import com.google.mlkit.vision.text.Text;
|
|
import com.google.mlkit.vision.text.TextRecognizer;
|
|
import com.google.mlkit.vision.text.TextRecognizerOptionsInterface;
|
|
import com.google.mlkit.vision.text.internal.zzn;
|
|
import java.util.concurrent.Callable;
|
|
import java.util.concurrent.Executor;
|
|
|
|
/* loaded from: classes3.dex */
|
|
public final class zzn extends MobileVisionBase implements TextRecognizer {
|
|
public final TextRecognizerOptionsInterface j;
|
|
|
|
/* JADX WARN: Type inference failed for: r0v0, types: [com.google.android.gms.internal.mlkit_vision_text_common.zzsa, java.lang.Object] */
|
|
/* JADX WARN: Type inference failed for: r3v1, types: [java.lang.Object, com.google.android.gms.internal.mlkit_vision_text_common.zzow] */
|
|
/* JADX WARN: Type inference failed for: r4v4, types: [com.google.android.gms.internal.mlkit_vision_text_common.zzrx, java.lang.Object] */
|
|
public zzn(TextRecognizerTaskWithResource textRecognizerTaskWithResource, Executor executor, zzuc zzucVar, TextRecognizerOptionsInterface textRecognizerOptionsInterface) {
|
|
super(textRecognizerTaskWithResource, executor);
|
|
zzot zzotVar;
|
|
this.j = textRecognizerOptionsInterface;
|
|
?? obj = new Object();
|
|
if (textRecognizerOptionsInterface.g()) {
|
|
zzotVar = zzot.TYPE_THICK;
|
|
} else {
|
|
zzotVar = zzot.TYPE_THIN;
|
|
}
|
|
obj.f11393c = zzotVar;
|
|
?? obj2 = new Object();
|
|
?? obj3 = new Object();
|
|
obj3.f11404a = LoggingUtils.a(textRecognizerOptionsInterface.d());
|
|
obj2.f11401c = new zzsd(obj3);
|
|
obj.d = new zzrz(obj2);
|
|
MLTaskExecutor.c().execute(new zztw(zzucVar, new zzuf(obj, 1), zzov.ON_DEVICE_TEXT_CREATE, zzucVar.c()));
|
|
}
|
|
|
|
public final Task e(final InputImage inputImage) {
|
|
synchronized (this) {
|
|
Preconditions.checkNotNull(inputImage, "InputImage can not be null");
|
|
if (this.f12811c.get()) {
|
|
return Tasks.d(new MlKitException("This detector is already closed!", 14));
|
|
}
|
|
if (inputImage.b >= 32 && inputImage.f12809c >= 32) {
|
|
return this.f.a(this.h, new Callable() { // from class: com.google.mlkit.vision.common.internal.zza
|
|
@Override // java.util.concurrent.Callable
|
|
public final Object call() {
|
|
zzn zznVar = zzn.this;
|
|
InputImage inputImage2 = inputImage;
|
|
zzlx d = zzlx.d();
|
|
d.a();
|
|
try {
|
|
Text d2 = zznVar.f.d(inputImage2);
|
|
d.close();
|
|
return d2;
|
|
} catch (Throwable th) {
|
|
try {
|
|
d.close();
|
|
} catch (Throwable th2) {
|
|
try {
|
|
Throwable.class.getDeclaredMethod("addSuppressed", Throwable.class).invoke(th, th2);
|
|
} catch (Exception unused) {
|
|
}
|
|
}
|
|
throw th;
|
|
}
|
|
}
|
|
}, this.g.f11603a);
|
|
}
|
|
return Tasks.d(new MlKitException("InputImage width and height should be at least 32!", 3));
|
|
}
|
|
}
|
|
|
|
@Override // com.google.android.gms.common.api.OptionalModuleApi
|
|
public final Feature[] getOptionalFeatures() {
|
|
return TextOptionalModuleUtils.a(this.j);
|
|
}
|
|
}
|