chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 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.

Browse source
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.**

4
app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
View file

@ -310,11 +310,13 @@ 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) {
startingHideText = !contentWarning.isEmpty();
if (startingHideText) { if (startingHideText) {
startingContentWarning = contentWarning; startingContentWarning = contentWarning;
} }
} }
}
// If come from SavedTootActivity // If come from SavedTootActivity
String savedTootText = intent.getStringExtra("saved_toot_text"); String savedTootText = intent.getStringExtra("saved_toot_text");