Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

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.

This commit is contained in:
Vavassor 2017-07-17 00:06:18 -04:00
parent 408d38102d
commit 857f39b480
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/proguard-rules.pro vendored
View File

@ -59,5 +59,5 @@ public *;
} }
# for bouncycastle # for bouncycastle
-keep class org.bouncycastle.jce.provider.** -keep class org.bouncycastle.**
-dontwarn javax.naming.** -dontwarn javax.naming.**

8
app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
View File

@ -310,9 +310,11 @@ public class ComposeActivity extends BaseActivity implements ComposeOptionsFragm
} }
} else { } else {
String contentWarning = intent.getStringExtra("saved_toot_content_warning"); String contentWarning = intent.getStringExtra("saved_toot_content_warning");
startingHideText = !TextUtils.isEmpty(contentWarning); if (contentWarning != null) {
if (startingHideText) { startingHideText = !contentWarning.isEmpty();
startingContentWarning = contentWarning; if (startingHideText) {
startingContentWarning = contentWarning;
}
} }
} }