Issue/woomob 1909 add new local feature flag for woo notifications disabled by by JorgeMucientes · Pull Request #15157 · woocommerce/woocommerce-android

JorgeMucientes · 2026-01-05T14:35:32Z

Closes: WOOMOB-1909
CLoses: WOOMOB-1910

Description

This PR introduces a new feature flag for the new Woo core PN system and wires it into the existing registration logic so that, when enabled, the app uses the new PN registration endpoint instead of the WP.com one.

This PR doesn't include the changes required to display any PN sent through the new system. Neither includes any fallback strategy for cases where PN toke registration fails. That is the reason why the feature flag is disabled by default for now.
NOT included in this PRs:

Add fall back strategy
Unregister WP.com PN token if successfully registered in the new Woo core system
Remove PN token using the new endpoint on user log out.

Test Steps

Install the .zip file version of WooCoomerce containing the new PN registration endpoint.
Make a clean install of the app with the feature flag set to true.
Log in using WP.com credentials
Kill the app
Restart it with the network inspector enabled
Using network inspector verify that the new PN successfully registers

wpmobilebot · 2026-01-05T14:42:20Z

📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce-Wear Android
	Platform	⌚️ Wear OS
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`67b77dd`
	Direct Download	`woocommerce-wear-prototype-build-pr15157-67b77dd.apk`

wpmobilebot · 2026-01-05T14:58:30Z

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`67b77dd`
	Direct Download	`woocommerce-prototype-build-pr15157-67b77dd.apk`

JorgeMucientes · 2026-01-06T08:55:54Z

...rce/src/main/kotlin/com/woocommerce/android/notifications/push/PushNotificationRepository.kt

+            message = "Registering FCM token in Woo Core instance${if (BuildConfig.DEBUG) ": $token" else ""}"
+        )
+        selectedSite.getIfExists()?.let {
+            val uuid = appPrefsWrapper.wooCorePushDeviceUUID.orNullIfEmpty() ?: generateAndStoreUUID()


For now we are reusing the existing logic to create the device UUID. Asked Hannah here: https://wp.me/pe5sF9-4OM#comment-5081 if the current strategy is good enough.

JorgeMucientes · 2026-01-06T08:56:29Z

WooCommerce/src/main/kotlin/com/woocommerce/android/util/FeatureFlag.kt


-            WOO_POS_LOCAL_CATALOG_FILE_APPROACH -> false
+            WOO_POS_LOCAL_CATALOG_FILE_APPROACH,
+            WOO_PUSH_NOTIFICATIONS_SYSTEM -> false


Disabled by default for now to avoid breaking PN for all devs until the endpoint starts working

…g-for-woo-notifications-disabled-by # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/AppPrefs.kt

codecov-commenter · 2026-01-08T11:11:23Z

Codecov Report

❌ Patch coverage is 21.21212% with 26 lines in your changes missing coverage. Please review.
✅ Project coverage is 38.68%. Comparing base (0f44b09) to head (67b77dd).

Files with missing lines	Patch %	Lines
...d/notifications/push/PushNotificationRepository.kt	0.00%	20 Missing ⚠️
...rc/main/kotlin/com/woocommerce/android/AppPrefs.kt	0.00%	4 Missing ⚠️
...merce/android/notifications/push/RegisterDevice.kt	66.66%	1 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #15157      +/-   ##
============================================
- Coverage     38.69%   38.68%   -0.01%     
  Complexity    10548    10548              
============================================
  Files          2192     2193       +1     
  Lines        124712   124741      +29     
  Branches      17243    17248       +5     
============================================
+ Hits          48258    48260       +2     
- Misses        71576    71602      +26     
- Partials       4878     4879       +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

irfano

LGTM! I just have one question before approving: why do we need to kill and restart the app to trigger the push-tokens endpoint? Shouldn’t it be triggered right after the first login?

WooCommerce/src/main/kotlin/com/woocommerce/android/notifications/push/RegisterDevice.kt

...rce/src/main/kotlin/com/woocommerce/android/notifications/push/PushNotificationRepository.kt

wpmobilebot · 2026-01-09T11:35:37Z

Version 23.9 has now entered code-freeze, so the milestone of this PR has been updated to 24.0.

…g-for-woo-notifications-disabled-by

JorgeMucientes · 2026-01-15T08:47:41Z

LGTM! I just have one question before approving: why do we need to kill and restart the app to trigger the push-tokens endpoint? Shouldn’t it be triggered right after the first login?

So the problem is that this new enpoint requires a site to be selected first in order to register the PN token. So, on log in, by the time RegisterDevice.invoke() is called, there's no selected site yet. But this is not a big deal given PN token registration will be attempted the next time you resume the app (you don't actually have to kill the app, just send it to the background).

irfano

So, on log in, by the time RegisterDevice.invoke() is called, there's no selected site yet. But this is not a big deal given PN token registration will be attempted the next time you resume the app (you don't actually have to kill the app, just send it to the background).

This is also the current behavior for the wpcom push registration, right? If so, we can keep improving it outside this project’s scope.

JorgeMucientes · 2026-01-16T16:53:34Z

This is also the current behavior for the wpcom push registration, right? If so, we can keep improving it outside this project’s scope.

Not really @irfano. Because registering for WP.com push notifications doesn't require a site to be selected. So the device registration for WP.com system will happen right away. In any case agree we can improve this in subsequent PRs and I don't think is a big deal tbh, as soon as they resume the app from background the next time they'll get registered.

JorgeMucientes added 6 commits January 2, 2026 16:08

Adds new PN feature flag

3a71ea0

Use new PN registration endpoint when feature flag enabled

971a4d1

Revert accidental change

064447f

Add new PushNotificationRepository to register device using new endpoint

309742f

Remove deprecated annotation

7b5983c

Fix detekt indentation issues

d3fc945

JorgeMucientes added this to the 23.9 milestone Jan 5, 2026

JorgeMucientes requested a review from irfano January 6, 2026 08:52

JorgeMucientes commented Jan 6, 2026

View reviewed changes

Fix existing unit tests

d825a1c

JorgeMucientes added unit-tests-exemption feature: notifications Related to notifications or notifs. labels Jan 6, 2026

JorgeMucientes marked this pull request as ready for review January 6, 2026 09:21

irfano self-assigned this Jan 7, 2026

JorgeMucientes added 2 commits January 8, 2026 11:21

Merge branch 'trunk' into issue/woomob-1909-add-new-local-feature-fla…

bb33147

…g-for-woo-notifications-disabled-by # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/AppPrefs.kt

Remove unneeded TODO comment

2851e9e

irfano reviewed Jan 8, 2026

View reviewed changes

WooCommerce/src/main/kotlin/com/woocommerce/android/notifications/push/RegisterDevice.kt Outdated Show resolved Hide resolved

...rce/src/main/kotlin/com/woocommerce/android/notifications/push/PushNotificationRepository.kt Outdated Show resolved Hide resolved

wpmobilebot modified the milestones: 23.9, 24.0 Jan 9, 2026

JorgeMucientes and others added 3 commits January 15, 2026 09:04

Ensure FCM token is not empty before registering PN token

fe9f03d

Add extra log

aa1a156

Merge branch 'trunk' into issue/woomob-1909-add-new-local-feature-fla…

67b77dd

…g-for-woo-notifications-disabled-by

JorgeMucientes requested a review from irfano January 15, 2026 19:17

irfano approved these changes Jan 15, 2026

View reviewed changes

JorgeMucientes merged commit 3030fdf into trunk Jan 16, 2026
19 checks passed

JorgeMucientes deleted the issue/woomob-1909-add-new-local-feature-flag-for-woo-notifications-disabled-by branch January 16, 2026 16:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue/woomob 1909 add new local feature flag for woo notifications disabled by#15157

Issue/woomob 1909 add new local feature flag for woo notifications disabled by#15157
JorgeMucientes merged 12 commits intotrunkfrom
issue/woomob-1909-add-new-local-feature-flag-for-woo-notifications-disabled-by

JorgeMucientes commented Jan 5, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Jan 5, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Jan 5, 2026 •

edited

Loading

Uh oh!

JorgeMucientes Jan 6, 2026

Uh oh!

JorgeMucientes Jan 6, 2026

Uh oh!

codecov-commenter commented Jan 8, 2026 •

edited

Loading

Uh oh!

irfano left a comment

Uh oh!

Uh oh!

Uh oh!

wpmobilebot commented Jan 9, 2026

Uh oh!

JorgeMucientes commented Jan 15, 2026 •

edited

Loading

Uh oh!

irfano left a comment

Uh oh!

JorgeMucientes commented Jan 16, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

JorgeMucientes commented Jan 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Test Steps

Uh oh!

wpmobilebot commented Jan 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Jan 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JorgeMucientes Jan 6, 2026

Choose a reason for hiding this comment

Uh oh!

JorgeMucientes Jan 6, 2026

Choose a reason for hiding this comment

Uh oh!

codecov-commenter commented Jan 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

irfano left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

wpmobilebot commented Jan 9, 2026

Uh oh!

JorgeMucientes commented Jan 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

irfano left a comment

Choose a reason for hiding this comment

Uh oh!

JorgeMucientes commented Jan 16, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

JorgeMucientes commented Jan 5, 2026 •

edited

Loading

wpmobilebot commented Jan 5, 2026 •

edited

Loading

wpmobilebot commented Jan 5, 2026 •

edited

Loading

codecov-commenter commented Jan 8, 2026 •

edited

Loading

JorgeMucientes commented Jan 15, 2026 •

edited

Loading