From 236f8e5f6f69d8b19cbd21ca2fe50113b68c4d3d Mon Sep 17 00:00:00 2001
From: Ash <>
Date: Fri, 15 May 2020 04:39:50 +0530
Subject: [PATCH] Fix: unblock option not working in account activity's menu
---
.../fedilab/android/activities/ShowAccountActivity.java | 9 +++++++--
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 @@
- Report this toot?
- Block this domain?
- Unmute this account?
+ - Unblock this account?