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

138 lines
5.3 KiB
Java

package com.google.android.gms.common.stats;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.ServiceConnection;
import android.content.pm.PackageManager;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import com.google.android.gms.common.annotation.KeepForSdk;
import com.google.android.gms.common.internal.Preconditions;
import com.google.android.gms.common.internal.zzr;
import com.google.android.gms.common.util.PlatformVersion;
import com.google.android.gms.common.wrappers.Wrappers;
import j$.util.concurrent.ConcurrentHashMap;
import java.util.NoSuchElementException;
import java.util.concurrent.Executor;
import javax.annotation.Nullable;
@KeepForSdk
/* loaded from: classes.dex */
public class ConnectionTracker {
private static final Object zzb = new Object();
@Nullable
private static volatile ConnectionTracker zzc;
@NonNull
@VisibleForTesting
public final ConcurrentHashMap zza = new ConcurrentHashMap();
private ConnectionTracker() {
}
@NonNull
@KeepForSdk
public static ConnectionTracker getInstance() {
if (zzc == null) {
synchronized (zzb) {
try {
if (zzc == null) {
zzc = new ConnectionTracker();
}
} finally {
}
}
}
ConnectionTracker connectionTracker = zzc;
Preconditions.checkNotNull(connectionTracker);
return connectionTracker;
}
private final boolean zzb(Context context, String str, Intent intent, ServiceConnection serviceConnection, int i, boolean z, @Nullable Executor executor) {
ComponentName component = intent.getComponent();
if (component != null) {
String packageName = component.getPackageName();
"com.google.android.gms".equals(packageName);
try {
if ((Wrappers.packageManager(context).getApplicationInfo(packageName, 0).flags & 2097152) != 0) {
Log.w("ConnectionTracker", "Attempted to bind to a service in a STOPPED package.");
return false;
}
} catch (PackageManager.NameNotFoundException unused) {
}
}
if (zzc(serviceConnection)) {
ServiceConnection serviceConnection2 = (ServiceConnection) this.zza.putIfAbsent(serviceConnection, serviceConnection);
if (serviceConnection2 != null && serviceConnection != serviceConnection2) {
Log.w("ConnectionTracker", String.format("Duplicate binding with the same ServiceConnection: %s, %s, %s.", serviceConnection, str, intent.getAction()));
}
try {
boolean zze = zze(context, intent, serviceConnection, i, executor);
if (!zze) {
return false;
}
return zze;
} finally {
this.zza.remove(serviceConnection, serviceConnection);
}
}
return zze(context, intent, serviceConnection, i, executor);
}
private static boolean zzc(ServiceConnection serviceConnection) {
return !(serviceConnection instanceof zzr);
}
private static void zzd(Context context, ServiceConnection serviceConnection) {
try {
context.unbindService(serviceConnection);
} catch (IllegalArgumentException | IllegalStateException | NoSuchElementException unused) {
}
}
private static final boolean zze(Context context, Intent intent, ServiceConnection serviceConnection, int i, @Nullable Executor executor) {
if (executor == null) {
executor = null;
}
if (PlatformVersion.isAtLeastQ() && executor != null) {
return context.bindService(intent, i, executor, serviceConnection);
}
return context.bindService(intent, serviceConnection, i);
}
@KeepForSdk
public boolean bindService(@NonNull Context context, @NonNull Intent intent, @NonNull ServiceConnection serviceConnection, int i) {
return zzb(context, context.getClass().getName(), intent, serviceConnection, i, true, null);
}
@KeepForSdk
public void unbindService(@NonNull Context context, @NonNull ServiceConnection serviceConnection) {
if (zzc(serviceConnection)) {
ConcurrentHashMap concurrentHashMap = this.zza;
if (concurrentHashMap.containsKey(serviceConnection)) {
try {
zzd(context, (ServiceConnection) concurrentHashMap.get(serviceConnection));
return;
} finally {
this.zza.remove(serviceConnection);
}
}
}
zzd(context, serviceConnection);
}
@KeepForSdk
public void unbindServiceSafe(@NonNull Context context, @NonNull ServiceConnection serviceConnection) {
try {
unbindService(context, serviceConnection);
} catch (IllegalArgumentException unused) {
}
}
public final boolean zza(@NonNull Context context, @NonNull String str, @NonNull Intent intent, @NonNull ServiceConnection serviceConnection, int i, @Nullable Executor executor) {
return zzb(context, str, intent, serviceConnection, 4225, true, executor);
}
}