From 1e85f08f59865888c1c5f04259e805c7e303d32a Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Mon, 23 Oct 2023 16:35:47 +0300 Subject: [PATCH 1/3] Build: Update fluxc version to pr hash (#2878) This 'FluxC' PR hash updates the library to that branch version where the 'Media' payload classes are updated to their new null proof version. FluxC PR: https://github.com/wordpress-mobile/ WordPress-FluxC-Android/pull/2878 This step is required in order to check that these 'FluxC' related changes work as expected for WPAndroid. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fc1fa0e1e654..7e4ce2a84680 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ ext { automatticTracksVersion = '3.3.0' gutenbergMobileVersion = 'v1.106.0' wordPressAztecVersion = 'v1.8.0' - wordPressFluxCVersion = 'trunk-5f7448d86213648f402c2e04af738ec5904ebb31' + wordPressFluxCVersion = '2878-3334cf0e27dfb7c2eb9021a7e09700dbc49645bf' wordPressLoginVersion = '1.6.0' wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.10.0' From 966023e8c54651915d24f112da7f42f05d2de213 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Mon, 23 Oct 2023 16:36:35 +0300 Subject: [PATCH 2/3] Test: Update post media handler test to updated media payload --- .../android/ui/uploads/PostMediaHandlerTest.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/WordPress/src/test/java/org/wordpress/android/ui/uploads/PostMediaHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/uploads/PostMediaHandlerTest.kt index 37e2fe49dd87..9ea1eb5a53b6 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/uploads/PostMediaHandlerTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/uploads/PostMediaHandlerTest.kt @@ -61,7 +61,7 @@ class PostMediaHandlerTest { verify(dispatcher).dispatch(any()) assertThat(actions).hasSize(1) val emittedAction = actions.last() - assertThat(emittedAction.payload.media.postId).isEqualTo(updatedPostId) + assertThat(emittedAction.payload.media?.postId).isEqualTo(updatedPostId) assertThat(emittedAction.payload.site).isEqualTo(site) } @@ -83,12 +83,12 @@ class PostMediaHandlerTest { verify(dispatcher, times(2)).dispatch(any()) assertThat(actions).hasSize(2) val firstAction = actions[0] - assertThat(firstAction.payload.media.mediaId).isEqualTo(firstMediaItem.mediaId) - assertThat(firstAction.payload.media.postId).isEqualTo(updatedPostId) + assertThat(firstAction.payload.media?.mediaId).isEqualTo(firstMediaItem.mediaId) + assertThat(firstAction.payload.media?.postId).isEqualTo(updatedPostId) assertThat(firstAction.payload.site).isEqualTo(site) val secondAction = actions[1] - assertThat(secondAction.payload.media.mediaId).isEqualTo(secondMediaItem.mediaId) - assertThat(secondAction.payload.media.postId).isEqualTo(updatedPostId) + assertThat(secondAction.payload.media?.mediaId).isEqualTo(secondMediaItem.mediaId) + assertThat(secondAction.payload.media?.postId).isEqualTo(updatedPostId) assertThat(secondAction.payload.site).isEqualTo(site) } From 2e605ea9b0b40a1c7712a600931f99810b40cfd5 Mon Sep 17 00:00:00 2001 From: Petros Paraskevopoulos Date: Fri, 27 Oct 2023 11:46:19 +0300 Subject: [PATCH 3/3] Build: Update fluxc version to trunk hash (#2878) This 'FluxC' hash updates the library to that 'trunk' version where the 'Media' payload classes are updated to their new null proof version. FluxC PR: https://github.com/wordpress-mobile/ WordPress-FluxC-Android/pull/2878 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 66f3c079aca6..0e17e0fa1a37 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ ext { automatticTracksVersion = '3.3.0' gutenbergMobileVersion = 'v1.107.0' wordPressAztecVersion = 'v1.8.0' - wordPressFluxCVersion = '2878-3334cf0e27dfb7c2eb9021a7e09700dbc49645bf' + wordPressFluxCVersion = 'trunk-b85a542abce556295bb4afc44e553bc2a395c3b4' wordPressLoginVersion = '1.6.0' wordPressPersistentEditTextVersion = '1.0.2' wordPressUtilsVersion = '3.10.0'