correctly update the menu when muting domains (#1848)

app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt

@@ -83,6 +83,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
     private var followState: FollowState = FollowState.NOT_FOLLOWING
     private var blocking: Boolean = false
     private var muting: Boolean = false
+    private var blockingDomain: Boolean = false
     private var showingReblogs: Boolean = false
     private var subscribing: Boolean = false
     private var loadedAccount: Account? = null
@@ -543,6 +544,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
         }
         blocking = relation.blocking
         muting = relation.muting
+        blockingDomain = relation.blockingDomain
         showingReblogs = relation.showingReblogs
 
         accountFollowsYouTextView.visible(relation.followedBy)
@@ -664,10 +666,14 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
                 if (domain.isEmpty()) {
                     // If we can't get the domain, there's no way we can mute it anyway...
                     menu.removeItem(R.id.action_mute_domain)
+                } else {
+                    if (blockingDomain) {
+                        muteDomain.title = getString(R.string.action_unmute_domain, domain)
                     } else {
                         muteDomain.title = getString(R.string.action_mute_domain, domain)
                     }
                 }
+            }
 
             if (followState == FollowState.FOLLOWING) {
                 val showReblogs = menu.findItem(R.id.action_show_reblogs)
@@ -710,13 +716,17 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
                 .show()
     }
 
-    private fun showMuteDomainWarningDialog(instance: String) {
+    private fun toggleBlockDomain(instance: String) {
+        if(blockingDomain) {
+            viewModel.unblockDomain(instance)
+        } else {
             AlertDialog.Builder(this)
                     .setMessage(getString(R.string.mute_domain_warning, instance))
-                .setPositiveButton(getString(R.string.mute_domain_warning_dialog_ok)) { _, _ -> viewModel.muteDomain(instance) }
+                    .setPositiveButton(getString(R.string.mute_domain_warning_dialog_ok)) { _, _ -> viewModel.blockDomain(instance) }
                     .setNegativeButton(android.R.string.cancel, null)
                     .show()
         }
+    }
 
     private fun toggleBlock() {
         if (viewModel.relationshipData.value?.data?.blocking != true) {
@@ -796,7 +806,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI
                 return true
             }
             R.id.action_mute_domain -> {
-                showMuteDomainWarningDialog(domain)
+                toggleBlockDomain(domain)
                 return true
             }
             R.id.action_show_reblogs -> {

app/src/main/java/com/keylesspalace/tusky/entity/Relationship.kt

@@ -25,5 +25,6 @@ data class Relationship (
     val muting: Boolean,
     val requested: Boolean,
     @SerializedName("showing_reblogs") val showingReblogs: Boolean,
-    val subscribing: Boolean? = null // Pleroma extension
+    val subscribing: Boolean? = null, // Pleroma extension
+    @SerializedName("domain_blocking") val blockingDomain: Boolean
 )

app/src/main/java/com/keylesspalace/tusky/viewmodel/AccountViewModel.kt

@@ -164,18 +164,41 @@ class AccountViewModel @Inject constructor(
         }
     }
 
-    fun muteDomain(instance: String) {
+    fun blockDomain(instance: String) {
         mastodonApi.blockDomain(instance).enqueue(object: Callback<Any> {
             override fun onResponse(call: Call<Any>, response: Response<Any>) {
                 if (response.isSuccessful) {
                     eventHub.dispatch(DomainMuteEvent(instance))
+                    val relation = relationshipData.value?.data
+                    if(relation != null) {
+                        relationshipData.postValue(Success(relation.copy(blockingDomain = true)))
+                    }
+                } else {
+                    Log.e(TAG, "Error muting %s".format(instance))
+                }
+            }
+
+            override fun onFailure(call: Call<Any>, t: Throwable) {
+                Log.e(TAG, "Error muting %s".format(instance), t)
+            }
+        })
+    }
+
+    fun unblockDomain(instance: String) {
+        mastodonApi.unblockDomain(instance).enqueue(object: Callback<Any> {
+            override fun onResponse(call: Call<Any>, response: Response<Any>) {
+                if (response.isSuccessful) {
+                    val relation = relationshipData.value?.data
+                    if(relation != null) {
+                        relationshipData.postValue(Success(relation.copy(blockingDomain = false)))
+                    }
                 } else {
-                    Log.e(TAG, String.format("Error muting %s", instance))
+                    Log.e(TAG, "Error unmuting %s".format(instance))
                 }
             }
 
             override fun onFailure(call: Call<Any>, t: Throwable) {
-                Log.e(TAG, String.format("Error muting %s", instance), t)
+                Log.e(TAG, "Error unmuting %s".format(instance), t)
             }
         })
     }

app/src/main/res/values/strings.xml

@@ -109,6 +109,7 @@
     <string name="action_mute">Mute</string>
     <string name="action_unmute">Unmute</string>
     <string name="action_mute_domain">Mute %s</string>
+    <string name="action_unmute_domain">Unmute %s</string>
     <string name="action_mute_conversation">Mute conversation</string>
     <string name="action_unmute_conversation">Unmute conversation</string>
     <string name="action_mention">Mention</string>