From 9b8fc983cdd4d4a90c440daea4e70c1e45ff2598 Mon Sep 17 00:00:00 2001
From: Ricki Hirner <hirner@bitfire.at>
Date: Wed, 25 May 2016 20:50:02 +0200
Subject: [PATCH] Version bump to 1.0.9

* upgrade to okhttp 3.3 to reduce HTTP/2 incompatibilties
* vcard4android: enable RFC 6868 support in ez-vcard
* minor improvements and bug fixes
* new translations from Transifex
* version bump to 1.0.9
---
 app/build.gradle                              |  8 ++--
 app/proguard-rules.txt                        |  2 +-
 .../main/java/at/bitfire/davdroid/App.java    |  3 ++
 .../java/at/bitfire/davdroid/HttpClient.java  |  2 +-
 app/src/main/res/values-da/strings.xml        | 16 +++++++
 app/src/main/res/values-es/strings.xml        | 45 +++++++++++++++++++
 app/src/main/res/values-it/strings.xml        | 25 +++++++++++
 dav4android                                   |  2 +-
 vcard4android                                 |  2 +-
 9 files changed, 97 insertions(+), 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6996fe71..0eede1a7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         minSdkVersion 14
         targetSdkVersion 23
 
-        versionCode 99
-        versionName "1.0.8"
+        versionCode 100
+        versionName "1.0.9"
 
         buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
     }
@@ -75,6 +75,6 @@ dependencies {
 
     // for tests
     testCompile 'junit:junit:4.12'
-    testCompile 'com.squareup.okhttp3:mockwebserver:3.2.0'
-    androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.2.0'
+    testCompile 'com.squareup.okhttp3:mockwebserver:3.3.0'
+    androidTestCompile 'com.squareup.okhttp3:mockwebserver:3.3.0'
 }
diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt
index 8859805b..222e532c 100644
--- a/app/proguard-rules.txt
+++ b/app/proguard-rules.txt
@@ -8,7 +8,7 @@
 -dontobfuscate
 
 # ez-vcard
--dontwarn com.fasterxml.jackson.**		# Jackson JSON Processor (for jCards) not used
+-dontwarn ezvcard.io.json.**			# JSON serializer (for jCards) not used
 -dontwarn freemarker.**				# freemarker templating library (for creating hCards) not used
 -dontwarn org.jsoup.**				# jsoup library (for hCard parsing) not used
 -dontwarn sun.misc.Perf
diff --git a/app/src/main/java/at/bitfire/davdroid/App.java b/app/src/main/java/at/bitfire/davdroid/App.java
index 247faea1..2ab17894 100644
--- a/app/src/main/java/at/bitfire/davdroid/App.java
+++ b/app/src/main/java/at/bitfire/davdroid/App.java
@@ -50,6 +50,9 @@ public class App extends Application {
     private static HostnameVerifier hostnameVerifier;
 
     public final static Logger log = Logger.getLogger("davdroid");
+    static {
+        at.bitfire.dav4android.Constants.log = Logger.getLogger("davdroid.dav4android");
+    }
 
     @Override
     public void onCreate() {
diff --git a/app/src/main/java/at/bitfire/davdroid/HttpClient.java b/app/src/main/java/at/bitfire/davdroid/HttpClient.java
index 138bc5fc..5431f9ee 100644
--- a/app/src/main/java/at/bitfire/davdroid/HttpClient.java
+++ b/app/src/main/java/at/bitfire/davdroid/HttpClient.java
@@ -74,7 +74,7 @@ public class HttpClient {
 
         // use MemorizingTrustManager to manage self-signed certificates
         if (App.getSslSocketFactoryCompat() != null)
-            builder.sslSocketFactory(App.getSslSocketFactoryCompat());
+            builder.sslSocketFactory(App.getSslSocketFactoryCompat(), App.getMemorizingTrustManager());
         if (App.getHostnameVerifier() != null)
             builder.hostnameVerifier(App.getHostnameVerifier());
 
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 22131ed2..65a04176 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -19,6 +19,8 @@
   <string name="startup_google_play_accounts_removed_message">Under visse tekniske omstændigheder kan DRM fra Play Store bevirke, at alle DAVdroid-konti er væk efter en genstart eller opgradering af DAVdroid. Hvis du er udsat for dette problem (og ellers ikke), opfordres du til at installere DAVDroid JB Workaround\" fra Play Store.</string>
   <string name="startup_google_play_accounts_removed_more_info">Yderligere oplysninger</string>
   <string name="startup_opentasks_not_installed">OpenTasks ikke installeret</string>
+  <string name="startup_opentasks_not_installed_message">OpenTasks er ikke til rådighedm så DAVdroid vil ikke kunne synkronisere opgavelister.</string>
+  <string name="startup_opentasks_reinstall_davdroid">Efter at have installeret OpenTasks, vil du være nødt til at GENINSTALLERE DAVdroid og dine konti igen (en fejl i Android).</string>
   <string name="startup_opentasks_not_installed_install">Installer OpenTasks</string>
   <!--AboutActivity-->
   <string name="about_license_terms">Licensforhold</string>
@@ -76,6 +78,13 @@
   <string name="account_refresh_calendar_list">Opdater kalenderliste</string>
   <string name="account_create_new_calendar">Opret ny kalender</string>
   <!--PermissionsActivity-->
+  <string name="permissions_title">DAVdroid adgangsrettigheder</string>
+  <string name="permissions_calendar">Kalenderadgange</string>
+  <string name="permissions_calendar_details">For at synkronisere CalDAV-begivenheder med dine lokale kalendere, skal DAVdroid have adgang til dine kalendere.</string>
+  <string name="permissions_calendar_request">Anmod om kalenderadgang</string>
+  <string name="permissions_contacts">Kontakter: Adgangsrettigheder</string>
+  <string name="permissions_contacts_request">Anmod om adgang til kontakter</string>
+  <string name="permissions_opentasks">OpenTasks: Adgangsrettigheder</string>
   <!--AddAccountActivity-->
   <string name="login_title">Tilføj konto</string>
   <string name="login_type_email">Log ind med emailadresse</string>
@@ -139,6 +148,12 @@
     <item>En gang hver 4. time</item>
     <item>En gang om dagen</item>
   </string-array>
+  <string name="settings_sync_wifi_only">Synkroniser kun over WiFi</string>
+  <string name="settings_sync_wifi_only_on">Synkronisering er begrænset til WiFi-forbindelser</string>
+  <string name="settings_sync_wifi_only_ssid">Begræsning til WiFi-SSID</string>
+  <string name="settings_sync_wifi_only_ssid_on">Vil kun blive synkroniseret over %s</string>
+  <string name="settings_sync_wifi_only_ssid_off">Alle WiFi-forbindelse vil kunne bruges</string>
+  <string name="settings_caldav">CalDAV</string>
   <string name="settings_sync_time_range_past">Tidsafgrænsning for tidligere begivenheder</string>
   <string name="settings_sync_time_range_past_none">Alle begivenheder vil blive synkroniseret</string>
   <plurals name="settings_sync_time_range_past_days">
@@ -146,6 +161,7 @@
     <item quantity="other">Begivenheder, der er mere end %d dage gamle, vil blive ignoreret</item>
   </plurals>
   <string name="settings_sync_time_range_past_message">Begivenheder, som er mere end dette antal dage gamle vil blive ignoreret (kan også være 0). Hvis feltet ikke er udfyldt, vil alle begivenheder blive synkroniseret.</string>
+  <string name="settings_manage_calendar_colors">Administrer farver for kalender</string>
   <string name="settings_version_update">Versionsopdatering af DAVdroid</string>
   <string name="settings_version_update_settings_updated">Interne indstillinger er blevet opdateret.</string>
   <string name="settings_version_update_install_hint">Problemer? Afinstaller DAVdroid og geninstaller.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index bea338bf..8954b7e4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -18,8 +18,12 @@
   <string name="startup_google_play_accounts_removed_message">Bajo ciertas condiciones, el DRM de Play Store puede causar que todas las cuentas de DAVdroid se desconfiguren tras un reinicio o una actualización de DAVdroid. Si esto le afecta (y sólo en ese caso), por favor, instale \"DAVdroid JB Workaround\" desde Play Store.</string>
   <string name="startup_google_play_accounts_removed_more_info">Más información</string>
   <string name="startup_opentasks_not_installed">OpenTasks no está instalado</string>
+  <string name="startup_opentasks_not_installed_message">La aplicación OpenTasks no está disponible. DAVdroid no podrá sincronizar listas de tareas.</string>
+  <string name="startup_opentasks_reinstall_davdroid">Tras instalar OpenTasks, tendrás que re-instalar DAVdroid y añadir tus cuentas de nuevo (por un error de Android).</string>
   <string name="startup_opentasks_not_installed_install">Instalar OpenTasks</string>
   <!--AboutActivity-->
+  <string name="about_license_terms">Términos de la licencia</string>
+  <string name="about_license_info_no_warranty">Este programa viene sin NINGÚN TIPO DE GARANTÍA. Es software libre, y cualquier contribución es bienvenida y redistribuida bajo ciertas condiciones.</string>
   <!--global settings-->
   <string name="logging_davdroid_file_logging">Archivo de registro de DAVdroid</string>
   <string name="logging_to_external_storage">Registrar en almacenamiento externo: %s</string>
@@ -27,9 +31,12 @@
   <string name="logging_couldnt_create_file">No se puede crear el archivo de registro externo: %s</string>
   <string name="logging_no_external_storage">Almacenamiento externo no encontrado</string>
   <!--AccountsActivity-->
+  <string name="navigation_drawer_open">Abrir panel de navegación</string>
+  <string name="navigation_drawer_close">Cerrar panel de navegación</string>
   <string name="navigation_drawer_subtitle">Adaptador de sincronización CalDAV/CardDAV</string>
   <string name="navigation_drawer_about">Acerca de / Licencia</string>
   <string name="navigation_drawer_settings">Ajustes</string>
+  <string name="navigation_drawer_news_updates">Noticias y actualizaciones</string>
   <string name="navigation_drawer_external_links">Enlaces externos</string>
   <string name="navigation_drawer_website">Sitio web</string>
   <string name="navigation_drawer_faq">Preguntas frequentes</string>
@@ -37,13 +44,27 @@
   <string name="navigation_drawer_donate">Donar</string>
   <string name="account_list_empty">Bienvenido a DAVdroid!\n\nAhora puede añadir una cuenta CalDAV/CardDAV.</string>
   <!--DavService-->
+  <string name="dav_service_refresh_failed">Falló la detección del servicio</string>
+  <string name="dav_service_refresh_couldnt_refresh">No se pudo refrescar lista de colección</string>
   <!--AppSettingsActivity-->
   <string name="app_settings">Ajustes</string>
   <string name="app_settings_user_interface">Interfaz de usuario</string>
+  <string name="app_settings_reset_hints">Restablecer advertencias</string>
+  <string name="app_settings_reset_hints_summary">Habilita las advertencias que han sido cesadas con anterioridad</string>
+  <string name="app_settings_reset_hints_success">Todas las advertencias serán mostradas de nuevo</string>
   <string name="app_settings_security">Seguridad</string>
   <string name="app_settings_reset_trusted_certificates">Restablecer certificados de confianza</string>
   <string name="app_settings_reset_trusted_certificates_summary">Olvidar todos los certificados aceptados previamente</string>
+  <plurals name="app_settings_reset_trusted_certificates_success">
+    <item quantity="one">Retirada la confianza de un certificado</item>
+    <item quantity="other">Retirada la confianza de %d certificados</item>
+  </plurals>
   <string name="app_settings_debug">Depuración</string>
+  <string name="app_settings_log_to_external_storage">Registrar en fichero externo</string>
+  <string name="app_settings_log_to_external_storage_on">Registro en almacenamiento externo (si está disponible)</string>
+  <string name="app_settings_log_to_external_storage_off">El archivo de registro externo está deshabilitado</string>
+  <string name="app_settings_show_debug_info">Mostrar la información de depuración</string>
+  <string name="app_settings_show_debug_info_details">Ver/compartir detalles de software y configuración</string>
   <!--AccountActivity-->
   <string name="account_synchronize_now">Sincronizar ahora</string>
   <string name="account_synchronizing_now">Sincronizando...</string>
@@ -56,6 +77,16 @@
   <string name="account_refresh_calendar_list">Refrescar calendario</string>
   <string name="account_create_new_calendar">Crear nuevo calendario</string>
   <!--PermissionsActivity-->
+  <string name="permissions_title">Permisos de DAVdroid</string>
+  <string name="permissions_calendar">Permisos de calendario</string>
+  <string name="permissions_calendar_details">Para sincronizar eventos CalDAV con sus calendarios locales, DAVdroid necesita acceder a los mismos.</string>
+  <string name="permissions_calendar_request">Solicitar permisos sobre calendario</string>
+  <string name="permissions_contacts">Permisos de contactos</string>
+  <string name="permissions_contacts_details">Para sincronizar libretas de contactos CadDAV con sus contactos locales, DAVdroid necesita acceder a los mismos.</string>
+  <string name="permissions_contacts_request">Solicitar permisos sobre contactos</string>
+  <string name="permissions_opentasks">Permisos de OpenTasks</string>
+  <string name="permissions_opentasks_details">Para sincronizar listas de tareas CalDAV con sus listas de tareas locales, DAVdroid necesita acceder a OpenTasks.</string>
+  <string name="permissions_opentasks_request">Solicitar permisos sobre OpenTasks</string>
   <!--AddAccountActivity-->
   <string name="login_title">Añadir cuenta</string>
   <string name="login_type_email">Acceder con cuenta de correo</string>
@@ -119,6 +150,14 @@
     <item>Cada 4 horas</item>
     <item>Una vez al día</item>
   </string-array>
+  <string name="settings_sync_wifi_only">Sincronizar sólo sobre WiFi</string>
+  <string name="settings_sync_wifi_only_on">La sincronización está restringida a conexiones WiFi</string>
+  <string name="settings_sync_wifi_only_off">Tipo de conexión no tomada en consideración</string>
+  <string name="settings_sync_wifi_only_ssid">Restricción WiFi SSID</string>
+  <string name="settings_sync_wifi_only_ssid_on">Sólo se sincronizará sobre %s</string>
+  <string name="settings_sync_wifi_only_ssid_off">Todas las conexiones WiFi pueden ser usadas</string>
+  <string name="settings_sync_wifi_only_ssid_message">Introduzca el nombre de una red WiFi (SSID) para restringir la sincronización a esta red, o deje el campo en blanco para usar todas las conexiones WiFi.</string>
+  <string name="settings_caldav">CalDAV</string>
   <string name="settings_sync_time_range_past">Límite de tiempo de eventos pasados</string>
   <string name="settings_sync_time_range_past_none">Todos los eventos serán sincronizados</string>
   <plurals name="settings_sync_time_range_past_days">
@@ -126,6 +165,9 @@
     <item quantity="other">Los eventos anteriores a %d días serán ignorados</item>
   </plurals>
   <string name="settings_sync_time_range_past_message">Los eventos anteriores a este número de días serán ignorados (puede ser 0). Deje en blanco el campo para sincronizar todos los eventos.</string>
+  <string name="settings_manage_calendar_colors">Colores de calendario</string>
+  <string name="settings_manage_calendar_colors_on">Los colores de los calendarios son administrados por DAVdroid</string>
+  <string name="settings_manage_calendar_colors_off">Los colores de los calendarios no son establecidos por DAVdroid</string>
   <string name="settings_version_update">Actualización de la versión de Android</string>
   <string name="settings_version_update_settings_updated">Los ajustes internos han sido actualizados.</string>
   <string name="settings_version_update_install_hint">¿Problemas? Desinstala y vuelve a instalar DAVdroid.</string>
@@ -144,6 +186,7 @@
   <string name="create_collection_display_name">Nombre mostrado (título):</string>
   <string name="create_collection_display_name_required">Título requerido</string>
   <string name="create_collection_description">Descripción (opcional):</string>
+  <string name="create_collection_home_set">Establecer localización:</string>
   <string name="create_collection_create">Crear</string>
   <string name="delete_collection">Eliminar colección</string>
   <string name="delete_collection_confirm_title">¿Está seguro/a?</string>
@@ -156,6 +199,8 @@
   <string name="exception_show_details">Mostrar detalles</string>
   <!--sync errors and DebugInfoActivity-->
   <string name="debug_info_title">Información de depuración</string>
+  <string name="sync_error_permissions">Permisos de DAVdroid</string>
+  <string name="sync_error_permissions_text">Permisos adicionales requeridos</string>
   <string name="sync_error_calendar">La sincronización de calendario falló (%s)</string>
   <string name="sync_error_contacts">La sincronización de agenda falló (%s)</string>
   <string name="sync_error_tasks">La sincronización de tareas falló (%s)</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0c8b7c19..1b7fd724 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -6,6 +6,8 @@
   <string name="manage_accounts">Gestione account</string>
   <string name="please_wait">Attendere prego …</string>
   <!--startup dialogs-->
+  <string name="startup_dont_show_again">Non mostrare più</string>
+  <string name="startup_donate_now">Mostra pagina donazioni</string>
   <string name="startup_google_play_accounts_removed_more_info">Maggiori informazioni</string>
   <string name="startup_opentasks_not_installed">OpenTasks non installata</string>
   <string name="startup_opentasks_not_installed_install">Installa OpenTasks</string>
@@ -31,29 +33,52 @@
   <string name="account_synchronizing_now">Sincronizzazione in corso</string>
   <string name="account_settings">Impostazioni account</string>
   <string name="account_delete">Elimina account</string>
+  <string name="account_delete_confirmation_text">Tutte le copie locali delle rubriche, dei calendari e degli elenchi attività verranno eliminate.</string>
   <string name="account_refresh_calendar_list">Aggiorna lista calendari</string>
   <string name="account_create_new_calendar">Crea nuovo calendario</string>
   <!--PermissionsActivity-->
+  <string name="permissions_title">Permessi DAVdroid</string>
+  <string name="permissions_calendar">Permessi Calendario</string>
+  <string name="permissions_contacts">Permessi Contatti</string>
+  <string name="permissions_opentasks">Permessi OpenTasks</string>
   <!--AddAccountActivity-->
   <string name="login_title">Aggiungi account</string>
+  <string name="login_type_email">Accedi con indirizzo email</string>
   <string name="login_email_address">Indirizzo email</string>
   <string name="login_password">Password</string>
+  <string name="login_type_url">Accedi con URL e nome utente</string>
+  <string name="login_url_must_be_http_or_https">L\'URL deve iniziare con http(s)://</string>
   <string name="login_user_name">Nome utente</string>
   <string name="login_back">Indietro</string>
   <string name="login_create_account">Crea account</string>
   <string name="login_account_name">Nome account</string>
+  <string name="login_configuration_detection">Rilevazione configurazione</string>
   <!--AccountSettingsActivity-->
   <string name="settings_title">Impostazioni: %s</string>
   <string name="settings_authentication">Autenticazione</string>
   <string name="settings_username">Nome utente</string>
   <string name="settings_enter_username">Inserisci nome utente:</string>
   <string name="settings_password">Password</string>
+  <string name="settings_enter_password">Inserisci la tua password:</string>
+  <string name="settings_sync_interval_contacts">Intervallo sincr. Contatti</string>
   <string name="settings_sync_summary_manually">Solo manualmente</string>
+  <string name="settings_sync_interval_calendars">Intervallo sincr. Calendari</string>
+  <string name="settings_sync_interval_tasks">Intervallo sincr. Attività</string>
+  <string name="settings_sync_wifi_only">Sincr. solo tramite WiFi</string>
+  <string name="settings_sync_wifi_only_on">La sincronizzazione è limitata alle connessioni WiFi</string>
+  <string name="settings_caldav">CalDAV</string>
+  <string name="settings_sync_time_range_past_none">Verranno sincronizzati tutti gli eventi</string>
+  <string name="settings_version_update_install_hint">Problemi? Disinstalla e poi re-installa DAVdroid.</string>
   <!--collection management-->
+  <string name="create_calendar_time_zone">Fuso orario:</string>
+  <string name="create_calendar_type_only_events">Calendario (solo eventi)</string>
+  <string name="create_calendar_type_only_tasks">Elenco attività (solo attività)</string>
+  <string name="delete_collection_confirm_title">Sei sicuro?</string>
   <!--ExceptionInfoFragment-->
   <string name="exception">Si è verificato un errore.</string>
   <string name="exception_httpexception">Si è verificato un errore HTTP.</string>
   <string name="exception_ioexception">Si è verificato un errore di I/O.</string>
   <string name="exception_show_details">Mostra dettagli</string>
   <!--sync errors and DebugInfoActivity-->
+  <string name="sync_error_permissions">Permessi DAVdroid</string>
 </resources>
diff --git a/dav4android b/dav4android
index 0edfc6a7..7893c474 160000
--- a/dav4android
+++ b/dav4android
@@ -1 +1 @@
-Subproject commit 0edfc6a74c2d48c051d4ffcd7d41272f6a83020e
+Subproject commit 7893c474152290fed83db6f907ed911513d54850
diff --git a/vcard4android b/vcard4android
index 1f72dbbe..c75322ea 160000
--- a/vcard4android
+++ b/vcard4android
@@ -1 +1 @@
-Subproject commit 1f72dbbea94fb5a6e0a55530266f8b5331793022
+Subproject commit c75322ea59d8d6b204418f27e19f6604e6a4ac59