* 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>
73 lines
3.2 KiB
Java
73 lines
3.2 KiB
Java
package com.google.android.gms.auth;
|
|
|
|
import android.accounts.Account;
|
|
import android.content.Context;
|
|
import android.os.Bundle;
|
|
import android.os.IBinder;
|
|
import android.util.Log;
|
|
import com.google.android.gms.common.api.ApiException;
|
|
import com.google.android.gms.common.internal.Preconditions;
|
|
import com.google.android.gms.internal.auth.zzbw;
|
|
import com.google.android.gms.internal.auth.zzdc;
|
|
import com.google.android.gms.internal.auth.zzhw;
|
|
import com.google.android.gms.internal.auth.zzhx;
|
|
import java.io.IOException;
|
|
|
|
/* loaded from: classes.dex */
|
|
public final class GoogleAuthUtil extends zzl {
|
|
public static void j(Context context, String str) {
|
|
Preconditions.checkNotMainThread("Calling this from your main thread can lead to deadlock");
|
|
zzl.e(context);
|
|
Bundle bundle = new Bundle();
|
|
zzl.f(context, bundle);
|
|
zzdc.c(context);
|
|
if (((zzhx) zzhw.f.f9578c.zza()).zzc() && zzl.i(context)) {
|
|
com.google.android.gms.internal.auth.zzg a2 = com.google.android.gms.internal.auth.zzh.a(context);
|
|
zzbw zzbwVar = new zzbw();
|
|
zzbwVar.f = str;
|
|
try {
|
|
zzl.c(a2.f(zzbwVar), "clear token");
|
|
return;
|
|
} catch (ApiException e) {
|
|
zzl.f3422c.w("%s failed via GoogleAuthServiceClient, falling back to previous approach:\n%s", "clear token", Log.getStackTraceString(e));
|
|
}
|
|
}
|
|
zzl.b(context, zzl.b, new zzh(str, bundle));
|
|
}
|
|
|
|
public static String k(final Context context, String str, final String str2) {
|
|
TokenData tokenData;
|
|
final Account account = new Account(str, "com.google");
|
|
Bundle bundle = new Bundle();
|
|
zzl.h(account);
|
|
Preconditions.checkNotMainThread("Calling this from your main thread can lead to deadlock");
|
|
Preconditions.checkNotEmpty(str2, "Scope cannot be empty or null.");
|
|
zzl.h(account);
|
|
zzl.e(context);
|
|
final Bundle bundle2 = new Bundle(bundle);
|
|
zzl.f(context, bundle2);
|
|
zzdc.c(context);
|
|
if (((zzhx) zzhw.f.f9578c.zza()).zzc() && zzl.i(context)) {
|
|
try {
|
|
Bundle bundle3 = (Bundle) zzl.c(com.google.android.gms.internal.auth.zzh.a(context).c(account, str2, bundle2), "token retrieval");
|
|
zzl.d(bundle3);
|
|
tokenData = zzl.a(context, bundle3);
|
|
} catch (ApiException e) {
|
|
zzl.f3422c.w("%s failed via GoogleAuthServiceClient, falling back to previous approach:\n%s", "token retrieval", Log.getStackTraceString(e));
|
|
}
|
|
return tokenData.f;
|
|
}
|
|
tokenData = (TokenData) zzl.b(context, zzl.b, new zzk() { // from class: com.google.android.gms.auth.zzg
|
|
@Override // com.google.android.gms.auth.zzk
|
|
public final Object a(IBinder iBinder) {
|
|
String[] strArr = zzl.f3421a;
|
|
Bundle n0 = com.google.android.gms.internal.auth.zze.f2(iBinder).n0(account, str2, bundle2);
|
|
if (n0 != null) {
|
|
return zzl.a(context, n0);
|
|
}
|
|
throw new IOException("Service call returned null");
|
|
}
|
|
});
|
|
return tokenData.f;
|
|
}
|
|
}
|