Skip to content

Offline Support : Post List - Fix Upload Status Cache issue #11472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
malinajirka merged 5 commits into from
Mar 19, 2020
Merged

Offline Support : Post List - Fix Upload Status Cache issue #11472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa86310
Shared the upload status tracker with all Post List VMs.
jd-alexander Mar 19, 2020
300bcbf
Fixed test issue that occurred as a result of changes in FluxC.
jd-alexander Mar 19, 2020
b16221d
Fixed Post List tests
jd-alexander Mar 19, 2020
ac0b015
Move uploadStatusTracker into ViewModelConnector
malinajirka Mar 19, 2020
edd0645
Merge remote-tracking branch 'origin/move-tracker-to-connector' into …
jd-alexander Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ class PostListMainViewModel @Inject constructor(
site = site,
postListType = postListType,
postActionHandler = postActionHandler,
getUploadStatus = uploadStatusTracker::getUploadStatus,
uploadStatusTracker = uploadStatusTracker,
doesPostHaveUnhandledConflict = postConflictResolver::doesPostHaveUnhandledConflict,
hasAutoSave = postConflictResolver::hasUnhandledAutoSave,
postFetcher = postFetcher,
Expand Down
4 changes: 1 addition & 3 deletions WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import org.wordpress.android.ui.posts.AuthorFilterSelection
import org.wordpress.android.ui.posts.AuthorFilterSelection.EVERYONE
import org.wordpress.android.ui.posts.AuthorFilterSelection.ME
import org.wordpress.android.ui.posts.PostListType.SEARCH
import org.wordpress.android.ui.posts.PostModelUploadStatusTracker
import org.wordpress.android.ui.posts.PostUtils
import org.wordpress.android.ui.posts.trackPostListAction
import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
Expand Down Expand Up @@ -70,7 +69,6 @@ class PostListViewModel @Inject constructor(
private val uploadStarter: UploadStarter,
private val readerUtilsWrapper: ReaderUtilsWrapper,
private val uploadUtilsWrapper: UploadUtilsWrapper,
private val uploadStatusTracker: PostModelUploadStatusTracker,
@Named(UI_THREAD) private val uiDispatcher: CoroutineDispatcher,
@Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
connectionStatus: LiveData<ConnectionStatus>
Expand Down Expand Up @@ -373,7 +371,7 @@ class PostListViewModel @Inject constructor(
trackPostListAction(connector.site, buttonType, postModel, statEvent)
connector.postActionHandler.handlePostButton(buttonType, postModel)
},
uploadStatusTracker = uploadStatusTracker
uploadStatusTracker = connector.uploadStatusTracker
)

private fun retryOnConnectionAvailableAfterRefreshError() {
Expand Down
3 changes: 2 additions & 1 deletion WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModelConnector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ import org.wordpress.android.fluxc.model.PostModel
import org.wordpress.android.fluxc.model.SiteModel
import org.wordpress.android.ui.posts.PostActionHandler
import org.wordpress.android.ui.posts.PostListType
import org.wordpress.android.ui.posts.PostModelUploadStatusTracker

class PostListViewModelConnector(
val site: SiteModel,
val postListType: PostListType,
val postActionHandler: PostActionHandler,
val getUploadStatus: (PostModel, SiteModel) -> PostListItemUploadStatus,
val doesPostHaveUnhandledConflict: (PostModel) -> Boolean,
val hasAutoSave: (PostModel) -> Boolean,
val postFetcher: PostFetcher,
val uploadStatusTracker: PostModelUploadStatusTracker,
private val getFeaturedImageUrl: (site: SiteModel, featuredImageId: Long) -> String?
) {
fun getFeaturedImageUrl(featuredImageId: Long): String? {
Expand Down
2 changes: 1 addition & 1 deletion WordPress/src/test/java/org/wordpress/android/ui/posts/AutoSavePostIfNotDraftUseCaseTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class AutoSavePostIfNotDraftUseCaseTest {
}

private fun createOnPostChangedEvent(post: PostModel, error: PostError? = null): OnPostChanged {
val event = OnPostChanged(CauseOfOnPostChanged.RemoteAutoSavePost(post.id), 0)
val event = OnPostChanged(CauseOfOnPostChanged.RemoteAutoSavePost(post.id, post.remotePostId), 0)
Comment thread
jd-alexander marked this conversation as resolved.
error?.let { event.error = it }
return event
}
Expand Down
7 changes: 2 additions & 5 deletions WordPress/src/test/java/org/wordpress/android/viewmodel/posts/PostListViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import org.wordpress.android.ui.posts.AuthorFilterSelection
import org.wordpress.android.ui.posts.PostListType
import org.wordpress.android.ui.posts.PostListType.DRAFTS
import org.wordpress.android.ui.posts.PostListType.SEARCH
import org.wordpress.android.ui.posts.PostModelUploadStatusTracker
import org.wordpress.android.ui.uploads.UploadStarter

private const val DEFAULT_PHOTON_DIMENSIONS = -9
Expand All @@ -30,7 +29,6 @@ private val DEFAULT_AUTHOR_FILTER = AuthorFilterSelection.EVERYONE
class PostListViewModelTest : BaseUnitTest() {
@Mock private lateinit var site: SiteModel
@Mock private lateinit var uploadStarter: UploadStarter
@Mock private lateinit var uploadStatusTracker: PostModelUploadStatusTracker

private lateinit var viewModel: PostListViewModel

Expand Down Expand Up @@ -63,8 +61,7 @@ class PostListViewModelTest : BaseUnitTest() {
connectionStatus = mock(),
uploadUtilsWrapper = mock(),
uiDispatcher = TEST_DISPATCHER,
bgDispatcher = TEST_DISPATCHER,
uploadStatusTracker = uploadStatusTracker
bgDispatcher = TEST_DISPATCHER
)
}

Expand Down Expand Up @@ -110,7 +107,7 @@ class PostListViewModelTest : BaseUnitTest() {
site = site,
postListType = postListType,
postActionHandler = mock(),
getUploadStatus = mock(),
uploadStatusTracker = mock(),
doesPostHaveUnhandledConflict = mock(),
hasAutoSave = mock(),
getFeaturedImageUrl = mock(),
Expand Down