Commit 9ebbe6d5 authored by Thomas's avatar Thomas
Browse files

Merge remote-tracking branch 'origin/develop' into develop

parents dd26a6ae 0923eada
Pipeline #302045 passed with stage
in 5 minutes and 7 seconds
......@@ -1330,8 +1330,13 @@ public class ShowAccountActivity extends BaseActivity implements OnPostActionInt
return true;
case R.id.action_block:
builderInner = new AlertDialog.Builder(ShowAccountActivity.this, style);
builderInner.setTitle(stringArrayConf[1]);
doActionAccount = API.StatusAction.BLOCK;
if (relationship.isBlocking()) {
builderInner.setTitle(stringArrayConf[5]);
doActionAccount = API.StatusAction.UNBLOCK;
} else {
builderInner.setTitle(stringArrayConf[1]);
doActionAccount = API.StatusAction.BLOCK;
}
break;
case R.id.action_block_instance:
builderInner = new AlertDialog.Builder(ShowAccountActivity.this, style);
......
......@@ -115,6 +115,7 @@
<item>Report this toot?</item>
<item>Block this domain?</item>
<item>Unmute this account?</item>
<item>Unblock this account?</item>
</string-array>
<string-array name="action_notification">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment