From aeca799006a7632cfa0ba38ab3bcaaf8fefdf2a0 Mon Sep 17 00:00:00 2001
From: Sebastian Wolf <sebastian@ygriega.de>
Date: Mon, 16 Nov 2020 14:37:14 +0100
Subject: [PATCH] Harmonize error handling, ignore 404 (for now)

---
 qml/js/functions.js                         | 12 ++++++++++++
 qml/pages/ChatPage.qml                      |  6 +-----
 qml/pages/OverviewPage.qml                  |  6 +-----
 translations/harbour-fernschreiber-de.ts    | 12 ++++--------
 translations/harbour-fernschreiber-en.ts    | 12 ++++--------
 translations/harbour-fernschreiber-es.ts    | 12 ++++--------
 translations/harbour-fernschreiber-fi.ts    | 12 ++++--------
 translations/harbour-fernschreiber-hu.ts    | 12 ++++--------
 translations/harbour-fernschreiber-it.ts    | 12 ++++--------
 translations/harbour-fernschreiber-pl.ts    | 12 ++++--------
 translations/harbour-fernschreiber-ru.ts    | 12 ++++--------
 translations/harbour-fernschreiber-sv.ts    | 12 ++++--------
 translations/harbour-fernschreiber-zh_CN.ts | 12 ++++--------
 translations/harbour-fernschreiber.ts       | 12 ++++--------
 14 files changed, 58 insertions(+), 98 deletions(-)

diff --git a/qml/js/functions.js b/qml/js/functions.js
index 8a8a9ca..e7fa25e 100644
--- a/qml/js/functions.js
+++ b/qml/js/functions.js
@@ -394,3 +394,15 @@ function getMessagesArrayText(messages) {
     }
     return lines.join("\n");
 }
+
+function handleErrorMessage(code, message) {
+    if (code === 404) {
+        // Silently ignore 404 Not Found messages (occur sometimes, without clear context...)
+        return;
+    }
+    if (message === "USER_ALREADY_PARTICIPANT") {
+        appNotification.show(qsTr("You are already a member of this chat."));
+    } else {
+        appNotification.show(message);
+    }
+}
diff --git a/qml/pages/ChatPage.qml b/qml/pages/ChatPage.qml
index 4612588..ace6181 100644
--- a/qml/pages/ChatPage.qml
+++ b/qml/pages/ChatPage.qml
@@ -341,11 +341,7 @@ Page {
             chatPage.emojiProposals = result;
         }
         onErrorReceived: {
-            if (message === "USER_ALREADY_PARTICIPANT") {
-                appNotification.show(qsTr("You are already a member of this chat."));
-            } else {
-                appNotification.show(message);
-            }
+            Functions.handleErrorMessage(code, message);
         }
     }
 
diff --git a/qml/pages/OverviewPage.qml b/qml/pages/OverviewPage.qml
index 7a726b0..27a9113 100644
--- a/qml/pages/OverviewPage.qml
+++ b/qml/pages/OverviewPage.qml
@@ -160,11 +160,7 @@ Page {
             }
         }
         onErrorReceived: {
-            if (message === "USER_ALREADY_PARTICIPANT") {
-                appNotification.show(qsTr("You are already a member of this chat."));
-            } else {
-                appNotification.show(message);
-            }
+            Functions.handleErrorMessage(code, message);
         }
     }
 
diff --git a/translations/harbour-fernschreiber-de.ts b/translations/harbour-fernschreiber-de.ts
index efd3373..8335fa8 100644
--- a/translations/harbour-fernschreiber-de.ts
+++ b/translations/harbour-fernschreiber-de.ts
@@ -347,10 +347,6 @@
             <numerusform>%n Nachrichten weiterleiten</numerusform>
         </translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation>Sie sind bereits Mitglied dieses Chats.</translation>
-    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -900,10 +896,6 @@
         <source>You don&apos;t have any chats yet.</source>
         <translation>Sie haben noch keine Chats.</translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation>Sie sind bereits Mitglied dieses Chats.</translation>
-    </message>
 </context>
 <context>
     <name>PollCreationPage</name>
@@ -1530,5 +1522,9 @@
         <source>sent a video note</source>
         <translation>hat eine Videonachricht geschickt</translation>
     </message>
+    <message>
+        <source>You are already a member of this chat.</source>
+        <translation>Sie sind bereits Mitglied dieses Chats.</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-fernschreiber-en.ts b/translations/harbour-fernschreiber-en.ts
index ba48ac2..80ac99f 100644
--- a/translations/harbour-fernschreiber-en.ts
+++ b/translations/harbour-fernschreiber-en.ts
@@ -347,10 +347,6 @@
             <numerusform>Forward %n messages</numerusform>
         </translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation type="unfinished">You are already a member of this chat.</translation>
-    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -900,10 +896,6 @@
         <source>You don&apos;t have any chats yet.</source>
         <translation>You don&apos;t have any chats yet.</translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation>You are already a member of this chat.</translation>
-    </message>
 </context>
 <context>
     <name>PollCreationPage</name>
@@ -1530,5 +1522,9 @@
         <source>sent a video note</source>
         <translation>sent a video note</translation>
     </message>
+    <message>
+        <source>You are already a member of this chat.</source>
+        <translation>You are already a member of this chat.</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-fernschreiber-es.ts b/translations/harbour-fernschreiber-es.ts
index 399dc9a..4829037 100644
--- a/translations/harbour-fernschreiber-es.ts
+++ b/translations/harbour-fernschreiber-es.ts
@@ -343,10 +343,6 @@
             <numerusform>Reenviar %n mensajes</numerusform>
         </translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation>Ya eres miembro de este grupo.</translation>
-    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -896,10 +892,6 @@
         <source>You don&apos;t have any chats yet.</source>
         <translation>No hay todavía ninguna charla.</translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation>Ya eres miembro de este grupo.</translation>
-    </message>
 </context>
 <context>
     <name>PollCreationPage</name>
@@ -1520,5 +1512,9 @@
         <source>sent a video note</source>
         <translation>envió una nota de video</translation>
     </message>
+    <message>
+        <source>You are already a member of this chat.</source>
+        <translation>Ya eres miembro de este grupo.</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-fernschreiber-fi.ts b/translations/harbour-fernschreiber-fi.ts
index 7a41c88..25910c6 100644
--- a/translations/harbour-fernschreiber-fi.ts
+++ b/translations/harbour-fernschreiber-fi.ts
@@ -347,10 +347,6 @@
             <numerusform></numerusform>
         </translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation type="unfinished">Olet jo tämän ryhmän jäsen.</translation>
-    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -901,10 +897,6 @@
         <source>You don&apos;t have any chats yet.</source>
         <translation>Sinulla ei ole vielä keskusteluja.</translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation>Olet jo tämän ryhmän jäsen.</translation>
-    </message>
 </context>
 <context>
     <name>PollCreationPage</name>
@@ -1531,5 +1523,9 @@
         <source>sent a video note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You are already a member of this chat.</source>
+        <translation>Olet jo tämän ryhmän jäsen.</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-fernschreiber-hu.ts b/translations/harbour-fernschreiber-hu.ts
index b6f24dc..5ae30cc 100644
--- a/translations/harbour-fernschreiber-hu.ts
+++ b/translations/harbour-fernschreiber-hu.ts
@@ -343,10 +343,6 @@
             <numerusform></numerusform>
         </translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -896,10 +892,6 @@
         <source>You don&apos;t have any chats yet.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PollCreationPage</name>
@@ -1520,5 +1512,9 @@
         <source>sent a video note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You are already a member of this chat.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-fernschreiber-it.ts b/translations/harbour-fernschreiber-it.ts
index 034942d..33e5ef3 100644
--- a/translations/harbour-fernschreiber-it.ts
+++ b/translations/harbour-fernschreiber-it.ts
@@ -347,10 +347,6 @@
             <numerusform></numerusform>
         </translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation type="unfinished">Sei già membro di questa chat.</translation>
-    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -900,10 +896,6 @@
         <source>Loading chat list...</source>
         <translation>Carica lista chat...</translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation>Sei già membro di questa chat.</translation>
-    </message>
 </context>
 <context>
     <name>PollCreationPage</name>
@@ -1530,5 +1522,9 @@
         <source>sent a video note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You are already a member of this chat.</source>
+        <translation>Sei già membro di questa chat.</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-fernschreiber-pl.ts b/translations/harbour-fernschreiber-pl.ts
index a5663d3..bc554af 100644
--- a/translations/harbour-fernschreiber-pl.ts
+++ b/translations/harbour-fernschreiber-pl.ts
@@ -351,10 +351,6 @@
             <numerusform></numerusform>
         </translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -904,10 +900,6 @@
         <source>You don&apos;t have any chats yet.</source>
         <translation type="unfinished">Nie masz jeszcze żadnych czatów.</translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PollCreationPage</name>
@@ -1540,5 +1532,9 @@
         <source>sent a video note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You are already a member of this chat.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-fernschreiber-ru.ts b/translations/harbour-fernschreiber-ru.ts
index 4792b55..0b7d7ea 100644
--- a/translations/harbour-fernschreiber-ru.ts
+++ b/translations/harbour-fernschreiber-ru.ts
@@ -351,10 +351,6 @@
             <numerusform></numerusform>
         </translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation type="unfinished">Вы уже в этом чате.</translation>
-    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -904,10 +900,6 @@
         <source>You don&apos;t have any chats yet.</source>
         <translation>Тут пока ничего нет</translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation>Вы уже в этом чате.</translation>
-    </message>
 </context>
 <context>
     <name>PollCreationPage</name>
@@ -1540,5 +1532,9 @@
         <source>sent a video note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You are already a member of this chat.</source>
+        <translation>Вы уже в этом чате.</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-fernschreiber-sv.ts b/translations/harbour-fernschreiber-sv.ts
index e75beaa..fa0dfe8 100644
--- a/translations/harbour-fernschreiber-sv.ts
+++ b/translations/harbour-fernschreiber-sv.ts
@@ -347,10 +347,6 @@
             <numerusform></numerusform>
         </translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation type="unfinished">Du är redan medlem i den här chatten.</translation>
-    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -900,10 +896,6 @@
         <source>You don&apos;t have any chats yet.</source>
         <translation>Du har inga chattar än.</translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation>Du är redan medlem i den här chatten.</translation>
-    </message>
 </context>
 <context>
     <name>PollCreationPage</name>
@@ -1530,5 +1522,9 @@
         <source>sent a video note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You are already a member of this chat.</source>
+        <translation>Du är redan medlem i den här chatten.</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-fernschreiber-zh_CN.ts b/translations/harbour-fernschreiber-zh_CN.ts
index 32940a5..01db2e9 100644
--- a/translations/harbour-fernschreiber-zh_CN.ts
+++ b/translations/harbour-fernschreiber-zh_CN.ts
@@ -343,10 +343,6 @@
             <numerusform></numerusform>
         </translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation type="unfinished">你已是此对话的成员。</translation>
-    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -896,10 +892,6 @@
         <source>You don&apos;t have any chats yet.</source>
         <translation>你还没有任何对话。</translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation>你已是此对话的成员。</translation>
-    </message>
 </context>
 <context>
     <name>PollCreationPage</name>
@@ -1520,5 +1512,9 @@
         <source>sent a video note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You are already a member of this chat.</source>
+        <translation>你已是此对话的成员。</translation>
+    </message>
 </context>
 </TS>
diff --git a/translations/harbour-fernschreiber.ts b/translations/harbour-fernschreiber.ts
index 72ffe9e..14ff145 100644
--- a/translations/harbour-fernschreiber.ts
+++ b/translations/harbour-fernschreiber.ts
@@ -343,10 +343,6 @@
             <numerusform></numerusform>
         </translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ChatSelectionPage</name>
@@ -896,10 +892,6 @@
         <source>You don&apos;t have any chats yet.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>You are already a member of this chat.</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>PollCreationPage</name>
@@ -1520,5 +1512,9 @@
         <source>sent a video note</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>You are already a member of this chat.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>