soul-browser/sources/java/com/google/api/client/http/javanet/NetHttpRequest.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

171 lines
6.9 KiB
Java

package com.google.api.client.http.javanet;
import com.google.api.client.http.HttpMethods;
import com.google.api.client.http.LowLevelHttpRequest;
import com.google.api.client.http.LowLevelHttpResponse;
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.StreamingContent;
import com.google.common.annotations.VisibleForTesting;
import java.io.IOException;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.jsoup.helper.HttpConnection;
/* loaded from: classes3.dex */
final class NetHttpRequest extends LowLevelHttpRequest {
private static final OutputWriter DEFAULT_CONNECTION_WRITER = new DefaultOutputWriter();
private final HttpURLConnection connection;
private int writeTimeout = 0;
/* loaded from: classes3.dex */
public static class DefaultOutputWriter implements OutputWriter {
@Override // com.google.api.client.http.javanet.NetHttpRequest.OutputWriter
public void write(OutputStream outputStream, StreamingContent streamingContent) {
streamingContent.writeTo(outputStream);
}
}
/* loaded from: classes3.dex */
public interface OutputWriter {
void write(OutputStream outputStream, StreamingContent streamingContent);
}
public NetHttpRequest(HttpURLConnection httpURLConnection) {
this.connection = httpURLConnection;
httpURLConnection.setInstanceFollowRedirects(false);
}
private boolean hasResponse(HttpURLConnection httpURLConnection) {
if (httpURLConnection.getResponseCode() <= 0) {
return false;
}
return true;
}
private void writeContentToOutputStream(final OutputWriter outputWriter, final OutputStream outputStream) {
if (this.writeTimeout == 0) {
outputWriter.write(outputStream, getStreamingContent());
return;
}
final StreamingContent streamingContent = getStreamingContent();
Callable<Boolean> callable = new Callable<Boolean>() { // from class: com.google.api.client.http.javanet.NetHttpRequest.1
/* JADX WARN: Can't rename method to resolve collision */
@Override // java.util.concurrent.Callable
public Boolean call() {
outputWriter.write(outputStream, streamingContent);
return Boolean.TRUE;
}
};
ExecutorService newSingleThreadExecutor = Executors.newSingleThreadExecutor();
Future submit = newSingleThreadExecutor.submit(new FutureTask(callable), null);
newSingleThreadExecutor.shutdown();
try {
submit.get(this.writeTimeout, TimeUnit.MILLISECONDS);
if (!newSingleThreadExecutor.isTerminated()) {
newSingleThreadExecutor.shutdown();
}
} catch (InterruptedException e) {
throw new IOException("Socket write interrupted", e);
} catch (ExecutionException e2) {
throw new IOException("Exception in socket write", e2);
} catch (TimeoutException e3) {
throw new IOException("Socket write timed out", e3);
}
}
@Override // com.google.api.client.http.LowLevelHttpRequest
public void addHeader(String str, String str2) {
this.connection.addRequestProperty(str, str2);
}
@Override // com.google.api.client.http.LowLevelHttpRequest
public LowLevelHttpResponse execute() {
return execute(DEFAULT_CONNECTION_WRITER);
}
@VisibleForTesting
public String getRequestProperty(String str) {
return this.connection.getRequestProperty(str);
}
@Override // com.google.api.client.http.LowLevelHttpRequest
public void setTimeout(int i, int i2) {
this.connection.setReadTimeout(i2);
this.connection.setConnectTimeout(i);
}
@Override // com.google.api.client.http.LowLevelHttpRequest
public void setWriteTimeout(int i) {
this.writeTimeout = i;
}
@VisibleForTesting
public LowLevelHttpResponse execute(OutputWriter outputWriter) {
HttpURLConnection httpURLConnection = this.connection;
if (getStreamingContent() != null) {
String contentType = getContentType();
if (contentType != null) {
addHeader(HttpConnection.CONTENT_TYPE, contentType);
}
String contentEncoding = getContentEncoding();
if (contentEncoding != null) {
addHeader(HttpConnection.CONTENT_ENCODING, contentEncoding);
}
long contentLength = getContentLength();
if (contentLength >= 0) {
httpURLConnection.setRequestProperty("Content-Length", Long.toString(contentLength));
}
String requestMethod = httpURLConnection.getRequestMethod();
if (!HttpMethods.POST.equals(requestMethod) && !HttpMethods.PUT.equals(requestMethod)) {
Preconditions.checkArgument(contentLength == 0, "%s with non-zero content length is not supported", requestMethod);
} else {
httpURLConnection.setDoOutput(true);
if (contentLength >= 0 && contentLength <= 2147483647L) {
httpURLConnection.setFixedLengthStreamingMode((int) contentLength);
} else {
httpURLConnection.setChunkedStreamingMode(0);
}
OutputStream outputStream = httpURLConnection.getOutputStream();
try {
try {
writeContentToOutputStream(outputWriter, outputStream);
outputStream.close();
} catch (IOException e) {
if (hasResponse(httpURLConnection)) {
try {
outputStream.close();
} catch (IOException unused) {
}
} else {
throw e;
}
}
} catch (Throwable th) {
try {
outputStream.close();
} catch (IOException unused2) {
}
throw th;
}
}
} else if (HttpMethods.DELETE.equals(httpURLConnection.getRequestMethod())) {
httpURLConnection.setDoOutput(true);
httpURLConnection.setFixedLengthStreamingMode(0L);
}
try {
httpURLConnection.connect();
return new NetHttpResponse(httpURLConnection);
} catch (Throwable th2) {
httpURLConnection.disconnect();
throw th2;
}
}
}