soul-browser/sources/java/com/google/api/client/auth/oauth2/TokenRequest.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

207 lines
8.5 KiB
Java

package com.google.api.client.auth.oauth2;
import com.google.api.client.http.GenericUrl;
import com.google.api.client.http.HttpExecuteInterceptor;
import com.google.api.client.http.HttpRequestInitializer;
import com.google.api.client.http.HttpTransport;
import com.google.api.client.json.JsonFactory;
import com.google.api.client.util.GenericData;
import com.google.api.client.util.Joiner;
import com.google.api.client.util.Key;
import com.google.api.client.util.Preconditions;
import java.util.Collection;
/* loaded from: classes3.dex */
public class TokenRequest extends GenericData {
HttpExecuteInterceptor clientAuthentication;
@Key("grant_type")
private String grantType;
private final JsonFactory jsonFactory;
HttpRequestInitializer requestInitializer;
protected Class<? extends TokenResponse> responseClass;
@Key("scope")
private String scopes;
private GenericUrl tokenServerUrl;
private final HttpTransport transport;
public TokenRequest(HttpTransport httpTransport, JsonFactory jsonFactory, GenericUrl genericUrl, String str) {
this.transport = (HttpTransport) Preconditions.checkNotNull(httpTransport);
this.jsonFactory = (JsonFactory) Preconditions.checkNotNull(jsonFactory);
setTokenServerUrl(genericUrl);
setGrantType(str);
setResponseClass(TokenResponse.class);
}
public TokenResponse execute() {
return (TokenResponse) executeUnparsed().parseAs((Class) this.responseClass);
}
/* JADX WARN: Multi-variable type inference failed */
/* JADX WARN: Removed duplicated region for block: B:21:0x0098 */
/* JADX WARN: Type inference failed for: r1v11 */
/* JADX WARN: Type inference failed for: r1v14, types: [com.google.api.client.auth.oauth2.TokenErrorResponse, com.google.api.client.json.GenericJson] */
/* JADX WARN: Type inference failed for: r1v16 */
/* JADX WARN: Type inference failed for: r1v6 */
/* JADX WARN: Type inference failed for: r1v7 */
/* JADX WARN: Type inference failed for: r1v8, types: [com.google.api.client.auth.oauth2.TokenErrorResponse] */
/*
Code decompiled incorrectly, please refer to instructions dump.
To view partially-correct add '--show-bad-code' argument
*/
public final com.google.api.client.http.HttpResponse executeUnparsed() {
/*
r8 = this;
com.google.api.client.http.HttpTransport r0 = r8.transport
com.google.api.client.auth.oauth2.TokenRequest$1 r1 = new com.google.api.client.auth.oauth2.TokenRequest$1
r1.<init>()
com.google.api.client.http.HttpRequestFactory r0 = r0.createRequestFactory(r1)
com.google.api.client.http.GenericUrl r1 = r8.tokenServerUrl
com.google.api.client.http.UrlEncodedContent r2 = new com.google.api.client.http.UrlEncodedContent
r2.<init>(r8)
com.google.api.client.http.HttpRequest r0 = r0.buildPostRequest(r1, r2)
com.google.api.client.json.JsonObjectParser r1 = new com.google.api.client.json.JsonObjectParser
com.google.api.client.json.JsonFactory r2 = r8.jsonFactory
r1.<init>(r2)
r0.setParser(r1)
r1 = 0
r0.setThrowExceptionOnExecuteError(r1)
com.google.api.client.http.HttpResponse r0 = r0.execute()
boolean r1 = r0.isSuccessStatusCode()
if (r1 == 0) goto L2f
return r0
L2f:
com.google.api.client.json.JsonFactory r1 = r8.jsonFactory
int r2 = com.google.api.client.auth.oauth2.TokenResponseException.f
com.google.api.client.http.HttpResponseException$Builder r2 = new com.google.api.client.http.HttpResponseException$Builder
int r3 = r0.getStatusCode()
java.lang.String r4 = r0.getStatusMessage()
com.google.api.client.http.HttpHeaders r5 = r0.getHeaders()
r2.<init>(r3, r4, r5)
com.google.api.client.util.Preconditions.checkNotNull(r1)
java.lang.String r3 = r0.getContentType()
r4 = 0
boolean r5 = r0.isSuccessStatusCode() // Catch: java.io.IOException -> L80
if (r5 != 0) goto L83
if (r3 == 0) goto L83
java.io.InputStream r5 = r0.getContent() // Catch: java.io.IOException -> L80
if (r5 == 0) goto L83
java.lang.String r5 = "application/json; charset=UTF-8"
boolean r3 = com.google.api.client.http.HttpMediaType.equalsIgnoreParameters(r5, r3) // Catch: java.io.IOException -> L80
if (r3 == 0) goto L83
com.google.api.client.json.JsonObjectParser r3 = new com.google.api.client.json.JsonObjectParser // Catch: java.io.IOException -> L80
r3.<init>(r1) // Catch: java.io.IOException -> L80
java.io.InputStream r1 = r0.getContent() // Catch: java.io.IOException -> L80
java.nio.charset.Charset r5 = r0.getContentCharset() // Catch: java.io.IOException -> L80
java.lang.Class<com.google.api.client.auth.oauth2.TokenErrorResponse> r6 = com.google.api.client.auth.oauth2.TokenErrorResponse.class
java.lang.Object r1 = r3.parseAndClose(r1, r5, r6) // Catch: java.io.IOException -> L80
com.google.api.client.auth.oauth2.TokenErrorResponse r1 = (com.google.api.client.auth.oauth2.TokenErrorResponse) r1 // Catch: java.io.IOException -> L80
java.lang.String r3 = r1.toPrettyString() // Catch: java.io.IOException -> L7e
r4 = r1
r1 = r3
goto L87
L7e:
r3 = move-exception
goto L8b
L80:
r3 = move-exception
r1 = r4
goto L8b
L83:
java.lang.String r1 = r0.parseAsString() // Catch: java.io.IOException -> L80
L87:
r7 = r4
r4 = r1
r1 = r7
goto L8e
L8b:
r3.printStackTrace()
L8e:
java.lang.StringBuilder r0 = com.google.api.client.http.HttpResponseException.computeMessageBuffer(r0)
boolean r3 = com.google.api.client.util.Strings.isNullOrEmpty(r4)
if (r3 != 0) goto La3
java.lang.String r3 = com.google.api.client.util.StringUtils.LINE_SEPARATOR
r0.append(r3)
r0.append(r4)
r2.setContent(r4)
La3:
java.lang.String r0 = r0.toString()
r2.setMessage(r0)
com.google.api.client.auth.oauth2.TokenResponseException r0 = new com.google.api.client.auth.oauth2.TokenResponseException
r0.<init>(r2, r1)
throw r0
*/
throw new UnsupportedOperationException("Method not decompiled: com.google.api.client.auth.oauth2.TokenRequest.executeUnparsed():com.google.api.client.http.HttpResponse");
}
public final HttpExecuteInterceptor getClientAuthentication() {
return this.clientAuthentication;
}
public final String getGrantType() {
return this.grantType;
}
public final JsonFactory getJsonFactory() {
return this.jsonFactory;
}
public final HttpRequestInitializer getRequestInitializer() {
return this.requestInitializer;
}
public final Class<? extends TokenResponse> getResponseClass() {
return this.responseClass;
}
public final String getScopes() {
return this.scopes;
}
public final GenericUrl getTokenServerUrl() {
return this.tokenServerUrl;
}
public final HttpTransport getTransport() {
return this.transport;
}
public TokenRequest setGrantType(String str) {
this.grantType = (String) Preconditions.checkNotNull(str);
return this;
}
public TokenRequest setResponseClass(Class cls) {
this.responseClass = TokenResponse.class;
return this;
}
public TokenRequest setScopes(Collection collection) {
String join;
if (collection == null) {
join = null;
} else {
join = Joiner.on(' ').join(collection);
}
this.scopes = join;
return this;
}
public TokenRequest setTokenServerUrl(GenericUrl genericUrl) {
boolean z;
this.tokenServerUrl = genericUrl;
if (genericUrl.getFragment() == null) {
z = true;
} else {
z = false;
}
Preconditions.checkArgument(z);
return this;
}
@Override // com.google.api.client.util.GenericData
public TokenRequest set(String str, Object obj) {
return (TokenRequest) super.set(str, obj);
}
}