From c94c319225d2fc1b911efaed8c72cc300bf72085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 5 Dec 2019 17:18:44 +0100
Subject: [PATCH] MOBILE-3201 log: Delete logs if WS call fails

---
 src/addon/mod/data/components/index/index.ts |  2 +-
 src/core/course/providers/log-helper.ts      | 22 ++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/addon/mod/data/components/index/index.ts b/src/addon/mod/data/components/index/index.ts
index ecdd5064e..0b3e22870 100644
--- a/src/addon/mod/data/components/index/index.ts
+++ b/src/addon/mod/data/components/index/index.ts
@@ -124,7 +124,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
         this.selectedGroup = this.group || 0;
 
         this.loadContent(false, true).then(() => {
-            if (!this.data) {
+            if (!this.data || !this.data.id) {
                 return;
             }
 
diff --git a/src/core/course/providers/log-helper.ts b/src/core/course/providers/log-helper.ts
index f2319aad3..8792eab81 100644
--- a/src/core/course/providers/log-helper.ts
+++ b/src/core/course/providers/log-helper.ts
@@ -185,14 +185,17 @@ export class CoreCourseLogHelperProvider {
      */
     protected logOnline(ws: string, data: any, siteId?: string): Promise<any> {
         return this.sitesProvider.getSite(siteId).then((site) => {
-            return site.write(ws, data).then((response) => {
+            // Clone to have an unmodified data object.
+            const wsData = Object.assign({}, data);
+
+            return site.write(ws, wsData).then((response) => {
                 if (!response.status) {
                     return Promise.reject(this.utils.createFakeWSError(''));
                 }
 
                 // Remove all the logs performed.
                 // TODO: Remove this lines when time is accepted in logs.
-                return this.deleteWSLogs(ws, data);
+                return this.deleteWSLogs(ws, data, siteId);
             });
         });
     }
@@ -335,8 +338,19 @@ export class CoreCourseLogHelperProvider {
      */
     protected syncLogs(logs: any[], siteId: string): Promise<any> {
         return Promise.all(logs.map((log) => {
-            return this.logOnline(log.ws, this.textUtils.parseJSON(log.data), siteId).then(() => {
-                return this.deleteWSLogsByComponent(log.component, log.componentid, log.ws);
+            const data = this.textUtils.parseJSON(log.data);
+
+            return this.logOnline(log.ws, data, siteId).catch((error) => {
+                const promise = this.utils.isWebServiceError(error) ? this.deleteWSLogs(log.ws, data, siteId) : Promise.resolve();
+
+                return promise.catch(() => {
+                    // Ignore errors.
+                }).then(() => {
+                    // The WebService has thrown an error, this means that responses cannot be submitted.
+                    return Promise.reject(error);
+                });
+            }).then(() => {
+                return this.deleteWSLogsByComponent(log.component, log.componentid, log.ws, siteId);
             });
         }));
     }