Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes issue #300: Default post visibility for locked accounts

This commit is contained in:
stom79 2018-02-09 08:39:54 +01:00
parent 4c2237b371
commit 84fc31d2a4
2 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
View File

@ -414,37 +414,22 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount
if (!sharedUri.isEmpty()) {
uploadSharedImage(sharedUri);
}
String visibilityCheck = sharedpreferences.getString(Helper.SET_TOOT_VISIBILITY + "@" + account.getAcct() + "@" + account.getInstance(), "public");
boolean isAccountPrivate = (account.isLocked() || visibilityCheck.equals("private"));
if(isAccountPrivate){
if( tootReply == null) {
visibility = "private";
toot_visibility.setImageResource(R.drawable.ic_lock_outline_toot);
}else {
if( visibility.equals("direct") ){
toot_visibility.setImageResource(R.drawable.ic_mail_outline_toot);
}else{
visibility = "private";
String defaultVisibility = account.isLocked()?"private":"public";
if( tootReply == null){
visibility = sharedpreferences.getString(Helper.SET_TOOT_VISIBILITY + "@" + account.getAcct() + "@" + account.getInstance(), defaultVisibility);
switch (visibility) {
case "public":
toot_visibility.setImageResource(R.drawable.ic_public_toot);
break;
case "unlisted":
toot_visibility.setImageResource(R.drawable.ic_lock_open_toot);
break;
case "private":
toot_visibility.setImageResource(R.drawable.ic_lock_outline_toot);
}
}
}else {
if( tootReply == null){
visibility = sharedpreferences.getString(Helper.SET_TOOT_VISIBILITY + "@" + account.getAcct() + "@" + account.getInstance(), "public");
switch (visibility) {
case "public":
toot_visibility.setImageResource(R.drawable.ic_public_toot);
break;
case "unlisted":
toot_visibility.setImageResource(R.drawable.ic_lock_open_toot);
break;
case "private":
toot_visibility.setImageResource(R.drawable.ic_lock_outline_toot);
break;
case "direct":
toot_visibility.setImageResource(R.drawable.ic_mail_outline_toot);
break;
}
break;
case "direct":
toot_visibility.setImageResource(R.drawable.ic_mail_outline_toot);
break;
}
}
toot_sensitive.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {

5
app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
View File

@ -434,8 +434,9 @@ public class SettingsFragment extends Fragment {
changeDrawableColor(context, set_toot_visibility, R.color.white);
}
//Only displayed for non locked accounts
if (account != null && !account.isLocked()) {
String tootVisibility = sharedpreferences.getString(Helper.SET_TOOT_VISIBILITY + "@" + account.getAcct() + "@" + account.getInstance(), "public");
if (account != null ) {
String defaultVisibility = account.isLocked()?"private":"public";
String tootVisibility = sharedpreferences.getString(Helper.SET_TOOT_VISIBILITY + "@" + account.getAcct() + "@" + account.getInstance(), defaultVisibility);
switch (tootVisibility) {
case "public":
set_toot_visibility.setImageResource(R.drawable.ic_public);