Merge branch 'feature/always-preserve-cw' into fork

always preserve cw when replying
2022-05-21 18:49:07 +02:00 · 2022-05-21 18:48:48 +02:00
1 changed files with 3 additions and 1 deletions
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
@@ -453,7 +453,9 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
 			if(savedInstanceState==null){
 				mainEditText.setText(initialText);
 				mainEditText.setSelection(mainEditText.length());
-				if(!TextUtils.isEmpty(replyTo.spoilerText) && AccountSessionManager.getInstance().isSelf(accountID, replyTo.account)){
+				// TODO: setting for preserving cw always / only when replying to own posts
+				// && AccountSessionManager.getInstance().isSelf(accountID, replyTo.account)
+				if(!TextUtils.isEmpty(replyTo.spoilerText)){
 					hasSpoiler=true;
 					spoilerEdit.setVisibility(View.VISIBLE);
 					spoilerEdit.setText(replyTo.spoilerText);
Author	SHA1	Message	Date
sk	f1bfe05263	Merge branch 'feature/always-preserve-cw' into fork	2022-05-21 18:49:07 +02:00
sk	0f223159c0	always preserve cw when replying	2022-05-21 18:48:48 +02:00