For #24854: Add ability to delete an existing address.

mozilla-mobile · May 5, 2022 · d847ec2 · d847ec2
1 parent 7ebceea
commit d847ec2
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 0 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/settings/address/controller/AddressEditorController.kt b/app/src/main/java/org/mozilla/fenix/settings/address/controller/AddressEditorController.kt
@@ -29,6 +29,11 @@ interface AddressEditorController {
      */
     fun handleSaveAddress(addressFields: UpdatableAddressFields)
 
+    /**
+     * @see [AddressEditorInteractor.onDeleteAddress]
+     */
+    fun handleDeleteAddress(guid: String)
+
     /**
      * @see [AddressEditorInteractor.onUpdateAddress]
      */
@@ -63,6 +68,15 @@ class DefaultAddressEditorController(
         }
     }
 
+    override fun handleDeleteAddress(guid: String) {
+        lifecycleScope.launch {
+            storage.deleteAddress(guid)
+            lifecycleScope.launch(Dispatchers.Main) {
+                navController.popBackStack()
+            }
+        }
+    }
+
     override fun handleUpdateAddress(guid: String, addressFields: UpdatableAddressFields) {
         lifecycleScope.launch {
             storage.updateAddress(guid, addressFields)

diff --git a/app/src/main/java/org/mozilla/fenix/settings/address/interactor/AddressEditorInteractor.kt b/app/src/main/java/org/mozilla/fenix/settings/address/interactor/AddressEditorInteractor.kt
@@ -4,6 +4,7 @@
 
 package org.mozilla.fenix.settings.address.interactor
 
+import mozilla.components.concept.storage.Address
 import mozilla.components.concept.storage.UpdatableAddressFields
 import org.mozilla.fenix.settings.address.controller.AddressEditorController
 
@@ -26,6 +27,14 @@ interface AddressEditorInteractor {
      */
     fun onSaveAddress(addressFields: UpdatableAddressFields)
 
+    /**
+     * Deletes the provided address from the autofill storage. Called when a user
+     * taps on the save menu item or "Save" button.
+     *
+     * @param address An [Address] record to delete.
+     */
+    fun onDeleteAddress(guid: String)
+
     /**
      * Updates the provided address in the autofill storage. Called when a user
      * taps on the update menu item or "Update" button.
@@ -53,6 +62,10 @@ class DefaultAddressEditorInteractor(
         controller.handleSaveAddress(addressFields)
     }
 
+    override fun onDeleteAddress(guid: String) {
+        controller.handleDeleteAddress(guid)
+    }
+
     override fun onUpdateAddress(guid: String, addressFields: UpdatableAddressFields) {
         controller.handleUpdateAddress(guid, addressFields)
     }

diff --git a/app/src/main/java/org/mozilla/fenix/settings/address/view/AddressEditorView.kt b/app/src/main/java/org/mozilla/fenix/settings/address/view/AddressEditorView.kt
@@ -84,4 +84,17 @@ class AddressEditorView(
             interactor.onSaveAddress(addressFields)
         }
     }
+
+    internal fun showConfirmDeleteAddressDialog(context: Context, guid: String) {
+        AlertDialog.Builder(context).apply {
+            setMessage(R.string.addressess_confirm_dialog_message)
+            setNegativeButton(R.string.addressess_confirm_dialog_cancel_button) { dialog: DialogInterface, _ ->
+                dialog.cancel()
+            }
+            setPositiveButton(R.string.addressess_confirm_dialog_ok_button) { _, _ ->
+                interactor.onDeleteAddress(guid)
+            }
+            create()
+        }.show()
+    }
 }
diff --git a/app/src/test/java/org/mozilla/fenix/settings/address/AddressEditorViewTest.kt b/app/src/test/java/org/mozilla/fenix/settings/address/AddressEditorViewTest.kt
@@ -6,10 +6,14 @@ package org.mozilla.fenix.settings.address
 
 import android.view.LayoutInflater
 import android.view.View
+import io.mockk.every
 import io.mockk.mockk
 import io.mockk.spyk
 import io.mockk.verify
+import kotlinx.coroutines.runBlocking
+import mozilla.components.concept.storage.Address
 import mozilla.components.support.test.robolectric.testContext
+import org.junit.Assert.assertEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -26,12 +30,15 @@ class AddressEditorViewTest {
     private lateinit var interactor: AddressEditorInteractor
     private lateinit var addressEditorView: AddressEditorView
     private lateinit var binding: FragmentAddressEditorBinding
+    private lateinit var address: Address
 
     @Before
     fun setup() {
         view = LayoutInflater.from(testContext).inflate(R.layout.fragment_address_editor, null)
         binding = FragmentAddressEditorBinding.bind(view)
         interactor = mockk(relaxed = true)
+        address = mockk(relaxed = true)
+        every { address.guid } returns "123"
 
         addressEditorView = spyk(AddressEditorView(binding, interactor))
     }
@@ -44,4 +51,22 @@ class AddressEditorViewTest {
 
         verify { interactor.onCancelButtonClicked() }
     }
+
+    @Test
+    fun `GIVEN an existing address WHEN editor is opened THEN the delete address button is visible`() = runBlocking {
+        val addressEditorView = spyk(AddressEditorView(binding, interactor, address))
+        addressEditorView.bind()
+
+        assertEquals(View.VISIBLE, binding.deleteButton.visibility)
+    }
+
+    @Test
+    fun `GIVEN an existing address WHEN the delete address button is clicked THEN confirm delete dialog is shown`() = runBlocking {
+        val addressEditorView = spyk(AddressEditorView(binding, interactor, address))
+        addressEditorView.bind()
+
+        binding.deleteButton.performClick()
+
+        verify { addressEditorView.showConfirmDeleteAddressDialog(view.context, "123") }
+    }
 }