bring null setters back to where they were

wordpress-mobile · Jan 23, 2019 · fd320bc · fd320bc
1 parent 2aa2f97
commit fd320bc
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt
@@ -654,7 +654,6 @@ class PostListViewModel @Inject constructor(
                 publishPost(it)
             }
             CONFIRM_ON_CONFLICT_LOAD_REMOTE_POST_DIALOG_TAG -> localPostIdForConflictResolutionDialog?.let {
-                localPostIdForConflictResolutionDialog = null
                 // here load version from remote
                 updateConflictedPostWithItsRemoteVersion(it)
             }
@@ -736,6 +735,8 @@ class PostListViewModel @Inject constructor(
             originalPostCopyForConflictUndo = post.clone()
             dispatcher.dispatch(PostActionBuilder.newFetchPostAction(RemotePostPayload(post, site)))
             _toastMessage.postValue(ToastMessageHolder(R.string.toast_conflict_updating_post, Duration.SHORT))
+        } else {
+            localPostIdForConflictResolutionDialog = null
         }
     }
 
@@ -747,6 +748,8 @@ class PostListViewModel @Inject constructor(
 
         val post = postStore.getPostByLocalPostId(localPostId) ?: return
 
+        localPostIdForConflictResolutionDialog = null
+
         // keep a copy for undoing
         originalPostCopyForConflictUndo = post.clone()