diff options
| author | Thomas <tschneider.ac@gmail.com> | 2020-05-16 11:32:18 +0200 |
|---|---|---|
| committer | Thomas <tschneider.ac@gmail.com> | 2020-05-16 11:32:18 +0200 |
| commit | 9ebbe6d555382f8ea04112d232852297146c758d (patch) | |
| tree | a7fd26c63da985e4fd8867e04c25fa5667173bd5 /app | |
| parent | dd26a6aeb50f8f18c6e5080b1e6097361fca6fe0 (diff) | |
| parent | 0923eada5514b3b0dd5e9bb89b1db8dff94a31a3 (diff) | |
Merge remote-tracking branch 'origin/develop' into develop
Diffstat (limited to 'app')
| -rw-r--r-- | app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java | 9 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java index bb39b6732..96edc6d7b 100644 --- a/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/ShowAccountActivity.java @@ -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); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c11208d0d..d9a741cb0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -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"> |