Display caldav exceptions

gtask_related_email
Alex Baker 5 years ago
parent ad29cfa030
commit 5cb3ae2747

@ -352,12 +352,12 @@ public class CaldavAccountSettingsActivity extends ThemedInjectingAppCompatActiv
showSnackbar(R.string.network_error); showSnackbar(R.string.network_error);
} else { } else {
Timber.e(t); Timber.e(t);
showSnackbar(R.string.error_adding_account); showSnackbar(R.string.error_adding_account, t.getMessage());
} }
} }
private void showSnackbar(int resId) { private void showSnackbar(int resId, Object... formatArgs) {
showSnackbar(getString(resId)); showSnackbar(getString(resId, formatArgs));
} }
private void showSnackbar(String message) { private void showSnackbar(String message) {

@ -171,16 +171,12 @@ public class CaldavCalendarSettingsActivity extends BaseListSettingsActivity {
} else if (t instanceof ConnectException) { } else if (t instanceof ConnectException) {
showSnackbar(R.string.network_error); showSnackbar(R.string.network_error);
} else { } else {
showGenericError(); showSnackbar(R.string.error_adding_account, t.getMessage());
} }
} }
private void showGenericError() { private void showSnackbar(int resId, Object... formatArgs) {
showSnackbar(R.string.error_adding_account); showSnackbar(getString(resId, formatArgs));
}
private void showSnackbar(int resId) {
showSnackbar(getString(resId));
} }
private void showSnackbar(String message) { private void showSnackbar(String message) {

@ -433,7 +433,6 @@
<string name="add_account">Добави акаунт</string> <string name="add_account">Добави акаунт</string>
<string name="user">Потребител</string> <string name="user">Потребител</string>
<string name="password">Парола</string> <string name="password">Парола</string>
<string name="error_adding_account">Грешка при добавяне на акаунт</string>
<string name="calendar_settings">Настройки на календара</string> <string name="calendar_settings">Настройки на календара</string>
<string name="notification_channel_settings">Управление на уведомления</string> <string name="notification_channel_settings">Управление на уведомления</string>
<string name="battery_optimization_settings">Управление на оптимизациите на батерията</string> <string name="battery_optimization_settings">Управление на оптимизациите на батерията</string>

@ -420,7 +420,6 @@
<string name="add_account">Account hinzufügen</string> <string name="add_account">Account hinzufügen</string>
<string name="user">Benutzer</string> <string name="user">Benutzer</string>
<string name="password">Passwort</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="calendar_settings">Kalendereinstellungen</string>
<string name="notification_channel_settings">Benachrichtigungen verwalten</string> <string name="notification_channel_settings">Benachrichtigungen verwalten</string>
<string name="battery_optimization_settings">Energiesparmodus verwalten</string> <string name="battery_optimization_settings">Energiesparmodus verwalten</string>

@ -426,7 +426,6 @@
<string name="add_account">Añadir cuenta</string> <string name="add_account">Añadir cuenta</string>
<string name="user">Usuario</string> <string name="user">Usuario</string>
<string name="password">Contraseña</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="calendar_settings">Configuración de calendario</string>
<string name="notification_channel_settings">Gestionar notificaciones</string> <string name="notification_channel_settings">Gestionar notificaciones</string>
<string name="battery_optimization_settings">Optimizaciones en gestión de batería</string> <string name="battery_optimization_settings">Optimizaciones en gestión de batería</string>

@ -439,7 +439,6 @@
<string name="user">Erabiltzailea</string> <string name="user">Erabiltzailea</string>
<string name="password">Pasahitza</string> <string name="password">Pasahitza</string>
<string name="url">URL-a</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="calendar_settings">Egutegiaren ezarpenak</string>
<string name="notification_channel_settings">Kudeatu jakinarazpenak</string> <string name="notification_channel_settings">Kudeatu jakinarazpenak</string>
<string name="battery_optimization_settings">Kudeatu bateriaren optimizazioak</string> <string name="battery_optimization_settings">Kudeatu bateriaren optimizazioak</string>

@ -411,7 +411,6 @@
<string name="user">Utilisateur</string> <string name="user">Utilisateur</string>
<string name="password">Mot de passe</string> <string name="password">Mot de passe</string>
<string name="url">Adresse URL</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="calendar_settings">Paramètres du calendrier</string>
<string name="notification_channel_settings">Gérer les notifications</string> <string name="notification_channel_settings">Gérer les notifications</string>
<string name="battery_optimization_settings">Gérer les optimisations de la batterie</string> <string name="battery_optimization_settings">Gérer les optimisations de la batterie</string>

@ -432,7 +432,6 @@
<string name="user">Felhasználónév</string> <string name="user">Felhasználónév</string>
<string name="password">Jelszó</string> <string name="password">Jelszó</string>
<string name="url">Link</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="calendar_settings">Naptár beállítások</string>
<string name="notification_channel_settings">Értesítések kezelése</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> <string name="battery_optimization_settings">Akkumulátor optimalizálások kezelése</string>

@ -428,7 +428,6 @@
<string name="use_native_datetime_pickers">Usa data e ora locali</string> <string name="use_native_datetime_pickers">Usa data e ora locali</string>
<string name="add_account">Aggiungi account</string> <string name="add_account">Aggiungi account</string>
<string name="user">Utente</string> <string name="user">Utente</string>
<string name="error_adding_account">Aggiunta account fallita</string>
<string name="calendar_settings">Impostazioni calendario <string name="calendar_settings">Impostazioni calendario
</string> </string>
<string name="notification_channel_settings">Gestione notifiche</string> <string name="notification_channel_settings">Gestione notifiche</string>

@ -469,7 +469,6 @@
<string name="user">משתמש</string> <string name="user">משתמש</string>
<string name="password">סיסמא</string> <string name="password">סיסמא</string>
<string name="url">כתובת URL</string> <string name="url">כתובת URL</string>
<string name="error_adding_account">שגיאה בהוספת חשבון</string>
<string name="calendar_settings">הגדרות יומן</string> <string name="calendar_settings">הגדרות יומן</string>
<string name="notification_channel_settings">נהל התראות</string> <string name="notification_channel_settings">נהל התראות</string>
<string name="battery_optimization_settings">נהל חיסכון בסוללה</string> <string name="battery_optimization_settings">נהל חיסכון בסוללה</string>

@ -430,7 +430,6 @@
<string name="add_account">アカウントを追加</string> <string name="add_account">アカウントを追加</string>
<string name="user">ユーザー</string> <string name="user">ユーザー</string>
<string name="password">パスワード</string> <string name="password">パスワード</string>
<string name="error_adding_account">アカウントの追加時にエラーが発生しました</string>
<string name="calendar_settings">カレンダー設定</string> <string name="calendar_settings">カレンダー設定</string>
<string name="notification_channel_settings">通知を管理</string> <string name="notification_channel_settings">通知を管理</string>
<string name="battery_optimization_settings">バッテリー最適化を管理</string> <string name="battery_optimization_settings">バッテリー最適化を管理</string>

@ -433,7 +433,6 @@
<string name="add_account">계정 추가</string> <string name="add_account">계정 추가</string>
<string name="user">사용자</string> <string name="user">사용자</string>
<string name="password">비밀번호</string> <string name="password">비밀번호</string>
<string name="error_adding_account">계정 추가 오류</string>
<string name="calendar_settings">달력 설정</string> <string name="calendar_settings">달력 설정</string>
<string name="notification_channel_settings">알림 관리</string> <string name="notification_channel_settings">알림 관리</string>
<string name="battery_optimization_settings">배터리 최적화 관리</string> <string name="battery_optimization_settings">배터리 최적화 관리</string>

@ -428,7 +428,6 @@
<string name="add_account">Pridėti paskyrą</string> <string name="add_account">Pridėti paskyrą</string>
<string name="user">Vartotojas</string> <string name="user">Vartotojas</string>
<string name="password">Slaptažodis</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="calendar_settings">Kalendoriaus nustatymai</string>
<string name="notification_channel_settings">Valdyti pranešimus</string> <string name="notification_channel_settings">Valdyti pranešimus</string>
<string name="battery_optimization_settings">Valdyti baterijos optimizacijas</string> <string name="battery_optimization_settings">Valdyti baterijos optimizacijas</string>

@ -460,7 +460,6 @@
<string name="user">Bruker</string> <string name="user">Bruker</string>
<string name="password">Passord</string> <string name="password">Passord</string>
<string name="url">Nettadresse</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="calendar_settings">Kalenderinnstillinger</string>
<string name="badges">Merker</string> <string name="badges">Merker</string>
<string name="list">Liste</string> <string name="list">Liste</string>

@ -420,7 +420,6 @@
<string name="add_account">Account toevoegen</string> <string name="add_account">Account toevoegen</string>
<string name="user">Gebruiker</string> <string name="user">Gebruiker</string>
<string name="password">Wachtwoord</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="calendar_settings">Kalender instellingen</string>
<string name="notification_channel_settings">Beheer notificaties</string> <string name="notification_channel_settings">Beheer notificaties</string>
<string name="battery_optimization_settings">Beheer batterij optimalisatie</string> <string name="battery_optimization_settings">Beheer batterij optimalisatie</string>

@ -429,7 +429,6 @@
<string name="add_account">Dodaj konto</string> <string name="add_account">Dodaj konto</string>
<string name="user">Użytkownik</string> <string name="user">Użytkownik</string>
<string name="password">Hasło</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="calendar_settings">Ustawienia kalendarza</string>
<string name="notification_channel_settings">Zarządzaj powiadamieniami</string> <string name="notification_channel_settings">Zarządzaj powiadamieniami</string>
<string name="battery_optimization_settings">Zarządzaj zużyciem energii</string> <string name="battery_optimization_settings">Zarządzaj zużyciem energii</string>

@ -430,7 +430,6 @@
<string name="add_account">Adicionar conta</string> <string name="add_account">Adicionar conta</string>
<string name="user">Usuário</string> <string name="user">Usuário</string>
<string name="password">Senha</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="calendar_settings">Configurações do calendário</string>
<string name="notification_channel_settings">Gerenciar notificações</string> <string name="notification_channel_settings">Gerenciar notificações</string>
<string name="battery_optimization_settings">Gerenciar otimizações da bateria</string> <string name="battery_optimization_settings">Gerenciar otimizações da bateria</string>

@ -431,7 +431,6 @@
<string name="add_account">Добавить учётную запись</string> <string name="add_account">Добавить учётную запись</string>
<string name="user">Пользователь</string> <string name="user">Пользователь</string>
<string name="password">Пароль</string> <string name="password">Пароль</string>
<string name="error_adding_account">Ошибка при добавлении учётной записи</string>
<string name="calendar_settings">Настройки календаря</string> <string name="calendar_settings">Настройки календаря</string>
<string name="notification_channel_settings">Управление уведомлениями</string> <string name="notification_channel_settings">Управление уведомлениями</string>
<string name="battery_optimization_settings">Управление расходом батареи</string> <string name="battery_optimization_settings">Управление расходом батареи</string>

@ -429,7 +429,6 @@
<string name="add_account">Pridať účet</string> <string name="add_account">Pridať účet</string>
<string name="user">Užívateľ</string> <string name="user">Užívateľ</string>
<string name="password">Heslo</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="calendar_settings">Nastavenia kalendára</string>
<string name="notification_channel_settings">Spravovať upozornenia</string> <string name="notification_channel_settings">Spravovať upozornenia</string>
<string name="battery_optimization_settings">Zníženie spotreby energie</string> <string name="battery_optimization_settings">Zníženie spotreby energie</string>

@ -433,7 +433,6 @@
<string name="user">Användare</string> <string name="user">Användare</string>
<string name="password">Lösenord</string> <string name="password">Lösenord</string>
<string name="url">URL</string> <string name="url">URL</string>
<string name="error_adding_account">Fel vid kontoskapande</string>
<string name="calendar_settings">Kalenderinställningar</string> <string name="calendar_settings">Kalenderinställningar</string>
<string name="notification_channel_settings">Hantera notiser</string> <string name="notification_channel_settings">Hantera notiser</string>
<string name="battery_optimization_settings">Hantera batterioptimering</string> <string name="battery_optimization_settings">Hantera batterioptimering</string>

@ -62,7 +62,6 @@
<string name="layout_direction_left_to_right">Kaliwa sa kanan</string> <string name="layout_direction_left_to_right">Kaliwa sa kanan</string>
<string name="add_account">Magdagdag ng account</string> <string name="add_account">Magdagdag ng account</string>
<string name="user">Gumagamit</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="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="notification_disable_battery_optimizations_description">Mga baterya optimization ay maaaring antalahin ang mga notification</string>
<string name="dont_sync">Huwag i-sync</string> <string name="dont_sync">Huwag i-sync</string>

@ -434,7 +434,6 @@
<string name="add_account">Hesap ekle</string> <string name="add_account">Hesap ekle</string>
<string name="user">Kullanıcı</string> <string name="user">Kullanıcı</string>
<string name="password">Parola</string> <string name="password">Parola</string>
<string name="error_adding_account">Hesap eklenirken hata</string>
<string name="calendar_settings">Takvim ayarları</string> <string name="calendar_settings">Takvim ayarları</string>
<string name="notification_channel_settings">Bildirimleri yönet</string> <string name="notification_channel_settings">Bildirimleri yönet</string>
<string name="battery_optimization_settings">Pil optimizasyonlarını yönet</string> <string name="battery_optimization_settings">Pil optimizasyonlarını yönet</string>

@ -433,7 +433,6 @@
<string name="add_account">Додати обліковий запис</string> <string name="add_account">Додати обліковий запис</string>
<string name="user">Користувач</string> <string name="user">Користувач</string>
<string name="password">Пароль</string> <string name="password">Пароль</string>
<string name="error_adding_account">Помилка додання облікового запису</string>
<string name="calendar_settings">Налаштування календаря</string> <string name="calendar_settings">Налаштування календаря</string>
<string name="notification_channel_settings">Управління сповіщеннями</string> <string name="notification_channel_settings">Управління сповіщеннями</string>
<string name="battery_optimization_settings">Управління оптимізацією розряда акумулятора</string> <string name="battery_optimization_settings">Управління оптимізацією розряда акумулятора</string>

@ -414,7 +414,6 @@
<string name="user">用户</string> <string name="user">用户</string>
<string name="password">密码</string> <string name="password">密码</string>
<string name="url">网址</string> <string name="url">网址</string>
<string name="error_adding_account">添加帐号错误</string>
<string name="calendar_settings">日历设置</string> <string name="calendar_settings">日历设置</string>
<string name="notification_channel_settings">管理通知</string> <string name="notification_channel_settings">管理通知</string>
<string name="battery_optimization_settings">电池优化管理</string> <string name="battery_optimization_settings">电池优化管理</string>

@ -440,7 +440,7 @@ File %1$s contained %2$s.\n\n
<string name="user">User</string> <string name="user">User</string>
<string name="password">Password</string> <string name="password">Password</string>
<string name="url">URL</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="calendar_settings">Calendar settings</string>
<string name="notification_channel_settings">Manage notifications</string> <string name="notification_channel_settings">Manage notifications</string>
<string name="battery_optimization_settings">Manage battery optimizations</string> <string name="battery_optimization_settings">Manage battery optimizations</string>

Loading…
Cancel
Save