soul-browser/sources/java/com/bumptech/glide/disklrucache/StrictLineReader.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

130 lines
5.1 KiB
Java

package com.bumptech.glide.disklrucache;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
import java.io.EOFException;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
/* JADX INFO: Access modifiers changed from: package-private */
/* loaded from: classes.dex */
public class StrictLineReader implements Closeable {
/* renamed from: c, reason: collision with root package name */
public final FileInputStream f2104c;
public final Charset f;
public byte[] g;
public int h;
public int i;
public StrictLineReader(FileInputStream fileInputStream, Charset charset) {
if (charset != null) {
if (charset.equals(Util.f2106a)) {
this.f2104c = fileInputStream;
this.f = charset;
this.g = new byte[8192];
return;
}
throw new IllegalArgumentException("Unsupported encoding");
}
throw null;
}
public final String a() {
int i;
synchronized (this.f2104c) {
try {
byte[] bArr = this.g;
if (bArr != null) {
if (this.h >= this.i) {
int read = this.f2104c.read(bArr, 0, bArr.length);
if (read != -1) {
this.h = 0;
this.i = read;
} else {
throw new EOFException();
}
}
for (int i2 = this.h; i2 != this.i; i2++) {
byte[] bArr2 = this.g;
if (bArr2[i2] == 10) {
int i3 = this.h;
if (i2 != i3) {
i = i2 - 1;
if (bArr2[i] == 13) {
String str = new String(bArr2, i3, i - i3, this.f.name());
this.h = i2 + 1;
return str;
}
}
i = i2;
String str2 = new String(bArr2, i3, i - i3, this.f.name());
this.h = i2 + 1;
return str2;
}
}
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream((this.i - this.h) + 80) { // from class: com.bumptech.glide.disklrucache.StrictLineReader.1
@Override // java.io.ByteArrayOutputStream
public final String toString() {
int i4 = ((ByteArrayOutputStream) this).count;
if (i4 > 0 && ((ByteArrayOutputStream) this).buf[i4 - 1] == 13) {
i4--;
}
try {
return new String(((ByteArrayOutputStream) this).buf, 0, i4, StrictLineReader.this.f.name());
} catch (UnsupportedEncodingException e) {
throw new AssertionError(e);
}
}
};
while (true) {
byte[] bArr3 = this.g;
int i4 = this.h;
byteArrayOutputStream.write(bArr3, i4, this.i - i4);
this.i = -1;
FileInputStream fileInputStream = this.f2104c;
byte[] bArr4 = this.g;
int read2 = fileInputStream.read(bArr4, 0, bArr4.length);
if (read2 != -1) {
this.h = 0;
this.i = read2;
for (int i5 = 0; i5 != this.i; i5++) {
byte[] bArr5 = this.g;
if (bArr5[i5] == 10) {
int i6 = this.h;
if (i5 != i6) {
byteArrayOutputStream.write(bArr5, i6, i5 - i6);
}
this.h = i5 + 1;
return byteArrayOutputStream.toString();
}
}
} else {
throw new EOFException();
}
}
} else {
throw new IOException("LineReader is closed");
}
} catch (Throwable th) {
throw th;
}
}
}
@Override // java.io.Closeable, java.lang.AutoCloseable
public final void close() {
synchronized (this.f2104c) {
try {
if (this.g != null) {
this.g = null;
this.f2104c.close();
}
} catch (Throwable th) {
throw th;
}
}
}
}