owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use hasSpoiler method

Browse Source
This commit is contained in:
sk
2023-08-28 23:29:18 +02:00
parent cc46e09853
commit 696016bd8f
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java
View File

@@ -325,7 +325,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{
req.visibility = preferences.postingDefaultVisibility; req.visibility = preferences.postingDefaultVisibility;
req.inReplyToId = notification.status.id; req.inReplyToId = notification.status.id;
if (!notification.status.spoilerText.isEmpty() && if (notification.status.hasSpoiler() &&
(GlobalUserPreferences.prefixReplies == ALWAYS (GlobalUserPreferences.prefixReplies == ALWAYS
|| (GlobalUserPreferences.prefixReplies == TO_OTHERS && !ownID.equals(notification.status.account.id))) || (GlobalUserPreferences.prefixReplies == TO_OTHERS && !ownID.equals(notification.status.account.id)))
&& !notification.status.spoilerText.startsWith("re: ")) { && !notification.status.spoilerText.startsWith("re: ")) {

4
mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java
View File

@@ -419,7 +419,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
hasSpoiler=true; hasSpoiler=true;
spoilerWrap.setVisibility(View.VISIBLE); spoilerWrap.setVisibility(View.VISIBLE);
spoilerBtn.setSelected(true); spoilerBtn.setSelected(true);
}else if(editingStatus!=null && !TextUtils.isEmpty(editingStatus.spoilerText)){ }else if(editingStatus!=null && editingStatus.hasSpoiler()){
hasSpoiler=true; hasSpoiler=true;
spoilerWrap.setVisibility(View.VISIBLE); spoilerWrap.setVisibility(View.VISIBLE);
spoilerEdit.setText(getArguments().getString("sourceSpoiler", editingStatus.spoilerText)); spoilerEdit.setText(getArguments().getString("sourceSpoiler", editingStatus.spoilerText));
@@ -678,7 +678,7 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
view.findViewById(R.id.time).setVisibility(time==null ? View.GONE : View.VISIBLE); view.findViewById(R.id.time).setVisibility(time==null ? View.GONE : View.VISIBLE);
if(time!=null) ((TextView) view.findViewById(R.id.time)).setText(time); if(time!=null) ((TextView) view.findViewById(R.id.time)).setText(time);
if (status.spoilerText != null && !status.spoilerText.isBlank()) { if (status.hasSpoiler()) {
TextView replyToSpoiler = view.findViewById(R.id.reply_to_spoiler); TextView replyToSpoiler = view.findViewById(R.id.reply_to_spoiler);
replyToSpoiler.setVisibility(View.VISIBLE); replyToSpoiler.setVisibility(View.VISIBLE);
replyToSpoiler.setText(status.spoilerText); replyToSpoiler.setText(status.spoilerText);

4
mastodon/src/main/java/org/joinmastodon/android/model/Status.java
View File

@@ -114,8 +114,8 @@ public class Status extends BaseModel implements DisplayItemsParent, Searchable{
for(FilterResult fr:filtered) for(FilterResult fr:filtered)
fr.postprocess(); fr.postprocess();
if(!TextUtils.isEmpty(spoilerText)) sensitive=true; spoilerRevealed=!hasSpoiler();
spoilerRevealed=TextUtils.isEmpty(spoilerText); if(!spoilerRevealed) sensitive=true;
sensitiveRevealed=!sensitive; sensitiveRevealed=!sensitive;
if(visibility.equals(StatusPrivacy.LOCAL)) localOnly=true; if(visibility.equals(StatusPrivacy.LOCAL)) localOnly=true;
if(emojiReactions!=null) reactions=emojiReactions; if(emojiReactions!=null) reactions=emojiReactions;

2
mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java
View File

@@ -226,7 +226,7 @@ public abstract class StatusDisplayItem{
} }
ArrayList<StatusDisplayItem> contentItems; ArrayList<StatusDisplayItem> contentItems;
if(!TextUtils.isEmpty(statusForContent.spoilerText)){ if(statusForContent.hasSpoiler()){
if (AccountSessionManager.get(accountID).getLocalPreferences().revealCWs) statusForContent.spoilerRevealed = true; if (AccountSessionManager.get(accountID).getLocalPreferences().revealCWs) statusForContent.spoilerRevealed = true;
SpoilerStatusDisplayItem spoilerItem=new SpoilerStatusDisplayItem(parentID, fragment, null, statusForContent, Type.SPOILER); SpoilerStatusDisplayItem spoilerItem=new SpoilerStatusDisplayItem(parentID, fragment, null, statusForContent, Type.SPOILER);
items.add(spoilerItem); items.add(spoilerItem);