From 5cb3ae2747bd051ba172edccc094a82a3d658782 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Mon, 18 Nov 2019 14:28:11 -0600
Subject: [PATCH] Display caldav exceptions

---
 .../tasks/caldav/CaldavAccountSettingsActivity.java    |  6 +++---
 .../tasks/caldav/CaldavCalendarSettingsActivity.java   | 10 +++-------
 app/src/main/res/values-bg-rBG/strings.xml             |  1 -
 app/src/main/res/values-de/strings.xml                 |  1 -
 app/src/main/res/values-es/strings.xml                 |  1 -
 app/src/main/res/values-eu/strings.xml                 |  1 -
 app/src/main/res/values-fr/strings.xml                 |  1 -
 app/src/main/res/values-hu/strings.xml                 |  1 -
 app/src/main/res/values-it/strings.xml                 |  1 -
 app/src/main/res/values-iw/strings.xml                 |  1 -
 app/src/main/res/values-ja/strings.xml                 |  1 -
 app/src/main/res/values-ko/strings.xml                 |  1 -
 app/src/main/res/values-lt/strings.xml                 |  1 -
 app/src/main/res/values-nb/strings.xml                 |  1 -
 app/src/main/res/values-nl/strings.xml                 |  1 -
 app/src/main/res/values-pl/strings.xml                 |  1 -
 app/src/main/res/values-pt-rBR/strings.xml             |  1 -
 app/src/main/res/values-ru/strings.xml                 |  1 -
 app/src/main/res/values-sk/strings.xml                 |  1 -
 app/src/main/res/values-sv/strings.xml                 |  1 -
 app/src/main/res/values-tl/strings.xml                 |  1 -
 app/src/main/res/values-tr/strings.xml                 |  1 -
 app/src/main/res/values-uk/strings.xml                 |  1 -
 app/src/main/res/values-zh-rCN/strings.xml             |  1 -
 app/src/main/res/values/strings.xml                    |  2 +-
 25 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
index f5436a8be..f2a92d0ba 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
@@ -352,12 +352,12 @@ public class CaldavAccountSettingsActivity extends ThemedInjectingAppCompatActiv
       showSnackbar(R.string.network_error);
     } else {
       Timber.e(t);
-      showSnackbar(R.string.error_adding_account);
+      showSnackbar(R.string.error_adding_account, t.getMessage());
     }
   }
 
-  private void showSnackbar(int resId) {
-    showSnackbar(getString(resId));
+  private void showSnackbar(int resId, Object... formatArgs) {
+    showSnackbar(getString(resId, formatArgs));
   }
 
   private void showSnackbar(String message) {
diff --git a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
index 4988adba4..86fafc563 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
@@ -171,16 +171,12 @@ public class CaldavCalendarSettingsActivity extends BaseListSettingsActivity {
     } else if (t instanceof ConnectException) {
       showSnackbar(R.string.network_error);
     } else {
-      showGenericError();
+      showSnackbar(R.string.error_adding_account, t.getMessage());
     }
   }
 
-  private void showGenericError() {
-    showSnackbar(R.string.error_adding_account);
-  }
-
-  private void showSnackbar(int resId) {
-    showSnackbar(getString(resId));
+  private void showSnackbar(int resId, Object... formatArgs) {
+    showSnackbar(getString(resId, formatArgs));
   }
 
   private void showSnackbar(String message) {
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 0f90d7991..d43ad6ac6 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -433,7 +433,6 @@
 	<string name="add_account">Добави акаунт</string>
 	<string name="user">Потребител</string>
 	<string name="password">Парола</string>
-	<string name="error_adding_account">Грешка при добавяне на акаунт</string>
 	<string name="calendar_settings">Настройки на календара</string>
 	<string name="notification_channel_settings">Управление на уведомления</string>
 	<string name="battery_optimization_settings">Управление на оптимизациите на батерията</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index fe7509c1d..aecd52653 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -420,7 +420,6 @@
     <string name="add_account">Account hinzufügen</string>
     <string name="user">Benutzer</string>
     <string name="password">Passwort</string>
-    <string name="error_adding_account">Fehler beim Hinzufügen des Accounts</string>
     <string name="calendar_settings">Kalendereinstellungen</string>
     <string name="notification_channel_settings">Benachrichtigungen verwalten</string>
     <string name="battery_optimization_settings">Energiesparmodus verwalten</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index e96713d1a..682b7b98a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -426,7 +426,6 @@
     <string name="add_account">Añadir cuenta</string>
     <string name="user">Usuario</string>
     <string name="password">Contraseña</string>
-    <string name="error_adding_account">Error añadiendo cuenta</string>
     <string name="calendar_settings">Configuración de calendario</string>
     <string name="notification_channel_settings">Gestionar notificaciones</string>
     <string name="battery_optimization_settings">Optimizaciones en gestión de batería</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 4a9db0e93..92b3ae330 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -439,7 +439,6 @@
     <string name="user">Erabiltzailea</string>
     <string name="password">Pasahitza</string>
     <string name="url">URL-a</string>
-    <string name="error_adding_account">Errorea kontua gehitzean</string>
     <string name="calendar_settings">Egutegiaren ezarpenak</string>
     <string name="notification_channel_settings">Kudeatu jakinarazpenak</string>
     <string name="battery_optimization_settings">Kudeatu bateriaren optimizazioak</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6d97c071d..30497f7ac 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -411,7 +411,6 @@
     <string name="user">Utilisateur</string>
     <string name="password">Mot de passe</string>
     <string name="url">Adresse URL</string>
-    <string name="error_adding_account">Erreur dans l\'ajout du compte</string>
     <string name="calendar_settings">Paramètres du calendrier</string>
     <string name="notification_channel_settings">Gérer les notifications</string>
     <string name="battery_optimization_settings">Gérer les optimisations de la batterie</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 96414662a..9fc9ddf18 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -432,7 +432,6 @@
     <string name="user">Felhasználónév</string>
     <string name="password">Jelszó</string>
     <string name="url">Link</string>
-    <string name="error_adding_account">Felhasználói fiók hozzáadása sikertelen</string>
     <string name="calendar_settings">Naptár beállítások</string>
     <string name="notification_channel_settings">Értesítések kezelése</string>
     <string name="battery_optimization_settings">Akkumulátor optimalizálások kezelése</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index db4f0e756..f996cf21a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -428,7 +428,6 @@
 	<string name="use_native_datetime_pickers">Usa data e ora locali</string>
 	<string name="add_account">Aggiungi account</string>
 	<string name="user">Utente</string>
-	<string name="error_adding_account">Aggiunta account fallita</string>
 	<string name="calendar_settings">Impostazioni calendario
 </string>
 	<string name="notification_channel_settings">Gestione notifiche</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index ad52c8150..a93e3a10a 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -469,7 +469,6 @@
     <string name="user">משתמש</string>
     <string name="password">סיסמא</string>
     <string name="url">כתובת URL</string>
-    <string name="error_adding_account">שגיאה בהוספת חשבון</string>
     <string name="calendar_settings">הגדרות יומן</string>
     <string name="notification_channel_settings">נהל התראות</string>
     <string name="battery_optimization_settings">נהל חיסכון בסוללה</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index de30948a1..6c82ac038 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -430,7 +430,6 @@
     <string name="add_account">アカウントを追加</string>
     <string name="user">ユーザー</string>
     <string name="password">パスワード</string>
-    <string name="error_adding_account">アカウントの追加時にエラーが発生しました</string>
     <string name="calendar_settings">カレンダー設定</string>
     <string name="notification_channel_settings">通知を管理</string>
     <string name="battery_optimization_settings">バッテリー最適化を管理</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index ffa3b1d11..a74a36e0d 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -433,7 +433,6 @@
 	<string name="add_account">계정 추가</string>
 	<string name="user">사용자</string>
 	<string name="password">비밀번호</string>
-	<string name="error_adding_account">계정 추가 오류</string>
 	<string name="calendar_settings">달력 설정</string>
 	<string name="notification_channel_settings">알림 관리</string>
 	<string name="battery_optimization_settings">배터리 최적화 관리</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index cc401ea07..4f80ecbf9 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -428,7 +428,6 @@
 	<string name="add_account">Pridėti paskyrą</string>
 	<string name="user">Vartotojas</string>
 	<string name="password">Slaptažodis</string>
-	<string name="error_adding_account">Klaida kuriant paskyrą</string>
 	<string name="calendar_settings">Kalendoriaus nustatymai</string>
 	<string name="notification_channel_settings">Valdyti pranešimus</string>
 	<string name="battery_optimization_settings">Valdyti baterijos optimizacijas</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 7cd592537..f134b8831 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -460,7 +460,6 @@
     <string name="user">Bruker</string>
     <string name="password">Passord</string>
     <string name="url">Nettadresse</string>
-    <string name="error_adding_account">Kunne ikke legge til konto</string>
     <string name="calendar_settings">Kalenderinnstillinger</string>
     <string name="badges">Merker</string>
     <string name="list">Liste</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 2acfe1cd3..e66bd0cc4 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -420,7 +420,6 @@
     <string name="add_account">Account toevoegen</string>
     <string name="user">Gebruiker</string>
     <string name="password">Wachtwoord</string>
-    <string name="error_adding_account">Fout bij account toevoegen</string>
     <string name="calendar_settings">Kalender instellingen</string>
     <string name="notification_channel_settings">Beheer notificaties</string>
     <string name="battery_optimization_settings">Beheer batterij optimalisatie</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index f30773bd1..95f0ba034 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -429,7 +429,6 @@
     <string name="add_account">Dodaj konto</string>
     <string name="user">Użytkownik</string>
     <string name="password">Hasło</string>
-    <string name="error_adding_account">Błąd przy dodawaniu konta</string>
     <string name="calendar_settings">Ustawienia kalendarza</string>
     <string name="notification_channel_settings">Zarządzaj powiadamieniami</string>
     <string name="battery_optimization_settings">Zarządzaj zużyciem energii</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 4a64281ac..446a5fb8f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -430,7 +430,6 @@
 	<string name="add_account">Adicionar conta</string>
 	<string name="user">Usuário</string>
 	<string name="password">Senha</string>
-	<string name="error_adding_account">Erro ao adicionar conta</string>
 	<string name="calendar_settings">Configurações do calendário</string>
 	<string name="notification_channel_settings">Gerenciar notificações</string>
 	<string name="battery_optimization_settings">Gerenciar otimizações da bateria</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index efb3680e2..0238491a1 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -431,7 +431,6 @@
     <string name="add_account">Добавить учётную запись</string>
     <string name="user">Пользователь</string>
     <string name="password">Пароль</string>
-    <string name="error_adding_account">Ошибка при добавлении учётной записи</string>
     <string name="calendar_settings">Настройки календаря</string>
     <string name="notification_channel_settings">Управление уведомлениями</string>
     <string name="battery_optimization_settings">Управление расходом батареи</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index b823181ec..65caa7698 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -429,7 +429,6 @@
 	<string name="add_account">Pridať účet</string>
 	<string name="user">Užívateľ</string>
 	<string name="password">Heslo</string>
-	<string name="error_adding_account">Chyba pridania účtu</string>
 	<string name="calendar_settings">Nastavenia kalendára</string>
 	<string name="notification_channel_settings">Spravovať upozornenia</string>
 	<string name="battery_optimization_settings">Zníženie spotreby energie</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 10dc9895b..17c09ad86 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -433,7 +433,6 @@
     <string name="user">Användare</string>
     <string name="password">Lösenord</string>
     <string name="url">URL</string>
-    <string name="error_adding_account">Fel vid kontoskapande</string>
     <string name="calendar_settings">Kalenderinställningar</string>
     <string name="notification_channel_settings">Hantera notiser</string>
     <string name="battery_optimization_settings">Hantera batterioptimering</string>
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index 01053bbd0..17c516574 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -62,7 +62,6 @@
 	<string name="layout_direction_left_to_right">Kaliwa sa kanan</string>
 	<string name="add_account">Magdagdag ng account</string>
 	<string name="user">Gumagamit</string>
-	<string name="error_adding_account">Kamalian sa pagdadagdag ng account</string>
 	<string name="battery_optimization_settings">Mamahala ng baterya mga optimization</string>
 	<string name="notification_disable_battery_optimizations_description">Mga baterya optimization ay maaaring antalahin ang mga notification</string>
 	<string name="dont_sync">Huwag i-sync</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 2bfc6b139..a8b8507cc 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -434,7 +434,6 @@
 	<string name="add_account">Hesap ekle</string>
 	<string name="user">Kullanıcı</string>
 	<string name="password">Parola</string>
-	<string name="error_adding_account">Hesap eklenirken hata</string>
 	<string name="calendar_settings">Takvim ayarları</string>
 	<string name="notification_channel_settings">Bildirimleri yönet</string>
 	<string name="battery_optimization_settings">Pil optimizasyonlarını yönet</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 251131477..da515de73 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -433,7 +433,6 @@
     <string name="add_account">Додати обліковий запис</string>
     <string name="user">Користувач</string>
     <string name="password">Пароль</string>
-    <string name="error_adding_account">Помилка додання облікового запису</string>
     <string name="calendar_settings">Налаштування календаря</string>
     <string name="notification_channel_settings">Управління сповіщеннями</string>
     <string name="battery_optimization_settings">Управління оптимізацією розряда акумулятора</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d33f96423..d0bddda43 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -414,7 +414,6 @@
     <string name="user">用户</string>
     <string name="password">密码</string>
     <string name="url">网址</string>
-    <string name="error_adding_account">添加帐号错误</string>
     <string name="calendar_settings">日历设置</string>
     <string name="notification_channel_settings">管理通知</string>
     <string name="battery_optimization_settings">电池优化管理</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 134a758b0..fbbfdeb4d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -440,7 +440,7 @@ File %1$s contained %2$s.\n\n
   <string name="user">User</string>
   <string name="password">Password</string>
   <string name="url">URL</string>
-  <string name="error_adding_account">Error adding account</string>
+  <string name="error_adding_account">Error: %s</string>
   <string name="calendar_settings">Calendar settings</string>
   <string name="notification_channel_settings">Manage notifications</string>
   <string name="battery_optimization_settings">Manage battery optimizations</string>