From e10949501e3a9e4cca2ad340ff3771712e2a06f7 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 11 Sep 2026 12:50:14 -0400
Subject: [PATCH] Revert "Enable r8 optimizations."

This reverts commit 4bd136919e80eba1049fb4e396f524b0730a08c0.
---
 app/build.gradle.kts                           |  2 ++
 app/proguard/proguard-appcompat-v7.pro         | 13 +++++++++++++
 app/proguard/proguard-glide.pro                |  6 ++++++
 app/proguard/proguard-google-play-services.pro |  4 ++++
 app/proguard/proguard-retrofit.pro             |  1 +
 app/proguard/proguard-sqlite.pro               |  4 ++++
 app/proguard/proguard-square-okhttp.pro        |  2 ++
 app/proguard/proguard-square-okio.pro          |  1 +
 app/proguard/proguard.cfg                      |  3 +--
 9 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 app/proguard/proguard-appcompat-v7.pro
 create mode 100644 app/proguard/proguard-glide.pro

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 36a0a0f360..3684f2b8ad 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -343,9 +343,11 @@ android {
         "proguard/proguard-google-play-services.pro",
         "proguard/proguard-jackson.pro",
         "proguard/proguard-sqlite.pro",
+        "proguard/proguard-appcompat-v7.pro",
         "proguard/proguard-square-okhttp.pro",
         "proguard/proguard-square-okio.pro",
         "proguard/proguard-rounded-image-view.pro",
+        "proguard/proguard-glide.pro",
         "proguard/proguard-shortcutbadger.pro",
         "proguard/proguard-retrofit.pro",
         "proguard/proguard-klinker.pro",
diff --git a/app/proguard/proguard-appcompat-v7.pro b/app/proguard/proguard-appcompat-v7.pro
new file mode 100644
index 0000000000..f0d673934f
--- /dev/null
+++ b/app/proguard/proguard-appcompat-v7.pro
@@ -0,0 +1,13 @@
+# https://code.google.com/p/android/issues/detail?id=78377
+-keepnames class !android.support.v7.internal.view.menu.**, ** { *; }
+
+-keep public class android.support.v7.widget.** { *; }
+-keep public class android.support.v7.internal.widget.** { *; }
+
+-keep public class * extends android.support.v4.view.ActionProvider {
+    public <init>(android.content.Context);
+}
+
+-keepattributes *Annotation*
+-keep public class * extends android.support.design.widget.CoordinatorLayout.Behavior { *; }
+-keep public class * extends android.support.design.widget.ViewOffsetBehavior { *; }
diff --git a/app/proguard/proguard-glide.pro b/app/proguard/proguard-glide.pro
new file mode 100644
index 0000000000..a5a3efcc1b
--- /dev/null
+++ b/app/proguard/proguard-glide.pro
@@ -0,0 +1,6 @@
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class * extends com.bumptech.glide.AppGlideModule
+-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
+    **[] $VALUES;
+    public *;
+}
diff --git a/app/proguard/proguard-google-play-services.pro b/app/proguard/proguard-google-play-services.pro
index ddab6b4fca..ae70fc4e49 100644
--- a/app/proguard/proguard-google-play-services.pro
+++ b/app/proguard/proguard-google-play-services.pro
@@ -1,6 +1,10 @@
 ## Google Play Services 4.3.23 specific rules ##
 ## https://developer.android.com/google/play-services/setup.html#Proguard ##
 
+-keep class * extends java.util.ListResourceBundle {
+    protected Object[][] getContents();
+}
+
 -keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
     public static final *** NULL;
 }
diff --git a/app/proguard/proguard-retrofit.pro b/app/proguard/proguard-retrofit.pro
index 4091158b4e..2d0ca2ebea 100644
--- a/app/proguard/proguard-retrofit.pro
+++ b/app/proguard/proguard-retrofit.pro
@@ -1,3 +1,4 @@
 -dontwarn retrofit.**
+-keep class retrofit.** { *; }
 -keepattributes Signature
 -keepattributes Exceptions
\ No newline at end of file
diff --git a/app/proguard/proguard-sqlite.pro b/app/proguard/proguard-sqlite.pro
index 38e58767bb..3626fa180e 100644
--- a/app/proguard/proguard-sqlite.pro
+++ b/app/proguard/proguard-sqlite.pro
@@ -1,3 +1,7 @@
+-keep class org.sqlite.** { *; }
+-keep class org.sqlite.database.** { *; }
+
+-keep class net.sqlcipher.** { *; }
 -dontwarn net.sqlcipher.**
 
 -keep class net.zetetic.** { *; }
diff --git a/app/proguard/proguard-square-okhttp.pro b/app/proguard/proguard-square-okhttp.pro
index ebd89bdb92..6b25daf645 100644
--- a/app/proguard/proguard-square-okhttp.pro
+++ b/app/proguard/proguard-square-okhttp.pro
@@ -1,4 +1,6 @@
 # OkHttp
 -keepattributes Signature
 -keepattributes *Annotation*
+-keep class com.squareup.okhttp.** { *; }
+-keep interface com.squareup.okhttp.** { *; }
 -dontwarn com.squareup.okhttp.**
\ No newline at end of file
diff --git a/app/proguard/proguard-square-okio.pro b/app/proguard/proguard-square-okio.pro
index 7b7468037e..589e679d90 100644
--- a/app/proguard/proguard-square-okio.pro
+++ b/app/proguard/proguard-square-okio.pro
@@ -1,4 +1,5 @@
 # Okio
+-keep class sun.misc.Unsafe { *; }
 -dontwarn java.nio.file.*
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 -dontwarn okio.**
\ No newline at end of file
diff --git a/app/proguard/proguard.cfg b/app/proguard/proguard.cfg
index 0b35e6ddb9..2acd3d1fa4 100644
--- a/app/proguard/proguard.cfg
+++ b/app/proguard/proguard.cfg
@@ -1,5 +1,4 @@
-# Obfuscation is off: libsignal resolves store callbacks via JNI signature and Jackson
-# derives property names from identifiers, neither of which survives renaming.
+-dontoptimize
 -dontobfuscate
 -keepattributes SourceFile,LineNumberTable
 -keep class org.whispersystems.** { *; }