Skip to content

Commit 5ae0880

Browse files
authored
Merge pull request #19668 from wordpress-mobile/flux-wpcom-theme-changes
Align with FluxC breaking changes
2 parents 6331cad + 9803b6a commit 5ae0880

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

RELEASE-NOTES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* [*] Block Editor: Ensure uploaded audio is always visible within Audio block [https://github.com/WordPress/gutenberg/pull/55627]
77
* [*] Block Editor: In the deeply nested block warning, only display the ungroup option for blocks that support it [https://github.com/WordPress/gutenberg/pull/56445]
88
* [**] Enable Optimize Image setting (via Me → App Settings) by default, and change default compression and resolution values. [https://github.com/wordpress-mobile/WordPress-Android/pull/19581]
9+
* [*] Fixed an issue that prevented theme installation on atomic sites [https://github.com/wordpress-mobile/WordPress-Android/pull/19668]
910

1011
23.7
1112
-----

WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.wordpress.android.fluxc.model.SiteModel;
3030
import org.wordpress.android.fluxc.model.ThemeModel;
3131
import org.wordpress.android.fluxc.store.ThemeStore;
32+
import org.wordpress.android.fluxc.store.ThemeStore.FetchWPComThemesPayload;
3233
import org.wordpress.android.fluxc.store.ThemeStore.OnCurrentThemeFetched;
3334
import org.wordpress.android.fluxc.store.ThemeStore.OnSiteThemesChanged;
3435
import org.wordpress.android.fluxc.store.ThemeStore.OnThemeActivated;
@@ -398,7 +399,7 @@ private void fetchCurrentTheme() {
398399
private void fetchWpComThemesIfSyncTimedOut(boolean force) {
399400
long currentTime = System.currentTimeMillis();
400401
if (force || currentTime - AppPrefs.getLastWpComThemeSync() > WP_COM_THEMES_SYNC_TIMEOUT) {
401-
mDispatcher.dispatch(ThemeActionBuilder.newFetchWpComThemesAction());
402+
mDispatcher.dispatch(ThemeActionBuilder.newFetchWpComThemesAction(new FetchWPComThemesPayload()));
402403
}
403404
}
404405

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ext {
2222
automatticTracksVersion = '3.3.0'
2323
gutenbergMobileVersion = 'v1.109.0'
2424
wordPressAztecVersion = 'v1.8.0'
25-
wordPressFluxCVersion = 'trunk-3115d5cbd99f41e97752bd38d6a2af06053bbcb0'
25+
wordPressFluxCVersion = 'trunk-8076d17a1b4ede515be0e1d93c8d35a3c6fc2adb'
2626
wordPressLoginVersion = 'trunk-6c5dc3311836d1eb0973f3164bdb2d7f72251951'
2727
wordPressPersistentEditTextVersion = '1.0.2'
2828
wordPressUtilsVersion = '3.10.0'

0 commit comments

Comments
 (0)