Skip to content

Periodic Notifications Sync #3384

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

Merged
shubham1g5 merged 10 commits into from
Oct 29, 2025
Merged

Periodic Notifications Sync #3384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4dc27e4
rename methods
shubham1g5 Oct 28, 2025
a6dbd3b
call notifications api instead of deprecated messaging one
shubham1g5 Oct 28, 2025
3e414cc
comments
shubham1g5 Oct 28, 2025
b28d421
Schedule post-fcm notification sync from worker manager to avoid doin…
shubham1g5 Oct 28, 2025
05680b3
no need to use Gson for simple strings
shubham1g5 Oct 28, 2025
0805605
separate state init from start worker
shubham1g5 Oct 28, 2025
26ac991
More renaming to get rid of pn
shubham1g5 Oct 28, 2025
6ef7a12
Consolidate 2 notifications worker and reuse existing worker
shubham1g5 Oct 28, 2025
2dfd31b
Minor lint
shubham1g5 Oct 29, 2025
402370e
Corrects sync type for notification sync
shubham1g5 Oct 29, 2025
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
4 changes: 2 additions & 2 deletions app/src/org/commcare/CommCareApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
import org.commcare.network.DataPullResponseFactory;
import org.commcare.network.HttpUtils;
import org.commcare.network.OkHttpBuilderCustomConfig;
import org.commcare.pn.workermanager.NotificationsRetrievalWorkerManager;
import org.commcare.pn.workermanager.NotificationsSyncWorkerManager;
import org.commcare.preferences.DevSessionRestorer;
import org.commcare.preferences.DeveloperPreferences;
import org.commcare.preferences.HiddenPreferences;
Expand Down Expand Up @@ -275,7 +275,7 @@ public void onCreate() {
setRxJavaGlobalHandler();

ProcessLifecycleOwner.get().getLifecycle().addObserver(this);
NotificationsRetrievalWorkerManager.schedulePeriodicPushNotificationRetrievalChecked(
NotificationsSyncWorkerManager.schedulePeriodicPushNotificationRetrievalChecked(
CommCareApplication.instance());
}

Expand Down
8 changes: 4 additions & 4 deletions app/src/org/commcare/activities/connect/viewmodel/PushNotificationViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import org.commcare.android.database.connect.models.PushNotificationRecord
import org.commcare.connect.database.NotificationRecordDatabaseHelper
import org.commcare.pn.workermanager.PNApiSyncWorkerManager
import org.commcare.pn.workermanager.NotificationsSyncWorkerManager
import org.commcare.utils.PushNotificationApiHelper.retrieveLatestPushNotifications

class PushNotificationViewModel(application: Application) : AndroidViewModel(application) {
Expand Down Expand Up @@ -39,10 +39,10 @@ class PushNotificationViewModel(application: Application) : AndroidViewModel(app
val latestPushNotificationsFromApi = retrieveLatestPushNotifications(application)
latestPushNotificationsFromApi.onSuccess {
val currentNotifications = _allNotifications.value.orEmpty()
PNApiSyncWorkerManager(
NotificationsSyncWorkerManager(
application,
it,
PNApiSyncWorkerManager.SYNC_TYPE.NOTIFICATION_API
NotificationsSyncWorkerManager.SyncType.OTHER
).startPNApiSync()
val updatedNotifications = (it + currentNotifications).distinctBy { it.notificationId }.sortedByDescending { it.createdDate }
_isLoading.postValue(false)
Expand All @@ -54,4 +54,4 @@ class PushNotificationViewModel(application: Application) : AndroidViewModel(app

}
}
}
}
6 changes: 3 additions & 3 deletions app/src/org/commcare/connect/PersonalIdManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
import org.commcare.connect.network.TokenDeniedException;
import org.commcare.connect.network.TokenUnavailableException;
import org.commcare.connect.workers.ConnectHeartbeatWorker;
import org.commcare.pn.workermanager.NotificationsRetrievalWorkerManager;
import org.commcare.core.network.AuthInfo;
import org.commcare.dalvik.R;
import org.commcare.google.services.analytics.FirebaseAnalyticsUtil;
import org.commcare.pn.workermanager.NotificationsSyncWorkerManager;
import org.commcare.util.LogTypes;
import org.commcare.utils.BiometricsHelper;
import org.commcare.utils.CrashUtil;
Expand Down Expand Up @@ -206,7 +206,7 @@ private void logBiometricInvalidations() {
public void completeSignin() {
personalIdSatus = PersonalIdStatus.LoggedIn;
scheduleHeartbeat();
NotificationsRetrievalWorkerManager.INSTANCE.schedulePeriodicPushNotificationRetrieval(CommCareApplication.instance());
NotificationsSyncWorkerManager.schedulePeriodicPushNotificationRetrieval(CommCareApplication.instance());
CrashUtil.registerUserData();
}

Expand All @@ -226,7 +226,7 @@ public void forgetUser(String reason) {
personalIdSatus = PersonalIdStatus.NotIntroduced;

// Cancel periodic push notification retrieval when user logs out
NotificationsRetrievalWorkerManager.INSTANCE.cancelPeriodicPushNotificationRetrieval(CommCareApplication.instance());
NotificationsSyncWorkerManager.cancelPeriodicPushNotificationRetrieval(CommCareApplication.instance());
}

public AuthInfo.TokenAuth getConnectToken() {
Expand Down
108 changes: 0 additions & 108 deletions app/src/org/commcare/pn/workermanager/NotificationsRetrievalWorkerManager.kt
View file
Open in desktop

This file was deleted.

Loading