diff options
| author | Thomas <tschneider.ac@gmail.com> | 2020-05-15 11:25:14 +0200 |
|---|---|---|
| committer | Thomas <tschneider.ac@gmail.com> | 2020-05-15 11:25:14 +0200 |
| commit | 0923eada5514b3b0dd5e9bb89b1db8dff94a31a3 (patch) | |
| tree | 5b2c7d3e20d35bda58dbd8d62c577763bfabc3ad /app | |
| parent | 853286fa1a8988dce32debf52b424124e12def1f (diff) | |
| parent | 236f8e5f6f69d8b19cbd21ca2fe50113b68c4d3d (diff) | |
Merge branch 'fix_unblock' into 'develop'
Fix: unblock option not working in account activity's menu
See merge request tom79/fedilab!1002
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 b0a84b134..202aadd38 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"> |