soul-browser/sources/java/com/google/android/gms/common/api/AvailabilityException.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

67 lines
2.9 KiB
Java

package com.google.android.gms.common.api;
import android.support.v4.media.a;
import android.text.TextUtils;
import androidx.annotation.NonNull;
import androidx.collection.ArrayMap;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.api.Api;
import com.google.android.gms.common.api.internal.ApiKey;
import com.google.android.gms.common.internal.Preconditions;
import java.util.ArrayList;
/* loaded from: classes.dex */
public class AvailabilityException extends Exception {
private final ArrayMap zaa;
public AvailabilityException(@NonNull ArrayMap arrayMap) {
this.zaa = arrayMap;
}
@NonNull
public ConnectionResult getConnectionResult(@NonNull GoogleApi<? extends Api.ApiOptions> googleApi) {
ArrayMap arrayMap = this.zaa;
ApiKey<? extends Api.ApiOptions> apiKey = googleApi.getApiKey();
Object obj = arrayMap.get(apiKey);
String zaa = apiKey.zaa();
Preconditions.checkArgument(obj != null, a.q(new StringBuilder(String.valueOf(zaa).length() + 58), "The given API (", zaa, ") was not part of the availability request."));
return (ConnectionResult) Preconditions.checkNotNull((ConnectionResult) arrayMap.get(apiKey));
}
@Override // java.lang.Throwable
@NonNull
public String getMessage() {
ArrayList arrayList = new ArrayList();
ArrayMap arrayMap = this.zaa;
boolean z = true;
for (ApiKey apiKey : arrayMap.keySet()) {
ConnectionResult connectionResult = (ConnectionResult) Preconditions.checkNotNull((ConnectionResult) arrayMap.get(apiKey));
z &= !connectionResult.isSuccess();
String zaa = apiKey.zaa();
String valueOf = String.valueOf(connectionResult);
StringBuilder sb = new StringBuilder(androidx.work.impl.workers.a.e(2, zaa) + valueOf.length());
sb.append(zaa);
sb.append(": ");
sb.append(valueOf);
arrayList.add(sb.toString());
}
StringBuilder sb2 = new StringBuilder();
if (z) {
sb2.append("None of the queried APIs are available. ");
} else {
sb2.append("Some of the queried APIs are unavailable. ");
}
sb2.append(TextUtils.join("; ", arrayList));
return sb2.toString();
}
@NonNull
public ConnectionResult getConnectionResult(@NonNull HasApiKey<? extends Api.ApiOptions> hasApiKey) {
ArrayMap arrayMap = this.zaa;
ApiKey<? extends Api.ApiOptions> apiKey = hasApiKey.getApiKey();
Object obj = arrayMap.get(apiKey);
String zaa = apiKey.zaa();
Preconditions.checkArgument(obj != null, a.q(new StringBuilder(String.valueOf(zaa).length() + 58), "The given API (", zaa, ") was not part of the availability request."));
return (ConnectionResult) Preconditions.checkNotNull((ConnectionResult) arrayMap.get(apiKey));
}
}