* 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>
138 lines
5.3 KiB
Java
138 lines
5.3 KiB
Java
package com.google.android.gms.common.api;
|
|
|
|
import android.app.Activity;
|
|
import android.app.PendingIntent;
|
|
import android.content.ActivityNotFoundException;
|
|
import android.content.Context;
|
|
import android.content.DialogInterface;
|
|
import android.content.Intent;
|
|
import android.content.IntentSender;
|
|
import android.os.Build;
|
|
import android.os.Bundle;
|
|
import android.support.v4.media.a;
|
|
import android.util.Log;
|
|
import androidx.annotation.NonNull;
|
|
import androidx.annotation.Nullable;
|
|
import androidx.annotation.VisibleForTesting;
|
|
import com.google.android.gms.common.ConnectionResult;
|
|
import com.google.android.gms.common.GoogleApiAvailability;
|
|
import com.google.android.gms.common.annotation.KeepName;
|
|
import com.google.android.gms.common.api.internal.GoogleApiManager;
|
|
import com.google.android.gms.common.internal.Preconditions;
|
|
|
|
@KeepName
|
|
/* loaded from: classes.dex */
|
|
public class GoogleApiActivity extends Activity implements DialogInterface.OnCancelListener {
|
|
|
|
@VisibleForTesting
|
|
protected int zaa = 0;
|
|
|
|
@NonNull
|
|
public static Intent zaa(@NonNull Context context, @NonNull PendingIntent pendingIntent, int i, boolean z) {
|
|
Intent intent = new Intent(context, (Class<?>) GoogleApiActivity.class);
|
|
intent.putExtra("pending_intent", pendingIntent);
|
|
intent.putExtra("failing_client_id", i);
|
|
intent.putExtra("notify_manager", z);
|
|
return intent;
|
|
}
|
|
|
|
private final void zab() {
|
|
GoogleApiActivity googleApiActivity;
|
|
Bundle extras = getIntent().getExtras();
|
|
if (extras == null) {
|
|
Log.e("GoogleApiActivity", "Activity started without extras");
|
|
finish();
|
|
return;
|
|
}
|
|
PendingIntent pendingIntent = (PendingIntent) extras.get("pending_intent");
|
|
Integer num = (Integer) extras.get("error_code");
|
|
if (pendingIntent == null && num == null) {
|
|
Log.e("GoogleApiActivity", "Activity started without resolution");
|
|
finish();
|
|
return;
|
|
}
|
|
if (pendingIntent != null) {
|
|
try {
|
|
googleApiActivity = this;
|
|
try {
|
|
googleApiActivity.startIntentSenderForResult(pendingIntent.getIntentSender(), 1, null, 0, 0, 0);
|
|
googleApiActivity.zaa = 1;
|
|
} catch (ActivityNotFoundException e) {
|
|
e = e;
|
|
if (extras.getBoolean("notify_manager", true)) {
|
|
GoogleApiManager.zaa(this).zaq(new ConnectionResult(22, null), getIntent().getIntExtra("failing_client_id", -1));
|
|
} else {
|
|
String obj = pendingIntent.toString();
|
|
String q = a.q(new StringBuilder(obj.length() + 36), "Activity not found while launching ", obj, ".");
|
|
if (Build.FINGERPRINT.contains("generic")) {
|
|
q = q.concat(" This may occur when resolving Google Play services connection issues on emulators with Google APIs but not Google Play Store.");
|
|
}
|
|
Log.e("GoogleApiActivity", q, e);
|
|
}
|
|
googleApiActivity.zaa = 1;
|
|
finish();
|
|
} catch (IntentSender.SendIntentException e2) {
|
|
e = e2;
|
|
Log.e("GoogleApiActivity", "Failed to launch pendingIntent", e);
|
|
finish();
|
|
}
|
|
} catch (ActivityNotFoundException e3) {
|
|
e = e3;
|
|
googleApiActivity = this;
|
|
} catch (IntentSender.SendIntentException e4) {
|
|
e = e4;
|
|
}
|
|
} else {
|
|
GoogleApiAvailability.getInstance().showErrorDialogFragment(this, ((Integer) Preconditions.checkNotNull(num)).intValue(), 2, this);
|
|
this.zaa = 1;
|
|
}
|
|
}
|
|
|
|
@Override // android.app.Activity
|
|
public final void onActivityResult(int i, int i2, @NonNull Intent intent) {
|
|
super.onActivityResult(i, i2, intent);
|
|
if (i == 1) {
|
|
boolean booleanExtra = getIntent().getBooleanExtra("notify_manager", true);
|
|
this.zaa = 0;
|
|
setResult(i2, intent);
|
|
if (booleanExtra) {
|
|
GoogleApiManager zaa = GoogleApiManager.zaa(this);
|
|
if (i2 != -1) {
|
|
if (i2 == 0) {
|
|
zaa.zaq(new ConnectionResult(13, null), getIntent().getIntExtra("failing_client_id", -1));
|
|
}
|
|
} else {
|
|
zaa.zai();
|
|
}
|
|
}
|
|
} else if (i == 2) {
|
|
this.zaa = 0;
|
|
setResult(i2, intent);
|
|
}
|
|
finish();
|
|
}
|
|
|
|
@Override // android.content.DialogInterface.OnCancelListener
|
|
public final void onCancel(@NonNull DialogInterface dialogInterface) {
|
|
this.zaa = 0;
|
|
setResult(0);
|
|
finish();
|
|
}
|
|
|
|
@Override // android.app.Activity
|
|
public final void onCreate(@Nullable Bundle bundle) {
|
|
super.onCreate(bundle);
|
|
if (bundle != null) {
|
|
this.zaa = bundle.getInt("resolution");
|
|
}
|
|
if (this.zaa != 1) {
|
|
zab();
|
|
}
|
|
}
|
|
|
|
@Override // android.app.Activity
|
|
public final void onSaveInstanceState(@NonNull Bundle bundle) {
|
|
bundle.putInt("resolution", this.zaa);
|
|
super.onSaveInstanceState(bundle);
|
|
}
|
|
}
|