Offline Pages : Added Support for unpublished revision to Page List

WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java

@@ -556,15 +556,17 @@ public static void editPostOrPageForResult(Intent intent, Activity activity, Sit
         activity.startActivityForResult(intent, RequestCodes.EDIT_POST);
     }
 
-    public static void editPageForResult(@NonNull Fragment fragment, @NonNull PageModel page) {
+    public static void editPageForResult(@NonNull Fragment fragment, @NonNull PageModel page,
+                                         boolean loadAutoSaveRevision) {
         Intent intent = new Intent(fragment.getContext(), EditPostActivity.class);
-        editPageForResult(intent, fragment, page.getSite(), page.getPageId());
+        editPageForResult(intent, fragment, page.getSite(), page.getPageId(), loadAutoSaveRevision);
     }
 
     public static void editPageForResult(Intent intent, @NonNull Fragment fragment, @NonNull SiteModel site,
-                                         int pageLocalId) {
+                                         int pageLocalId, boolean loadAutoSaveRevision) {
         intent.putExtra(WordPress.SITE, site);
         intent.putExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, pageLocalId);
+        intent.putExtra(EditPostActivity.EXTRA_LOAD_AUTO_SAVE_REVISION, loadAutoSaveRevision);
         fragment.startActivityForResult(intent, RequestCodes.EDIT_POST);
     }
 

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

@@ -53,16 +53,20 @@ class PagesActivity : AppCompatActivity(),
     }
 
     override fun onPositiveClicked(instanceTag: String) {
-        passDeleteConfirmation(instanceTag.toLong())
+        val fragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
+        if (fragment is PagesFragment) {
+            fragment.onPositiveClickedForBasicDialog(instanceTag)
+        } else {
+            throw IllegalStateException("PagesFragment is required to consume this event.")
+        }
     }
 
     override fun onNegativeClicked(instanceTag: String) {
-    }
-
-    private fun passDeleteConfirmation(remoteId: Long) {
         val fragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
         if (fragment is PagesFragment) {
-            fragment.onPageDeleteConfirmed(remoteId)
+            fragment.onNegativeClickedForBasicDialog(instanceTag)
+        } else {
+            throw IllegalStateException("PagesFragment is required to consume this event.")
         }
     }
 }

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

@@ -42,8 +42,6 @@ import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.PagePostCreationSourcesDetail.PAGE_FROM_PAGES_LIST
 import org.wordpress.android.ui.RequestCodes
-import org.wordpress.android.ui.pages.PageItem.Page
-import org.wordpress.android.ui.posts.BasicFragmentDialog
 import org.wordpress.android.ui.posts.EditPostActivity
 import org.wordpress.android.ui.posts.PostListAction.PreviewPost
 import org.wordpress.android.ui.posts.PreviewStateHelper
@@ -125,7 +123,7 @@ class PagesFragment : Fragment() {
 
             if (EditPostActivity.checkToRestart(data)) {
                 ActivityLauncher.editPageForResult(data, this@PagesFragment, viewModel.site,
-                        data.getIntExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, 0))
+                        data.getIntExtra(EditPostActivity.EXTRA_POST_LOCAL_ID, 0), false)
 
                 // a restart will happen so, no need to continue here
                 return
@@ -314,9 +312,9 @@ class PagesFragment : Fragment() {
             }
         })
 
-        viewModel.editPage.observe(this, Observer { page ->
+        viewModel.editPage.observe(this, Observer { (page, loadAutoRevision) ->
             page?.let {
-                ActivityLauncher.editPageForResult(this, page)
+                ActivityLauncher.editPageForResult(this, page, loadAutoRevision)
             }
         })
 
@@ -345,10 +343,6 @@ class PagesFragment : Fragment() {
             page?.let { ActivityLauncher.viewPageParentForResult(this, page) }
         })
 
-        viewModel.displayDeleteDialog.observe(this, Observer { page ->
-            page?.let { displayDeleteDialog(page) }
-        })
-
         viewModel.isNewPageButtonVisible.observe(this, Observer { isVisible ->
             isVisible?.let {
                 if (isVisible) {
@@ -366,6 +360,10 @@ class PagesFragment : Fragment() {
                 (pagesPager.adapter as PagesPagerAdapter).scrollToPage(page)
             }
         })
+
+        viewModel.dialogAction.observe(this, Observer {
+            it?.show(activity, activity.supportFragmentManager, uiHelpers)
+        })
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -378,10 +376,6 @@ class PagesFragment : Fragment() {
         initializeSearchView()
     }
 
-    fun onPageDeleteConfirmed(remoteId: Long) {
-        viewModel.onDeleteConfirmed(remoteId)
-    }
-
     private fun refreshProgressBars(listState: PageListState?) {
         if (!isAdded || view == null) {
             return
@@ -408,16 +402,12 @@ class PagesFragment : Fragment() {
         }
     }
 
-    private fun displayDeleteDialog(page: Page) {
-        val dialog = BasicFragmentDialog()
-        dialog.initialize(
-                page.id.toString(),
-                getString(R.string.delete_page),
-                getString(R.string.page_delete_dialog_message, page.title),
-                getString(R.string.delete),
-                getString(R.string.cancel)
-        )
-        dialog.show(fragmentManager, page.id.toString())
+    fun onPositiveClickedForBasicDialog(instanceTag: String) {
+        viewModel.onPositiveClickedForBasicDialog(instanceTag)
+    }
+
+    fun onNegativeClickedForBasicDialog(instanceTag: String) {
+        viewModel.onNegativeClickedForBasicDialog(instanceTag)
     }
 
     override fun onStart() {

WordPress/src/main/java/org/wordpress/android/ui/posts/PostUtils.java

@@ -461,7 +461,8 @@ public static String getConflictedPostCustomStringForDialog(PostModel post) {
 
     public static UiStringText getCustomStringForAutosaveRevisionDialog(PostModel post) {
         Context context = WordPress.getContext();
-        String firstPart = context.getString(R.string.dialog_confirm_autosave_body_first_part);
+        String firstPart = post.isPage() ? context.getString(R.string.dialog_confirm_autosave_body_first_part_for_page)
+                : context.getString(R.string.dialog_confirm_autosave_body_first_part);
 
         String lastModified =
                 TextUtils.isEmpty(post.getDateLocallyChanged()) ? post.getLastModified() : post.getDateLocallyChanged();

WordPress/src/main/java/org/wordpress/android/ui/utils/UiHelpers.kt

@@ -16,6 +16,7 @@ import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.util.DisplayUtils
 import javax.inject.Inject
 import android.graphics.Point
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
 
 class UiHelpers @Inject constructor() {
     fun getPxOfUiDimen(context: Context, uiDimen: UiDimen): Int =
@@ -28,6 +29,15 @@ class UiHelpers @Inject constructor() {
             when (uiString) {
                 is UiStringRes -> context.getString(uiString.stringRes)
                 is UiStringText -> uiString.text
+                is UiStringResWithParams -> context.getString(
+                        uiString.stringRes,
+                        *uiString.params.map { value ->
+                            getTextOfUiString(
+                                    context,
+                                    value
+                            )
+                        }.toTypedArray()
+                )
             }
 
     fun updateVisibility(view: View, visible: Boolean) {

WordPress/src/main/java/org/wordpress/android/ui/utils/UiString.kt

@@ -9,4 +9,5 @@ import androidx.annotation.StringRes
 sealed class UiString {
     data class UiStringText(val text: String) : UiString()
     data class UiStringRes(@StringRes val stringRes: Int) : UiString()
+    data class UiStringResWithParams(@StringRes val stringRes: Int, val params: List<UiString>) : UiString()
 }

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

@@ -0,0 +1,11 @@
+package org.wordpress.android.viewmodel.pages
+
+import org.wordpress.android.fluxc.model.PostModel
+import org.wordpress.android.ui.posts.PostUtils
+import javax.inject.Inject
+
+class PageConflictResolver @Inject constructor() {
+    fun hasUnhandledAutoSave(post: PostModel): Boolean {
+        return PostUtils.hasAutoSave(post)
+    }
+}

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

@@ -0,0 +1,100 @@
+package org.wordpress.android.viewmodel.pages
+
+import org.wordpress.android.R
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.UNPUBLISHED_REVISION_DIALOG_LOAD_LOCAL_VERSION_CLICKED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.UNPUBLISHED_REVISION_DIALOG_LOAD_UNPUBLISHED_VERSION_CLICKED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.UNPUBLISHED_REVISION_DIALOG_SHOWN
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.PostModel
+import org.wordpress.android.ui.posts.PostUtils
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.viewmodel.helpers.DialogHolder
+import java.lang.NullPointerException
+
+private const val CONFIRM_ON_AUTOSAVE_REVISION_DIALOG_TAG = "CONFIRM_ON_AUTOSAVE_REVISION_DIALOG_TAG"
+private const val CONFIRM_DELETE_PAGE_DIALOG_TAG = "CONFIRM_DELETE_PAGE_DIALOG_TAG"
+private const val POST_TYPE = "post_type"
+
+class PageListDialogHelper(
+    private val showDialog: (DialogHolder) -> Unit,
+    private val analyticsTracker: AnalyticsTrackerWrapper
+) {
+    private var pageIdForAutosaveRevisionResolutionDialog: RemoteId? = null
+    private var pageIdForDeleteDialog: RemoteId? = null
+
+    fun showAutoSaveRevisionDialog(page: PostModel) {
+        analyticsTracker.track(UNPUBLISHED_REVISION_DIALOG_SHOWN, mapOf(POST_TYPE to "page"))
+        val dialogHolder = DialogHolder(
+                tag = CONFIRM_ON_AUTOSAVE_REVISION_DIALOG_TAG,
+                title = UiStringRes(R.string.dialog_confirm_autosave_title),
+                message = PostUtils.getCustomStringForAutosaveRevisionDialog(page),
+                positiveButton = UiStringRes(R.string.dialog_confirm_autosave_restore_button),
+                negativeButton = UiStringRes(R.string.dialog_confirm_autosave_dont_restore_button)
+        )
+        pageIdForAutosaveRevisionResolutionDialog = RemoteId(page.remotePostId)
+        showDialog.invoke(dialogHolder)
+    }
+
+    fun showDeletePageConfirmationDialog(pageId: RemoteId, pageTitle: String) {
+        val dialogHolder = DialogHolder(
+                tag = CONFIRM_DELETE_PAGE_DIALOG_TAG,
+                title = UiStringRes(R.string.delete_page),
+                message = UiStringResWithParams(
+                        R.string.page_delete_dialog_message,
+                        listOf(UiStringText(pageTitle))
+                ),
+                positiveButton = UiStringRes(R.string.delete),
+                negativeButton = UiStringRes(R.string.cancel)
+        )
+        pageIdForDeleteDialog = pageId
+        showDialog.invoke(dialogHolder)
+    }
+
+    fun onPositiveClickedForBasicDialog(
+        instanceTag: String,
+        deletePage: (RemoteId) -> Unit,
+        editPage: (RemoteId, LoadAutoSaveRevision) -> Unit
+    ) {
+        when (instanceTag) {
+            CONFIRM_DELETE_PAGE_DIALOG_TAG -> pageIdForDeleteDialog?.let {
+                pageIdForDeleteDialog = null
+                deletePage(it)
+            } ?: throw NullPointerException("pageIdForDeleteDialog shouldn't be null.")
+            CONFIRM_ON_AUTOSAVE_REVISION_DIALOG_TAG -> pageIdForAutosaveRevisionResolutionDialog?.let {
+                // open the editor with the restored auto save
+                pageIdForAutosaveRevisionResolutionDialog = null
+                editPage(it, true)
+                analyticsTracker.track(
+                        UNPUBLISHED_REVISION_DIALOG_LOAD_UNPUBLISHED_VERSION_CLICKED,
+                        mapOf(POST_TYPE to "page")
+                )
+            }
+                    ?: throw NullPointerException("pageIdForAutosaveRevisionResolutionDialog shouldn't be null.")
+
+            else -> throw IllegalArgumentException("Dialog's positive button click is not handled: $instanceTag")
+        }
+    }
+
+    fun onNegativeClickedForBasicDialog(
+        instanceTag: String,
+        editPage: (RemoteId, LoadAutoSaveRevision) -> Unit
+    ) {
+        when (instanceTag) {
+            CONFIRM_DELETE_PAGE_DIALOG_TAG -> pageIdForDeleteDialog = null
+            CONFIRM_ON_AUTOSAVE_REVISION_DIALOG_TAG -> pageIdForAutosaveRevisionResolutionDialog?.let {
+                // open the editor with the local page (don't use the auto save version)
+                editPage(it, false)
+                analyticsTracker.track(
+                        UNPUBLISHED_REVISION_DIALOG_LOAD_LOCAL_VERSION_CLICKED,
+                        mapOf(POST_TYPE to "page")
+                )
+            }
+                    ?: throw NullPointerException("pageIdForAutosaveRevisionResolutionDialog shouldn't be null.")
+
+            else -> throw IllegalArgumentException("Dialog's negative button click is not handled: $instanceTag")
+        }
+    }
+}