soul-browser/sources/java/com/google/api/client/util/Objects.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

87 lines
2.7 KiB
Java

package com.google.api.client.util;
import com.google.android.gms.ads.RequestConfiguration;
/* loaded from: classes3.dex */
public final class Objects {
private Objects() {
}
public static boolean equal(Object obj, Object obj2) {
return j$.util.Objects.equals(obj, obj2);
}
public static ToStringHelper toStringHelper(Object obj) {
return new ToStringHelper(obj.getClass().getSimpleName());
}
/* loaded from: classes3.dex */
public static final class ToStringHelper {
private final String className;
private ValueHolder holderHead;
private ValueHolder holderTail;
private boolean omitNullValues;
/* loaded from: classes3.dex */
public static final class ValueHolder {
String name;
ValueHolder next;
Object value;
private ValueHolder() {
}
}
public ToStringHelper(String str) {
ValueHolder valueHolder = new ValueHolder();
this.holderHead = valueHolder;
this.holderTail = valueHolder;
this.className = str;
}
private ValueHolder addHolder() {
ValueHolder valueHolder = new ValueHolder();
this.holderTail.next = valueHolder;
this.holderTail = valueHolder;
return valueHolder;
}
public ToStringHelper add(String str, Object obj) {
return addHolder(str, obj);
}
public ToStringHelper omitNullValues() {
this.omitNullValues = true;
return this;
}
public String toString() {
boolean z = this.omitNullValues;
StringBuilder sb = new StringBuilder(32);
sb.append(this.className);
sb.append('{');
String str = RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED;
for (ValueHolder valueHolder = this.holderHead.next; valueHolder != null; valueHolder = valueHolder.next) {
if (!z || valueHolder.value != null) {
sb.append(str);
String str2 = valueHolder.name;
if (str2 != null) {
sb.append(str2);
sb.append('=');
}
sb.append(valueHolder.value);
str = ", ";
}
}
sb.append('}');
return sb.toString();
}
private ToStringHelper addHolder(String str, Object obj) {
ValueHolder addHolder = addHolder();
addHolder.value = obj;
addHolder.name = (String) Preconditions.checkNotNull(str);
return this;
}
}
}