#1269 | Stop sync if user declines reset

avniproject · Mar 13, 2024 · 62769aa · 62769aa
1 parent dba5e37
commit 62769aa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/packages/openchs-android/package-lock.json b/packages/openchs-android/package-lock.json
diff --git a/packages/openchs-android/src/service/SyncService.js b/packages/openchs-android/src/service/SyncService.js
@@ -184,6 +184,8 @@ class SyncService extends BaseService {
             const userResponse = await userConfirmation();
             if (userResponse === 'YES')
                 return this.getService(ResetSyncService).resetSync();
+            else
+                return Promise.reject(new IgnorableSyncError("userDeclinedResetSync", "User Declined Reset Sync"));
         }
     }
 

diff --git a/packages/openchs-android/src/views/SyncComponent.js b/packages/openchs-android/src/views/SyncComponent.js
@@ -20,6 +20,7 @@ import AsyncAlert from "./common/AsyncAlert";
 import {ScheduleDummySyncJob, ScheduleSyncJob} from "../AvniBackgroundJob";
 import AvniError from "../framework/errorHandling/AvniError";
 import ErrorUtil from "../framework/errorHandling/ErrorUtil";
+import {IgnorableSyncError} from "openchs-models";
 
 class SyncComponent extends AbstractComponent {
     unsubscribe;
@@ -54,14 +55,16 @@ class SyncComponent extends AbstractComponent {
 
     _onError(error, ignoreBugsnag) {
         General.logError(`${this.viewName()}-Sync`, error);
+        const isIgnorableSyncError = error instanceof IgnorableSyncError;
         this.setState({syncStarted: false});
-        this.dispatchAction(SyncTelemetryActions.SYNC_FAILED);
+        !isIgnorableSyncError && this.dispatchAction(SyncTelemetryActions.SYNC_FAILED);
         const isServerError = error instanceof ServerError;
         //Do not notify bugsnag if it's a server error since it would have been notified on server bugsnag already.
-        if (!ignoreBugsnag && !isServerError) {
+        if (!ignoreBugsnag && !isServerError && !isIgnorableSyncError) {
             ErrorUtil.notifyBugsnag(error, "SyncComponent");
         }
         this.dispatchAction(SyncActions.ON_ERROR);
+        if (isIgnorableSyncError) return;
         if (error instanceof AuthenticationError && error.authErrCode !== 'NetworkingError') {
             General.logError(this.viewName(), "Could not authenticate");
             General.logError(this.viewName(), error);