Revert "626, 627: Add kebab menu for delete (#764)"

This reverts commit 17605c3.

app/src/main/java/mozilla/lockbox/action/DataStoreAction.kt

@@ -6,7 +6,7 @@
 
 package mozilla.lockbox.action
 
-import mozilla.appservices.logins.ServerPassword
+import mozilla.components.service.sync.logins.ServerPassword
 import mozilla.lockbox.model.SyncCredentials
 
 sealed class DataStoreAction(

app/src/main/java/mozilla/lockbox/action/DialogAction.kt

@@ -6,7 +6,6 @@
 
 package mozilla.lockbox.action
 
-import mozilla.appservices.logins.ServerPassword
 import mozilla.lockbox.R
 import mozilla.lockbox.flux.Action
 import mozilla.lockbox.model.DialogViewModel
@@ -16,17 +15,15 @@ sealed class DialogAction(
     val positiveButtonActionList: List<Action> = emptyList(),
     val negativeButtonActionList: List<Action> = emptyList()
 ) : RouteAction(TelemetryEventMethod.show, TelemetryEventObject.dialog) {
-
     object SecurityDisclaimer : DialogAction(
         DialogViewModel(
             R.string.no_device_security_title,
             R.string.no_device_security_message,
             R.string.set_up_security_button,
             R.string.cancel
         ),
-        listOf(SystemSetting(SettingIntent.Security))
+        listOf(RouteAction.SystemSetting(SettingIntent.Security))
     )
-
     object UnlinkDisclaimer : DialogAction(
         DialogViewModel(
             R.string.disconnect_disclaimer_title,
@@ -37,34 +34,17 @@ sealed class DialogAction(
         ),
         listOf(LifecycleAction.UserReset)
     )
-
     object OnboardingSecurityDialog : DialogAction(
-        DialogViewModel(
-            R.string.secure_your_device,
-            R.string.device_security_description,
-            R.string.set_up_now,
-            R.string.skip_button
-        ),
-        listOf(
-            SystemSetting(SettingIntent.Security),
-            Login
-        ),
-        listOf(Login)
-    )
-
-    data class DeleteConfirmationDialog(
-        val item: ServerPassword?
-    ) : DialogAction(
-        DialogViewModel(
-            R.string.delete_this_login,
-            R.string.delete_description,
-            R.string.delete,
-            R.string.cancel,
-            R.color.red
-        ),
-        listOf(
-            DataStoreAction.Delete(item),
-            ItemList
+            DialogViewModel(
+                R.string.secure_your_device,
+                R.string.device_security_description,
+                R.string.set_up_now,
+                R.string.skip_button
+            ),
+            listOf(
+                RouteAction.SystemSetting(SettingIntent.Security),
+                RouteAction.Login
+            ),
+            listOf(RouteAction.Login)
         )
-    )
 }

app/src/main/java/mozilla/lockbox/action/ItemDetailAction.kt

@@ -6,18 +6,10 @@
 
 package mozilla.lockbox.action
 
-import androidx.annotation.StringRes
-import mozilla.lockbox.R
-
 sealed class ItemDetailAction(
     override val eventMethod: TelemetryEventMethod,
     override val eventObject: TelemetryEventObject
 ) : TelemetryAction {
     data class TogglePassword(val displayed: Boolean)
         : ItemDetailAction(TelemetryEventMethod.tap, TelemetryEventObject.reveal_password)
-
-    enum class EditItemMenu(@StringRes val titleId: Int) {
-        EDIT(R.string.edit),
-        DELETE(R.string.delete)
-    }
 }

app/src/main/java/mozilla/lockbox/action/SettingAction.kt

@@ -41,7 +41,7 @@ class Setting {
         val ms: Long = this.seconds * 1000
     }
 
-    enum class ItemListSort(@StringRes val titleId: Int, @StringRes val valueId: Int) {
+    enum class ItemListSort(val titleId: Int, val valueId: Int) {
         ALPHABETICALLY(R.string.all_logins_a_z, R.string.sort_menu_az),
         RECENTLY_USED(R.string.all_logins_recent, R.string.sort_menu_recent)
     }

app/src/main/java/mozilla/lockbox/action/TelemetryAction.kt

@@ -17,7 +17,7 @@ interface TelemetryAction : Action {
     val extras: Map<String, Any>?
         get() = null
 
-    fun createEvent(category: String = "action"): TelemetryEvent {
+    open fun createEvent(category: String = "action"): TelemetryEvent {
         val evt = TelemetryEvent.create(
                 category,
                 eventMethod.name,
@@ -58,9 +58,7 @@ enum class TelemetryEventMethod {
     autofill_multiple,
     autofill_cancel,
     autofill_error,
-    autofill_filter,
-    delete,
-    edit
+    autofill_filter
 }
 
 enum class TelemetryEventObject {
@@ -100,8 +98,5 @@ enum class TelemetryEventObject {
     filter,
     back,
     dialog,
-    datastore,
-    delete_credential,
-    edit_credential,
-    entry_kebab
+    datastore
 }

app/src/main/java/mozilla/lockbox/adapter/SectionedAdapter.kt

@@ -73,6 +73,7 @@ class SectionedAdapter(
         else
             baseAdapter.getItemViewType(sectionedPositionToPosition(position)) + 1
     }
+
     class Section(internal var firstPosition: Int, @StringRes title: Int) {
         internal var sectionedPosition: Int = 0
         @StringRes var title: Int

app/src/main/java/mozilla/lockbox/extensions/view/AlertDialog+.kt

@@ -12,7 +12,6 @@ import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import io.reactivex.Observable
 import io.reactivex.ObservableEmitter
-import kotlinx.android.synthetic.main.list_cell_setting_toggle.*
 import mozilla.lockbox.R
 import mozilla.lockbox.model.DialogViewModel
 
@@ -26,7 +25,7 @@ object AlertDialogHelper {
         viewModel: DialogViewModel
     ): Observable<AlertState> {
         return Observable.create { emitter ->
-            val builder = AlertDialog.Builder(context, R.style.DeleteDialogStyle)
+            val builder = AlertDialog.Builder(context, R.style.AlertDialogStyle)
 
             viewModel.title?.let {
                 val titleString = context.getString(it)
@@ -63,6 +62,7 @@ object AlertDialogHelper {
             setUpDismissal(builder, emitter)
 
             val dialog = builder.create()
+
             dialog.show()
 
             val defaultColor = context.getColor(R.color.violet_70)

app/src/main/java/mozilla/lockbox/presenter/ItemDetailPresenter.kt

@@ -16,7 +16,6 @@ import mozilla.lockbox.R
 import mozilla.lockbox.action.AppWebPageAction
 import mozilla.lockbox.action.ClipboardAction
 import mozilla.lockbox.action.DataStoreAction
-import mozilla.lockbox.action.DialogAction
 import mozilla.lockbox.action.ItemDetailAction
 import mozilla.lockbox.action.RouteAction
 import mozilla.lockbox.extensions.filterNotNull
@@ -34,12 +33,10 @@ interface ItemDetailView {
     val togglePasswordClicks: Observable<Unit>
     val hostnameClicks: Observable<Unit>
     val learnMoreClicks: Observable<Unit>
-    val kebabMenuClicks: Observable<Unit>
     var isPasswordVisible: Boolean
     fun updateItem(item: ItemDetailViewModel)
     fun showToastNotification(@StringRes strId: Int)
     fun handleNetworkError(networkErrorVisibility: Boolean)
-    val menuItemSelection: Observable<ItemDetailAction.EditItemMenu>
     //    val retryNetworkConnectionClicks: Observable<Unit>
 }
 
@@ -83,13 +80,6 @@ class ItemDetailPresenter(
             }
         }
 
-        view.menuItemSelection
-            .map {
-                DialogAction.DeleteConfirmationDialog(credentials)
-            }
-            .subscribe(dispatcher::dispatch)
-            .addTo(compositeDisposable)
-
         this.view.learnMoreClicks
             .map { AppWebPageAction.FaqEdit }
             .subscribe(dispatcher::dispatch)
@@ -127,8 +117,8 @@ class ItemDetailPresenter(
 
     private fun handleClicks(clicks: Observable<Unit>, withServerPassword: (ServerPassword) -> Unit) {
         clicks.subscribe {
-            this.credentials?.let { password -> withServerPassword(password) }
-        }
+                this.credentials?.let { password -> withServerPassword(password) }
+            }
             .addTo(compositeDisposable)
     }
 }

app/src/main/java/mozilla/lockbox/presenter/ItemListPresenter.kt

@@ -51,7 +51,6 @@ interface ItemListView {
     val isRefreshing: Boolean
     fun stopRefreshing()
     fun showToastNotification(@StringRes strId: Int)
-    fun showDeleteToastNotification(text: String)
 }
 
 @ExperimentalCoroutinesApi
@@ -172,13 +171,6 @@ class ItemListPresenter(
             .subscribe(view::handleNetworkError)
             .addTo(compositeDisposable)
 
-        dataStore.deletedItem
-            .subscribe {
-                val event = it.get() ?: return@subscribe
-                view.showDeleteToastNotification(event.formSubmitURL ?: event.hostname)
-            }
-            .addTo(compositeDisposable)
-
         // TODO: make this more robust to retry loading the correct page again (loadUrl)
 //        view.retryNetworkConnectionClicks.subscribe {
 //            dispatcher.dispatch(NetworkAction.CheckConnectivity)

app/src/main/java/mozilla/lockbox/store/DataStore.kt

@@ -32,6 +32,7 @@ import mozilla.lockbox.support.DataStoreSupport
 import mozilla.lockbox.support.FxASyncDataStoreSupport
 import mozilla.lockbox.support.Optional
 import mozilla.lockbox.support.TimingSupport
+import mozilla.lockbox.support.asOptional
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.TimeoutException
 import kotlin.coroutines.CoroutineContext
@@ -62,12 +63,10 @@ open class DataStore(
     private val stateSubject = ReplayRelay.createWithSize<State>(1)
     private val syncStateSubject = BehaviorRelay.createDefault<SyncState>(SyncState.NotSyncing)
     private val listSubject: BehaviorRelay<List<ServerPassword>> = BehaviorRelay.createDefault(emptyList())
-    private val deletedItemSubject = ReplayRelay.create<Consumable<ServerPassword>>()
 
     open val state: Observable<State> = stateSubject
     open val syncState: Observable<SyncState> = syncStateSubject
     open val list: Observable<List<ServerPassword>> get() = listSubject
-    open val deletedItem: Observable<Consumable<ServerPassword>> get() = deletedItemSubject
 
     private val exceptionHandler: CoroutineExceptionHandler
         get() = CoroutineExceptionHandler { _, e ->
@@ -109,7 +108,6 @@ open class DataStore(
                     is DataStoreAction.Touch -> touch(action.id)
                     is DataStoreAction.Reset -> reset()
                     is DataStoreAction.UpdateCredentials -> updateCredentials(action.syncCredentials)
-                    is DataStoreAction.Delete -> deleteCredentials(action.item)
                 }
             }
             .addTo(compositeDisposable)
@@ -122,26 +120,6 @@ open class DataStore(
         setupAutoLock()
     }
 
-    private fun deleteCredentials(item: ServerPassword?) {
-        try {
-            if (item != null) {
-                backend.delete(item.id)
-                    .asSingle(coroutineContext)
-                    .subscribe()
-                    .addTo(compositeDisposable)
-                sync()
-                deletedItemSubject.accept(Consumable(item))
-            }
-        } catch (loginsStorageException: LoginsStorageException) {
-            log.error("Exception: ", loginsStorageException)
-        }
-    }
-
-    private fun editEntry() {
-        // TODO
-//        dispatcher.dispatch(RouteAction.ItemList)
-    }
-
     private fun shutdown() {
         // rather than calling `close`, which will make the `AsyncLoginsStorage` instance unusable,
         // we use the `ensureLocked` method to close the database connection.

app/src/main/java/mozilla/lockbox/support/Optional.kt

@@ -7,4 +7,4 @@
 package mozilla.lockbox.support
 
 data class Optional<T>(val value: T?)
-fun <T> T?.asOptional(): Optional<T> = Optional(this)
+fun <T> T?.asOptional() = Optional(this)

app/src/main/java/mozilla/lockbox/view/DialogFragment.kt

@@ -7,10 +7,10 @@
 package mozilla.lockbox.view
 
 import android.os.Bundle
-import android.view.View
 import androidx.annotation.StringRes
-import mozilla.lockbox.flux.Presenter
 import androidx.fragment.app.DialogFragment as AndroidDialogFragment
+import android.view.View
+import mozilla.lockbox.flux.Presenter
 
 open class DialogFragment : AndroidDialogFragment() {
     lateinit var presenter: Presenter