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

fix the "always mark media as sensitive" setting not being respected (#1407)

This commit is contained in:
Konrad Pozniak 2019-07-25 12:17:07 +02:00 committed by GitHub
parent 7ae07111af
commit fbd04cbe7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -518,7 +518,7 @@ public final class ComposeActivity
replyContentTextView.setText(intent.getStringExtra(REPLYING_STATUS_CONTENT_EXTRA)); replyContentTextView.setText(intent.getStringExtra(REPLYING_STATUS_CONTENT_EXTRA));
} }
statusMarkSensitive = intent.getBooleanExtra(SENSITIVE_EXTRA, false); statusMarkSensitive = intent.getBooleanExtra(SENSITIVE_EXTRA, statusMarkSensitive);
} }
// After the starting state is finalised, the interface can be set to reflect this state. // After the starting state is finalised, the interface can be set to reflect this state.
@ -1963,7 +1963,8 @@ public final class ComposeActivity
private String replyingStatusContent; private String replyingStatusContent;
@Nullable @Nullable
private ArrayList<Attachment> mediaAttachments; private ArrayList<Attachment> mediaAttachments;
private boolean sensitive = false; @Nullable
private Boolean sensitive;
public IntentBuilder savedTootUid(int uid) { public IntentBuilder savedTootUid(int uid) {
@ -2071,7 +2072,9 @@ public final class ComposeActivity
if (mediaAttachments != null) { if (mediaAttachments != null) {
intent.putParcelableArrayListExtra(MEDIA_ATTACHMENTS_EXTRA, mediaAttachments); intent.putParcelableArrayListExtra(MEDIA_ATTACHMENTS_EXTRA, mediaAttachments);
} }
intent.putExtra(SENSITIVE_EXTRA, sensitive); if(sensitive != null) {
intent.putExtra(SENSITIVE_EXTRA, sensitive);
}
return intent; return intent;
} }
} }