* 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>
104 lines
4.3 KiB
Java
104 lines
4.3 KiB
Java
package com.google.api.client.googleapis.mtls;
|
|
|
|
import com.google.android.gms.ads.RequestConfiguration;
|
|
import com.google.api.client.googleapis.util.Utils;
|
|
import com.google.api.client.util.Beta;
|
|
import com.google.api.client.util.SecurityUtils;
|
|
import com.google.common.annotations.VisibleForTesting;
|
|
import java.io.FileInputStream;
|
|
import java.io.FileNotFoundException;
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.security.KeyStore;
|
|
import java.util.List;
|
|
|
|
@Beta
|
|
/* loaded from: classes3.dex */
|
|
public class MtlsUtils {
|
|
private static final MtlsProvider MTLS_PROVIDER = new DefaultMtlsProvider();
|
|
|
|
@VisibleForTesting
|
|
/* loaded from: classes3.dex */
|
|
public static class DefaultMtlsProvider implements MtlsProvider {
|
|
private static final String DEFAULT_CONTEXT_AWARE_METADATA_PATH = System.getProperty("user.home") + "/.secureConnect/context_aware_metadata.json";
|
|
public static final String GOOGLE_API_USE_CLIENT_CERTIFICATE = "GOOGLE_API_USE_CLIENT_CERTIFICATE";
|
|
private EnvironmentProvider envProvider;
|
|
private String metadataPath;
|
|
|
|
/* loaded from: classes3.dex */
|
|
public interface EnvironmentProvider {
|
|
String getenv(String str);
|
|
}
|
|
|
|
/* loaded from: classes3.dex */
|
|
public static class SystemEnvironmentProvider implements EnvironmentProvider {
|
|
@Override // com.google.api.client.googleapis.mtls.MtlsUtils.DefaultMtlsProvider.EnvironmentProvider
|
|
public String getenv(String str) {
|
|
return System.getenv(str);
|
|
}
|
|
}
|
|
|
|
public DefaultMtlsProvider() {
|
|
this(new SystemEnvironmentProvider(), DEFAULT_CONTEXT_AWARE_METADATA_PATH);
|
|
}
|
|
|
|
@VisibleForTesting
|
|
public static List<String> extractCertificateProviderCommand(InputStream inputStream) {
|
|
return ((ContextAwareMetadataJson) Utils.getDefaultJsonFactory().createJsonParser(inputStream).z(ContextAwareMetadataJson.class, false)).getCommands();
|
|
}
|
|
|
|
@VisibleForTesting
|
|
public static int runCertificateProviderCommand(Process process, long j) {
|
|
long currentTimeMillis = System.currentTimeMillis();
|
|
do {
|
|
try {
|
|
process.exitValue();
|
|
return process.exitValue();
|
|
} catch (IllegalThreadStateException unused) {
|
|
if (j > 0) {
|
|
Thread.sleep(Math.min(1 + j, 100L));
|
|
}
|
|
j -= System.currentTimeMillis() - currentTimeMillis;
|
|
}
|
|
} while (j > 0);
|
|
process.destroy();
|
|
throw new IOException("cert provider command timed out");
|
|
}
|
|
|
|
@Override // com.google.api.client.googleapis.mtls.MtlsProvider
|
|
public KeyStore getKeyStore() {
|
|
try {
|
|
Process start = new ProcessBuilder(extractCertificateProviderCommand(new FileInputStream(this.metadataPath))).start();
|
|
int runCertificateProviderCommand = runCertificateProviderCommand(start, 1000L);
|
|
if (runCertificateProviderCommand == 0) {
|
|
return SecurityUtils.createMtlsKeyStore(start.getInputStream());
|
|
}
|
|
throw new IOException("Cert provider command failed with exit code: " + runCertificateProviderCommand);
|
|
} catch (FileNotFoundException unused) {
|
|
return null;
|
|
} catch (InterruptedException e) {
|
|
throw new IOException("Interrupted executing certificate provider command", e);
|
|
}
|
|
}
|
|
|
|
@Override // com.google.api.client.googleapis.mtls.MtlsProvider
|
|
public String getKeyStorePassword() {
|
|
return RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED;
|
|
}
|
|
|
|
@Override // com.google.api.client.googleapis.mtls.MtlsProvider
|
|
public boolean useMtlsClientCertificate() {
|
|
return "true".equals(this.envProvider.getenv(GOOGLE_API_USE_CLIENT_CERTIFICATE));
|
|
}
|
|
|
|
@VisibleForTesting
|
|
public DefaultMtlsProvider(EnvironmentProvider environmentProvider, String str) {
|
|
this.envProvider = environmentProvider;
|
|
this.metadataPath = str;
|
|
}
|
|
}
|
|
|
|
public static MtlsProvider getDefaultMtlsProvider() {
|
|
return MTLS_PROVIDER;
|
|
}
|
|
}
|