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

166 lines
5.2 KiB
Java

package com.google.android.gms.common.internal;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.os.IBinder;
import android.os.StrictMode;
import androidx.annotation.Nullable;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.stats.ConnectionTracker;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.concurrent.Executor;
/* loaded from: classes.dex */
final class zzo implements ServiceConnection, zzr {
final /* synthetic */ zzq zza;
private final Map zzb;
private int zzc;
private boolean zzd;
@Nullable
private IBinder zze;
private final zzn zzf;
private ComponentName zzg;
public zzo(zzq zzqVar, zzn zznVar) {
j$.util.Objects.requireNonNull(zzqVar);
this.zza = zzqVar;
this.zzf = zznVar;
this.zzb = new HashMap();
this.zzc = 2;
}
@Override // android.content.ServiceConnection
public final void onBindingDied(ComponentName componentName) {
onServiceDisconnected(componentName);
}
@Override // android.content.ServiceConnection
public final void onServiceConnected(ComponentName componentName, IBinder iBinder) {
zzq zzqVar = this.zza;
synchronized (zzqVar.zzf()) {
try {
zzqVar.zzh().removeMessages(1, this.zzf);
this.zze = iBinder;
this.zzg = componentName;
Iterator it = this.zzb.values().iterator();
while (it.hasNext()) {
((ServiceConnection) it.next()).onServiceConnected(componentName, iBinder);
}
this.zzc = 1;
} catch (Throwable th) {
throw th;
}
}
}
@Override // android.content.ServiceConnection
public final void onServiceDisconnected(ComponentName componentName) {
zzq zzqVar = this.zza;
synchronized (zzqVar.zzf()) {
try {
zzqVar.zzh().removeMessages(1, this.zzf);
this.zze = null;
this.zzg = componentName;
Iterator it = this.zzb.values().iterator();
while (it.hasNext()) {
((ServiceConnection) it.next()).onServiceDisconnected(componentName);
}
this.zzc = 2;
} catch (Throwable th) {
throw th;
}
}
}
public final void zza(String str) {
zzn zznVar = this.zzf;
zzq zzqVar = this.zza;
zzqVar.zzh().removeMessages(1, zznVar);
zzqVar.zzi().unbindService(zzqVar.zzg(), this);
this.zzd = false;
this.zzc = 2;
}
public final void zzb(ServiceConnection serviceConnection, ServiceConnection serviceConnection2, String str) {
this.zzb.put(serviceConnection, serviceConnection2);
}
public final void zzc(ServiceConnection serviceConnection, String str) {
this.zzb.remove(serviceConnection);
}
public final boolean zzd() {
return this.zzd;
}
public final int zze() {
return this.zzc;
}
public final boolean zzf(ServiceConnection serviceConnection) {
return this.zzb.containsKey(serviceConnection);
}
public final boolean zzg() {
return this.zzb.isEmpty();
}
@Nullable
public final IBinder zzh() {
return this.zze;
}
public final ComponentName zzi() {
return this.zzg;
}
public final /* synthetic */ ConnectionResult zzj(String str, Executor executor) {
zzq zzqVar;
ConnectionTracker zzi;
Context zzg;
zzn zznVar;
try {
Intent zza = zzah.zza(this.zza.zzg(), this.zzf);
this.zzc = 3;
StrictMode.VmPolicy zza2 = com.google.android.gms.common.util.zzd.zza();
try {
zzqVar = this.zza;
zzi = zzqVar.zzi();
zzg = zzqVar.zzg();
zznVar = this.zzf;
} catch (Throwable th) {
th = th;
}
try {
boolean zza3 = zzi.zza(zzg, str, zza, this, 4225, executor);
this.zzd = zza3;
if (zza3) {
zzqVar.zzh().sendMessageDelayed(zzqVar.zzh().obtainMessage(1, zznVar), zzqVar.zzj());
ConnectionResult connectionResult = ConnectionResult.RESULT_SUCCESS;
StrictMode.setVmPolicy(zza2);
return connectionResult;
}
this.zzc = 2;
try {
zzqVar.zzi().unbindService(zzqVar.zzg(), this);
} catch (IllegalArgumentException unused) {
}
ConnectionResult connectionResult2 = new ConnectionResult(16);
StrictMode.setVmPolicy(zza2);
return connectionResult2;
} catch (Throwable th2) {
th = th2;
Throwable th3 = th;
StrictMode.setVmPolicy(zza2);
throw th3;
}
} catch (zzaf e) {
return e.zza;
}
}
}