Delete subscriber

WordPress/src/main/java/org/wordpress/android/ui/subscribers/AddSubscribersViewModel.kt

@@ -62,7 +62,7 @@ class AddSubscribersViewModel @Inject constructor(
     ) {
         launch(bgDispatcher) {
             val result = addSubscribers(emails)
-            launch(mainDispatcher) {
+            withContext(mainDispatcher) {
                 if (result.isSuccess) {
                     toastUtilsWrapper.showToast(R.string.subscribers_add_success)
                     onSuccess()

WordPress/src/main/java/org/wordpress/android/ui/subscribers/SubscriberDetailScreen.kt

@@ -57,6 +57,7 @@ fun SubscriberDetailScreen(
     onUrlClick: (String) -> Unit,
     onEmailClick: (String) -> Unit,
     onPlanClick: (index: Int) -> Unit,
+    onDeleteClick: (subscriber: Subscriber) -> Unit,
     modifier: Modifier = Modifier,
     subscriberStats: State<IndividualSubscriberStats?>? = null
 ) {
@@ -92,7 +93,11 @@ fun SubscriberDetailScreen(
 
         Spacer(modifier = Modifier.height(32.dp))
 
-        DeleteSubscriberButton()
+        DeleteSubscriberButton(
+            onClick = {
+                onDeleteClick(subscriber)
+            }
+        )
     }
 }
 
@@ -346,9 +351,13 @@ private fun DetailRow(
 }
 
 @Composable
-private fun DeleteSubscriberButton() {
+private fun DeleteSubscriberButton(
+    onClick: () -> Unit,
+) {
     Button(
-        onClick = { /* Handle delete action */ },
+        onClick = {
+            onClick()
+        },
         modifier = Modifier.fillMaxWidth(),
         colors = ButtonDefaults.buttonColors(
             containerColor = Color.Transparent,
@@ -399,7 +408,8 @@ fun SubscriberDetailScreenPreview() {
             subscriberStats = remember { mutableStateOf(subscriberStats) },
             onUrlClick = {},
             onEmailClick = {},
-            onPlanClick = {}
+            onPlanClick = {},
+            onDeleteClick = {}
         )
     }
 }

WordPress/src/main/java/org/wordpress/android/ui/subscribers/SubscribersActivity.kt

@@ -2,6 +2,7 @@ package org.wordpress.android.ui.subscribers
 
 import android.os.Build
 import android.os.Bundle
+import android.widget.Toast
 import androidx.activity.viewModels
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
@@ -17,6 +18,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
@@ -25,6 +27,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.R
 import org.wordpress.android.ui.ActivityLauncher
@@ -40,6 +43,7 @@ class SubscribersActivity : BaseAppCompatActivity() {
     private val addSubscribersViewModel by viewModels<AddSubscribersViewModel>()
 
     private lateinit var composeView: ComposeView
+    private lateinit var navController: NavHostController
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -55,6 +59,18 @@ class SubscribersActivity : BaseAppCompatActivity() {
                 }
             }
         )
+
+        viewModel.uiEvent.observe(this) { event ->
+            when (event) {
+                is SubscribersViewModel.UiEvent.ShowDeleteConfirmationDialog -> {
+                    showDeleteConfirmationDialog(event.subscriber, navController)
+                }
+
+                is SubscribersViewModel.UiEvent.ShowToast -> {
+                    Toast.makeText(this, event.messageRes, Toast.LENGTH_SHORT).show()
+                }
+            }
+        }
     }
 
     private enum class SubscriberScreen {
@@ -67,10 +83,10 @@ class SubscribersActivity : BaseAppCompatActivity() {
     @OptIn(ExperimentalMaterial3Api::class)
     @Composable
     private fun NavigableContent() {
-        val navController = rememberNavController()
+        navController = rememberNavController()
         val listTitle = stringResource(R.string.subscribers)
         val titleState = remember { mutableStateOf(listTitle) }
-        val showAddSubscribersButtonState = remember { mutableStateOf(true) }
+        val showAddSubscribersButtonState = rememberSaveable { mutableStateOf(true) }
 
         AppThemeM3 {
             Scaffold(
@@ -235,6 +251,11 @@ class SubscribersActivity : BaseAppCompatActivity() {
                 )
                 navController.navigate(route = SubscriberScreen.Plan.name)
             },
+            onDeleteClick = { _ ->
+                viewModel.onDeleteSubscriberClick(
+                    subscriber = subscriber,
+                )
+            },
             modifier = modifier,
             subscriberStats = viewModel.subscriberStats.collectAsState()
         )
@@ -260,6 +281,26 @@ class SubscribersActivity : BaseAppCompatActivity() {
         )
     }
 
+    private fun showDeleteConfirmationDialog(
+        subscriber: Subscriber,
+        navController: NavHostController
+    ) {
+        MaterialAlertDialogBuilder(this).also { builder ->
+            builder.setTitle(R.string.subscribers_delete_confirmation_title)
+            builder.setMessage(R.string.subscribers_delete_confirmation_message)
+            builder.setPositiveButton(R.string.delete) { _, _ ->
+                viewModel.deleteSubscriberConfirmed(
+                    subscriber = subscriber,
+                    onSuccess = {
+                        navController.navigateUp()
+                    }
+                )
+            }
+            builder.setNegativeButton(R.string.cancel, null)
+            builder.show()
+        }
+    }
+
     private fun onEmailClick(email: String) {
         ActivityLauncher.openUrlExternal(this, "mailto:$email")
     }

WordPress/src/main/java/org/wordpress/android/ui/subscribers/SubscribersViewModel.kt

@@ -30,7 +30,7 @@ import javax.inject.Named
 
 @HiltViewModel
 class SubscribersViewModel @Inject constructor(
-    @Named(UI_THREAD) mainDispatcher: CoroutineDispatcher,
+    @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
     private val appLogWrapper: AppLogWrapper,
 ) : DataViewViewModel(
     mainDispatcher = mainDispatcher,
@@ -44,6 +44,13 @@ class SubscribersViewModel @Inject constructor(
     @Inject
     lateinit var dateFormatWrapper: SimpleDateFormatWrapper
 
+    sealed class UiEvent {
+        data class ShowDeleteConfirmationDialog(val subscriber: Subscriber) : UiEvent()
+        data class ShowToast(val messageRes: Int) : UiEvent()
+    }
+    private val _uiEvent = MutableStateFlow<UiEvent?>(null)
+    val uiEvent = _uiEvent.asStateFlow()
+
     override fun getSupportedFilters(): List<DataViewDropdownItem> {
         return listOf(
             DataViewDropdownItem(
@@ -215,6 +222,37 @@ class SubscribersViewModel @Inject constructor(
             }
         }
 
+    private suspend fun deleteSubscriber(subscriber: Subscriber): Result<Boolean> = withContext(ioDispatcher) {
+        val response = if (subscriber.isEmailSubscriber) {
+            wpComApiClient.request { requestBuilder ->
+                requestBuilder.followers().deleteEmailFollower(
+                    wpComSiteId = siteId().toULong(),
+                    subscriptionId = subscriber.subscriptionId
+                )
+            }
+        } else {
+            wpComApiClient.request { requestBuilder ->
+                requestBuilder.followers().deleteFollower(
+                    wpComSiteId = siteId().toULong(),
+                    userId = subscriber.userId
+                )
+            }
+        }
+        when (response) {
+            is WpRequestResult.Success -> {
+                appLogWrapper.d(AppLog.T.MAIN, "Delete subscriber success")
+                return@withContext Result.success(true)
+            }
+
+            else -> {
+                val error = (response as? WpRequestResult.WpError)?.errorMessage
+                appLogWrapper.e(AppLog.T.MAIN, "Delete subscriber failed: $error")
+                return@withContext Result.failure(Exception(error))
+            }
+        }
+    }
+
+
     /**
      * Called when an item in the list is clicked. We use this to request stats for the clicked subscriber.
      */
@@ -230,6 +268,36 @@ class SubscribersViewModel @Inject constructor(
         }
     }
 
+    /**
+     * Trigger the delete confirmation dialog when the user taps the delete button for a subscriber
+     */
+    fun onDeleteSubscriberClick(subscriber: Subscriber) {
+        appLogWrapper.d(AppLog.T.MAIN, "Clicked on delete subscriber ${subscriber.displayNameOrEmail()}")
+        _uiEvent.value = UiEvent.ShowDeleteConfirmationDialog(subscriber)
+    }
+
+    /**
+     * Subscriber deletion has been confirmed by the user. Delete the subscriber and refresh the list.
+     */
+    fun deleteSubscriberConfirmed(subscriber: Subscriber, onSuccess: () -> Unit) {
+        launch(ioDispatcher) {
+            val result = deleteSubscriber(subscriber = subscriber)
+            withContext(mainDispatcher) {
+                if (result.isSuccess) {
+                    _uiEvent.value = UiEvent.ShowToast(R.string.subscribers_delete_success)
+                    onSuccess()
+                    onRefreshData()
+                } else {
+                    _uiEvent.value = UiEvent.ShowToast(R.string.subscribers_delete_failed)
+                }
+            }
+        }
+    }
+
+    fun clearUiEvent() {
+        _uiEvent.value = null
+    }
+
     companion object {
         private const val ID_FILTER_EMAIL = 1L
         private const val ID_FILTER_READER = 2L

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

@@ -5031,6 +5031,10 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
     </string>
     <string name="subscribers_add_success">Successfully added subscribers</string>
     <string name="subscribers_add_failed">Failed to add subscribers</string>
+    <string name="subscribers_delete_confirmation_title">Delete subscriber</string>
+    <string name="subscribers_delete_confirmation_message">Are you sure you want to delete this subscriber?</string>
+    <string name="subscribers_delete_success">Subscriber deleted</string>
+    <string name="subscribers_delete_failed">Failed to delete subscriber</string>
 
     <!-- Application Password authentication -->
     <string name="application_password_credentials_stored">Application password credentials stored for %1$s</string>

gradle/libs.versions.toml

@@ -103,7 +103,7 @@ wiremock = '2.26.3'
 wordpress-aztec = 'v2.1.4'
 wordpress-lint = '2.1.0'
 wordpress-persistent-edittext = '1.0.2'
-wordpress-rs = 'trunk-14fe1179d108dc91066776e28ee9690864cab1f1'
+wordpress-rs = 'trunk-342fd04e1f398fdf9167ae9f8a7618da10f10688'
 wordpress-utils = '3.14.0'
 automattic-ucrop = '2.2.11'
 zendesk = '5.5.0'