Offline Support Pages : Cancel Auto Upload

WordPress/src/main/java/org/wordpress/android/ui/pages/PageItem.kt

@@ -4,12 +4,6 @@ import androidx.annotation.ColorRes
 import androidx.annotation.IdRes
 import androidx.annotation.StringRes
 import org.wordpress.android.R
-import org.wordpress.android.ui.pages.PageItem.Action.DELETE_PERMANENTLY
-import org.wordpress.android.ui.pages.PageItem.Action.MOVE_TO_DRAFT
-import org.wordpress.android.ui.pages.PageItem.Action.MOVE_TO_TRASH
-import org.wordpress.android.ui.pages.PageItem.Action.PUBLISH_NOW
-import org.wordpress.android.ui.pages.PageItem.Action.SET_PARENT
-import org.wordpress.android.ui.pages.PageItem.Action.VIEW_PAGE
 import org.wordpress.android.ui.pages.PageItem.Type.DIVIDER
 import org.wordpress.android.ui.pages.PageItem.Type.EMPTY
 import org.wordpress.android.ui.pages.PageItem.Type.PAGE
@@ -19,7 +13,8 @@ import java.util.Date
 
 sealed class PageItem(open val type: Type) {
     abstract class Page(
-        open val id: Long,
+        open val remoteId: Long,
+        open val localId: Int,
         open val title: String,
         open val date: Date,
         open val labels: List<UiString>,
@@ -34,100 +29,112 @@ sealed class PageItem(open val type: Type) {
     ) : PageItem(PAGE)
 
     data class PublishedPage(
-        override val id: Long,
+        override val remoteId: Long,
+        override val localId: Int,
         override val title: String,
         override val date: Date,
         override val labels: List<UiString> = emptyList(),
         override val labelsColor: Int? = null,
         override var indent: Int = 0,
         override var imageUrl: String? = null,
+        override val actions: Set<Action>,
         override var actionsEnabled: Boolean = true,
         override val progressBarUiState: ProgressBarUiState,
         override val showOverlay: Boolean
     ) : Page(
-            id = id,
+            remoteId = remoteId,
+            localId = localId,
             title = title,
             date = date,
             labels = labels,
             labelsColor = labelsColor,
             indent = indent,
             imageUrl = imageUrl,
-            actions = setOf(VIEW_PAGE, SET_PARENT, MOVE_TO_DRAFT, MOVE_TO_TRASH),
+            actions = actions,
             actionsEnabled = actionsEnabled,
             tapActionEnabled = true,
             progressBarUiState = progressBarUiState,
             showOverlay = showOverlay
     )
 
     data class DraftPage(
-        override val id: Long,
+        override val remoteId: Long,
+        override val localId: Int,
         override val title: String,
         override val date: Date,
         override val labels: List<UiString> = emptyList(),
         override val labelsColor: Int? = null,
         override var imageUrl: String? = null,
+        override val actions: Set<Action>,
         override var actionsEnabled: Boolean = true,
         override val progressBarUiState: ProgressBarUiState,
         override val showOverlay: Boolean
     ) : Page(
-            id = id,
+            remoteId = remoteId,
+            localId = localId,
             title = title,
             date = date,
             labels = labels,
             labelsColor = labelsColor,
             indent = 0,
             imageUrl = imageUrl,
-            actions = setOf(VIEW_PAGE, SET_PARENT, PUBLISH_NOW, MOVE_TO_TRASH),
+            actions = actions,
             actionsEnabled = actionsEnabled,
             tapActionEnabled = true,
             progressBarUiState = progressBarUiState,
             showOverlay = showOverlay
     )
 
     data class ScheduledPage(
-        override val id: Long,
+        override val remoteId: Long,
+        override val localId: Int,
         override val title: String,
         override val date: Date,
         override val labels: List<UiString> = emptyList(),
         override val labelsColor: Int? = null,
         override var imageUrl: String? = null,
+        override val actions: Set<Action>,
         override var actionsEnabled: Boolean = true,
         override val progressBarUiState: ProgressBarUiState,
         override val showOverlay: Boolean
     ) : Page(
-            id = id,
+            remoteId = remoteId,
+            localId = localId,
             title = title,
             date = date,
             labels = labels,
             labelsColor = labelsColor,
             indent = 0,
             imageUrl = imageUrl,
-            actions = setOf(VIEW_PAGE, SET_PARENT, MOVE_TO_DRAFT, MOVE_TO_TRASH),
+            actions = actions,
             actionsEnabled = actionsEnabled,
             tapActionEnabled = true,
             progressBarUiState = progressBarUiState,
             showOverlay = showOverlay
     )
 
     data class TrashedPage(
-        override val id: Long,
+        override val remoteId: Long,
+        override val localId: Int,
         override val title: String,
         override val date: Date,
         override val labels: List<UiString> = emptyList(),
         override val labelsColor: Int? = null,
         override var imageUrl: String? = null,
+        override val actions: Set<Action>,
         override var actionsEnabled: Boolean = true,
         override val progressBarUiState: ProgressBarUiState,
         override val showOverlay: Boolean
     ) : Page(
-            id = id,
+            remoteId = remoteId,
+            localId = localId,
             title = title,
             date = date,
             labels = labels,
             labelsColor = labelsColor,
             indent = 0,
             imageUrl = imageUrl,
-            actions = setOf(MOVE_TO_DRAFT, DELETE_PERMANENTLY),
+            actions = actions,
             actionsEnabled = actionsEnabled,
             tapActionEnabled = false,
             progressBarUiState = progressBarUiState,
@@ -160,6 +167,7 @@ sealed class PageItem(open val type: Type) {
 
     enum class Action(@IdRes val itemId: Int) {
         VIEW_PAGE(R.id.view_page),
+        CANCEL_AUTO_UPLOAD(R.id.cancel_auto_upload),
         SET_PARENT(R.id.set_parent),
         PUBLISH_NOW(R.id.publish_now),
         MOVE_TO_DRAFT(R.id.move_to_draft),

WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemDiffUtil.kt

@@ -10,7 +10,7 @@ class PageItemDiffUtil(val items: List<PageItem>, val result: List<PageItem>) :
         val oldItem = items[oldItemPosition]
         val newItem = result[newItemPosition]
         return oldItem.type == newItem.type && when (oldItem) {
-            is Page -> oldItem.id == (newItem as Page).id
+            is Page -> oldItem.remoteId == (newItem as Page).remoteId
             is ParentPage -> oldItem.id == (newItem as ParentPage).id
             else -> oldItem == newItem
         }

WordPress/src/main/java/org/wordpress/android/viewmodel/pages/CreatePageListItemActionsUseCase.kt

@@ -0,0 +1,46 @@
+package org.wordpress.android.viewmodel.pages
+
+import org.wordpress.android.ui.pages.PageItem.Action
+import org.wordpress.android.ui.pages.PageItem.Action.CANCEL_AUTO_UPLOAD
+import org.wordpress.android.ui.pages.PageItem.Action.DELETE_PERMANENTLY
+import org.wordpress.android.ui.pages.PageItem.Action.MOVE_TO_DRAFT
+import org.wordpress.android.ui.pages.PageItem.Action.MOVE_TO_TRASH
+import org.wordpress.android.ui.pages.PageItem.Action.PUBLISH_NOW
+import org.wordpress.android.ui.pages.PageItem.Action.SET_PARENT
+import org.wordpress.android.ui.pages.PageItem.Action.VIEW_PAGE
+import org.wordpress.android.viewmodel.pages.CreatePageUploadUiStateUseCase.PostUploadUiState
+import org.wordpress.android.viewmodel.pages.CreatePageUploadUiStateUseCase.PostUploadUiState.UploadFailed
+import org.wordpress.android.viewmodel.pages.CreatePageUploadUiStateUseCase.PostUploadUiState.UploadWaitingForConnection
+import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType
+import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.DRAFTS
+import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.PUBLISHED
+import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.SCHEDULED
+import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.TRASHED
+import javax.inject.Inject
+
+class CreatePageListItemActionsUseCase @Inject constructor() {
+    fun setupPageActions(listType: PageListType, uploadUiState: PostUploadUiState): Set<Action> {
+        return when (listType) {
+            SCHEDULED, PUBLISHED -> mutableSetOf(
+                    VIEW_PAGE,
+                    SET_PARENT,
+                    MOVE_TO_DRAFT,
+                    MOVE_TO_TRASH
+            ).apply {
+                if (canCancelPendingAutoUpload(uploadUiState)) {
+                    add(CANCEL_AUTO_UPLOAD)
+                }
+            }
+            DRAFTS -> mutableSetOf(VIEW_PAGE, SET_PARENT, PUBLISH_NOW, MOVE_TO_TRASH).apply {
+                if (canCancelPendingAutoUpload(uploadUiState)) {
+                    add(CANCEL_AUTO_UPLOAD)
+                }
+            }
+            TRASHED -> setOf(MOVE_TO_DRAFT, DELETE_PERMANENTLY)
+        }
+    }
+
+    private fun canCancelPendingAutoUpload(uploadUiState: PostUploadUiState) =
+            (uploadUiState is UploadWaitingForConnection ||
+                    (uploadUiState is UploadFailed && uploadUiState.isEligibleForAutoUpload))
+}

WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageItemUploadProgressHelper.kt → WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageItemProgressUiStateUseCase.kt

@@ -11,7 +11,7 @@ import javax.inject.Inject
 
 typealias ShouldShowOverlay = Boolean
 
-class PageItemUploadProgressHelper @Inject constructor(
+class PageItemProgressUiStateUseCase @Inject constructor(
     private val appPrefsWrapper: AppPrefsWrapper
 ) {
     fun getProgressStateForPage(

WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListViewModel.kt

@@ -52,12 +52,13 @@ private const val DEFAULT_INDENT = 0
 class PageListViewModel @Inject constructor(
     private val createPageListItemLabelsUseCase: CreatePageListItemLabelsUseCase,
     private val createPageUploadUiStateUseCase: CreatePageUploadUiStateUseCase,
+    private val pageListItemActionsUseCase: CreatePageListItemActionsUseCase,
+    private val pageItemProgressUiStateUseCase: PageItemProgressUiStateUseCase,
     private val mediaStore: MediaStore,
     private val postStore: PostStore,
     private val dispatcher: Dispatcher,
     private val localeManagerWrapper: LocaleManagerWrapper,
-    @Named(BG_THREAD) private val coroutineDispatcher: CoroutineDispatcher,
-    private val progressHelper: PageItemUploadProgressHelper
+    @Named(BG_THREAD) private val coroutineDispatcher: CoroutineDispatcher
 ) : ScopedViewModel(coroutineDispatcher) {
     private val _pages: MutableLiveData<List<PageItem>> = MutableLiveData()
     val pages: LiveData<Pair<List<PageItem>, Boolean>> = Transformations.map(_pages) {
@@ -147,7 +148,7 @@ class PageListViewModel @Inject constructor(
     }
 
     fun onScrollToPageRequested(remotePageId: Long) {
-        val position = _pages.value?.indexOfFirst { it is Page && it.id == remotePageId } ?: -1
+        val position = _pages.value?.indexOfFirst { it is Page && it.remoteId == remotePageId } ?: -1
         if (position != -1) {
             _scrollToPosition.postValue(position)
         } else {
@@ -253,9 +254,15 @@ class PageListViewModel @Inject constructor(
                     val itemUiStateData = createItemUiStateData(it)
 
                     PublishedPage(
-                            it.remoteId, it.title, it.date, itemUiStateData.labels, itemUiStateData.labelsColor,
+                            it.remoteId,
+                            it.pageId,
+                            it.title,
+                            it.date,
+                            itemUiStateData.labels,
+                            itemUiStateData.labelsColor,
                             pageItemIndent,
                             getFeaturedImageUrl(it.featuredImageId),
+                            itemUiStateData.actions,
                             actionsEnabled,
                             itemUiStateData.progressBarUiState,
                             itemUiStateData.showOverlay
@@ -274,9 +281,13 @@ class PageListViewModel @Inject constructor(
                                 val itemUiStateData = createItemUiStateData(it)
 
                                 ScheduledPage(
-                                        it.remoteId, it.title, it.date, itemUiStateData.labels,
+                                        it.remoteId, it.pageId,
+                                        it.title,
+                                        it.date,
+                                        itemUiStateData.labels,
                                         itemUiStateData.labelsColor,
                                         getFeaturedImageUrl(it.featuredImageId),
+                                        itemUiStateData.actions,
                                         actionsEnabled,
                                         itemUiStateData.progressBarUiState,
                                         itemUiStateData.showOverlay
@@ -294,11 +305,13 @@ class PageListViewModel @Inject constructor(
             val itemUiStateData = createItemUiStateData(it)
             DraftPage(
                     it.remoteId,
+                    it.pageId,
                     it.title,
                     it.date,
                     itemUiStateData.labels,
                     itemUiStateData.labelsColor,
                     getFeaturedImageUrl(it.featuredImageId),
+                    itemUiStateData.actions,
                     actionsEnabled,
                     itemUiStateData.progressBarUiState,
                     itemUiStateData.showOverlay
@@ -314,11 +327,13 @@ class PageListViewModel @Inject constructor(
             val itemUiStateData = createItemUiStateData(it)
             TrashedPage(
                     it.remoteId,
+                    it.pageId,
                     it.title,
                     it.date,
                     itemUiStateData.labels,
                     itemUiStateData.labelsColor,
                     getFeaturedImageUrl(it.featuredImageId),
+                    itemUiStateData.actions,
                     actionsEnabled,
                     itemUiStateData.progressBarUiState,
                     itemUiStateData.showOverlay
@@ -373,17 +388,19 @@ class PageListViewModel @Inject constructor(
         )
         val (labels, labelColor) = createPageListItemLabelsUseCase.createLabels(postModel, uploadUiState)
 
-        val (progressBarUiState, showOverlay) = progressHelper.getProgressStateForPage(
+        val (progressBarUiState, showOverlay) = pageItemProgressUiStateUseCase.getProgressStateForPage(
                 postModel,
                 uploadUiState
         )
-        return ItemUiStateData(labels, labelColor, progressBarUiState, showOverlay)
+        val actions = pageListItemActionsUseCase.setupPageActions(listType, uploadUiState)
+        return ItemUiStateData(labels, labelColor, progressBarUiState, showOverlay, actions)
     }
 
     private data class ItemUiStateData(
         val labels: List<UiString>,
         @ColorRes val labelsColor: Int?,
         val progressBarUiState: ProgressBarUiState,
-        val showOverlay: Boolean
+        val showOverlay: Boolean,
+        val actions: Set<Action>
     )
 }