* 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>
126 lines
4.4 KiB
Java
126 lines
4.4 KiB
Java
package com.google.common.base;
|
|
|
|
import com.google.android.gms.ads.RequestConfiguration;
|
|
import com.google.common.annotations.GwtCompatible;
|
|
import java.util.Arrays;
|
|
|
|
@GwtCompatible
|
|
/* loaded from: classes3.dex */
|
|
public final class MoreObjects {
|
|
|
|
/* loaded from: classes3.dex */
|
|
public static final class ToStringHelper {
|
|
|
|
/* renamed from: a, reason: collision with root package name */
|
|
public final String f12171a;
|
|
public final ValueHolder b;
|
|
|
|
/* renamed from: c, reason: collision with root package name */
|
|
public ValueHolder f12172c;
|
|
public boolean d;
|
|
|
|
/* loaded from: classes3.dex */
|
|
public static final class UnconditionalValueHolder extends ValueHolder {
|
|
}
|
|
|
|
/* loaded from: classes3.dex */
|
|
public static class ValueHolder {
|
|
|
|
/* renamed from: a, reason: collision with root package name */
|
|
public String f12173a;
|
|
public Object b;
|
|
|
|
/* renamed from: c, reason: collision with root package name */
|
|
public ValueHolder f12174c;
|
|
}
|
|
|
|
/* JADX WARN: Type inference failed for: r0v0, types: [com.google.common.base.MoreObjects$ToStringHelper$ValueHolder, java.lang.Object] */
|
|
public ToStringHelper(String str) {
|
|
?? obj = new Object();
|
|
this.b = obj;
|
|
this.f12172c = obj;
|
|
this.d = false;
|
|
this.f12171a = str;
|
|
}
|
|
|
|
public final void a(int i, String str) {
|
|
e(str, String.valueOf(i));
|
|
}
|
|
|
|
/* JADX WARN: Type inference failed for: r0v0, types: [com.google.common.base.MoreObjects$ToStringHelper$ValueHolder, java.lang.Object] */
|
|
public final void b(Object obj, String str) {
|
|
?? obj2 = new Object();
|
|
this.f12172c.f12174c = obj2;
|
|
this.f12172c = obj2;
|
|
obj2.b = obj;
|
|
obj2.f12173a = str;
|
|
}
|
|
|
|
public final void c(String str) {
|
|
e(str, String.valueOf(0L));
|
|
}
|
|
|
|
public final void d(String str, boolean z) {
|
|
e(str, String.valueOf(z));
|
|
}
|
|
|
|
/* JADX WARN: Type inference failed for: r0v0, types: [com.google.common.base.MoreObjects$ToStringHelper$ValueHolder, java.lang.Object] */
|
|
public final void e(String str, String str2) {
|
|
?? obj = new Object();
|
|
this.f12172c.f12174c = obj;
|
|
this.f12172c = obj;
|
|
obj.b = str2;
|
|
obj.f12173a = str;
|
|
}
|
|
|
|
/* JADX WARN: Type inference failed for: r0v0, types: [com.google.common.base.MoreObjects$ToStringHelper$ValueHolder, java.lang.Object] */
|
|
public final void f(Object obj) {
|
|
?? obj2 = new Object();
|
|
this.f12172c.f12174c = obj2;
|
|
this.f12172c = obj2;
|
|
obj2.b = obj;
|
|
}
|
|
|
|
public final String toString() {
|
|
boolean z = this.d;
|
|
StringBuilder sb = new StringBuilder(32);
|
|
sb.append(this.f12171a);
|
|
sb.append('{');
|
|
String str = RequestConfiguration.MAX_AD_CONTENT_RATING_UNSPECIFIED;
|
|
for (ValueHolder valueHolder = this.b.f12174c; valueHolder != null; valueHolder = valueHolder.f12174c) {
|
|
Object obj = valueHolder.b;
|
|
if ((valueHolder instanceof UnconditionalValueHolder) || obj != null || !z) {
|
|
sb.append(str);
|
|
String str2 = valueHolder.f12173a;
|
|
if (str2 != null) {
|
|
sb.append(str2);
|
|
sb.append('=');
|
|
}
|
|
if (obj != null && obj.getClass().isArray()) {
|
|
String deepToString = Arrays.deepToString(new Object[]{obj});
|
|
sb.append((CharSequence) deepToString, 1, deepToString.length() - 1);
|
|
} else {
|
|
sb.append(obj);
|
|
}
|
|
str = ", ";
|
|
}
|
|
}
|
|
sb.append('}');
|
|
return sb.toString();
|
|
}
|
|
}
|
|
|
|
public static Object a(Object obj, Object obj2) {
|
|
if (obj != null) {
|
|
return obj;
|
|
}
|
|
if (obj2 != null) {
|
|
return obj2;
|
|
}
|
|
throw new NullPointerException("Both parameters are null");
|
|
}
|
|
|
|
public static ToStringHelper b(Object obj) {
|
|
return new ToStringHelper(obj.getClass().getSimpleName());
|
|
}
|
|
}
|