soul-browser/sources/java/com/google/android/gms/common/data/EntityBuffer.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

119 lines
4.6 KiB
Java

package com.google.android.gms.common.data;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.android.gms.common.annotation.KeepForSdk;
import com.google.android.gms.common.internal.Preconditions;
import java.util.ArrayList;
@KeepForSdk
/* loaded from: classes.dex */
public abstract class EntityBuffer<T> extends AbstractDataBuffer<T> {
private boolean zaa;
private ArrayList zab;
@KeepForSdk
public EntityBuffer(@NonNull DataHolder dataHolder) {
super(dataHolder);
this.zaa = false;
}
private final void zab() {
synchronized (this) {
try {
if (!this.zaa) {
int count = ((DataHolder) Preconditions.checkNotNull(this.mDataHolder)).getCount();
ArrayList arrayList = new ArrayList();
this.zab = arrayList;
if (count > 0) {
arrayList.add(0);
String primaryDataMarkerColumn = getPrimaryDataMarkerColumn();
String string = this.mDataHolder.getString(primaryDataMarkerColumn, 0, this.mDataHolder.getWindowIndex(0));
for (int i = 1; i < count; i++) {
int windowIndex = this.mDataHolder.getWindowIndex(i);
String string2 = this.mDataHolder.getString(primaryDataMarkerColumn, i, windowIndex);
if (string2 != null) {
if (!string2.equals(string)) {
this.zab.add(Integer.valueOf(i));
string = string2;
}
} else {
StringBuilder sb = new StringBuilder(String.valueOf(primaryDataMarkerColumn).length() + 42 + String.valueOf(i).length() + 14 + String.valueOf(windowIndex).length());
sb.append("Missing value for markerColumn: ");
sb.append(primaryDataMarkerColumn);
sb.append(", at row: ");
sb.append(i);
sb.append(", for window: ");
sb.append(windowIndex);
throw new NullPointerException(sb.toString());
}
}
}
this.zaa = true;
}
} catch (Throwable th) {
throw th;
}
}
}
@Override // com.google.android.gms.common.data.AbstractDataBuffer, com.google.android.gms.common.data.DataBuffer
@NonNull
@KeepForSdk
public final T get(int i) {
int intValue;
int intValue2;
zab();
int zaa = zaa(i);
int i2 = 0;
if (i >= 0 && i != this.zab.size()) {
if (i == this.zab.size() - 1) {
intValue = ((DataHolder) Preconditions.checkNotNull(this.mDataHolder)).getCount();
intValue2 = ((Integer) this.zab.get(i)).intValue();
} else {
intValue = ((Integer) this.zab.get(i + 1)).intValue();
intValue2 = ((Integer) this.zab.get(i)).intValue();
}
int i3 = intValue - intValue2;
if (i3 == 1) {
int zaa2 = zaa(i);
int windowIndex = ((DataHolder) Preconditions.checkNotNull(this.mDataHolder)).getWindowIndex(zaa2);
String childDataMarkerColumn = getChildDataMarkerColumn();
if (childDataMarkerColumn == null || this.mDataHolder.getString(childDataMarkerColumn, zaa2, windowIndex) != null) {
i2 = 1;
}
} else {
i2 = i3;
}
}
return getEntry(zaa, i2);
}
@Nullable
@KeepForSdk
public String getChildDataMarkerColumn() {
return null;
}
@Override // com.google.android.gms.common.data.AbstractDataBuffer, com.google.android.gms.common.data.DataBuffer
@KeepForSdk
public int getCount() {
zab();
return this.zab.size();
}
@NonNull
@KeepForSdk
public abstract T getEntry(int i, int i2);
@NonNull
@KeepForSdk
public abstract String getPrimaryDataMarkerColumn();
public final int zaa(int i) {
if (i >= 0 && i < this.zab.size()) {
return ((Integer) this.zab.get(i)).intValue();
}
throw new IllegalArgumentException(androidx.work.impl.workers.a.t(new StringBuilder(String.valueOf(i).length() + 42), "Position ", i, " is out of bounds for this buffer"));
}
}