Skip to content

Commit

Permalink
Merge pull request #19668 from wordpress-mobile/flux-wpcom-theme-changes
Browse files Browse the repository at this point in the history
Align with FluxC breaking changes
  • Loading branch information
0nko authored Nov 27, 2023
2 parents 6331cad + 9803b6a commit 5ae0880
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* [*] Block Editor: Ensure uploaded audio is always visible within Audio block [https://github.com/WordPress/gutenberg/pull/55627]
* [*] 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]
* [**] 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]
* [*] Fixed an issue that prevented theme installation on atomic sites [https://github.com/wordpress-mobile/WordPress-Android/pull/19668]

23.7
-----
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.wordpress.android.fluxc.model.SiteModel;
import org.wordpress.android.fluxc.model.ThemeModel;
import org.wordpress.android.fluxc.store.ThemeStore;
import org.wordpress.android.fluxc.store.ThemeStore.FetchWPComThemesPayload;
import org.wordpress.android.fluxc.store.ThemeStore.OnCurrentThemeFetched;
import org.wordpress.android.fluxc.store.ThemeStore.OnSiteThemesChanged;
import org.wordpress.android.fluxc.store.ThemeStore.OnThemeActivated;
Expand Down Expand Up @@ -398,7 +399,7 @@ private void fetchCurrentTheme() {
private void fetchWpComThemesIfSyncTimedOut(boolean force) {
long currentTime = System.currentTimeMillis();
if (force || currentTime - AppPrefs.getLastWpComThemeSync() > WP_COM_THEMES_SYNC_TIMEOUT) {
mDispatcher.dispatch(ThemeActionBuilder.newFetchWpComThemesAction());
mDispatcher.dispatch(ThemeActionBuilder.newFetchWpComThemesAction(new FetchWPComThemesPayload()));
}
}

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ext {
automatticTracksVersion = '3.3.0'
gutenbergMobileVersion = 'v1.109.0'
wordPressAztecVersion = 'v1.8.0'
wordPressFluxCVersion = 'trunk-3115d5cbd99f41e97752bd38d6a2af06053bbcb0'
wordPressFluxCVersion = 'trunk-8076d17a1b4ede515be0e1d93c8d35a3c6fc2adb'
wordPressLoginVersion = 'trunk-6c5dc3311836d1eb0973f3164bdb2d7f72251951'
wordPressPersistentEditTextVersion = '1.0.2'
wordPressUtilsVersion = '3.10.0'
Expand Down

0 comments on commit 5ae0880

Please sign in to comment.