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

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

This commit is contained in:
Thomas 2020-05-16 11:32:18 +02:00
parent dd26a6aeb5 0923eada55
commit 9ebbe6d555
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java
View File

@ -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);

1
app/src/main/res/values/strings.xml
View File

@ -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">