Skip to content
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

Containment fix for My Site > Comments crash with standalone JP plugins. #17456

Merged
merged 8 commits into from
Nov 17, 2022
Merged

Containment fix for My Site > Comments crash with standalone JP plugins. #17456

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a46f168
Account for accessToken being marked as Nullable in fluxc trunk.
develric Nov 11, 2022
24e746f
Link to fluxc PR.
develric Nov 11, 2022
1c95a19
Linking fluxc
develric Nov 11, 2022
4f82b1f
Updating release notes.
develric Nov 11, 2022
c8bce2b
Updating release notes.
develric Nov 11, 2022
f838f36
Linking to fluxc trunk.
develric Nov 16, 2022
eeb1839
Merge branch 'trunk' into issue/jp-standalone-plugin-comments
develric Nov 16, 2022
0b67edb
Removing unneeded empty line in RELEASE-NOTES.
develric Nov 16, 2022
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
5 changes: 4 additions & 1 deletion RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
*** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]

21.3
-----
* [*] [Jetpack-only] Comments: fix a crash in My Site > Comments with Jetpack standalone plugins. [https://github.com/wordpress-mobile/WordPress-Android/pull/17456]

21.2
-----
* [*] Stats: Fix an issue with opening the stats activity from the stats widget. [https://github.com/wordpress-mobile/WordPress-Android/pull/17439]


21.1
-----
* [**] Added functionality to set the parent of a page from page settings in the editor. [https://github.com/wordpress-mobile/WordPress-Android/pull/17329]
Expand Down
4 changes: 3 additions & 1 deletion ...c/main/java/org/wordpress/android/localcontentmigration/LocalAccessTokenProviderHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,7 @@ import javax.inject.Inject
class LocalAccessTokenProviderHelper @Inject constructor(
private val accountStore: AccountStore,
): LocalDataProviderHelper {
override fun getData(localSiteId: Int?, localEntityId: Int?) = AccessTokenData(token = accountStore.accessToken)
override fun getData(localSiteId: Int?, localEntityId: Int?) = AccessTokenData(
token = accountStore.accessToken ?: ""
)
develric marked this conversation as resolved.
Show resolved Hide resolved
}
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ext {
coroutinesVersion = '1.5.2'
androidxWorkVersion = "2.7.0"

fluxCVersion = '2.0.0'
fluxCVersion = '2566-9ef582c5ddad2c33863f99ebb34c5257386f9b27'

appCompatVersion = '1.0.2'
androidxCoreVersion = '1.3.2'
Expand Down