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

don't override visibility when replying to self

Browse Source 
closes sk22#348
This commit is contained in:
sk
2023-01-23 22:00:23 +01:00
parent 1b04440546
commit c2a993c5c1
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1795,10 +1795,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility"); statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
} }
Preferences prefs = AccountSessionManager.getInstance().getAccount(accountID).preferences; AccountSessionManager asm = AccountSessionManager.getInstance();
if (prefs != null) { Preferences prefs = asm.getAccount(accountID).preferences;
if (prefs != null && replyTo != null) {
// Only override the reply visibility if our preference is more private // Only override the reply visibility if our preference is more private
if (prefs.postingDefaultVisibility.isLessVisibleThan(statusVisibility)) { // (or we're replying to ourselves)
if (prefs.postingDefaultVisibility.isLessVisibleThan(statusVisibility) &&
!asm.isSelf(accountID, replyTo.account)) {
statusVisibility = switch (prefs.postingDefaultVisibility) { statusVisibility = switch (prefs.postingDefaultVisibility) {
case PUBLIC -> StatusPrivacy.PUBLIC; case PUBLIC -> StatusPrivacy.PUBLIC;
case UNLISTED -> StatusPrivacy.UNLISTED; case UNLISTED -> StatusPrivacy.UNLISTED;
@@ -1806,11 +1809,11 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr
case DIRECT -> StatusPrivacy.DIRECT; case DIRECT -> StatusPrivacy.DIRECT;
}; };
} }
}
// A saved privacy setting from a previous compose session wins over all // A saved privacy setting from a previous compose session wins over all
if(savedInstanceState !=null){ if(savedInstanceState !=null){
statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility"); statusVisibility = (StatusPrivacy) savedInstanceState.getSerializable("visibility");
}
} }
} }