From 34e8438d7c9e7110b677ba57cd6c8cd6cec7e7bc Mon Sep 17 00:00:00 2001 From: stom79 Date: Sat, 23 Dec 2017 08:42:27 +0100 Subject: [PATCH] Fixes issue #186 - Store visibility of the toots for replies --- .../mastodon/activities/TootActivity.java | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java index c3072915e..aedd715a5 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java @@ -440,7 +440,6 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount } } } - toot_sensitive.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { @@ -1830,26 +1829,28 @@ public class TootActivity extends BaseActivity implements OnRetrieveSearcAccount else userId = accountReply.getId(); - switch (tootReply.getVisibility()){ - case "public": - visibility = "public"; - toot_visibility.setImageResource(R.drawable.ic_public_toot); - break; - case "unlisted": - visibility = "unlisted"; - toot_visibility.setImageResource(R.drawable.ic_lock_open_toot); - break; - case "private": - visibility = "private"; - toot_visibility.setImageResource(R.drawable.ic_lock_outline_toot); - break; - case "direct": - visibility = "direct"; - toot_visibility.setImageResource(R.drawable.ic_mail_outline_toot); - break; - } //If toot is not restored if( restored == -1 ){ + + switch (tootReply.getVisibility()){ + case "public": + visibility = "public"; + toot_visibility.setImageResource(R.drawable.ic_public_toot); + break; + case "unlisted": + visibility = "unlisted"; + toot_visibility.setImageResource(R.drawable.ic_lock_open_toot); + break; + case "private": + visibility = "private"; + toot_visibility.setImageResource(R.drawable.ic_lock_outline_toot); + break; + case "direct": + visibility = "direct"; + toot_visibility.setImageResource(R.drawable.ic_mail_outline_toot); + break; + } + if( tootReply.getSpoiler_text() != null && tootReply.getSpoiler_text().length() > 0) { toot_cw_content.setText(tootReply.getSpoiler_text()); toot_cw_content.setVisibility(View.VISIBLE);