Widens proguard to just keep everything under org.bouncycastle when minifying. Also fixes a bug where the composer's content warning is hidden after changing orientation.

7 years ago · a0da0a4d9d
parent 764cd7a0d6
commit a0da0a4d9d
2 changed files with 6 additions and 4 deletions
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@ -59,5 +59,5 @@ public *;
 }

 # for bouncycastle
-keep class org.bouncycastle.jce.provider.**
+-keep class org.bouncycastle.**
 -dontwarn javax.naming.**
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@ -310,9 +310,11 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFragm
                }
            } else {
                String contentWarning = intent.getStringExtra("saved_toot_content_warning");
-                startingHideText = !TextUtils.isEmpty(contentWarning);
-                if (startingHideText) {
-                    startingContentWarning = contentWarning;
+                if (contentWarning != null) {
+                    startingHideText = !contentWarning.isEmpty();
+                    if (startingHideText) {
+                        startingContentWarning = contentWarning;
+                    }
                }
            }