soul-browser/sources/java/com/google/mlkit/vision/common/internal/ImageConvertUtils.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

69 lines
2.6 KiB
Java

package com.google.mlkit.vision.common.internal;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Rect;
import android.graphics.YuvImage;
import android.media.Image;
import android.util.Log;
import com.google.android.gms.common.annotation.KeepForSdk;
import com.google.mlkit.common.MlKitException;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
@KeepForSdk
/* loaded from: classes3.dex */
public class ImageConvertUtils {
public static Bitmap a(ByteBuffer byteBuffer, int i, int i2) {
byte[] bArr;
if (byteBuffer.hasArray() && byteBuffer.arrayOffset() == 0) {
bArr = byteBuffer.array();
} else {
byteBuffer.rewind();
int limit = byteBuffer.limit();
byte[] bArr2 = new byte[limit];
byteBuffer.get(bArr2, 0, limit);
bArr = bArr2;
}
byte[] b = b(bArr, i, i2);
Bitmap decodeByteArray = BitmapFactory.decodeByteArray(b, 0, b.length);
return Bitmap.createBitmap(decodeByteArray, 0, 0, decodeByteArray.getWidth(), decodeByteArray.getHeight());
}
public static byte[] b(byte[] bArr, int i, int i2) {
YuvImage yuvImage = new YuvImage(bArr, 17, i, i2, null);
try {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
try {
yuvImage.compressToJpeg(new Rect(0, 0, i, i2), 100, byteArrayOutputStream);
byte[] byteArray = byteArrayOutputStream.toByteArray();
byteArrayOutputStream.close();
return byteArray;
} finally {
}
} catch (IOException e) {
Log.w("ImageConvertUtils", "Error closing ByteArrayOutputStream");
throw new MlKitException(e, "Image conversion error from NV21 format");
}
}
public static final void c(Image.Plane plane, int i, int i2, byte[] bArr, int i3, int i4) {
ByteBuffer buffer = plane.getBuffer();
buffer.rewind();
int rowStride = ((plane.getRowStride() + buffer.limit()) - 1) / plane.getRowStride();
if (rowStride != 0) {
int i5 = i / (i2 / rowStride);
int i6 = 0;
for (int i7 = 0; i7 < rowStride; i7++) {
int i8 = i6;
for (int i9 = 0; i9 < i5; i9++) {
bArr[i3] = buffer.get(i8);
i3 += i4;
i8 += plane.getPixelStride();
}
i6 += plane.getRowStride();
}
}
}
}