Fetch translations from Transifex

* service DB: split readOnly into privWriteContent and privUnbind
* collections: use privWriteContent (DAV:write-content privilege) for read-only detection
* AccountActivity: allow collection deletion only when privUnbind (DAV:unbind privilege) is set

app/build.gradle

@@ -12,18 +12,18 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'org.jetbrains.dokka-android'
 
 ext {
-    baseVersionName = '2.0'
+    baseVersionName = '2.0.3'
 }
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '28.0.1'
+    buildToolsVersion '28.0.2'
 
     defaultConfig {
         applicationId "at.bitfire.davdroid"
         resValue "string", "packageID", applicationId
 
-        versionCode 241
+        versionCode 244
         buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"
 
         minSdkVersion 19        // Android 4.4

app/src/androidTest/java/at/bitfire/davdroid/model/CollectionInfoTest.kt

@@ -61,7 +61,8 @@ class CollectionInfoTest {
             info = CollectionInfo(response)
         }
         assertEquals(CollectionInfo.Type.ADDRESS_BOOK, info?.type)
-        assertFalse(info!!.readOnly)
+        assertTrue(info!!.privWriteContent)
+        assertTrue(info!!.privUnbind)
         assertEquals("My Contacts", info?.displayName)
         assertEquals("My Contacts Description", info?.description)
 
@@ -87,7 +88,8 @@ class CollectionInfoTest {
             info = CollectionInfo(response)
         }
         assertEquals(CollectionInfo.Type.CALENDAR, info?.type)
-        assertTrue(info!!.readOnly)
+        assertFalse(info!!.privWriteContent)
+        assertFalse(info!!.privUnbind)
         assertNull(info?.displayName)
         assertEquals("My Calendar", info?.description)
         assertEquals(0xFFFF0000.toInt(), info?.color)
@@ -103,7 +105,8 @@ class CollectionInfoTest {
         values.put(Collections.SERVICE_ID, 1)
         values.put(Collections.TYPE, CollectionInfo.Type.CALENDAR.name)
         values.put(Collections.URL, "http://example.com")
-        values.put(Collections.READ_ONLY, 1)
+        values.put(Collections.PRIV_WRITE_CONTENT, 0)
+        values.put(Collections.PRIV_UNBIND, 0)
         values.put(Collections.DISPLAY_NAME, "display name")
         values.put(Collections.DESCRIPTION, "description")
         values.put(Collections.COLOR, 0xFFFF0000)
@@ -117,7 +120,8 @@ class CollectionInfoTest {
         assertEquals(1.toLong(), info.id)
         assertEquals(1.toLong(), info.serviceID)
         assertEquals(HttpUrl.parse("http://example.com/"), info.url)
-        assertTrue(info.readOnly)
+        assertFalse(info.privWriteContent)
+        assertFalse(info.privUnbind)
         assertEquals("display name", info.displayName)
         assertEquals("description", info.description)
         assertEquals(0xFFFF0000.toInt(), info.color)

app/src/davdroid/res/values-ca/strings.xml

@@ -6,7 +6,7 @@
   <string name="address_books_authority_title">Llibreta d’adreces</string>
   <string name="help">Ajuda</string>
   <string name="manage_accounts">Gestiona comptes</string>
-  <string name="please_wait">Esperi si us plau...</string>
+  <string name="please_wait">Esperi si us plau…</string>
   <string name="send">Enviar</string>
   <string name="notification_channel_debugging">Depurador</string>
   <string name="notification_channel_general">Altres missatges importants</string>

app/src/davdroid/res/values-cs/strings.xml

@@ -4,7 +4,7 @@
   <string name="app_name">DAVdroid</string>
   <string name="help">Pomoc</string>
   <string name="manage_accounts">Spravovat účty</string>
-  <string name="please_wait">Chvíli strpení ...</string>
+  <string name="please_wait">Chvíli strpení …</string>
   <string name="send">Odeslat</string>
   <!--startup dialogs-->
   <string name="startup_battery_optimization_disable">Vypnout pro DAVdroid</string>
@@ -101,7 +101,7 @@
   <string name="login_account_name_required">Vyžadováno jméno účtu</string>
   <string name="login_account_not_created">Účet nelze vytvořit</string>
   <string name="login_configuration_detection">Vyhledání konfigurace</string>
-  <string name="login_querying_server">Chvíli strpení, probíhá dotazování serveru...</string>
+  <string name="login_querying_server">Chvíli strpení, probíhá dotazování serveru…</string>
   <string name="login_no_caldav_carddav">Nelze nalézt službu CalDAV nebo CardDAV.</string>
   <!--AccountSettingsActivity-->
   <string name="settings_title">Nastavení: %s</string>

app/src/davdroid/res/values-da/strings.xml

@@ -6,7 +6,7 @@
   <string name="address_books_authority_title">Adressebøger</string>
   <string name="help">Hjælp</string>
   <string name="manage_accounts">Administrere konti</string>
-  <string name="please_wait">Vent...</string>
+  <string name="please_wait">Vent…</string>
   <string name="send">Send</string>
   <string name="notification_channel_debugging">Fejlsøgning</string>
   <string name="notification_channel_general">Andre vigtige beskeder</string>
@@ -128,7 +128,7 @@
   <string name="login_account_name_required">Kontonavn påkrævet</string>
   <string name="login_account_not_created">Konto kunne ikke oprettes</string>
   <string name="login_configuration_detection">Check konfiguration</string>
-  <string name="login_querying_server">Vent, forespørger serveren...</string>
+  <string name="login_querying_server">Vent, forespørger serveren…</string>
   <string name="login_no_caldav_carddav">Kunne ikke finde CalDAV- eller CardDAV-tjeneste.</string>
   <!--AccountSettingsActivity-->
   <string name="settings_title">Indstillinger: %s</string>

app/src/davdroid/res/values-es/strings.xml

@@ -6,7 +6,7 @@
   <string name="address_books_authority_title">Agendas</string>
   <string name="help">Ayuda</string>
   <string name="manage_accounts">Administrar cuentas</string>
-  <string name="please_wait">Por favor, espere...</string>
+  <string name="please_wait">Por favor, espere…</string>
   <string name="send">Enviar</string>
   <string name="notification_channel_debugging">Depuración</string>
   <string name="notification_channel_general">Otros mensajes importantes</string>
@@ -82,7 +82,7 @@
   <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>
+  <string name="account_synchronizing_now">Sincronizando…</string>
   <string name="account_settings">Ajustes de cuenta</string>
   <string name="account_rename">Renombrar cuenta</string>
   <string name="account_rename_new_name">Información local no guardada puede ser desechada. Se requiere resincronizar después de renombrar. Nuevo nombre de cuenta:</string>
@@ -128,7 +128,7 @@
   <string name="login_account_name_required">Nombre de cuenta requerido</string>
   <string name="login_account_not_created">La cuenta no pudo ser creada</string>
   <string name="login_configuration_detection">Detectar configuración</string>
-  <string name="login_querying_server">Por favor espera, consultando al servidor...</string>
+  <string name="login_querying_server">Por favor espera, consultando al servidor…</string>
   <string name="login_no_caldav_carddav">No se pudo encontrar el servicio CalDAV o CardDAV.</string>
   <!--AccountSettingsActivity-->
   <string name="settings_title">Ajustes: %s</string>

app/src/davdroid/res/values-fr/strings.xml

@@ -6,7 +6,7 @@
   <string name="address_books_authority_title">Carnets d\'adresses</string>
   <string name="help">Aide</string>
   <string name="manage_accounts">Gestion des comptes</string>
-  <string name="please_wait">patientez ...</string>
+  <string name="please_wait">patientez …</string>
   <string name="send">Envoyer</string>
   <!--startup dialogs-->
   <string name="startup_battery_optimization_disable">Désactiver pour DAVdroid</string>
@@ -113,7 +113,7 @@
   <string name="login_account_name_required">Nom du compte requis</string>
   <string name="login_account_not_created">Le compte n\'a pas pu être créé</string>
   <string name="login_configuration_detection">Détection de la configuration</string>
-  <string name="login_querying_server">Veuillez patienter, nous interrogeons le serveur ...</string>
+  <string name="login_querying_server">Veuillez patienter, nous interrogeons le serveur …</string>
   <string name="login_no_caldav_carddav">Aucun accès possible au service CalDAV ou CardDAV.</string>
   <!--AccountSettingsActivity-->
   <string name="settings_title">Paramètres: %s</string>

app/src/davdroid/res/values-hu/strings.xml

@@ -6,7 +6,7 @@
   <string name="address_books_authority_title">Címjegyzékek</string>
   <string name="help">Súgó</string>
   <string name="manage_accounts">Fiókok kezelése</string>
-  <string name="please_wait">Kérjük, várjon ...</string>
+  <string name="please_wait">Kérjük, várjon …</string>
   <string name="send">Küldés</string>
   <string name="notification_channel_debugging">Hibakeresés</string>
   <string name="notification_channel_general">Egyéb fontos üzenetek</string>
@@ -15,8 +15,13 @@
   <string name="notification_channel_sync_io_errors">Hálózati és I/O hibák</string>
   <string name="notification_channel_sync_status">Státuszüzenetek</string>
   <!--startup dialogs-->
+  <string name="startup_autostart_permission">Automatikus szinkronizálás</string>
+  <string name="startup_autostart_permission_message">A(z) %s gyári szoftvere gyakran blokkolja az automatikus szinkronizálást. Ebben az esetben engedélyezze a szinkronizálást az Android beállítások között.</string>
+  <string name="startup_battery_optimization">Időzített szinkronizálás</string>
+  <string name="startup_battery_optimization_message">Az eszköz korlátozni fogja a DAVdroid szinkronizálást.  A szokásos DAVadroid szinkronizációs ciklus biztosítása érdekében vonja ki a DAVdroid-ot az „akkumulátorfigyelés” alól.</string>
   <string name="startup_battery_optimization_disable">Kikapcsolás a DAVdroid kapcsán</string>
   <string name="startup_dont_show_again">Ne jelenjen meg többet</string>
+  <string name="startup_not_now">Ne most</string>
   <string name="startup_donate">A forrás nyíltságával kapcsolatos információk</string>
   <string name="startup_donate_message">Örülünk, hogy használja a DAVdroidot.  A DAVdroid nyílt forráskódú (GPLv3) szoftver, de a fejlesztése kemény munkát jelent, már eddig több ezer munkaórát emésztett fel, ezért kérjük, fontolja meg, hogy támogassa munkánkat.</string>
   <string name="startup_donate_now">Támogatás küldése</string>
@@ -29,6 +34,10 @@
   <string name="startup_opentasks_reinstall_davdroid">Az OpenTasks telepítését követően újra kell telepíteni a DAVdroit alkalmazást és újra fel kell venni a fiókokat (Android hiba).</string>
   <string name="startup_opentasks_not_installed_install">Az OpenTasks telepítése</string>
   <!--AboutActivity-->
+  <string name="about_libraries">Könyvtárak</string>
+  <string name="about_version">Verziószám:%1s (%2d)</string>
+  <string name="about_build_date">Fordítás ideje: %s</string>
+  <string name="about_flavor_info">Ennek a verziónak a terjesztése csak a Play Áruházon keresztül engedélyezett.</string>
   <string name="about_license_info_no_warranty">Ehhez a program SEMMIFÉLE GARANCIA NEM JÁR.   Ez a program szabad szoftver, ami a bizonyos feltételek mellett szabadon terjeszthető.</string>
   <!--global settings-->
   <string name="logging_davdroid_file_logging">DAVdroid fájlalapú naplózás</string>
@@ -90,6 +99,7 @@
   <string name="account_delete">Fiók törlése</string>
   <string name="account_delete_confirmation_title">Valóban törölni akarja a fiókot?</string>
   <string name="account_delete_confirmation_text">Az összes címjegyzék, naptár és feladatlista helyi példányai törölve lesznek.</string>
+  <string name="account_select_collections_hint">Válassza ki a szinkronizálandó gyűjteményeket</string>
   <string name="account_carddav">CardDAV</string>
   <string name="account_caldav">CalDAV</string>
   <string name="account_webcal">Webcal</string>
@@ -128,8 +138,9 @@
   <string name="login_account_name_required">A fióknév megadása feltétlenül szükséges</string>
   <string name="login_account_not_created">A fiók létrehozása nem sikerült</string>
   <string name="login_configuration_detection">A konfiguráció felderítése</string>
-  <string name="login_querying_server">Kérjük, várjon, a szerver lekérdezése...</string>
+  <string name="login_querying_server">Kérjük, várjon, a szerver lekérdezése…</string>
   <string name="login_no_caldav_carddav">Nem található CalDAV vagy CardDAV szolgáltatás.</string>
+  <string name="login_view_logs">Részletek mutatása</string>
   <!--AccountSettingsActivity-->
   <string name="settings_title">Beállítások: %s</string>
   <string name="settings_authentication">Authentikáció</string>
@@ -210,6 +221,9 @@
   <string name="delete_collection_confirm_warning">A gyűjtemény (%s) és a hozzá tartozó adatok törölve lesznek a szerverről.</string>
   <string name="delete_collection_deleting_collection">Gyűjtemény törlése</string>
   <string name="collection_force_read_only">Csak olvashatóvá tétel</string>
+  <string name="collection_properties">Tulajdonságok</string>
+  <string name="collection_properties_url">Cím (URL):</string>
+  <string name="collection_properties_copy_url">URL másolása</string>
   <!--ExceptionInfoFragment-->
   <string name="exception">Hiba történt.</string>
   <string name="exception_httpexception">HTTP hiba történt.</string>

app/src/davdroid/res/values-it/strings.xml

@@ -124,7 +124,7 @@
   <string name="login_account_name_required">Richiesto il nome dell\'account</string>
   <string name="login_account_not_created">L\'account non può essere creato</string>
   <string name="login_configuration_detection">Rilevazione configurazione</string>
-  <string name="login_querying_server">Attendere, invio richiesta al server...</string>
+  <string name="login_querying_server">Attendere, invio richiesta al server…</string>
   <string name="login_no_caldav_carddav">Impossibile trovare servizi CalDAV o CardDAV.</string>
   <!--AccountSettingsActivity-->
   <string name="settings_title">Impostazioni: %s</string>

app/src/davdroid/res/values-ja/strings.xml

@@ -4,7 +4,6 @@
   <string name="app_name">DAVdroid</string>
   <string name="account_title_address_book">DAVdroid アドレス帳</string>
   <string name="address_books_authority_title">アドレス帳</string>
-  <string name="copied_to_clipboard">クリップボードにコピーしました</string>
   <string name="help">ヘルプ</string>
   <string name="manage_accounts">アカウントの管理</string>
   <string name="please_wait">しばらくお待ちください …</string>

app/src/davdroid/res/values-nl/strings.xml

@@ -6,7 +6,7 @@
   <string name="address_books_authority_title">Adresboeken</string>
   <string name="help">Help</string>
   <string name="manage_accounts">Beheer accounts</string>
-  <string name="please_wait">Een moment geduld...</string>
+  <string name="please_wait">Een moment geduld…</string>
   <string name="send">Verzenden</string>
   <!--startup dialogs-->
   <string name="startup_battery_optimization_disable">DAVdroid afsluiten</string>
@@ -73,7 +73,7 @@
   <string name="app_settings_show_debug_info_details">Bekijk/deel software configuratie details</string>
   <!--AccountActivity-->
   <string name="account_synchronize_now">Synchroniseer nu</string>
-  <string name="account_synchronizing_now">Aan het synchronizeren...</string>
+  <string name="account_synchronizing_now">Aan het synchronizeren…</string>
   <string name="account_settings">Account instellingen</string>
   <string name="account_rename">Account hernoemen</string>
   <string name="account_rename_new_name">Niet opgeslagen lokale informatie mag verloren gaan. Synchronisatie is noodzakelijk na hernoemen. Nieuw account naam:</string>
@@ -112,7 +112,7 @@
   <string name="login_account_name_required">Accountnaam vereist</string>
   <string name="login_account_not_created">Account kon niet gemaakt worden.</string>
   <string name="login_configuration_detection">Configuratie detectie</string>
-  <string name="login_querying_server">Even geduld, verzoek naar server...</string>
+  <string name="login_querying_server">Even geduld, verzoek naar server…</string>
   <string name="login_no_caldav_carddav">Kon geen CalDAV of CardDAV service vinden.</string>
   <!--AccountSettingsActivity-->
   <string name="settings_title">Instellingen: %s</string>

app/src/davdroid/res/values-pl/strings.xml

@@ -121,7 +121,7 @@
   <string name="login_account_name_required">Wymagana nazwa konta</string>
   <string name="login_account_not_created">Konto nie mogło zostać stworzone</string>
   <string name="login_configuration_detection">Wykrywanie konfiguracji</string>
-  <string name="login_querying_server">Proszę czekać, odpytywanie serwera...</string>
+  <string name="login_querying_server">Proszę czekać, odpytywanie serwera…</string>
   <string name="login_no_caldav_carddav">Nie można znaleźć usługi CalDAV lub CardDAV.</string>
   <!--AccountSettingsActivity-->
   <string name="settings_title">Ustawienia: %s</string>

app/src/davdroid/res/values-pt-rBR/strings.xml

@@ -4,10 +4,9 @@
   <string name="app_name">DAVdroid</string>
   <string name="account_title_address_book">Livro de endereços DAVdroid</string>
   <string name="address_books_authority_title">Livros de endereços</string>
-  <string name="copied_to_clipboard">Copiado para a área de transferência</string>
   <string name="help">Ajuda</string>
   <string name="manage_accounts">Gerenciar contas</string>
-  <string name="please_wait">Por favor, aguarde...</string>
+  <string name="please_wait">Por favor, aguarde…</string>
   <string name="send">Enviar</string>
   <string name="notification_channel_debugging">Depuração</string>
   <string name="notification_channel_general">Outras mensagens importantes</string>
@@ -139,7 +138,7 @@
   <string name="login_account_name_required">É necessário um nome de conta</string>
   <string name="login_account_not_created">A conta não pôde ser criada</string>
   <string name="login_configuration_detection">Detecção de configuração</string>
-  <string name="login_querying_server">Aguarde, procurando servidor...</string>
+  <string name="login_querying_server">Aguarde, procurando servidor…</string>
   <string name="login_no_caldav_carddav">Não foi possível encontrar o serviço CalDAV ou CardDAV.</string>
   <string name="login_view_logs">Mostrar detalhes</string>
   <!--AccountSettingsActivity-->

app/src/davdroid/res/values-ru/strings.xml

@@ -4,7 +4,6 @@
   <string name="app_name">DAVdroid</string>
   <string name="account_title_address_book">Адресная книга DAVdroid</string>
   <string name="address_books_authority_title">Адресные книги</string>
-  <string name="copied_to_clipboard">Скопировано в буфер обмена</string>
   <string name="help">Помощь</string>
   <string name="manage_accounts">Управление аккаунтами</string>
   <string name="please_wait">Пожалуйста, подождите …</string>
@@ -25,7 +24,7 @@
   <string name="startup_not_now">Не сейчас</string>
   <string name="startup_donate">Open-Source информация</string>
   <string name="startup_donate_message">Мы рады, что вы используете DAVdroid, который является программным обеспечением с открытым исходным кодом (GPLv3). Поскольку разработка DAVdroid - тяжелая работа и заняла у нас нас очень много времени, пожалуйста, рассмотрите возможность поддержать проект.</string>
-  <string name="startup_donate_now">Показать страницу пожертвования</string>
+  <string name="startup_donate_now">Показать страницу пожертвований</string>
   <string name="startup_donate_later">Возможно, позже</string>
   <string name="startup_google_play_accounts_removed">Информация об ошибке в Play Store DRM</string>
   <string name="startup_google_play_accounts_removed_message">При определенных условиях Play Store DRM может стать причиной потери всех DAVdroid аккаунтов после перезагрузки устройства или после обновления DAVdroid. Если Вы столкнулись с этой проблемой (и только в этом случае), установите \"DAVdroid JB Workaround\" из Play Store.</string>
@@ -89,7 +88,7 @@
   <string name="app_settings_log_to_external_storage_on">Сохранение логов во внешнем хранилище (если доступно)</string>
   <string name="app_settings_log_to_external_storage_off">Сохранение логов во внешний файл отключено</string>
   <string name="app_settings_show_debug_info">Показать отладочную информацию</string>
-  <string name="app_settings_show_debug_info_details">Просмотреть/поделиться программой и настройками</string>
+  <string name="app_settings_show_debug_info_details">Просмотреть/поделиться сведениями о ПО и конфигурации</string>
   <!--AccountActivity-->
   <string name="account_synchronize_now">Синхронизировать</string>
   <string name="account_synchronizing_now">Синхронизация</string>

app/src/davdroid/res/values-tr-rTR/strings.xml

@@ -4,7 +4,7 @@
   <string name="app_name">DAVdroid</string>
   <string name="help">Yardım</string>
   <string name="manage_accounts">Hesapları yönet</string>
-  <string name="please_wait">Lütfen bekle ...</string>
+  <string name="please_wait">Lütfen bekle …</string>
   <string name="send">Gönder</string>
   <!--startup dialogs-->
   <string name="startup_dont_show_again">Bir daha gösterme</string>
@@ -84,7 +84,7 @@
   <string name="login_account_name_required">Hesap adı zorunludur</string>
   <string name="login_account_not_created">Hesap yaratılamadı</string>
   <string name="login_configuration_detection">Konfigürasyon keşfi</string>
-  <string name="login_querying_server">Lütfen bekle, sunucu sorgulanıyor...</string>
+  <string name="login_querying_server">Lütfen bekle, sunucu sorgulanıyor…</string>
   <string name="login_no_caldav_carddav">CalDAV veya CardDAV servisi bulunamadı.</string>
   <!--AccountSettingsActivity-->
   <string name="settings_title">Ayarlar: %s</string>

app/src/davdroid/res/values-uk/strings.xml

@@ -6,7 +6,7 @@
   <string name="address_books_authority_title">Адресні книги</string>
   <string name="help">Допомога</string>
   <string name="manage_accounts">Керування обліковими записами</string>
-  <string name="please_wait">Будь ласка, зачекайте...</string>
+  <string name="please_wait">Будь ласка, зачекайте…</string>
   <string name="send">Відправити</string>
   <string name="notification_channel_debugging">Зневадження</string>
   <string name="notification_channel_general">Інші важливі повідомлення</string>
@@ -128,7 +128,7 @@
   <string name="login_account_name_required">Потребує назви облікового запису</string>
   <string name="login_account_not_created">Обліковий запис не може бути створений</string>
   <string name="login_configuration_detection">Виявлення конфігурації</string>
-  <string name="login_querying_server">Будь ласка, зачекайте, запит до серверу...</string>
+  <string name="login_querying_server">Будь ласка, зачекайте, запит до серверу…</string>
   <string name="login_no_caldav_carddav">Не вдалося знайти  CalDAV чи CardDAV сервіс.</string>
   <!--AccountSettingsActivity-->
   <string name="settings_title">Налаштування: %s</string>

app/src/davdroid/res/values-zh-rCN/strings.xml

@@ -6,22 +6,38 @@
   <string name="address_books_authority_title">通讯录</string>
   <string name="help">帮助</string>
   <string name="manage_accounts">管理账户</string>
-  <string name="please_wait">请稍等...</string>
+  <string name="please_wait">请稍等…</string>
   <string name="send">发送</string>
   <string name="notification_channel_debugging">调试</string>
+  <string name="notification_channel_general">其它重要消息</string>
+  <string name="notification_channel_sync">同步</string>
+  <string name="notification_channel_sync_errors">同步错误</string>
+  <string name="notification_channel_sync_io_errors">网络或 I/O 错误</string>
+  <string name="notification_channel_sync_status">状态消息</string>
   <!--startup dialogs-->
+  <string name="startup_autostart_permission">自动同步</string>
+  <string name="startup_autostart_permission_message">%s 的系统通常会禁止自动同步。在 Android 的系统设置中手工打开自动同步即可恢复。</string>
+  <string name="startup_battery_optimization">定时同步</string>
+  <string name="startup_battery_optimization_message">你的设备会限制 DAVdroid 的同步频率，如需恢复正常同步频率，请关闭电池优化设置。</string>
   <string name="startup_battery_optimization_disable">禁用电池优化</string>
   <string name="startup_dont_show_again">不再显示</string>
+  <string name="startup_not_now">暂不</string>
   <string name="startup_donate">开源信息</string>
   <string name="startup_donate_message">欢迎使用 DAVdroid，这是一款开源软件 (GPLv3)。开发 DAVdroid 的工作花费了数千小时，请您考虑捐助我们。</string>
   <string name="startup_donate_now">显示捐助页面</string>
   <string name="startup_donate_later">稍后提示</string>
   <string name="startup_google_play_accounts_removed">Play 商店 DRM 问题提醒</string>
   <string name="startup_google_play_accounts_removed_message">在某些情况下，Play 商店的 DRM 可能会导致所有 DAVdroid 账户在设备重启或升级 DAVdroid 后消失。如果你遇到了该问题，请从 Play 商店安装“DAVdroid JB Workaround”，否则请不要安装修复程序。</string>
+  <string name="startup_more_info">更多信息</string>
   <string name="startup_opentasks_not_installed">OpenTasks 未安装</string>
+  <string name="startup_opentasks_not_installed_message">同步任务需安装 OpenTasks 免费应用。（如只需同步通讯录、事件，则不用安装）</string>
   <string name="startup_opentasks_reinstall_davdroid">安装 OpenTasks 后，由于 Android 的限制，请重新安装 DAVdroid 并重新创建账户。</string>
   <string name="startup_opentasks_not_installed_install">安装 OpenTasks</string>
   <!--AboutActivity-->
+  <string name="about_libraries">程序库</string>
+  <string name="about_version">版本 %1s (%2d)</string>
+  <string name="about_build_date">编译于 %s</string>
+  <string name="about_flavor_info">此版本只允许在 Google Play 上发行。</string>
   <string name="about_license_info_no_warranty">本程序不附带任何担保。这是一款自由软件，你可以有条件地传播它。</string>
   <!--global settings-->
   <string name="logging_davdroid_file_logging">DAVdroid 文件日志</string>
@@ -83,6 +99,7 @@
   <string name="account_delete">删除账户</string>
   <string name="account_delete_confirmation_title">真的要删除账户吗？</string>
   <string name="account_delete_confirmation_text">所有通讯录、日历和任务列表的本机存储将被删除。</string>
+  <string name="account_select_collections_hint">选择需要同步的集合</string>
   <string name="account_carddav">CardDAV</string>
   <string name="account_caldav">CalDAV</string>
   <string name="account_webcal">Webcal</string>
@@ -121,8 +138,9 @@
   <string name="login_account_name_required">请输入账户名</string>
   <string name="login_account_not_created">账户无法创建</string>
   <string name="login_configuration_detection">正在配置</string>
-  <string name="login_querying_server">正在与服务器通信，请稍等...</string>
+  <string name="login_querying_server">正在与服务器通信，请稍等…</string>
   <string name="login_no_caldav_carddav">找不到 CalDAV 或 CardDAV 服务。</string>
+  <string name="login_view_logs">显示详情</string>
   <!--AccountSettingsActivity-->
   <string name="settings_title">设置：%s</string>
   <string name="settings_authentication">认证</string>
@@ -202,6 +220,9 @@
   <string name="delete_collection_confirm_warning">这个集合 %s 及其所有数据将会从服务器删除。</string>
   <string name="delete_collection_deleting_collection">正在删除集合</string>
   <string name="collection_force_read_only">强制只读</string>
+  <string name="collection_properties">属性</string>
+  <string name="collection_properties_url">地址 (URL):</string>
+  <string name="collection_properties_copy_url">复制 URL</string>
   <!--ExceptionInfoFragment-->
   <string name="exception">出现错误</string>
   <string name="exception_httpexception">出现 HTTP 错误</string>
@@ -217,6 +238,12 @@
   <string name="sync_error_permissions_text">需要额外权限</string>
   <string name="sync_error_opentasks_too_old">OpenTasks 版本太旧</string>
   <string name="sync_error_opentasks_required_version">最低版本 %1$s （当前 %2$s）</string>
+  <string name="sync_error_authentication_failed">认证失败（请检查登录凭据，如用户名密码）</string>
+  <string name="sync_error_io">网络或 I/O 错误 – %s</string>
+  <string name="sync_error_http_dav">HTTP 服务器错误 – %s</string>
+  <string name="sync_error_local_storage">本地存储错误 – %s</string>
+  <string name="sync_error_retry">重试</string>
+  <string name="sync_error_view_item">显示项目</string>
   <!--cert4android-->
   <string name="certificate_notification_connection_security">DAVdroid: 连接安全性</string>
   <string name="trust_certificate_unknown_certificate_found">DAVdroid 遇到了未知证书。你是否要信任该证书？</string>

app/src/davdroid/res/values-zh-rTW/strings.xml

@@ -6,7 +6,7 @@
   <string name="address_books_authority_title">通訊錄</string>
   <string name="help">幫助</string>
   <string name="manage_accounts">管理帳號</string>
-  <string name="please_wait">請稍待 ...</string>
+  <string name="please_wait">請稍待 …</string>
   <string name="send">送出</string>
   <!--startup dialogs-->
   <string name="startup_battery_optimization_disable">關閉 DAVdroid 的電池最佳化</string>
@@ -104,7 +104,7 @@
   <string name="login_account_name_required">需要帳號名稱</string>
   <string name="login_account_not_created">無法建立帳號</string>
   <string name="login_configuration_detection">設定錯誤</string>
-  <string name="login_querying_server">請稍待，正在詢問伺服器...</string>
+  <string name="login_querying_server">請稍待，正在詢問伺服器…</string>
   <string name="login_no_caldav_carddav">找不到 CalDAV 或 CardDAV 服務。</string>
   <!--AccountSettingsActivity-->
   <string name="settings_title">設定: %s</string>

app/src/main/assets/gplv3.html

@@ -0,0 +1,628 @@
+<h3 style="text-align: center;">GNU GENERAL PUBLIC LICENSE</h3>
+<p style="text-align: center;">Version 3, 29 June 2007</p>
+
+<p>Copyright &copy; 2007 Free Software Foundation, Inc.
+&lt;<a href="http://fsf.org/">http://fsf.org/</a>&gt;</p><p>
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.</p>
+
+<h3><a name="preamble"></a>Preamble</h3>
+
+<p>The GNU General Public License is a free, copyleft license for
+software and other kinds of works.</p>
+
+<p>The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.</p>
+
+<p>When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.</p>
+
+<p>To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.</p>
+
+<p>For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.</p>
+
+<p>Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.</p>
+
+<p>For the developers\' and authors\' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users\' and
+authors\' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.</p>
+
+<p>Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users\' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.</p>
+
+<p>Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.</p>
+
+<p>The precise terms and conditions for copying, distribution and
+modification follow.</p>
+
+<h3><a name="terms"></a>TERMS AND CONDITIONS</h3>
+
+<h4><a name="section0"></a>0. Definitions.</h4>
+
+<p>&ldquo;This License&rdquo; refers to version 3 of the GNU General Public License.</p>
+
+<p>&ldquo;Copyright&rdquo; also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.</p>
+
+<p>&ldquo;The Program&rdquo; refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as &ldquo;you&rdquo;.  &ldquo;Licensees&rdquo; and
+&ldquo;recipients&rdquo; may be individuals or organizations.</p>
+
+<p>To &ldquo;modify&rdquo; a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a &ldquo;modified version&rdquo; of the
+earlier work or a work &ldquo;based on&rdquo; the earlier work.</p>
+
+<p>A &ldquo;covered work&rdquo; means either the unmodified Program or a work based
+on the Program.</p>
+
+<p>To &ldquo;propagate&rdquo; a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.</p>
+
+<p>To &ldquo;convey&rdquo; a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.</p>
+
+<p>An interactive user interface displays &ldquo;Appropriate Legal Notices&rdquo;
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.</p>
+
+<h4><a name="section1"></a>1. Source Code.</h4>
+
+<p>The &ldquo;source code&rdquo; for a work means the preferred form of the work
+for making modifications to it.  &ldquo;Object code&rdquo; means any non-source
+form of a work.</p>
+
+<p>A &ldquo;Standard Interface&rdquo; means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.</p>
+
+<p>The &ldquo;System Libraries&rdquo; of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+&ldquo;Major Component&rdquo;, in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.</p>
+
+<p>The &ldquo;Corresponding Source&rdquo; for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work\'s
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.</p>
+
+<p>The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.</p>
+
+<p>The Corresponding Source for a work in source code form is that
+same work.</p>
+
+<h4><a name="section2"></a>2. Basic Permissions.</h4>
+
+<p>All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.</p>
+
+<p>You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.</p>
+
+<p>Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.</p>
+
+<h4><a name="section3"></a>3. Protecting Users\' Legal Rights From Anti-Circumvention Law.</h4>
+
+<p>No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.</p>
+
+<p>When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work\'s
+users, your or third parties\' legal rights to forbid circumvention of
+technological measures.</p>
+
+<h4><a name="section4"></a>4. Conveying Verbatim Copies.</h4>
+
+<p>You may convey verbatim copies of the Program\'s source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.</p>
+
+<p>You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.</p>
+
+<h4><a name="section5"></a>5. Conveying Modified Source Versions.</h4>
+
+<p>You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:</p>
+
+<ul>
+<li>a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.</li>
+
+<li>b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    &ldquo;keep intact all notices&rdquo;.</li>
+
+<li>c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.</li>
+
+<li>d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.</li>
+</ul>
+
+<p>A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+&ldquo;aggregate&rdquo; if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation\'s users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.</p>
+
+<h4><a name="section6"></a>6. Conveying Non-Source Forms.</h4>
+
+<p>You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:</p>
+
+<ul>
+<li>a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.</li>
+
+<li>b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.</li>
+
+<li>c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.</li>
+
+<li>d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.</li>
+
+<li>e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.</li>
+</ul>
+
+<p>A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.</p>
+
+<p>A &ldquo;User Product&rdquo; is either (1) a &ldquo;consumer product&rdquo;, which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, &ldquo;normally used&rdquo; refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.</p>
+
+<p>&ldquo;Installation Information&rdquo; for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.</p>
+
+<p>If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).</p>
+
+<p>The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.</p>
+
+<p>Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.</p>
+
+<h4><a name="section7"></a>7. Additional Terms.</h4>
+
+<p>&ldquo;Additional permissions&rdquo; are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.</p>
+
+<p>When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.</p>
+
+<p>Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:</p>
+
+<ul>
+<li>a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or</li>
+
+<li>b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or</li>
+
+<li>c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or</li>
+
+<li>d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or</li>
+
+<li>e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or</li>
+
+<li>f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.</li>
+</ul>
+
+<p>All other non-permissive additional terms are considered &ldquo;further
+restrictions&rdquo; within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.</p>
+
+<p>If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.</p>
+
+<p>Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.</p>
+
+<h4><a name="section8"></a>8. Termination.</h4>
+
+<p>You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).</p>
+
+<p>However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.</p>
+
+<p>Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.</p>
+
+<p>Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.</p>
+
+<h4><a name="section9"></a>9. Acceptance Not Required for Having Copies.</h4>
+
+<p>You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.</p>
+
+<h4><a name="section10"></a>10. Automatic Licensing of Downstream Recipients.</h4>
+
+<p>Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.</p>
+
+<p>An &ldquo;entity transaction&rdquo; is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party\'s predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.</p>
+
+<p>You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.</p>
+
+<h4><a name="section11"></a>11. Patents.</h4>
+
+<p>A &ldquo;contributor&rdquo; is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor\'s &ldquo;contributor version&rdquo;.</p>
+
+<p>A contributor\'s &ldquo;essential patent claims&rdquo; are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, &ldquo;control&rdquo; includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.</p>
+
+<p>Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor\'s essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.</p>
+
+<p>In the following three paragraphs, a &ldquo;patent license&rdquo; is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To &ldquo;grant&rdquo; such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.</p>
+
+<p>If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  &ldquo;Knowingly relying&rdquo; means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient\'s use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.</p>
+
+<p>If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.</p>
+
+<p>A patent license is &ldquo;discriminatory&rdquo; if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.</p>
+
+<p>Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.</p>
+
+<h4><a name="section12"></a>12. No Surrender of Others\' Freedom.</h4>
+
+<p>If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.</p>
+
+<h4><a name="section13"></a>13. Use with the GNU Affero General Public License.</h4>
+
+<p>Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.</p>
+
+<h4><a name="section14"></a>14. Revised Versions of this License.</h4>
+
+<p>The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.</p>
+
+<p>Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License &ldquo;or any later version&rdquo; applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.</p>
+
+<p>If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy\'s
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.</p>
+
+<p>Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.</p>
+
+<h4><a name="section15"></a>15. Disclaimer of Warranty.</h4>
+
+<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &ldquo;AS IS&rdquo; WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p>
+
+<h4><a name="section16"></a>16. Limitation of Liability.</h4>
+
+<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.</p>
+
+<h4><a name="section17"></a>17. Interpretation of Sections 15 and 16.</h4>
+
+<p>If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.</p>
+
+<p>END OF TERMS AND CONDITIONS</p>

app/src/main/java/at/bitfire/davdroid/DavService.kt

@@ -161,7 +161,7 @@ class DavService: Service() {
                 val collections = mutableMapOf<HttpUrl, CollectionInfo>()
                 db.query(Collections._TABLE, null, "${Collections.SERVICE_ID}=?", arrayOf(service.toString()), null, null, null)?.use { cursor ->
                     while (cursor.moveToNext()) {
-                        val values = ContentValues()
+                        val values = ContentValues(cursor.columnCount)
                         DatabaseUtils.cursorRowToContentValues(cursor, values)
                         values.getAsString(Collections.URL)?.let { url ->
                             HttpUrl.parse(url)?.let { collections.put(it, CollectionInfo(values)) }
@@ -181,8 +181,11 @@ class DavService: Service() {
 
             /**
              * Checks if the given URL defines home sets and adds them to the home set list.
+             *
+             * @throws IOException
+             * @throws HttpException
+             * @throws DavException
              */
-            @Throws(IOException::class, HttpException::class, DavException::class)
             fun queryHomeSets(client: OkHttpClient, url: HttpUrl, recurse: Boolean = true) {
                 var related = setOf<HttpUrl>()
 
@@ -219,24 +222,38 @@ class DavService: Service() {
                 val dav = DavResource(client, url)
                 when (serviceType) {
                     Services.SERVICE_CARDDAV ->
-                        dav.propfind(0, AddressbookHomeSet.NAME, GroupMembership.NAME) { response, _ ->
-                            response[AddressbookHomeSet::class.java]?.let {
-                                for (href in it.hrefs)
-                                    dav.location.resolve(href)?.let { homeSets += UrlUtils.withTrailingSlash(it) }
-                            }
+                        try {
+                            dav.propfind(0, AddressbookHomeSet.NAME, GroupMembership.NAME) { response, _ ->
+                                response[AddressbookHomeSet::class.java]?.let { homeSet ->
+                                    for (href in homeSet.hrefs)
+                                        dav.location.resolve(href)?.let { homeSets += UrlUtils.withTrailingSlash(it) }
+                                }
 
-                            if (recurse)
-                                findRelated(dav.location, response)
+                                if (recurse)
+                                    findRelated(dav.location, response)
+                            }
+                        } catch (e: HttpException) {
+                            if (e.code/100 == 4)
+                                Logger.log.log(Level.INFO, "Ignoring Client Error 4xx while looking for addressbook home sets", e)
+                            else
+                                throw e
                         }
                     Services.SERVICE_CALDAV -> {
-                        dav.propfind(0, CalendarHomeSet.NAME, CalendarProxyReadFor.NAME, CalendarProxyWriteFor.NAME, GroupMembership.NAME) { response, _ ->
-                            response[CalendarHomeSet::class.java]?.let {
-                                for (href in it.hrefs)
-                                    dav.location.resolve(href)?.let { homeSets.add(UrlUtils.withTrailingSlash(it)) }
-                            }
+                        try {
+                            dav.propfind(0, CalendarHomeSet.NAME, CalendarProxyReadFor.NAME, CalendarProxyWriteFor.NAME, GroupMembership.NAME) { response, _ ->
+                                response[CalendarHomeSet::class.java]?.let { homeSet ->
+                                    for (href in homeSet.hrefs)
+                                        dav.location.resolve(href)?.let { homeSets.add(UrlUtils.withTrailingSlash(it)) }
+                                }
 
-                            if (recurse)
-                                findRelated(dav.location, response)
+                                if (recurse)
+                                    findRelated(dav.location, response)
+                            }
+                        } catch (e: HttpException) {
+                            if (e.code/100 == 4)
+                                Logger.log.log(Level.INFO, "Ignoring Client Error 4xx while looking for calendar home sets", e)
+                            else
+                                throw e
                         }
                     }
                 }
@@ -286,7 +303,7 @@ class DavService: Service() {
                         val selectedCollections = HashSet<HttpUrl>()
                         collections.values
                                 .filter { it.selected }
-                                .forEach { (url, _) -> selectedCollections.add(url) }
+                                .forEach { (url, _) -> selectedCollections += url }
 
                         // now refresh collections (taken from home sets)
                         val itHomeSets = homeSets.iterator()
@@ -309,7 +326,7 @@ class DavService: Service() {
                                 }
                             } catch(e: HttpException) {
                                 if (e.code in arrayOf(403, 404, 410))
-                                // delete home set only if it was not accessible (40x)
+                                    // delete home set only if it was not accessible (40x)
                                     itHomeSets.remove()
                             }
                         }

app/src/main/java/at/bitfire/davdroid/model/CollectionInfo.kt

@@ -34,7 +34,8 @@ data class CollectionInfo(
 
         var type: Type? = null,
 
-        var readOnly: Boolean = false,
+        var privWriteContent: Boolean = true,
+        var privUnbind: Boolean = true,
         var forceReadOnly: Boolean = false,
         var displayName: String? = null,
         var description: String? = null,
@@ -68,7 +69,8 @@ data class CollectionInfo(
         }
 
         dav[CurrentUserPrivilegeSet::class.java]?.let { privilegeSet ->
-            readOnly = !privilegeSet.mayWriteContent
+            privWriteContent = privilegeSet.mayWriteContent
+            privUnbind = privilegeSet.mayUnbind
         }
 
         dav[DisplayName::class.java]?.let {
@@ -110,7 +112,8 @@ data class CollectionInfo(
             null
         }
 
-        readOnly = values.getAsInteger(Collections.READ_ONLY) != 0
+        privWriteContent = values.getAsInteger(Collections.PRIV_WRITE_CONTENT) != 0
+        privUnbind = values.getAsInteger(Collections.PRIV_UNBIND) != 0
         forceReadOnly = values.getAsInteger(Collections.FORCE_READ_ONLY) != 0
         displayName = values.getAsString(Collections.DISPLAY_NAME)
         description = values.getAsString(Collections.DESCRIPTION)
@@ -132,7 +135,8 @@ data class CollectionInfo(
         type?.let { values.put(Collections.TYPE, it.name) }
 
         values.put(Collections.URL, url.toString())
-        values.put(Collections.READ_ONLY, if (readOnly) 1 else 0)
+        values.put(Collections.PRIV_WRITE_CONTENT, if (privWriteContent) 1 else 0)
+        values.put(Collections.PRIV_UNBIND, if (privUnbind) 1 else 0)
         values.put(Collections.FORCE_READ_ONLY, if (forceReadOnly) 1 else 0)
         values.put(Collections.DISPLAY_NAME, displayName)
         values.put(Collections.DESCRIPTION, description)
@@ -176,7 +180,9 @@ data class CollectionInfo(
 
         dest.writeString(type?.name)
 
-        dest.writeByte(if (readOnly) 1 else 0)
+        dest.writeByte(if (privWriteContent) 1 else 0)
+        dest.writeByte(if (privUnbind) 1 else 0)
+
         dest.writeByte(if (forceReadOnly) 1 else 0)
         dest.writeString(displayName)
         dest.writeString(description)
@@ -220,6 +226,8 @@ data class CollectionInfo(
                     parcel.readString()?.let { Type.valueOf(it) },
 
                     parcel.readByte() != 0.toByte(),
+                    parcel.readByte() != 0.toByte(),
+
                     parcel.readByte() != 0.toByte(),
                     parcel.readString(),
                     parcel.readString(),

app/src/main/java/at/bitfire/davdroid/model/ServiceDB.kt

@@ -46,7 +46,8 @@ class ServiceDB {
         const val TYPE = "type"
         const val SERVICE_ID = "serviceID"
         const val URL = "url"
-        const val READ_ONLY = "readOnly"
+        const val PRIV_WRITE_CONTENT = "privWriteContent"
+        const val PRIV_UNBIND = "privUnbind"
         const val FORCE_READ_ONLY = "forceReadOnly"
         const val DISPLAY_NAME = "displayName"
         const val DESCRIPTION = "description"
@@ -75,7 +76,7 @@ class ServiceDB {
 
         companion object {
             const val DATABASE_NAME = "services.db"
-            const val DATABASE_VERSION = 4
+            const val DATABASE_VERSION = 5
         }
 
         override fun onConfigure(db: SQLiteDatabase) {
@@ -104,7 +105,8 @@ class ServiceDB {
                     "${Collections.SERVICE_ID} INTEGER NOT NULL REFERENCES ${Services._TABLE} ON DELETE CASCADE," +
                     "${Collections.TYPE} TEXT NOT NULL," +
                     "${Collections.URL} TEXT NOT NULL," +
-                    "${Collections.READ_ONLY} INTEGER DEFAULT 0 NOT NULL," +
+                    "${Collections.PRIV_WRITE_CONTENT} INTEGER DEFAULT 0 NOT NULL," +
+                    "${Collections.PRIV_UNBIND} INTEGER DEFAULT 0 NOT NULL," +
                     "${Collections.FORCE_READ_ONLY} INTEGER DEFAULT 0 NOT NULL," +
                     "${Collections.DISPLAY_NAME} TEXT NULL," +
                     "${Collections.DESCRIPTION} TEXT NULL," +
@@ -130,6 +132,17 @@ class ServiceDB {
             }
         }
 
+        @Suppress("unused")
+        private fun upgrade_4_5(db: SQLiteDatabase) {
+            db.execSQL("ALTER TABLE ${Collections._TABLE} ADD COLUMN ${Collections.PRIV_WRITE_CONTENT} INTEGER DEFAULT 0 NOT NULL")
+            db.execSQL("UPDATE ${Collections._TABLE} SET ${Collections.PRIV_WRITE_CONTENT}=NOT readOnly")
+
+            db.execSQL("ALTER TABLE ${Collections._TABLE} ADD COLUMN ${Collections.PRIV_UNBIND} INTEGER DEFAULT 0 NOT NULL")
+            db.execSQL("UPDATE ${Collections._TABLE} SET ${Collections.PRIV_UNBIND}=NOT readOnly")
+
+            // there's no DROP COLUMN in SQLite, so just keep the "readOnly" column
+        }
+
         @Suppress("unused")
         private fun upgrade_3_4(db: SQLiteDatabase) {
             db.execSQL("ALTER TABLE ${Collections._TABLE} ADD COLUMN ${Collections.FORCE_READ_ONLY} INTEGER DEFAULT 0 NOT NULL")

app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.kt

@@ -67,7 +67,7 @@ class LocalAddressBook(
             return addressBook
         }
 
-        fun findAll(context: Context, provider: ContentProviderClient, mainAccount: Account?) = AccountManager.get(context)
+        fun findAll(context: Context, provider: ContentProviderClient?, mainAccount: Account?) = AccountManager.get(context)
                 .getAccountsByType(context.getString(R.string.account_type_address_book))
                 .map { LocalAddressBook(context, it, provider) }
                 .filter { mainAccount == null || it.mainAccount == mainAccount }
@@ -191,8 +191,8 @@ class LocalAddressBook(
             account = future.result
         }
 
-        Constants.log.info("Address book read-only? = ${info.readOnly}")
-        readOnly = info.readOnly || info.forceReadOnly
+        Constants.log.info("Address book write permission? = ${info.privWriteContent}")
+        readOnly = !info.privWriteContent || info.forceReadOnly
 
         // make sure it will still be synchronized when contacts are updated
         ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true)

app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.kt

@@ -60,13 +60,12 @@ class LocalCalendar private constructor(
             if (withColor)
                 values.put(Calendars.CALENDAR_COLOR, info.color ?: Constants.DAVDROID_GREEN_RGBA)
 
-            if (info.readOnly || info.forceReadOnly)
-                values.put(Calendars.CALENDAR_ACCESS_LEVEL, Calendars.CAL_ACCESS_READ)
-            else {
+            if (info.privWriteContent && !info.forceReadOnly) {
                 values.put(Calendars.CALENDAR_ACCESS_LEVEL, Calendars.CAL_ACCESS_OWNER)
                 values.put(Calendars.CAN_MODIFY_TIME_ZONE, 1)
                 values.put(Calendars.CAN_ORGANIZER_RESPOND, 1)
-            }
+            } else
+                values.put(Calendars.CALENDAR_ACCESS_LEVEL, Calendars.CAL_ACCESS_READ)
 
             info.timeZone?.let { tzData ->
                 try {

app/src/main/java/at/bitfire/davdroid/syncadapter/AddressBooksSyncAdapterService.kt

@@ -9,7 +9,6 @@ package at.bitfire.davdroid.syncadapter
 
 import android.Manifest
 import android.accounts.Account
-import android.accounts.AccountManager
 import android.content.*
 import android.content.pm.PackageManager
 import android.database.DatabaseUtils
@@ -18,7 +17,6 @@ import android.os.Bundle
 import android.provider.ContactsContract
 import android.support.v4.content.ContextCompat
 import at.bitfire.davdroid.AccountSettings
-import at.bitfire.davdroid.R
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.model.CollectionInfo
 import at.bitfire.davdroid.model.ServiceDB
@@ -49,10 +47,9 @@ class AddressBooksSyncAdapterService : SyncAdapterService() {
                 if (!extras.containsKey(ContentResolver.SYNC_EXTRAS_MANUAL) && !checkSyncConditions(accountSettings))
                     return
 
-                updateLocalAddressBooks(provider, account, syncResult)
+                updateLocalAddressBooks(account, syncResult)
 
-                val accountManager = AccountManager.get(context)
-                for (addressBookAccount in accountManager.getAccountsByType(context.getString(R.string.account_type_address_book))) {
+                for (addressBookAccount in LocalAddressBook.findAll(context, null, account).map { it.account }) {
                     Logger.log.log(Level.INFO, "Running sync for address book", addressBookAccount)
                     val syncExtras = Bundle(extras)
                     syncExtras.putBoolean(ContentResolver.SYNC_EXTRAS_IGNORE_SETTINGS, true)
@@ -66,7 +63,7 @@ class AddressBooksSyncAdapterService : SyncAdapterService() {
             Logger.log.info("Address book sync complete")
         }
 
-        private fun updateLocalAddressBooks(provider: ContentProviderClient, account: Account, syncResult: SyncResult) {
+        private fun updateLocalAddressBooks(account: Account, syncResult: SyncResult) {
             ServiceDB.OpenHelper(context).use { dbHelper ->
                 val db = dbHelper.readableDatabase
 

app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.kt

@@ -8,20 +8,27 @@
 
 package at.bitfire.davdroid.ui
 
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentManager
 import android.support.v4.app.FragmentPagerAdapter
+import android.support.v4.app.LoaderManager
+import android.support.v4.content.AsyncTaskLoader
+import android.support.v4.content.Loader
 import android.support.v7.app.AppCompatActivity
 import android.text.Html
+import android.text.Spanned
 import android.view.*
 import at.bitfire.davdroid.App
 import at.bitfire.davdroid.BuildConfig
 import at.bitfire.davdroid.R
+import at.bitfire.davdroid.log.Logger
 import com.mikepenz.aboutlibraries.LibsBuilder
 import kotlinx.android.synthetic.main.about_davdroid.*
 import kotlinx.android.synthetic.main.activity_about.*
+import org.apache.commons.io.IOUtils
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -84,7 +91,7 @@ class AboutActivity: AppCompatActivity() {
     }
 
 
-    class DavdroidFragment: Fragment() {
+    class DavdroidFragment: Fragment(), LoaderManager.LoaderCallbacks<Spanned> {
 
         override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?) =
                 inflater.inflate(R.layout.about_davdroid, container, false)!!
@@ -98,7 +105,7 @@ class AboutActivity: AppCompatActivity() {
 
             if (false /* open-source version */) {
                 warranty.text = Html.fromHtml(getString(R.string.about_license_info_no_warranty))
-                license_text.text = Html.fromHtml(getString(R.string.gpl_v3))
+                loaderManager.initLoader(0, null, this)
             } else /* non-ose builds */ {
                 when (BuildConfig.FLAVOR) {
                     App.FLAVOR_GOOGLE_PLAY,
@@ -117,6 +124,33 @@ class AboutActivity: AppCompatActivity() {
             }
         }
 
+        override fun onCreateLoader(id: Int, args: Bundle?) =
+                HtmlAssetLoader(requireActivity(), "gplv3.html")
+
+        override fun onLoadFinished(loader: Loader<Spanned>, license: Spanned?) {
+            Logger.log.info("LOAD FINISHED")
+            license_text.text = license
+        }
+
+        override fun onLoaderReset(loader: Loader<Spanned>) {
+        }
+
+    }
+
+    class HtmlAssetLoader(
+            context: Context,
+            val fileName: String
+    ): AsyncTaskLoader<Spanned>(context) {
+
+        override fun onStartLoading() {
+            forceLoad()
+        }
+
+        override fun loadInBackground(): Spanned =
+                context.resources.assets.open(fileName).use {
+                    Html.fromHtml(IOUtils.toString(it, Charsets.UTF_8))
+                }
+
     }
 
 

app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.kt

@@ -11,6 +11,7 @@ package at.bitfire.davdroid.ui
 import android.Manifest
 import android.accounts.Account
 import android.accounts.AccountManager
+import android.annotation.SuppressLint
 import android.app.Dialog
 import android.app.LoaderManager
 import android.content.*
@@ -18,6 +19,7 @@ import android.content.pm.PackageManager
 import android.database.DatabaseUtils
 import android.database.sqlite.SQLiteDatabase
 import android.net.Uri
+import android.os.AsyncTask
 import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
@@ -44,8 +46,8 @@ import at.bitfire.davdroid.resource.LocalTaskList
 import at.bitfire.ical4android.TaskProvider
 import kotlinx.android.synthetic.main.account_caldav_item.view.*
 import kotlinx.android.synthetic.main.activity_account.*
+import java.lang.ref.WeakReference
 import java.util.*
-import java.util.concurrent.Executors
 import java.util.logging.Level
 
 class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, PopupMenu.OnMenuItemClickListener, LoaderManager.LoaderCallbacks<AccountActivity.AccountInfo> {
@@ -73,8 +75,6 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop
     lateinit var account: Account
     private var accountInfo: AccountInfo? = null
 
-    private val dbExecutor = Executors.newSingleThreadExecutor()
-
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -110,12 +110,6 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop
         loaderManager.initLoader(0, null, this)
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-
-        dbExecutor.shutdown()
-    }
-
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
         if (grantResults.any { it == PackageManager.PERMISSION_GRANTED })
             // we've got additional permissions; try to load everything again
@@ -202,24 +196,7 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop
         val info = adapter.getItem(position)
         val nowChecked = !info.selected
 
-        dbExecutor.execute {
-            OpenHelper(this).use { dbHelper ->
-                val db = dbHelper.writableDatabase
-                db.beginTransactionNonExclusive()
-
-                val values = ContentValues(1)
-                values.put(Collections.SYNC, if (nowChecked) 1 else 0)
-                db.update(Collections._TABLE, values, "${Collections.ID}=?", arrayOf(info.id.toString()))
-
-                db.setTransactionSuccessful()
-                db.endTransaction()
-            }
-
-            info.selected = nowChecked
-            runOnUiThread {
-                adapter.notifyDataSetChanged()
-            }
-        }
+        SelectCollectionTask(applicationContext, info, nowChecked, WeakReference(adapter), WeakReference(view)).execute()
     }
 
     private val onActionOverflowListener = { anchor: View, info: CollectionInfo ->
@@ -227,30 +204,19 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop
         popup.inflate(R.menu.account_collection_operations)
 
         with(popup.menu.findItem(R.id.force_read_only)) {
-            if (info.readOnly)
-                isVisible = false
-            else
+            if (info.privWriteContent)
                 isChecked = info.forceReadOnly
+            else
+                isVisible = false
         }
 
+        popup.menu.findItem(R.id.delete_collection).isVisible = info.privUnbind
+
         popup.setOnMenuItemClickListener { item ->
             when (item.itemId) {
                 R.id.force_read_only -> {
                     val nowChecked = !item.isChecked
-                    dbExecutor.execute {
-                        OpenHelper(this).use { dbHelper ->
-                            val db = dbHelper.writableDatabase
-                            db.beginTransactionNonExclusive()
-
-                            val values = ContentValues(1)
-                            values.put(Collections.FORCE_READ_ONLY, nowChecked)
-                            db.update(Collections._TABLE, values, "${Collections.ID}=?", arrayOf(info.id.toString()))
-
-                            db.setTransactionSuccessful()
-                            db.endTransaction()
-                            reload()
-                        }
-                    }
+                    SetReadOnlyTask(WeakReference(this), info.id!!, nowChecked).execute()
                 }
                 R.id.delete_collection ->
                     DeleteCollectionFragment.ConfirmDeleteCollectionFragment.newInstance(account, info).show(supportFragmentManager, null)
@@ -308,6 +274,68 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop
     }
 
 
+    /* TASKS */
+
+    @SuppressLint("StaticFieldLeak")
+    class SelectCollectionTask(
+            val applicationContext: Context,
+
+            val info: CollectionInfo,
+            val nowChecked: Boolean,
+            val adapter: WeakReference<ArrayAdapter<*>>,
+            val view: WeakReference<View>
+    ): AsyncTask<Void, Void, Void>() {
+
+        override fun onPreExecute() {
+            view.get()?.isEnabled = false
+        }
+
+        override fun doInBackground(vararg params: Void?): Void? {
+            val values = ContentValues(1)
+            values.put(Collections.SYNC, if (nowChecked) 1 else 0)
+
+            OpenHelper(applicationContext).use { dbHelper ->
+                val db = dbHelper.writableDatabase
+                db.update(Collections._TABLE, values, "${Collections.ID}=?", arrayOf(info.id.toString()))
+            }
+
+            return null
+        }
+
+        override fun onPostExecute(result: Void?) {
+            info.selected = nowChecked
+            adapter.get()?.notifyDataSetChanged()
+            view.get()?.isEnabled = true
+        }
+
+    }
+
+    class SetReadOnlyTask(
+            val activity: WeakReference<AccountActivity>,
+            val id: Long,
+            val nowChecked: Boolean
+    ): AsyncTask<Void, Void, Void>() {
+
+        override fun doInBackground(vararg params: Void?): Void? {
+            activity.get()?.let { context ->
+                OpenHelper(context).use { dbHelper ->
+                    val values = ContentValues(1)
+                    values.put(Collections.FORCE_READ_ONLY, nowChecked)
+
+                    val db = dbHelper.writableDatabase
+                    db.update(Collections._TABLE, values, "${Collections.ID}=?", arrayOf(id.toString()))
+                }
+            }
+            return null
+        }
+
+        override fun onPostExecute(result: Void?) {
+            activity.get()?.reload()
+        }
+
+    }
+
+
     /* LOADERS AND LOADED DATA */
 
     class AccountInfo {
@@ -588,9 +616,10 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop
             }
 
             v.findViewById<ImageView>(R.id.read_only).visibility =
-                    if (info.readOnly || info.forceReadOnly) View.VISIBLE else View.GONE
+                    if (!info.privWriteContent || info.forceReadOnly) View.VISIBLE else View.GONE
 
             v.findViewById<ImageView>(R.id.action_overflow).setOnClickListener { view ->
+                @Suppress("ReplaceSingleLineLet")
                 (context as? AccountActivity)?.let {
                     it.onActionOverflowListener(view, info)
                 }
@@ -632,7 +661,7 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop
             }
 
             v.findViewById<ImageView>(R.id.read_only).visibility =
-                    if (info.readOnly || info.forceReadOnly) View.VISIBLE else View.GONE
+                    if (!info.privWriteContent || info.forceReadOnly) View.VISIBLE else View.GONE
 
             v.findViewById<ImageView>(R.id.events).visibility =
                     if (info.supportsVEVENT) View.VISIBLE else View.GONE

app/src/main/java/at/bitfire/davdroid/ui/CollectionInfoFragment.kt

@@ -45,13 +45,6 @@ class CollectionInfoFragment : DialogFragment() {
         val view = requireActivity().layoutInflater.inflate(R.layout.collection_properties, null)
         view.url.text = info.url.toString()
 
-        view.url_copy.setOnClickListener {
-            val clipboard = requireActivity().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-            val text = ClipData.newPlainText(info.displayName, info.url.toString())
-            clipboard.primaryClip = text
-            Toast.makeText(requireActivity(), R.string.copied_to_clipboard, Toast.LENGTH_LONG).show()
-        }
-
         return AlertDialog.Builder(requireActivity())
                 .setTitle(info.displayName)
                 .setView(view)

app/src/main/java/at/bitfire/davdroid/ui/DebugInfoActivity.kt

@@ -111,7 +111,9 @@ class DebugInfoActivity: AppCompatActivity(), LoaderManager.LoaderCallbacks<Stri
     override fun onLoadFinished(loader: Loader<String>, data: String?) {
         data?.let {
             report = it
+
             text_report.text = it
+            text_report.setTextIsSelectable(true)
         }
     }
 

app/src/main/java/at/bitfire/davdroid/ui/StartupDialogFragment.kt

@@ -134,7 +134,7 @@ class StartupDialogFragment: DialogFragment(), LoaderManager.LoaderCallbacks<ISe
                         .setMessage(getString(R.string.startup_autostart_permission_message, WordUtils.capitalize(Build.MANUFACTURER.toLowerCase())))
                         .setPositiveButton(R.string.startup_more_info) { _, _ ->
                             val intent = Intent(Intent.ACTION_VIEW, App.homepageUrl(requireActivity()).buildUpon()
-                                    .appendPath("faq").appendEncodedPath("automatic-synchronization-is-not-run-as-expected/").build())
+                                    .appendPath("faq").appendEncodedPath("synchronization-is-not-run-as-expected/").build())
                             if (intent.resolveActivity(activity.packageManager) != null)
                                 activity.startActivity(intent)
                         }

app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt

@@ -10,12 +10,14 @@ package at.bitfire.davdroid.ui.setup
 
 import android.accounts.Account
 import android.accounts.AccountManager
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.ContentResolver
 import android.content.ContentValues
 import android.content.Context
 import android.content.Intent
 import android.database.sqlite.SQLiteDatabase
+import android.os.AsyncTask
 import android.os.Bundle
 import android.provider.CalendarContract
 import android.support.design.widget.Snackbar
@@ -34,7 +36,9 @@ import at.bitfire.davdroid.ui.SettingsLoader
 import at.bitfire.davdroid.ui.setup.AccountDetailsFragment.CreateSettings
 import at.bitfire.ical4android.TaskProvider
 import at.bitfire.vcard4android.GroupMethod
+import kotlinx.android.synthetic.main.login_account_details.*
 import kotlinx.android.synthetic.main.login_account_details.view.*
+import java.lang.ref.WeakReference
 import java.util.logging.Level
 
 class AccountDetailsFragment: Fragment(), LoaderManager.LoaderCallbacks<CreateSettings> {
@@ -80,13 +84,19 @@ class AccountDetailsFragment: Fragment(), LoaderManager.LoaderCallbacks<CreateSe
             val name = v.account_name.text.toString()
             if (name.isEmpty())
                 v.account_name.error = getString(R.string.login_account_name_required)
-            else {
-                if (createAccount(name, args.getParcelable(KEY_CONFIG) as DavResourceFinder.Configuration)) {
-                    requireActivity().setResult(Activity.RESULT_OK)
-                    requireActivity().finish()
-                } else
-                    Snackbar.make(v, R.string.login_account_not_created, Snackbar.LENGTH_LONG).show()
-            }
+            else
+                settings?.let {
+                    val idx = view!!.contact_group_method.selectedItemPosition
+                    val groupMethodName = resources.getStringArray(R.array.settings_contact_group_method_values)[idx]
+
+                    v.create_account.visibility = View.GONE
+                    v.create_account_progress.visibility = View.VISIBLE
+
+                    CreateAccountTask(requireActivity().applicationContext, WeakReference(requireActivity()),
+                            it, name,
+                            args.getParcelable(KEY_CONFIG) as DavResourceFinder.Configuration,
+                            GroupMethod.valueOf(groupMethodName)).execute()
+                }
         }
 
         loaderManager.initLoader(0, null, this)
@@ -124,98 +134,122 @@ class AccountDetailsFragment: Fragment(), LoaderManager.LoaderCallbacks<CreateSe
     }
 
 
-    private fun createAccount(accountName: String, config: DavResourceFinder.Configuration): Boolean {
-        val account = Account(accountName, getString(R.string.account_type))
-        val settings = settings ?: return false
+    @SuppressLint("StaticFieldLeak")    // we'll only keep the application Context
+    class CreateAccountTask(
+            val applicationContext: Context,
+            val activityRef: WeakReference<Activity>,
+            val settings: ISettings,
 
-        // create Android account
-        val userData = AccountSettings.initialUserData(config.credentials)
-        Logger.log.log(Level.INFO, "Creating Android account with initial config", arrayOf(account, userData))
+            val accountName: String,
+            val config: DavResourceFinder.Configuration,
+            val groupMethod: GroupMethod
+    ): AsyncTask<Void, Void, Boolean>() {
 
-        val accountManager = AccountManager.get(activity)
-        if (!accountManager.addAccountExplicitly(account, config.credentials.password, userData))
-            return false
+        override fun doInBackground(vararg params: Void?): Boolean {
+            val account = Account(accountName, applicationContext.getString(R.string.account_type))
 
-        // add entries for account to service DB
-        Logger.log.log(Level.INFO, "Writing account configuration to database", config)
-        OpenHelper(requireActivity()).use { dbHelper ->
-            val db = dbHelper.writableDatabase
-            try {
-                val accountSettings = AccountSettings(requireActivity(), settings, account)
+            // create Android account
+            val userData = AccountSettings.initialUserData(config.credentials)
+            Logger.log.log(Level.INFO, "Creating Android account with initial config", arrayOf(account, userData))
 
-                val refreshIntent = Intent(activity, DavService::class.java)
-                refreshIntent.action = DavService.ACTION_REFRESH_COLLECTIONS
+            val accountManager = AccountManager.get(applicationContext)
+            if (!accountManager.addAccountExplicitly(account, config.credentials.password, userData))
+                return false
 
-                if (config.cardDAV != null) {
-                    // insert CardDAV service
-                    val id = insertService(db, accountName, Services.SERVICE_CARDDAV, config.cardDAV)
+            // add entries for account to service DB
+            Logger.log.log(Level.INFO, "Writing account configuration to database", config)
+            OpenHelper(applicationContext).use { dbHelper ->
+                val db = dbHelper.writableDatabase
+                try {
+                    val accountSettings = AccountSettings(applicationContext, settings, account)
 
-                    // start CardDAV service detection (refresh collections)
-                    refreshIntent.putExtra(DavService.EXTRA_DAV_SERVICE_ID, id)
-                    requireActivity().startService(refreshIntent)
+                    val refreshIntent = Intent(applicationContext, DavService::class.java)
+                    refreshIntent.action = DavService.ACTION_REFRESH_COLLECTIONS
 
-                    // initial CardDAV account settings
-                    val idx = view!!.contact_group_method.selectedItemPosition
-                    val groupMethodName = resources.getStringArray(R.array.settings_contact_group_method_values)[idx]
-                    accountSettings.setGroupMethod(GroupMethod.valueOf(groupMethodName))
+                    if (config.cardDAV != null) {
+                        // insert CardDAV service
+                        val id = insertService(db, accountName, Services.SERVICE_CARDDAV, config.cardDAV)
 
-                    // contact sync is automatically enabled by isAlwaysSyncable="true" in res/xml/sync_address_books.xml
-                    accountSettings.setSyncInterval(getString(R.string.address_books_authority), Constants.DEFAULT_SYNC_INTERVAL)
-                } else
-                    ContentResolver.setIsSyncable(account, getString(R.string.address_books_authority), 0)
+                        // start CardDAV service detection (refresh collections)
+                        refreshIntent.putExtra(DavService.EXTRA_DAV_SERVICE_ID, id)
+                        applicationContext.startService(refreshIntent)
 
-                if (config.calDAV != null) {
-                    // insert CalDAV service
-                    val id = insertService(db, accountName, Services.SERVICE_CALDAV, config.calDAV)
+                        // initial CardDAV account settings
+                        accountSettings.setGroupMethod(groupMethod)
 
-                    // start CalDAV service detection (refresh collections)
-                    refreshIntent.putExtra(DavService.EXTRA_DAV_SERVICE_ID, id)
-                    requireActivity().startService(refreshIntent)
+                        // contact sync is automatically enabled by isAlwaysSyncable="true" in res/xml/sync_address_books.xml
+                        accountSettings.setSyncInterval(applicationContext.getString(R.string.address_books_authority), Constants.DEFAULT_SYNC_INTERVAL)
+                    } else
+                        ContentResolver.setIsSyncable(account, applicationContext.getString(R.string.address_books_authority), 0)
 
-                    // calendar sync is automatically enabled by isAlwaysSyncable="true" in res/xml/sync_calendars.xml
-                    accountSettings.setSyncInterval(CalendarContract.AUTHORITY, Constants.DEFAULT_SYNC_INTERVAL)
+                    if (config.calDAV != null) {
+                        // insert CalDAV service
+                        val id = insertService(db, accountName, Services.SERVICE_CALDAV, config.calDAV)
 
-                    // enable task sync if OpenTasks is installed
-                    // further changes will be handled by PackageChangedReceiver
-                    if (LocalTaskList.tasksProviderAvailable(requireActivity())) {
-                        ContentResolver.setIsSyncable(account, TaskProvider.ProviderName.OpenTasks.authority, 1)
-                        accountSettings.setSyncInterval(TaskProvider.ProviderName.OpenTasks.authority, Constants.DEFAULT_SYNC_INTERVAL)
-                    }
-                } else
-                    ContentResolver.setIsSyncable(account, CalendarContract.AUTHORITY, 0)
+                        // start CalDAV service detection (refresh collections)
+                        refreshIntent.putExtra(DavService.EXTRA_DAV_SERVICE_ID, id)
+                        applicationContext.startService(refreshIntent)
 
-            } catch(e: InvalidAccountException) {
-                Logger.log.log(Level.SEVERE, "Couldn't access account settings", e)
+                        // calendar sync is automatically enabled by isAlwaysSyncable="true" in res/xml/sync_calendars.xml
+                        accountSettings.setSyncInterval(CalendarContract.AUTHORITY, Constants.DEFAULT_SYNC_INTERVAL)
+
+                        // enable task sync if OpenTasks is installed
+                        // further changes will be handled by PackageChangedReceiver
+                        if (LocalTaskList.tasksProviderAvailable(applicationContext)) {
+                            ContentResolver.setIsSyncable(account, TaskProvider.ProviderName.OpenTasks.authority, 1)
+                            accountSettings.setSyncInterval(TaskProvider.ProviderName.OpenTasks.authority, Constants.DEFAULT_SYNC_INTERVAL)
+                        }
+                    } else
+                        ContentResolver.setIsSyncable(account, CalendarContract.AUTHORITY, 0)
+
+                } catch(e: InvalidAccountException) {
+                    Logger.log.log(Level.SEVERE, "Couldn't access account settings", e)
+                    return false
+                }
+            }
+            return true
+        }
+
+        override fun onPostExecute(result: Boolean) {
+            activityRef.get()?.let { activity ->
+                if (result) {
+                    activity.setResult(Activity.RESULT_OK)
+                    activity.finish()
+                } else {
+                    Snackbar.make(activity.findViewById(android.R.id.content), R.string.login_account_not_created, Snackbar.LENGTH_LONG).show()
+
+                    activity.create_account.visibility = View.VISIBLE
+                    activity.create_account_progress.visibility = View.GONE
+                }
             }
         }
 
-        return true
-    }
+        private fun insertService(db: SQLiteDatabase, accountName: String, service: String, info: DavResourceFinder.Configuration.ServiceInfo): Long {
+            // insert service
+            val values = ContentValues(3)
+            values.put(Services.ACCOUNT_NAME, accountName)
+            values.put(Services.SERVICE, service)
+            info.principal?.let { values.put(Services.PRINCIPAL, it.toString()) }
+            val serviceID = db.insertWithOnConflict(Services._TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE)
 
-    private fun insertService(db: SQLiteDatabase, accountName: String, service: String, info: DavResourceFinder.Configuration.ServiceInfo): Long {
-        // insert service
-        val values = ContentValues(3)
-        values.put(Services.ACCOUNT_NAME, accountName)
-        values.put(Services.SERVICE, service)
-        info.principal?.let { values.put(Services.PRINCIPAL, it.toString()) }
-        val serviceID = db.insertWithOnConflict(Services._TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE)
+            // insert home sets
+            for (homeSet in info.homeSets) {
+                val values = ContentValues(2)
+                values.put(HomeSets.SERVICE_ID, serviceID)
+                values.put(HomeSets.URL, homeSet.toString())
+                db.insertWithOnConflict(HomeSets._TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE)
+            }
 
-        // insert home sets
-        for (homeSet in info.homeSets) {
-            val values = ContentValues(2)
-            values.put(HomeSets.SERVICE_ID, serviceID)
-            values.put(HomeSets.URL, homeSet.toString())
-            db.insertWithOnConflict(HomeSets._TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE)
+            // insert collections
+            for (collection in info.collections.values) {
+                val values = collection.toDB()
+                values.put(Collections.SERVICE_ID, serviceID)
+                db.insertWithOnConflict(Collections._TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE)
+            }
+
+            return serviceID
         }
 
-        // insert collections
-        for (collection in info.collections.values) {
-            val values = collection.toDB()
-            values.put(Collections.SERVICE_ID, serviceID)
-            db.insertWithOnConflict(Collections._TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE)
-        }
-
-        return serviceID
     }
 
 

app/src/main/java/at/bitfire/davdroid/ui/setup/DavResourceFinder.kt

@@ -27,6 +27,7 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder
 import org.xbill.DNS.Lookup
 import org.xbill.DNS.Type
 import java.io.IOException
+import java.io.InterruptedIOException
 import java.net.URI
 import java.net.URISyntaxException
 import java.util.*
@@ -58,21 +59,30 @@ class DavResourceFinder(
             .setForeground(true)
             .build()
 
-    fun cancel() {
-        log.warning("Shutting down resource detection")
-        httpClient.okHttpClient.dispatcher().executorService().shutdown()
-        httpClient.okHttpClient.connectionPool().evictAll()
-    }
-
     override fun close() {
         settings?.close()
         httpClient.close()
     }
 
 
+    /**
+     * Finds the initial configuration, i.e. runs the auto-detection process. Must not throw an
+     * exception, but return an empty Configuration with error logs instead.
+     */
     fun findInitialConfiguration(): Configuration {
-        val cardDavConfig = findInitialConfiguration(Service.CARDDAV)
-        val calDavConfig = findInitialConfiguration(Service.CALDAV)
+        var cardDavConfig: Configuration.ServiceInfo?
+        var calDavConfig: Configuration.ServiceInfo?
+
+        try {
+            cardDavConfig = findInitialConfiguration(Service.CARDDAV)
+            calDavConfig = findInitialConfiguration(Service.CALDAV)
+        } catch(e: Exception) {
+            log.log(Level.INFO, "Service detection failed", e)
+
+            // reset results so that an error message will be shown
+            cardDavConfig = null
+            calDavConfig = null
+        }
 
         return Configuration(
                 loginInfo.credentials,
@@ -106,6 +116,7 @@ class DavResourceFinder(
                         config.principal = getCurrentUserPrincipal(baseURL.resolve("/.well-known/" + service.wellKnownName)!!, service)
                     } catch(e: Exception) {
                         log.log(Level.FINE, "Well-known URL detection failed", e)
+                        rethrowIfInterrupted(e)
                     }
             }
         } else if (baseURI.scheme.equals("mailto", true)) {
@@ -124,6 +135,7 @@ class DavResourceFinder(
                     config.principal = discoverPrincipalUrl(it, service)
                 } catch(e: Exception) {
                     log.log(Level.FINE, "$service service discovery failed", e)
+                    rethrowIfInterrupted(e)
                 }
             }
 
@@ -144,6 +156,7 @@ class DavResourceFinder(
                 }
             } catch(e: Exception) {
                 log.log(Level.WARNING, "Couldn't query user email address", e)
+                rethrowIfInterrupted(e)
             }
 
         // return config or null if config doesn't contain useful information
@@ -181,6 +194,7 @@ class DavResourceFinder(
             }
         } catch(e: Exception) {
             log.log(Level.FINE, "PROPFIND/OPTIONS on user-given URL failed", e)
+            rethrowIfInterrupted(e)
         }
     }
 
@@ -350,6 +364,7 @@ class DavResourceFinder(
                 principal?.let { return it }
             } catch(e: Exception) {
                 log.log(Level.WARNING, "No resource found", e)
+                rethrowIfInterrupted(e)
             }
         return null
     }
@@ -380,6 +395,15 @@ class DavResourceFinder(
         return principal
     }
 
+    /**
+     * Re-throws the exception if it signals that the current thread was interrupted
+     * to stop the current operation.
+     */
+    private fun rethrowIfInterrupted(e: Exception) {
+        if (e is InterruptedIOException || e is InterruptedException)
+            throw e
+    }
+
 
     // data classes
 

app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.kt

@@ -23,7 +23,7 @@ import at.bitfire.davdroid.R
 import at.bitfire.davdroid.log.Logger
 import at.bitfire.davdroid.ui.DebugInfoActivity
 import at.bitfire.davdroid.ui.setup.DavResourceFinder.Configuration
-import kotlin.concurrent.thread
+import java.lang.ref.WeakReference
 
 @Suppress("DEPRECATION")
 class DetectConfigurationFragment: DialogFragment(), LoaderManager.LoaderCallbacks<Configuration> {
@@ -41,7 +41,7 @@ class DetectConfigurationFragment: DialogFragment(), LoaderManager.LoaderCallbac
     }
 
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+    override fun onCreateDialog(savedInstancebState: Bundle?): Dialog {
         val progress = ProgressDialog(activity)
         progress.setTitle(R.string.login_configuration_detection)
         progress.setMessage(getString(R.string.login_querying_server))
@@ -122,21 +122,18 @@ class DetectConfigurationFragment: DialogFragment(), LoaderManager.LoaderCallbac
             private val credentials: LoginInfo
     ): AsyncTaskLoader<Configuration>(context) {
 
-        private var resourceFinder: DavResourceFinder? = null
+        private var workingThread: WeakReference<Thread>? = null
 
         override fun onStartLoading() = forceLoad()
 
         override fun cancelLoadInBackground() {
-            thread {
-                resourceFinder?.cancel()
-                resourceFinder = null
-            }
+            Logger.log.warning("Shutting down resource detection")
+            workingThread?.get()?.interrupt()
         }
 
         override fun loadInBackground(): Configuration {
-            val finder = DavResourceFinder(context, credentials)
-            resourceFinder = finder
-            return finder.findInitialConfiguration()
+            workingThread = WeakReference(Thread.currentThread())
+            return DavResourceFinder(context, credentials).findInitialConfiguration()
         }
 
     }

app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.kt

@@ -9,7 +9,6 @@
 package at.bitfire.davdroid.ui.setup
 
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.Menu

app/src/main/res/drawable/ic_content_copy_dark.xml

@@ -1,13 +0,0 @@
-<!--
-  ~ Copyright © Ricki Hirner (bitfire web engineering).
-  ~ All rights reserved. This program and the accompanying materials
-  ~ are made available under the terms of the GNU Public License v3.0
-  ~ which accompanies this distribution, and is available at
-  ~ http://www.gnu.org/licenses/gpl.html
-  -->
-
-<vector android:alpha="0.54" android:height="24dp"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"/>
-</vector>

app/src/main/res/layout/collection_properties.xml

@@ -8,7 +8,6 @@
   -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -26,30 +25,13 @@
             android:text="@string/collection_properties_url"
             android:labelFor="@id/url" />
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/url"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/url"
-                android:layout_width="0dp"
-                android:layout_weight="1"
-                android:layout_height="wrap_content"
-                android:fontFamily="monospace"
-                android:textSize="12sp"/>
-
-            <ImageButton
-                android:id="@+id/url_copy"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:padding="1sp"
-                android:background="@android:color/transparent"
-                android:layout_marginLeft="4dp"
-                app:srcCompat="@drawable/ic_content_copy_dark"
-                android:contentDescription="@string/collection_properties_copy_url" />
-
-        </LinearLayout>
+            android:layout_height="wrap_content"
+            android:fontFamily="monospace"
+            android:textSize="12sp"
+            android:textIsSelectable="true"/>
 
     </LinearLayout>
 

app/src/main/res/layout/login_account_details.xml

@@ -70,13 +70,13 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         style="@style/stepper_nav_bar">
 
         <Button
             android:id="@+id/back"
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:layout_gravity="center"
             android:text="@string/login_back"
             style="@style/stepper_nav_button"/>
 
@@ -84,11 +84,17 @@
             android:id="@+id/create_account"
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:layout_gravity="center"
             android:text="@string/login_create_account"
             android:enabled="false"
             style="@style/stepper_nav_button"/>
 
+        <ProgressBar
+            android:id="@+id/create_account_progress"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:visibility="gone"/>
+
     </LinearLayout>
 
 </LinearLayout>

app/src/main/res/values-ar/strings.xml

@@ -6,7 +6,7 @@
   <string name="address_books_authority_title">دفاتر العناوين</string>
   <string name="help">مساعدة</string>
   <string name="manage_accounts">إدارة الحسابات</string>
-  <string name="please_wait">يرجى الانتظار...</string>
+  <string name="please_wait">يرجى الانتظار…</string>
   <string name="send">إرسال</string>
   <string name="notification_channel_debugging">تصحيح العلل</string>
   <string name="notification_channel_general">رسائل هامة أخرى</string>
@@ -15,8 +15,13 @@
   <string name="notification_channel_sync_io_errors">أخطاء الشبكة و عمليات الإدخال/الإخراج</string>
   <string name="notification_channel_sync_status">رسائل الحالة</string>
   <!--startup dialogs-->
+  <string name="startup_autostart_permission">مزامنة تلقائية</string>
+  <string name="startup_autostart_permission_message">%s البرنامج الثابت للجهاز قد يمنع المزامنة التلقائية.  في هذه الحالة أعط الإذن بالمزامنة التلقائية في إعدادات النظام لديك.</string>
+  <string name="startup_battery_optimization">مزامنة مجدولة</string>
+  <string name="startup_battery_optimization_message">سيقوم جهازك بتقييد مزامنة DAVdroid .  قم بإطفاء \"تحسين البطارية\" لإجبار مدد منتظمة لمزامنة DAVdroid .</string>
   <string name="startup_battery_optimization_disable">التعطيل لـ DAVdroid</string>
   <string name="startup_dont_show_again">لاتعرضه مرة أخرى</string>
+  <string name="startup_not_now">ليس الآن</string>
   <string name="startup_donate">معلومات المصدر المفتوح</string>
   <string name="startup_donate_message">يسعدنا كونك تستخدم DAVdroid ، البرنامج ذو المصدر المفتوح (GPLv3). تطوير DAVdroid عمل مضنٍ أخذ منا آلاف ساعات العمل ، هلّا تبرعت لنا ؟</string>
   <string name="startup_donate_now">عرض صفحة التبرُّع</string>
@@ -29,6 +34,10 @@
   <string name="startup_opentasks_reinstall_davdroid">بعد تثبيت OpenTasks، لابد لك من إعادة تثبيت DAVdroid وإضافة حساباتك مجدداً (علة في آندرويد).</string>
   <string name="startup_opentasks_not_installed_install">تثبيت OpenTasks</string>
   <!--AboutActivity-->
+  <string name="about_libraries">المكتبات</string>
+  <string name="about_version">النسخة %1s (%2d)</string>
+  <string name="about_build_date">التجميع على %s</string>
+  <string name="about_flavor_info">هذا الإصدار صالح للتوزيع عبر Google Play فقط.</string>
   <string name="about_license_info_no_warranty">يقدَّم هذا البرنامج دون أدنى مسؤولية.  إنه برنامج حر، وندعوك لإعادة توزيعه حسب أحكام محددة.</string>
   <!--global settings-->
   <string name="logging_davdroid_file_logging">تسجيل ملفات DAVdroid</string>
@@ -90,6 +99,7 @@
   <string name="account_delete">حذف الحساب</string>
   <string name="account_delete_confirmation_title">هل تريد حذف الحساب فعلاً ؟</string>
   <string name="account_delete_confirmation_text">سيتم حذف كل النسخ المحليّة من دفاتر العناوين والتقاويم وقوائم المهام.</string>
+  <string name="account_select_collections_hint">إختر المجموعات لمزامنتها</string>
   <string name="account_carddav">CardDAV</string>
   <string name="account_caldav">CalDAV</string>
   <string name="account_webcal">Webcal</string>
@@ -128,8 +138,9 @@
   <string name="login_account_name_required">اسم الحساب مطلوب</string>
   <string name="login_account_not_created">لم نتمكن من إنشاء الحساب</string>
   <string name="login_configuration_detection">اكتشاف الضبط</string>
-  <string name="login_querying_server">يجري استعلام الخادم ... يرجى الانتظار</string>
+  <string name="login_querying_server">يجري استعلام الخادم … يرجى الانتظار</string>
   <string name="login_no_caldav_carddav">لم نجِد خدمة CalDAV أو CardDAV.</string>
+  <string name="login_view_logs">عرض التفاصيل</string>
   <!--AccountSettingsActivity-->
   <string name="settings_title">%s الإعدادات:</string>
   <string name="settings_authentication">التصديق</string>
@@ -214,6 +225,9 @@
   <string name="delete_collection_confirm_warning">ستتم إزالة هذه المجموعة (%s) وكل بياناتها من الخادم.</string>
   <string name="delete_collection_deleting_collection">حذف المجموعة جارٍ</string>
   <string name="collection_force_read_only">إجبار القراءة فقط</string>
+  <string name="collection_properties">خصائص</string>
+  <string name="collection_properties_url">العنوان (URL):</string>
+  <string name="collection_properties_copy_url">نسخ عنوان URL</string>
   <!--ExceptionInfoFragment-->
   <string name="exception">حدث خطأ.</string>
   <string name="exception_httpexception">حدث خطأ HTTP.</string>

app/src/main/res/values-de/strings.xml

@@ -4,7 +4,6 @@
   <string name="app_name">DAVdroid</string>
   <string name="account_title_address_book">DAVdroid-Adressbuch</string>
   <string name="address_books_authority_title">Adressbücher</string>
-  <string name="copied_to_clipboard">In Zwischenablage kopiert</string>
   <string name="help">Hilfe</string>
   <string name="manage_accounts">Konten verwalten</string>
   <string name="please_wait">Bitte warten …</string>

app/src/main/res/values/about.xml

@@ -63,637 +63,4 @@
     <string name="library_okhttp_isOpenSource" translatable="false">true</string>
     <string name="library_okhttp_licenseId">apache_2_0</string>
 
-
-    <!-- license texts -->
-    <string name="gpl_v3"><![CDATA[
-    <h3 style="text-align: center;">GNU GENERAL PUBLIC LICENSE</h3>
-<p style="text-align: center;">Version 3, 29 June 2007</p>
-
-<p>Copyright &copy; 2007 Free Software Foundation, Inc.
- &lt;<a href="http://fsf.org/">http://fsf.org/</a>&gt;</p><p>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.</p>
-
-<h3><a name="preamble"></a>Preamble</h3>
-
-<p>The GNU General Public License is a free, copyleft license for
-software and other kinds of works.</p>
-
-<p>The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.</p>
-
-<p>When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.</p>
-
-<p>To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.</p>
-
-<p>For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.</p>
-
-<p>Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.</p>
-
-<p>For the developers\' and authors\' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users\' and
-authors\' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.</p>
-
-<p>Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users\' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.</p>
-
-<p>Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.</p>
-
-<p>The precise terms and conditions for copying, distribution and
-modification follow.</p>
-
-<h3><a name="terms"></a>TERMS AND CONDITIONS</h3>
-
-<h4><a name="section0"></a>0. Definitions.</h4>
-
-<p>&ldquo;This License&rdquo; refers to version 3 of the GNU General Public License.</p>
-
-<p>&ldquo;Copyright&rdquo; also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.</p>
-
-<p>&ldquo;The Program&rdquo; refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as &ldquo;you&rdquo;.  &ldquo;Licensees&rdquo; and
-&ldquo;recipients&rdquo; may be individuals or organizations.</p>
-
-<p>To &ldquo;modify&rdquo; a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a &ldquo;modified version&rdquo; of the
-earlier work or a work &ldquo;based on&rdquo; the earlier work.</p>
-
-<p>A &ldquo;covered work&rdquo; means either the unmodified Program or a work based
-on the Program.</p>
-
-<p>To &ldquo;propagate&rdquo; a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.</p>
-
-<p>To &ldquo;convey&rdquo; a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.</p>
-
-<p>An interactive user interface displays &ldquo;Appropriate Legal Notices&rdquo;
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.</p>
-
-<h4><a name="section1"></a>1. Source Code.</h4>
-
-<p>The &ldquo;source code&rdquo; for a work means the preferred form of the work
-for making modifications to it.  &ldquo;Object code&rdquo; means any non-source
-form of a work.</p>
-
-<p>A &ldquo;Standard Interface&rdquo; means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.</p>
-
-<p>The &ldquo;System Libraries&rdquo; of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-&ldquo;Major Component&rdquo;, in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.</p>
-
-<p>The &ldquo;Corresponding Source&rdquo; for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work\'s
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.</p>
-
-<p>The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.</p>
-
-<p>The Corresponding Source for a work in source code form is that
-same work.</p>
-
-<h4><a name="section2"></a>2. Basic Permissions.</h4>
-
-<p>All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.</p>
-
-<p>You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.</p>
-
-<p>Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.</p>
-
-<h4><a name="section3"></a>3. Protecting Users\' Legal Rights From Anti-Circumvention Law.</h4>
-
-<p>No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.</p>
-
-<p>When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work\'s
-users, your or third parties\' legal rights to forbid circumvention of
-technological measures.</p>
-
-<h4><a name="section4"></a>4. Conveying Verbatim Copies.</h4>
-
-<p>You may convey verbatim copies of the Program\'s source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.</p>
-
-<p>You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.</p>
-
-<h4><a name="section5"></a>5. Conveying Modified Source Versions.</h4>
-
-<p>You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:</p>
-
-<ul>
-<li>a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.</li>
-
-<li>b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    &ldquo;keep intact all notices&rdquo;.</li>
-
-<li>c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.</li>
-
-<li>d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.</li>
-</ul>
-
-<p>A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-&ldquo;aggregate&rdquo; if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation\'s users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.</p>
-
-<h4><a name="section6"></a>6. Conveying Non-Source Forms.</h4>
-
-<p>You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:</p>
-
-<ul>
-<li>a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.</li>
-
-<li>b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.</li>
-
-<li>c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.</li>
-
-<li>d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.</li>
-
-<li>e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.</li>
-</ul>
-
-<p>A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.</p>
-
-<p>A &ldquo;User Product&rdquo; is either (1) a &ldquo;consumer product&rdquo;, which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, &ldquo;normally used&rdquo; refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.</p>
-
-<p>&ldquo;Installation Information&rdquo; for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.</p>
-
-<p>If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).</p>
-
-<p>The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.</p>
-
-<p>Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.</p>
-
-<h4><a name="section7"></a>7. Additional Terms.</h4>
-
-<p>&ldquo;Additional permissions&rdquo; are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.</p>
-
-<p>When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.</p>
-
-<p>Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:</p>
-
-<ul>
-<li>a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or</li>
-
-<li>b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or</li>
-
-<li>c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or</li>
-
-<li>d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or</li>
-
-<li>e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or</li>
-
-<li>f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.</li>
-</ul>
-
-<p>All other non-permissive additional terms are considered &ldquo;further
-restrictions&rdquo; within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.</p>
-
-<p>If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.</p>
-
-<p>Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.</p>
-
-<h4><a name="section8"></a>8. Termination.</h4>
-
-<p>You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).</p>
-
-<p>However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.</p>
-
-<p>Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.</p>
-
-<p>Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.</p>
-
-<h4><a name="section9"></a>9. Acceptance Not Required for Having Copies.</h4>
-
-<p>You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.</p>
-
-<h4><a name="section10"></a>10. Automatic Licensing of Downstream Recipients.</h4>
-
-<p>Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.</p>
-
-<p>An &ldquo;entity transaction&rdquo; is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party\'s predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.</p>
-
-<p>You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.</p>
-
-<h4><a name="section11"></a>11. Patents.</h4>
-
-<p>A &ldquo;contributor&rdquo; is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor\'s &ldquo;contributor version&rdquo;.</p>
-
-<p>A contributor\'s &ldquo;essential patent claims&rdquo; are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, &ldquo;control&rdquo; includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.</p>
-
-<p>Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor\'s essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.</p>
-
-<p>In the following three paragraphs, a &ldquo;patent license&rdquo; is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To &ldquo;grant&rdquo; such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.</p>
-
-<p>If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  &ldquo;Knowingly relying&rdquo; means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient\'s use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.</p>
-
-<p>If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.</p>
-
-<p>A patent license is &ldquo;discriminatory&rdquo; if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.</p>
-
-<p>Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.</p>
-
-<h4><a name="section12"></a>12. No Surrender of Others\' Freedom.</h4>
-
-<p>If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.</p>
-
-<h4><a name="section13"></a>13. Use with the GNU Affero General Public License.</h4>
-
-<p>Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.</p>
-
-<h4><a name="section14"></a>14. Revised Versions of this License.</h4>
-
-<p>The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.</p>
-
-<p>Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License &ldquo;or any later version&rdquo; applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.</p>
-
-<p>If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy\'s
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.</p>
-
-<p>Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.</p>
-
-<h4><a name="section15"></a>15. Disclaimer of Warranty.</h4>
-
-<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM &ldquo;AS IS&rdquo; WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.</p>
-
-<h4><a name="section16"></a>16. Limitation of Liability.</h4>
-
-<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.</p>
-
-<h4><a name="section17"></a>17. Interpretation of Sections 15 and 16.</h4>
-
-<p>If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.</p>
-
-<p>END OF TERMS AND CONDITIONS</p>
-    ]]></string>
-
 </resources>

app/src/main/res/values/strings.xml

@@ -16,7 +16,6 @@
     <string name="account_title_address_book">DAVdroid Address book</string>
     <string name="address_books_authority" translatable="false">at.bitfire.davdroid.addressbooks</string>
     <string name="address_books_authority_title">Address books</string>
-    <string name="copied_to_clipboard">Copied to clipboard</string>
     <string name="help">Help</string>
     <string name="manage_accounts">Manage accounts</string>
     <string name="please_wait">Please wait …</string>

build.gradle

@@ -8,17 +8,17 @@
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.dokka_version = '0.9.16'
-    ext.kotlin_version = '1.2.51'
+    ext.dokka_version = '0.9.17'
+    ext.kotlin_version = '1.2.61'
 
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${dokka_version}"
+        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$dokka_version"
     }
 }
 

scripts/fetch-translations.sh

@@ -9,7 +9,8 @@ do
 	target_cert4android=../cert4android/src/main/res/values-${android[$lang]}
 
 	#mkdir -p $target_app
-	#curl -n "https://www.transifex.com/api/2/project/davdroid/resource/app/translation/$lang?file" >$target_app/strings.xml
+	#curl -n "https://www.transifex.com/api/2/project/davdroid/resource/app/translation/$lang?file" |
+	#	sed 's/\.\.\./…/g' > $target_app/strings.xml
 
 	mkdir -p $target_cert4android
 	curl -n "https://www.transifex.com/api/2/project/davdroid/resource/cert4android/translation/$lang?file" >$target_cert4android/strings.xml