soul-browser/sources/java/com/google/api/client/googleapis/batch/BatchRequest.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

155 lines
6.5 KiB
Java

package com.google.api.client.googleapis.batch;
import com.google.api.client.http.GenericUrl;
import com.google.api.client.http.HttpExecuteInterceptor;
import com.google.api.client.http.HttpHeaders;
import com.google.api.client.http.HttpRequest;
import com.google.api.client.http.HttpRequestFactory;
import com.google.api.client.http.HttpRequestInitializer;
import com.google.api.client.http.HttpResponse;
import com.google.api.client.http.HttpTransport;
import com.google.api.client.http.MultipartContent;
import com.google.api.client.util.Preconditions;
import com.google.api.client.util.Sleeper;
import java.io.BufferedInputStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
/* loaded from: classes3.dex */
public final class BatchRequest {
private static final String GLOBAL_BATCH_ENDPOINT = "https://www.googleapis.com/batch";
private static final String GLOBAL_BATCH_ENDPOINT_WARNING = "You are using the global batch endpoint which will soon be shut down. Please instantiate your BatchRequest via your service client's `batch(HttpRequestInitializer)` method. For an example, please see https://github.com/googleapis/google-api-java-client#batching.";
private static final Logger LOGGER = Logger.getLogger(BatchRequest.class.getName());
private final HttpRequestFactory requestFactory;
private GenericUrl batchUrl = new GenericUrl(GLOBAL_BATCH_ENDPOINT);
List<RequestInfo<?, ?>> requestInfos = new ArrayList();
private Sleeper sleeper = Sleeper.DEFAULT;
/* loaded from: classes3.dex */
public class BatchInterceptor implements HttpExecuteInterceptor {
private HttpExecuteInterceptor originalInterceptor;
public BatchInterceptor(HttpExecuteInterceptor httpExecuteInterceptor) {
this.originalInterceptor = httpExecuteInterceptor;
}
@Override // com.google.api.client.http.HttpExecuteInterceptor
public void intercept(HttpRequest httpRequest) {
HttpExecuteInterceptor httpExecuteInterceptor = this.originalInterceptor;
if (httpExecuteInterceptor != null) {
httpExecuteInterceptor.intercept(httpRequest);
}
for (RequestInfo<?, ?> requestInfo : BatchRequest.this.requestInfos) {
HttpExecuteInterceptor interceptor = requestInfo.request.getInterceptor();
if (interceptor != null) {
interceptor.intercept(requestInfo.request);
}
}
}
}
/* loaded from: classes3.dex */
public static class RequestInfo<T, E> {
final BatchCallback<T, E> callback;
final Class<T> dataClass;
final Class<E> errorClass;
final HttpRequest request;
public RequestInfo(BatchCallback<T, E> batchCallback, Class<T> cls, Class<E> cls2, HttpRequest httpRequest) {
this.callback = batchCallback;
this.dataClass = cls;
this.errorClass = cls2;
this.request = httpRequest;
}
}
@Deprecated
public BatchRequest(HttpTransport httpTransport, HttpRequestInitializer httpRequestInitializer) {
HttpRequestFactory createRequestFactory;
if (httpRequestInitializer == null) {
createRequestFactory = httpTransport.createRequestFactory();
} else {
createRequestFactory = httpTransport.createRequestFactory(httpRequestInitializer);
}
this.requestFactory = createRequestFactory;
}
public void execute() {
boolean z;
Preconditions.checkState(!this.requestInfos.isEmpty(), "Batch is empty");
if (GLOBAL_BATCH_ENDPOINT.equals(this.batchUrl.toString())) {
LOGGER.log(Level.WARNING, GLOBAL_BATCH_ENDPOINT_WARNING);
}
HttpRequest buildPostRequest = this.requestFactory.buildPostRequest(this.batchUrl, null);
buildPostRequest.setInterceptor(new BatchInterceptor(buildPostRequest.getInterceptor()));
int numberOfRetries = buildPostRequest.getNumberOfRetries();
do {
if (numberOfRetries > 0) {
z = true;
} else {
z = false;
}
MultipartContent multipartContent = new MultipartContent();
multipartContent.getMediaType().setSubType("mixed");
Iterator<RequestInfo<?, ?>> it = this.requestInfos.iterator();
int i = 1;
while (it.hasNext()) {
multipartContent.addPart(new MultipartContent.Part(new HttpHeaders().setAcceptEncoding(null).set("Content-ID", (Object) Integer.valueOf(i)), new HttpRequestContent(it.next().request)));
i++;
}
buildPostRequest.setContent(multipartContent);
HttpResponse execute = buildPostRequest.execute();
try {
BatchUnparsedResponse batchUnparsedResponse = new BatchUnparsedResponse(new BufferedInputStream(execute.getContent()), "--" + execute.getMediaType().getParameter("boundary"), this.requestInfos, z);
while (batchUnparsedResponse.hasNext) {
batchUnparsedResponse.parseNextResponse();
}
execute.disconnect();
List<RequestInfo<?, ?>> list = batchUnparsedResponse.unsuccessfulRequestInfos;
if (list.isEmpty()) {
break;
}
this.requestInfos = list;
numberOfRetries--;
} catch (Throwable th) {
execute.disconnect();
throw th;
}
} while (z);
this.requestInfos.clear();
}
public GenericUrl getBatchUrl() {
return this.batchUrl;
}
public Sleeper getSleeper() {
return this.sleeper;
}
public <T, E> BatchRequest queue(HttpRequest httpRequest, Class<T> cls, Class<E> cls2, BatchCallback<T, E> batchCallback) {
Preconditions.checkNotNull(httpRequest);
Preconditions.checkNotNull(batchCallback);
Preconditions.checkNotNull(cls);
Preconditions.checkNotNull(cls2);
this.requestInfos.add(new RequestInfo<>(batchCallback, cls, cls2, httpRequest));
return this;
}
public BatchRequest setBatchUrl(GenericUrl genericUrl) {
this.batchUrl = genericUrl;
return this;
}
public BatchRequest setSleeper(Sleeper sleeper) {
this.sleeper = (Sleeper) Preconditions.checkNotNull(sleeper);
return this;
}
public int size() {
return this.requestInfos.size();
}
}