From 4bd136919e80eba1049fb4e396f524b0730a08c0 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 11 Sep 2026 10:02:51 -0400
Subject: [PATCH] Enable r8 optimizations.

---
 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, 2 insertions(+), 34 deletions(-)
 delete mode 100644 app/proguard/proguard-appcompat-v7.pro
 delete mode 100644 app/proguard/proguard-glide.pro

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3684f2b8ad..36a0a0f360 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -343,11 +343,9 @@ 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
deleted file mode 100644
index f0d673934f..0000000000
--- a/app/proguard/proguard-appcompat-v7.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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
deleted file mode 100644
index a5a3efcc1b..0000000000
--- a/app/proguard/proguard-glide.pro
+++ /dev/null
@@ -1,6 +0,0 @@
--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 ae70fc4e49..ddab6b4fca 100644
--- a/app/proguard/proguard-google-play-services.pro
+++ b/app/proguard/proguard-google-play-services.pro
@@ -1,10 +1,6 @@
 ## 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 2d0ca2ebea..4091158b4e 100644
--- a/app/proguard/proguard-retrofit.pro
+++ b/app/proguard/proguard-retrofit.pro
@@ -1,4 +1,3 @@
 -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 3626fa180e..38e58767bb 100644
--- a/app/proguard/proguard-sqlite.pro
+++ b/app/proguard/proguard-sqlite.pro
@@ -1,7 +1,3 @@
--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 6b25daf645..ebd89bdb92 100644
--- a/app/proguard/proguard-square-okhttp.pro
+++ b/app/proguard/proguard-square-okhttp.pro
@@ -1,6 +1,4 @@
 # 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 589e679d90..7b7468037e 100644
--- a/app/proguard/proguard-square-okio.pro
+++ b/app/proguard/proguard-square-okio.pro
@@ -1,5 +1,4 @@
 # 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 2acd3d1fa4..0b35e6ddb9 100644
--- a/app/proguard/proguard.cfg
+++ b/app/proguard/proguard.cfg
@@ -1,4 +1,5 @@
--dontoptimize
+# Obfuscation is off: libsignal resolves store callbacks via JNI signature and Jackson
+# derives property names from identifiers, neither of which survives renaming.
 -dontobfuscate
 -keepattributes SourceFile,LineNumberTable
 -keep class org.whispersystems.** { *; }