* 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>
139 lines
5.3 KiB
Java
139 lines
5.3 KiB
Java
package com.google.android.gms.common;
|
|
|
|
import android.app.Activity;
|
|
import android.app.Dialog;
|
|
import android.app.PendingIntent;
|
|
import android.content.Context;
|
|
import android.content.DialogInterface;
|
|
import android.content.res.Resources;
|
|
import androidx.annotation.NonNull;
|
|
import androidx.annotation.Nullable;
|
|
import androidx.fragment.app.Fragment;
|
|
import com.google.android.gms.common.annotation.KeepForSdk;
|
|
import com.google.android.gms.common.api.internal.GoogleApiManager;
|
|
import com.google.android.gms.common.internal.GmsClientSupervisor;
|
|
import com.google.android.gms.common.internal.HideFirstParty;
|
|
import com.google.android.gms.common.internal.zag;
|
|
|
|
/* loaded from: classes.dex */
|
|
public final class GooglePlayServicesUtil extends GooglePlayServicesUtilLight {
|
|
|
|
@NonNull
|
|
public static final String GMS_ERROR_DIALOG = "GooglePlayServicesErrorDialog";
|
|
|
|
@NonNull
|
|
@Deprecated
|
|
public static final String GOOGLE_PLAY_SERVICES_PACKAGE = "com.google.android.gms";
|
|
|
|
@Deprecated
|
|
public static final int GOOGLE_PLAY_SERVICES_VERSION_CODE = GooglePlayServicesUtilLight.GOOGLE_PLAY_SERVICES_VERSION_CODE;
|
|
|
|
@NonNull
|
|
public static final String GOOGLE_PLAY_STORE_PACKAGE = "com.android.vending";
|
|
|
|
private GooglePlayServicesUtil() {
|
|
}
|
|
|
|
@Nullable
|
|
@Deprecated
|
|
public static Dialog getErrorDialog(int i, @NonNull Activity activity, int i2) {
|
|
return getErrorDialog(i, activity, i2, null);
|
|
}
|
|
|
|
@NonNull
|
|
@Deprecated
|
|
public static PendingIntent getErrorPendingIntent(int i, @NonNull Context context, int i2) {
|
|
return GoogleApiAvailabilityLight.getInstance().getErrorResolutionPendingIntent(context, i, i2);
|
|
}
|
|
|
|
@NonNull
|
|
@Deprecated
|
|
public static String getErrorString(int i) {
|
|
return GooglePlayServicesUtilLight.getErrorString(i);
|
|
}
|
|
|
|
@NonNull
|
|
public static Context getRemoteContext(@NonNull Context context) {
|
|
return GooglePlayServicesUtilLight.getRemoteContext(context);
|
|
}
|
|
|
|
@NonNull
|
|
public static Resources getRemoteResource(@NonNull Context context) {
|
|
return GooglePlayServicesUtilLight.getRemoteResource(context);
|
|
}
|
|
|
|
@HideFirstParty
|
|
@Deprecated
|
|
public static int isGooglePlayServicesAvailable(@NonNull Context context) {
|
|
return GooglePlayServicesUtilLight.isGooglePlayServicesAvailable(context);
|
|
}
|
|
|
|
@Deprecated
|
|
public static boolean isUserRecoverableError(int i) {
|
|
return GooglePlayServicesUtilLight.isUserRecoverableError(i);
|
|
}
|
|
|
|
public static boolean isUsingBackgroundThreadExecutorForBindService() {
|
|
return GoogleApiManager.zat();
|
|
}
|
|
|
|
@Deprecated
|
|
public static boolean showErrorDialogFragment(int i, @NonNull Activity activity, int i2) {
|
|
return showErrorDialogFragment(i, activity, i2, null);
|
|
}
|
|
|
|
@Deprecated
|
|
public static void showErrorNotification(int i, @NonNull Context context) {
|
|
GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.getInstance();
|
|
if (!GooglePlayServicesUtilLight.isPlayServicesPossiblyUpdating(context, i) && !GooglePlayServicesUtilLight.isPlayStorePossiblyUpdating(context, i)) {
|
|
googleApiAvailability.showErrorNotification(context, i);
|
|
} else {
|
|
googleApiAvailability.zah(context);
|
|
}
|
|
}
|
|
|
|
public static boolean useBackgroundThreadExecutorForBindService() {
|
|
return GoogleApiManager.zas();
|
|
}
|
|
|
|
public static void useBackgroundThreadForConnectionCallback() {
|
|
GmsClientSupervisor.setUseHandlerThreadForCallbacks();
|
|
}
|
|
|
|
@Nullable
|
|
@Deprecated
|
|
public static Dialog getErrorDialog(int i, @NonNull Activity activity, int i2, @Nullable DialogInterface.OnCancelListener onCancelListener) {
|
|
if (true == GooglePlayServicesUtilLight.isPlayServicesPossiblyUpdating(activity, i)) {
|
|
i = 18;
|
|
}
|
|
return GoogleApiAvailability.getInstance().getErrorDialog(activity, i, i2, onCancelListener);
|
|
}
|
|
|
|
@KeepForSdk
|
|
@Deprecated
|
|
public static int isGooglePlayServicesAvailable(@NonNull Context context, int i) {
|
|
return GooglePlayServicesUtilLight.isGooglePlayServicesAvailable(context, i);
|
|
}
|
|
|
|
@Deprecated
|
|
public static boolean showErrorDialogFragment(int i, @NonNull Activity activity, int i2, @Nullable DialogInterface.OnCancelListener onCancelListener) {
|
|
return showErrorDialogFragment(i, activity, null, i2, onCancelListener);
|
|
}
|
|
|
|
public static boolean showErrorDialogFragment(int i, @NonNull Activity activity, @Nullable Fragment fragment, int i2, @Nullable DialogInterface.OnCancelListener onCancelListener) {
|
|
if (true == GooglePlayServicesUtilLight.isPlayServicesPossiblyUpdating(activity, i)) {
|
|
i = 18;
|
|
}
|
|
int i3 = i;
|
|
GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.getInstance();
|
|
if (fragment == null) {
|
|
return googleApiAvailability.showErrorDialogFragment(activity, i3, i2, onCancelListener);
|
|
}
|
|
Dialog zaa = googleApiAvailability.zaa(activity, i3, zag.zac(fragment, GoogleApiAvailability.getInstance().getErrorResolutionIntent(activity, i3, "d"), i2), onCancelListener, null);
|
|
if (zaa == null) {
|
|
return false;
|
|
}
|
|
googleApiAvailability.zag(activity, zaa, GMS_ERROR_DIALOG, onCancelListener);
|
|
return true;
|
|
}
|
|
}
|