From 3a8f17cc2e1e8af741e5abb3b3af976e9bb861a4 Mon Sep 17 00:00:00 2001
From: Ricki Hirner
Date: Sun, 8 Mar 2015 23:30:03 +0100
Subject: [PATCH] Version 0.7
* new Settings activity
* Settings: display/change user name, password, preemptive auth.
* Settings: display/change sync. interval for contacts and calendars
* requires permission GET_ACCOUNTS to list accounts in Settings
* requires permission READ_SYNC_SETTINGS to display current sync intervals
* remove obsolete files from res/
* update copyright notices
* version bump to 0.7
---
app/build.gradle | 19 ++-
app/lint.xml | 8 +
.../at/bitfire/davdroid/ArrayUtilsTest.java | 6 +-
.../java/at/bitfire/davdroid/ContactTest.java | 6 +-
.../at/bitfire/davdroid/TestConstants.java | 8 +
.../at/bitfire/davdroid/URLUtilsTest.java | 6 +-
.../davdroid/resource/ContactTest.java | 6 +-
.../bitfire/davdroid/resource/EventTest.java | 6 +-
.../davdroid/resource/LocalCalendarTest.java | 6 +-
.../syncadapter/DavResourceFinderTest.java | 8 +
.../webdav/DavRedirectStrategyTest.java | 8 +
.../webdav/TlsSniSocketFactoryTest.java | 2 +-
.../davdroid/webdav/WebDavResourceTest.java | 6 +-
app/src/androidTest/res/values/strings.xml | 8 +
app/src/main/AndroidManifest.xml | 22 ++-
.../java/at/bitfire/davdroid/ArrayUtils.java | 6 +-
.../java/at/bitfire/davdroid/Constants.java | 8 +-
.../at/bitfire/davdroid/MainActivity.java | 14 +-
.../java/at/bitfire/davdroid/URIUtils.java | 6 +-
.../davdroid/resource/CalDavCalendar.java | 6 +-
.../davdroid/resource/CardDavAddressBook.java | 6 +-
.../at/bitfire/davdroid/resource/Contact.java | 6 +-
.../davdroid/resource/DavResourceFinder.java | 10 +-
.../at/bitfire/davdroid/resource/Event.java | 6 +-
.../resource/InvalidResourceException.java | 6 +-
.../davdroid/resource/LocalAddressBook.java | 6 +-
.../davdroid/resource/LocalCalendar.java | 6 +-
.../davdroid/resource/LocalCollection.java | 6 +-
.../resource/LocalStorageException.java | 6 +-
.../resource/RecordNotFoundException.java | 6 +-
.../davdroid/resource/RemoteCollection.java | 6 +-
.../bitfire/davdroid/resource/Resource.java | 6 +-
.../bitfire/davdroid/resource/ServerInfo.java | 6 +-
.../AccountAuthenticatorService.java | 6 +-
.../syncadapter/AccountDetailsFragment.java | 6 +-
.../davdroid/syncadapter/AccountSettings.java | 75 +++++++--
.../syncadapter/AddAccountActivity.java | 8 +-
.../CalendarsSyncAdapterService.java | 6 +-
.../ContactsSyncAdapterService.java | 6 +-
.../davdroid/syncadapter/DavSyncAdapter.java | 6 +-
.../syncadapter/LoginEmailFragment.java | 6 +-
.../syncadapter/LoginTypeFragment.java | 8 +-
.../syncadapter/LoginURLFragment.java | 6 +-
.../QueryServerDialogFragment.java | 12 +-
.../syncadapter/SelectCollectionsAdapter.java | 6 +-
.../SelectCollectionsFragment.java | 8 +-
.../syncadapter/SettingsAccountFragment.java | 117 ++++++++++++++
.../syncadapter/SettingsActivity.java | 73 +++++++++
.../syncadapter/SettingsScopeFragment.java | 52 +++++++
.../davdroid/syncadapter/SyncManager.java | 6 +-
.../syncadapter/WebDavResourceAdapter.java | 6 +-
.../webdav/DavAddressbookMultiget.java | 6 +-
.../davdroid/webdav/DavCalendarMultiget.java | 6 +-
.../bitfire/davdroid/webdav/DavException.java | 6 +-
.../at/bitfire/davdroid/webdav/DavHref.java | 6 +-
.../davdroid/webdav/DavHttpClient.java | 6 +-
.../webdav/DavHttpRequestRetryHandler.java | 6 +-
.../webdav/DavIncapableException.java | 6 +-
.../bitfire/davdroid/webdav/DavMultiget.java | 6 +-
.../davdroid/webdav/DavMultistatus.java | 6 +-
.../webdav/DavNoContentException.java | 6 +-
.../webdav/DavNoMultiStatusException.java | 6 +-
.../at/bitfire/davdroid/webdav/DavProp.java | 6 +-
.../bitfire/davdroid/webdav/DavPropfind.java | 6 +-
.../bitfire/davdroid/webdav/DavPropstat.java | 6 +-
.../davdroid/webdav/DavRedirectStrategy.java | 6 +-
.../bitfire/davdroid/webdav/DavResponse.java | 6 +-
.../davdroid/webdav/HttpException.java | 6 +-
.../bitfire/davdroid/webdav/HttpPropfind.java | 6 +-
.../bitfire/davdroid/webdav/HttpReport.java | 6 +-
.../webdav/NotAuthorizedException.java | 6 +-
.../davdroid/webdav/NotFoundException.java | 6 +-
.../webdav/PreconditionFailedException.java | 6 +-
.../davdroid/webdav/TlsSniSocketFactory.java | 3 +-
.../davdroid/webdav/WebDavResource.java | 6 +-
.../res/drawable-hdpi/ic_action_settings.png | Bin 0 -> 953 bytes
.../res/drawable-mdpi/ic_action_settings.png | Bin 0 -> 594 bytes
.../res/drawable-xhdpi/ic_action_settings.png | Bin 0 -> 1231 bytes
.../drawable-xxhdpi/ic_action_settings.png | Bin 0 -> 1863 bytes
.../res/layout-sw720dp/activity_settings.xml | 27 ++++
app/src/main/res/layout/account_details.xml | 8 +
app/src/main/res/layout/activity_main.xml | 8 +
app/src/main/res/layout/activity_settings.xml | 17 ++
app/src/main/res/layout/add_account.xml | 10 +-
.../main/res/layout/address_books_heading.xml | 8 +
app/src/main/res/layout/calendars_heading.xml | 8 +
app/src/main/res/layout/login_email.xml | 8 +
app/src/main/res/layout/login_type.xml | 8 +
app/src/main/res/layout/login_url.xml | 8 +
app/src/main/res/layout/query_server.xml | 8 +
.../res/layout/select_collections_header.xml | 8 +
app/src/main/res/layout/settings_scope.xml | 14 ++
app/src/main/res/menu/account_details.xml | 8 +
app/src/main/res/menu/add_account.xml | 8 +
app/src/main/res/menu/main_activity.xml | 11 +-
app/src/main/res/menu/only_next.xml | 8 +
app/src/main/res/values-ca/strings.xml | 8 +
app/src/main/res/values-cs/strings.xml | 8 +
app/src/main/res/values-de/strings.xml | 37 ++++-
app/src/main/res/values-es/strings.xml | 8 +
app/src/main/res/values-fr/strings.xml | 8 +
app/src/main/res/values-hu/strings.xml | 8 +
app/src/main/res/values-sr/strings.xml | 8 +
app/src/main/res/values-zh-rcn/strings.xml | 8 +
app/src/main/res/values/dimen.xml | 12 ++
app/src/main/res/values/strings.xml | 56 ++++++-
app/src/main/res/values/styles.xml | 8 +
.../main/res/xml/account_authenticator.xml | 10 +-
app/src/main/res/xml/account_prefs.xml | 60 ++++++-
app/src/main/res/xml/contacts.xml | 8 +
app/src/main/res/xml/sync_calendars.xml | 8 +
app/src/main/res/xml/sync_contacts.xml | 8 +
app/src/main/res/xml/sync_prefs.xml | 19 +++
build.gradle | 8 +
gradle/wrapper/gradle-wrapper.properties | 8 +
res/drawable-hdpi/addressbook.png | Bin 1212 -> 0 bytes
.../alerts_and_states_warning.png | Bin 878 -> 0 bytes
res/drawable-hdpi/calendar.png | Bin 1429 -> 0 bytes
res/drawable-hdpi/extra_actions_about.png | Bin 1107 -> 0 bytes
res/drawable-hdpi/ic_action_new_account.png | Bin 962 -> 0 bytes
res/drawable-hdpi/ic_action_new_event.png | Bin 409 -> 0 bytes
res/drawable-hdpi/ic_launcher.png | Bin 5274 -> 0 bytes
res/drawable-hdpi/ic_read_only.png | Bin 1438 -> 0 bytes
res/drawable-hdpi/navigation_accept.png | Bin 1320 -> 0 bytes
res/drawable-hdpi/navigation_forward.png | Bin 1304 -> 0 bytes
res/drawable-hdpi/show_sync_settings.png | Bin 1550 -> 0 bytes
res/drawable-hdpi/view_website.png | Bin 1917 -> 0 bytes
res/drawable-mdpi/addressbook.png | Bin 804 -> 0 bytes
.../alerts_and_states_warning.png | Bin 613 -> 0 bytes
res/drawable-mdpi/calendar.png | Bin 1393 -> 0 bytes
res/drawable-mdpi/extra_actions_about.png | Bin 671 -> 0 bytes
res/drawable-mdpi/ic_action_new_account.png | Bin 666 -> 0 bytes
res/drawable-mdpi/ic_action_new_event.png | Bin 384 -> 0 bytes
res/drawable-mdpi/ic_launcher.png | Bin 3272 -> 0 bytes
res/drawable-mdpi/ic_read_only.png | Bin 868 -> 0 bytes
res/drawable-mdpi/navigation_accept.png | Bin 1197 -> 0 bytes
res/drawable-mdpi/navigation_forward.png | Bin 1221 -> 0 bytes
res/drawable-mdpi/show_sync_settings.png | Bin 910 -> 0 bytes
res/drawable-mdpi/view_website.png | Bin 1144 -> 0 bytes
res/drawable-xhdpi/addressbook.png | Bin 1251 -> 0 bytes
.../alerts_and_states_warning.png | Bin 1020 -> 0 bytes
res/drawable-xhdpi/calendar.png | Bin 1677 -> 0 bytes
res/drawable-xhdpi/extra_actions_about.png | Bin 1455 -> 0 bytes
res/drawable-xhdpi/ic_action_new_account.png | Bin 1049 -> 0 bytes
res/drawable-xhdpi/ic_action_new_event.png | Bin 481 -> 0 bytes
res/drawable-xhdpi/ic_launcher.png | Bin 7765 -> 0 bytes
res/drawable-xhdpi/ic_read_only.png | Bin 1895 -> 0 bytes
res/drawable-xhdpi/navigation_accept.png | Bin 1546 -> 0 bytes
res/drawable-xhdpi/navigation_forward.png | Bin 1458 -> 0 bytes
res/drawable-xhdpi/show_sync_settings.png | Bin 2038 -> 0 bytes
res/drawable-xhdpi/view_website.png | Bin 2638 -> 0 bytes
res/drawable-xxhdpi/addressbook.png | Bin 2817 -> 0 bytes
.../alerts_and_states_warning.png | Bin 912 -> 0 bytes
res/drawable-xxhdpi/calendar.png | Bin 1879 -> 0 bytes
res/drawable-xxhdpi/extra_actions_about.png | Bin 1436 -> 0 bytes
res/drawable-xxhdpi/ic_action_new_account.png | Bin 920 -> 0 bytes
res/drawable-xxhdpi/ic_action_new_event.png | Bin 530 -> 0 bytes
res/drawable-xxhdpi/ic_launcher.png | Bin 12150 -> 0 bytes
res/drawable-xxhdpi/ic_read_only.png | Bin 2037 -> 0 bytes
res/drawable-xxhdpi/navigation_accept.png | Bin 649 -> 0 bytes
res/drawable-xxhdpi/navigation_forward.png | Bin 578 -> 0 bytes
res/drawable-xxhdpi/show_sync_settings.png | Bin 2745 -> 0 bytes
res/drawable-xxhdpi/view_website.png | Bin 2703 -> 0 bytes
res/layout/account_details.xml | 53 -------
res/layout/activity_main.xml | 29 ----
res/layout/add_account.xml | 7 -
res/layout/address_books_heading.xml | 20 ---
res/layout/calendars_heading.xml | 21 ---
res/layout/login_email.xml | 52 -------
res/layout/login_type.xml | 38 -----
res/layout/login_url.xml | 89 -----------
res/layout/query_server.xml | 23 ---
res/layout/select_collections_header.xml | 18 ---
res/menu/account_details.xml | 11 --
res/menu/add_account.xml | 10 --
res/menu/debug_settings.xml | 4 -
res/menu/main_activity.xml | 7 -
res/menu/only_next.xml | 11 --
res/values-ca/strings.xml | 142 -----------------
res/values-cs/strings.xml | 141 -----------------
res/values-de/strings.xml | 138 ----------------
res/values-es/strings.xml | 86 ----------
res/values-fr/strings.xml | 93 -----------
res/values-hu/strings.xml | 147 ------------------
res/values-sr/strings.xml | 136 ----------------
res/values-zh-rcn/strings.xml | 126 ---------------
res/values/strings.xml | 140 -----------------
res/values/styles.xml | 26 ----
res/xml/account_authenticator.xml | 6 -
res/xml/account_prefs.xml | 11 --
res/xml/contacts.xml | 86 ----------
res/xml/general_settings.xml | 11 --
res/xml/sync_calendars.xml | 7 -
res/xml/sync_contacts.xml | 7 -
settings.gradle | 8 +
195 files changed, 1043 insertions(+), 1935 deletions(-)
create mode 100644 app/src/main/java/at/bitfire/davdroid/syncadapter/SettingsAccountFragment.java
create mode 100644 app/src/main/java/at/bitfire/davdroid/syncadapter/SettingsActivity.java
create mode 100644 app/src/main/java/at/bitfire/davdroid/syncadapter/SettingsScopeFragment.java
create mode 100644 app/src/main/res/drawable-hdpi/ic_action_settings.png
create mode 100644 app/src/main/res/drawable-mdpi/ic_action_settings.png
create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_settings.png
create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_settings.png
create mode 100644 app/src/main/res/layout-sw720dp/activity_settings.xml
create mode 100644 app/src/main/res/layout/activity_settings.xml
create mode 100644 app/src/main/res/layout/settings_scope.xml
create mode 100644 app/src/main/res/values/dimen.xml
create mode 100644 app/src/main/res/xml/sync_prefs.xml
delete mode 100644 res/drawable-hdpi/addressbook.png
delete mode 100644 res/drawable-hdpi/alerts_and_states_warning.png
delete mode 100644 res/drawable-hdpi/calendar.png
delete mode 100644 res/drawable-hdpi/extra_actions_about.png
delete mode 100644 res/drawable-hdpi/ic_action_new_account.png
delete mode 100644 res/drawable-hdpi/ic_action_new_event.png
delete mode 100644 res/drawable-hdpi/ic_launcher.png
delete mode 100644 res/drawable-hdpi/ic_read_only.png
delete mode 100644 res/drawable-hdpi/navigation_accept.png
delete mode 100644 res/drawable-hdpi/navigation_forward.png
delete mode 100644 res/drawable-hdpi/show_sync_settings.png
delete mode 100644 res/drawable-hdpi/view_website.png
delete mode 100644 res/drawable-mdpi/addressbook.png
delete mode 100644 res/drawable-mdpi/alerts_and_states_warning.png
delete mode 100644 res/drawable-mdpi/calendar.png
delete mode 100644 res/drawable-mdpi/extra_actions_about.png
delete mode 100644 res/drawable-mdpi/ic_action_new_account.png
delete mode 100644 res/drawable-mdpi/ic_action_new_event.png
delete mode 100644 res/drawable-mdpi/ic_launcher.png
delete mode 100644 res/drawable-mdpi/ic_read_only.png
delete mode 100644 res/drawable-mdpi/navigation_accept.png
delete mode 100644 res/drawable-mdpi/navigation_forward.png
delete mode 100644 res/drawable-mdpi/show_sync_settings.png
delete mode 100644 res/drawable-mdpi/view_website.png
delete mode 100644 res/drawable-xhdpi/addressbook.png
delete mode 100644 res/drawable-xhdpi/alerts_and_states_warning.png
delete mode 100644 res/drawable-xhdpi/calendar.png
delete mode 100644 res/drawable-xhdpi/extra_actions_about.png
delete mode 100644 res/drawable-xhdpi/ic_action_new_account.png
delete mode 100644 res/drawable-xhdpi/ic_action_new_event.png
delete mode 100644 res/drawable-xhdpi/ic_launcher.png
delete mode 100644 res/drawable-xhdpi/ic_read_only.png
delete mode 100644 res/drawable-xhdpi/navigation_accept.png
delete mode 100644 res/drawable-xhdpi/navigation_forward.png
delete mode 100644 res/drawable-xhdpi/show_sync_settings.png
delete mode 100644 res/drawable-xhdpi/view_website.png
delete mode 100644 res/drawable-xxhdpi/addressbook.png
delete mode 100644 res/drawable-xxhdpi/alerts_and_states_warning.png
delete mode 100644 res/drawable-xxhdpi/calendar.png
delete mode 100644 res/drawable-xxhdpi/extra_actions_about.png
delete mode 100644 res/drawable-xxhdpi/ic_action_new_account.png
delete mode 100644 res/drawable-xxhdpi/ic_action_new_event.png
delete mode 100644 res/drawable-xxhdpi/ic_launcher.png
delete mode 100644 res/drawable-xxhdpi/ic_read_only.png
delete mode 100644 res/drawable-xxhdpi/navigation_accept.png
delete mode 100644 res/drawable-xxhdpi/navigation_forward.png
delete mode 100644 res/drawable-xxhdpi/show_sync_settings.png
delete mode 100644 res/drawable-xxhdpi/view_website.png
delete mode 100644 res/layout/account_details.xml
delete mode 100644 res/layout/activity_main.xml
delete mode 100644 res/layout/add_account.xml
delete mode 100644 res/layout/address_books_heading.xml
delete mode 100644 res/layout/calendars_heading.xml
delete mode 100644 res/layout/login_email.xml
delete mode 100644 res/layout/login_type.xml
delete mode 100644 res/layout/login_url.xml
delete mode 100644 res/layout/query_server.xml
delete mode 100644 res/layout/select_collections_header.xml
delete mode 100644 res/menu/account_details.xml
delete mode 100644 res/menu/add_account.xml
delete mode 100644 res/menu/debug_settings.xml
delete mode 100644 res/menu/main_activity.xml
delete mode 100644 res/menu/only_next.xml
delete mode 100644 res/values-ca/strings.xml
delete mode 100644 res/values-cs/strings.xml
delete mode 100644 res/values-de/strings.xml
delete mode 100644 res/values-es/strings.xml
delete mode 100644 res/values-fr/strings.xml
delete mode 100644 res/values-hu/strings.xml
delete mode 100644 res/values-sr/strings.xml
delete mode 100644 res/values-zh-rcn/strings.xml
delete mode 100644 res/values/strings.xml
delete mode 100644 res/values/styles.xml
delete mode 100644 res/xml/account_authenticator.xml
delete mode 100644 res/xml/account_prefs.xml
delete mode 100644 res/xml/contacts.xml
delete mode 100644 res/xml/general_settings.xml
delete mode 100644 res/xml/sync_calendars.xml
delete mode 100644 res/xml/sync_contacts.xml
diff --git a/app/build.gradle b/app/build.gradle
index 9951fbaf..76dec230 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,8 +1,16 @@
+/*
+ * Copyright (c) 2013 – 2015 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
+ */
+
apply plugin: 'com.android.application'
android {
compileSdkVersion 21
- buildToolsVersion "21.1.2"
+ buildToolsVersion '21.1.2'
defaultConfig {
applicationId "at.bitfire.davdroid"
@@ -19,7 +27,8 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
- dexOptions {
+ lintOptions {
+ abortOnError false
}
packagingOptions {
@@ -36,13 +45,10 @@ dependencies {
// Apache Commons
compile 'commons-lang:commons-lang:2.6'
compile 'commons-io:commons-io:2.4'
-
// Lombok for useful @helpers
provided 'org.projectlombok:lombok:1.14.8'
-
// ical4j for parsing/generating iCalendars
compile 'org.mnode.ical4j:ical4j:1.0.6'
-
// ez-vcard for parsing/generating VCards
compile('com.googlecode.ez-vcard:ez-vcard:0.9.6') {
// hCard functionality not needed
@@ -51,16 +57,13 @@ dependencies {
// jCard functionality not needed
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
}
-
// dnsjava for querying SRV/TXT records
compile 'dnsjava:dnsjava:2.1.6'
-
// HttpClient 4.3, Android flavour for WebDAV operations
// we have to use our own patched build of 4.3.5.2-SNAPSHOT to avoid
// https://issues.apache.org/jira/browse/HTTPCLIENT-1591
compile files('lib/httpclient-android-4.3.5.2-davdroid1.jar')
// compile 'org.apache.httpcomponents:httpclient-android:4.3.5.2-SNAPSHOT'
-
// SimpleXML for parsing and generating WebDAV messages
compile('org.simpleframework:simple-xml:2.7.1') {
exclude group: 'stax', module: 'stax-api'
diff --git a/app/lint.xml b/app/lint.xml
index 98d6334d..abd3b917 100644
--- a/app/lint.xml
+++ b/app/lint.xml
@@ -1,4 +1,12 @@
+
+
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/ArrayUtilsTest.java b/app/src/androidTest/java/at/bitfire/davdroid/ArrayUtilsTest.java
index 854b709d..6fef1eb2 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/ArrayUtilsTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/ArrayUtilsTest.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid;
import java.util.Arrays;
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/ContactTest.java b/app/src/androidTest/java/at/bitfire/davdroid/ContactTest.java
index f292e2d8..48d6211d 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/ContactTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/ContactTest.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid;
import java.io.IOException;
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/TestConstants.java b/app/src/androidTest/java/at/bitfire/davdroid/TestConstants.java
index d1f7aa12..0f7cb842 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/TestConstants.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/TestConstants.java
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2013 – 2015 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
+ */
+
package at.bitfire.davdroid;
import java.net.URI;
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/URLUtilsTest.java b/app/src/androidTest/java/at/bitfire/davdroid/URLUtilsTest.java
index e31a78c6..2ee94a21 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/URLUtilsTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/URLUtilsTest.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid;
import java.net.URI;
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/resource/ContactTest.java b/app/src/androidTest/java/at/bitfire/davdroid/resource/ContactTest.java
index 89841223..fe8d90ff 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/resource/ContactTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/resource/ContactTest.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
import java.io.IOException;
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/resource/EventTest.java b/app/src/androidTest/java/at/bitfire/davdroid/resource/EventTest.java
index b24453d5..d1665df3 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/resource/EventTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/resource/EventTest.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
import java.io.IOException;
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java b/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java
index 8308e3cb..28249209 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/resource/LocalCalendarTest.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
import java.util.Calendar;
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/syncadapter/DavResourceFinderTest.java b/app/src/androidTest/java/at/bitfire/davdroid/syncadapter/DavResourceFinderTest.java
index 8e70eb7b..30492125 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/syncadapter/DavResourceFinderTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/syncadapter/DavResourceFinderTest.java
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2013 – 2015 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
+ */
+
package at.bitfire.davdroid.syncadapter;
import java.io.IOException;
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/webdav/DavRedirectStrategyTest.java b/app/src/androidTest/java/at/bitfire/davdroid/webdav/DavRedirectStrategyTest.java
index 24b4b31f..3112a9fb 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/webdav/DavRedirectStrategyTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/webdav/DavRedirectStrategyTest.java
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2013 – 2015 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
+ */
+
package at.bitfire.davdroid.webdav;
import java.io.IOException;
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/webdav/TlsSniSocketFactoryTest.java b/app/src/androidTest/java/at/bitfire/davdroid/webdav/TlsSniSocketFactoryTest.java
index 54afcace..6c50ce0d 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/webdav/TlsSniSocketFactoryTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/webdav/TlsSniSocketFactoryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright (c) 2013 – 2015 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
diff --git a/app/src/androidTest/java/at/bitfire/davdroid/webdav/WebDavResourceTest.java b/app/src/androidTest/java/at/bitfire/davdroid/webdav/WebDavResourceTest.java
index 6ba7871b..d9c66223 100644
--- a/app/src/androidTest/java/at/bitfire/davdroid/webdav/WebDavResourceTest.java
+++ b/app/src/androidTest/java/at/bitfire/davdroid/webdav/WebDavResourceTest.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import java.io.InputStream;
diff --git a/app/src/androidTest/res/values/strings.xml b/app/src/androidTest/res/values/strings.xml
index 2539643a..3be7ecec 100644
--- a/app/src/androidTest/res/values/strings.xml
+++ b/app/src/androidTest/res/values/strings.xml
@@ -1,4 +1,12 @@
+
+
DavdroidTest
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 88fa3895..d8cf83a6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,15 @@
+
+
+
+
+ android:process=":sync">
+
@@ -71,6 +82,13 @@
android:name=".syncadapter.AddAccountActivity"
android:excludeFromRecents="true" >
+
+
+
+
+
diff --git a/app/src/main/java/at/bitfire/davdroid/ArrayUtils.java b/app/src/main/java/at/bitfire/davdroid/ArrayUtils.java
index f4f050db..30a4d572 100644
--- a/app/src/main/java/at/bitfire/davdroid/ArrayUtils.java
+++ b/app/src/main/java/at/bitfire/davdroid/ArrayUtils.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid;
import java.lang.reflect.Array;
diff --git a/app/src/main/java/at/bitfire/davdroid/Constants.java b/app/src/main/java/at/bitfire/davdroid/Constants.java
index 88f26dec..320089d3 100644
--- a/app/src/main/java/at/bitfire/davdroid/Constants.java
+++ b/app/src/main/java/at/bitfire/davdroid/Constants.java
@@ -1,15 +1,15 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid;
public class Constants {
public static final String
- APP_VERSION = "0.6.12",
+ APP_VERSION = "0.7",
ACCOUNT_TYPE = "bitfire.at.davdroid",
WEB_URL_HELP = "https://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app",
WEB_URL_VIEW_LOGS = "https://github.com/bitfireAT/davdroid/wiki/How-to-view-the-logs";
diff --git a/app/src/main/java/at/bitfire/davdroid/MainActivity.java b/app/src/main/java/at/bitfire/davdroid/MainActivity.java
index a62969ed..c5524280 100644
--- a/app/src/main/java/at/bitfire/davdroid/MainActivity.java
+++ b/app/src/main/java/at/bitfire/davdroid/MainActivity.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid;
import android.app.Activity;
@@ -21,6 +21,7 @@ import android.view.View;
import android.widget.TextView;
import at.bitfire.davdroid.syncadapter.AddAccountActivity;
+import at.bitfire.davdroid.syncadapter.SettingsActivity;
public class MainActivity extends Activity {
@@ -51,8 +52,11 @@ public class MainActivity extends Activity {
public void addAccount(MenuItem item) {
- Intent intent = new Intent(this, AddAccountActivity.class);
- startActivity(intent);
+ startActivity(new Intent(this, AddAccountActivity.class));
+ }
+
+ public void showSettings(MenuItem item) {
+ startActivity(new Intent(this, SettingsActivity.class));
}
public void showSyncSettings(MenuItem item) {
diff --git a/app/src/main/java/at/bitfire/davdroid/URIUtils.java b/app/src/main/java/at/bitfire/davdroid/URIUtils.java
index 0a209637..d6f76fb9 100644
--- a/app/src/main/java/at/bitfire/davdroid/URIUtils.java
+++ b/app/src/main/java/at/bitfire/davdroid/URIUtils.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid;
import android.util.Log;
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/CalDavCalendar.java b/app/src/main/java/at/bitfire/davdroid/resource/CalDavCalendar.java
index 6012f2ea..cab88a5e 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/CalDavCalendar.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/CalDavCalendar.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
import org.apache.http.impl.client.CloseableHttpClient;
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/CardDavAddressBook.java b/app/src/main/java/at/bitfire/davdroid/resource/CardDavAddressBook.java
index 37821ac0..de23d95c 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/CardDavAddressBook.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/CardDavAddressBook.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
import org.apache.http.impl.client.CloseableHttpClient;
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/Contact.java b/app/src/main/java/at/bitfire/davdroid/resource/Contact.java
index 4dcfc1bf..271ff380 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/Contact.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/Contact.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
import android.util.Log;
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/DavResourceFinder.java b/app/src/main/java/at/bitfire/davdroid/resource/DavResourceFinder.java
index 05b364ca..13d730d8 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/DavResourceFinder.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/DavResourceFinder.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
import android.content.Context;
@@ -67,11 +67,11 @@ public class DavResourceFinder implements Closeable {
Log.i(TAG, "Couldn't find address-book home set", e);
}
if (uriAddressBookHomeSet != null) {
- serverInfo.setCardDAV(true);
Log.i(TAG, "Found address-book home set: " + uriAddressBookHomeSet);
WebDavResource homeSetAddressBooks = new WebDavResource(principal, uriAddressBookHomeSet);
if (checkHomesetCapabilities(homeSetAddressBooks, "addressbook")) {
+ serverInfo.setCardDAV(true);
homeSetAddressBooks.propfind(Mode.CARDDAV_COLLECTIONS);
List addressBooks = new LinkedList<>();
@@ -109,11 +109,11 @@ public class DavResourceFinder implements Closeable {
Log.i(TAG, "Couldn't find calendar home set", e);
}
if (uriCalendarHomeSet != null) {
- serverInfo.setCalDAV(true);
Log.i(TAG, "Found calendar home set: " + uriCalendarHomeSet);
WebDavResource homeSetCalendars = new WebDavResource(principal, uriCalendarHomeSet);
if (checkHomesetCapabilities(homeSetCalendars, "calendar-access")) {
+ serverInfo.setCalDAV(true);
homeSetCalendars.propfind(Mode.CALDAV_COLLECTIONS);
List calendars = new LinkedList<>();
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/Event.java b/app/src/main/java/at/bitfire/davdroid/resource/Event.java
index b9d0384f..122e0f75 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/Event.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/Event.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
import android.text.format.Time;
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/InvalidResourceException.java b/app/src/main/java/at/bitfire/davdroid/resource/InvalidResourceException.java
index ee24e1f6..8e97cc71 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/InvalidResourceException.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/InvalidResourceException.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
public class InvalidResourceException extends Exception {
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java b/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java
index c62891ca..101b635e 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalAddressBook.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
import android.accounts.Account;
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java b/app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java
index 48729ad6..8edfdf8d 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalCalendar.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
import android.accounts.Account;
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalCollection.java b/app/src/main/java/at/bitfire/davdroid/resource/LocalCollection.java
index 239b3be9..9f2e28d0 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalCollection.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalCollection.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
import android.accounts.Account;
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/LocalStorageException.java b/app/src/main/java/at/bitfire/davdroid/resource/LocalStorageException.java
index d33ad46a..4ef9c00e 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/LocalStorageException.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/LocalStorageException.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
public class LocalStorageException extends Exception {
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/RecordNotFoundException.java b/app/src/main/java/at/bitfire/davdroid/resource/RecordNotFoundException.java
index 98daa77c..50cda9ca 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/RecordNotFoundException.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/RecordNotFoundException.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
/**
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/RemoteCollection.java b/app/src/main/java/at/bitfire/davdroid/resource/RemoteCollection.java
index d71e0366..a3b8fcc4 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/RemoteCollection.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/RemoteCollection.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
import android.util.Log;
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/Resource.java b/app/src/main/java/at/bitfire/davdroid/resource/Resource.java
index 2bd87529..31e92426 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/Resource.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/Resource.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/at/bitfire/davdroid/resource/ServerInfo.java b/app/src/main/java/at/bitfire/davdroid/resource/ServerInfo.java
index 10e966c2..6823926e 100644
--- a/app/src/main/java/at/bitfire/davdroid/resource/ServerInfo.java
+++ b/app/src/main/java/at/bitfire/davdroid/resource/ServerInfo.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.resource;
import java.io.Serializable;
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountAuthenticatorService.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountAuthenticatorService.java
index f78cc4f6..5de2219d 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountAuthenticatorService.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountAuthenticatorService.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.syncadapter;
import android.accounts.AbstractAccountAuthenticator;
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountDetailsFragment.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountDetailsFragment.java
index 7c830dc5..61390115 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountDetailsFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountDetailsFragment.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.syncadapter;
import android.accounts.Account;
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountSettings.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountSettings.java
index f82c8684..2636242b 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountSettings.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/AccountSettings.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.syncadapter;
import android.accounts.Account;
@@ -13,15 +13,18 @@ import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.ContentValues;
import android.content.Context;
+import android.content.PeriodicSync;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.provider.CalendarContract;
import android.provider.CalendarContract.Calendars;
+import android.provider.ContactsContract;
import android.util.Log;
import java.net.URI;
import java.net.URISyntaxException;
+import java.util.List;
import at.bitfire.davdroid.resource.ServerInfo;
import ezvcard.VCardVersion;
@@ -40,7 +43,9 @@ public class AccountSettings {
KEY_ADDRESSBOOK_URL = "addressbook_url",
KEY_ADDRESSBOOK_CTAG = "addressbook_ctag",
KEY_ADDRESSBOOK_VCARD_VERSION = "addressbook_vcard_version";
-
+
+ public final static long SYNC_INTERVAL_MANUALLY = -1;
+
Context context;
AccountManager accountManager;
Account account;
@@ -79,21 +84,71 @@ public class AccountSettings {
}
- // general settings
-
+ // authentication settings
+
public String getUserName() {
return accountManager.getUserData(account, KEY_USERNAME);
}
+ void setUserName(String userName) { accountManager.setUserData(account, KEY_USERNAME, userName); }
public String getPassword() {
return accountManager.getPassword(account);
}
+ void setPassword(String password) { accountManager.setPassword(account, password); }
- public boolean getPreemptiveAuth() {
- return Boolean.parseBoolean(accountManager.getUserData(account, KEY_AUTH_PREEMPTIVE));
+ public boolean getPreemptiveAuth() { return Boolean.parseBoolean(accountManager.getUserData(account, KEY_AUTH_PREEMPTIVE)); }
+ void setPreemptiveAuth(boolean preemptive) { accountManager.setUserData(account, KEY_AUTH_PREEMPTIVE, Boolean.toString(preemptive)); }
+
+
+ // sync. settings
+
+ public Long getContactsSyncInterval() {
+ if (ContentResolver.getIsSyncable(account, ContactsContract.AUTHORITY) <= 0)
+ return null;
+
+ if (ContentResolver.getSyncAutomatically(account, ContactsContract.AUTHORITY)) {
+ List syncs = ContentResolver.getPeriodicSyncs(account, ContactsContract.AUTHORITY);
+ if (syncs.isEmpty())
+ return SYNC_INTERVAL_MANUALLY;
+ else
+ return syncs.get(0).period;
+ } else
+ return SYNC_INTERVAL_MANUALLY;
}
-
-
+
+ public void setContactsSyncInterval(long seconds) {
+ if (seconds == SYNC_INTERVAL_MANUALLY) {
+ ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, false);
+ } else {
+ ContentResolver.setSyncAutomatically(account, ContactsContract.AUTHORITY, true);
+ ContentResolver.addPeriodicSync(account, ContactsContract.AUTHORITY, new Bundle(), seconds);
+ }
+ }
+
+ public Long getCalendarsSyncInterval() {
+ if (ContentResolver.getIsSyncable(account, CalendarContract.AUTHORITY) <= 0)
+ return null;
+
+ if (ContentResolver.getSyncAutomatically(account, CalendarContract.AUTHORITY)) {
+ List syncs = ContentResolver.getPeriodicSyncs(account, CalendarContract.AUTHORITY);
+ if (syncs.isEmpty())
+ return SYNC_INTERVAL_MANUALLY;
+ else
+ return syncs.get(0).period;
+ } else
+ return SYNC_INTERVAL_MANUALLY;
+ }
+
+ public void setCalendarsSyncInterval(long seconds) {
+ if (seconds == SYNC_INTERVAL_MANUALLY) {
+ ContentResolver.setSyncAutomatically(account, CalendarContract.AUTHORITY, false);
+ } else {
+ ContentResolver.setSyncAutomatically(account, CalendarContract.AUTHORITY, true);
+ ContentResolver.addPeriodicSync(account, CalendarContract.AUTHORITY, new Bundle(), seconds);
+ }
+ }
+
+
// address book (CardDAV) settings
public String getAddressBookURL() {
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/AddAccountActivity.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/AddAccountActivity.java
index b10c4016..37719e3c 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/AddAccountActivity.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/AddAccountActivity.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.syncadapter;
import android.app.Activity;
@@ -28,7 +28,7 @@ public class AddAccountActivity extends Activity {
if (savedInstanceState == null) { // first call
getFragmentManager().beginTransaction()
- .add(R.id.fragment_container, new LoginTypeFragment(), "login_type")
+ .add(R.id.right_pane, new LoginTypeFragment(), "login_type")
.commit();
}
}
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java
index ede9927d..0d6f7ecb 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/CalendarsSyncAdapterService.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.syncadapter;
import android.accounts.Account;
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncAdapterService.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncAdapterService.java
index 1e932955..6e814d75 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncAdapterService.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/ContactsSyncAdapterService.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.syncadapter;
import android.accounts.Account;
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/DavSyncAdapter.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/DavSyncAdapter.java
index 19741f09..656e767a 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/DavSyncAdapter.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/DavSyncAdapter.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.syncadapter;
import android.accounts.Account;
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/LoginEmailFragment.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/LoginEmailFragment.java
index 523447ed..8cde2a01 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/LoginEmailFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/LoginEmailFragment.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.syncadapter;
import android.app.DialogFragment;
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/LoginTypeFragment.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/LoginTypeFragment.java
index 3a6cafdb..e2037909 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/LoginTypeFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/LoginTypeFragment.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.syncadapter;
import android.app.Fragment;
@@ -47,7 +47,7 @@ public class LoginTypeFragment extends Fragment {
case R.id.next:
Fragment loginFragment = btnTypeEmail.isChecked() ? new LoginEmailFragment() : new LoginURLFragment();
getFragmentManager().beginTransaction()
- .replace(R.id.fragment_container, loginFragment)
+ .replace(R.id.right_pane, loginFragment)
.addToBackStack(null)
.commitAllowingStateLoss();
return true;
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/LoginURLFragment.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/LoginURLFragment.java
index e47efec9..1704e7e6 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/LoginURLFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/LoginURLFragment.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.syncadapter;
import android.app.DialogFragment;
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/QueryServerDialogFragment.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/QueryServerDialogFragment.java
index 83eb19b7..c4b86462 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/QueryServerDialogFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/QueryServerDialogFragment.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.syncadapter;
import android.app.DialogFragment;
@@ -27,10 +27,6 @@ import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.security.cert.CertPathValidatorException;
-import java.security.cert.CertificateException;
-
-import javax.net.ssl.SSLHandshakeException;
-import javax.net.ssl.SSLPeerUnverifiedException;
import at.bitfire.davdroid.R;
import at.bitfire.davdroid.resource.DavResourceFinder;
@@ -81,7 +77,7 @@ public class QueryServerDialogFragment extends DialogFragment implements LoaderC
selectCollections.setArguments(arguments);
getFragmentManager().beginTransaction()
- .replace(R.id.fragment_container, selectCollections)
+ .replace(R.id.right_pane, selectCollections)
.addToBackStack(null)
.commitAllowingStateLoss();
}
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SelectCollectionsAdapter.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/SelectCollectionsAdapter.java
index ae750bb1..206938f2 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SelectCollectionsAdapter.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SelectCollectionsAdapter.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.syncadapter;
import android.annotation.SuppressLint;
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SelectCollectionsFragment.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/SelectCollectionsFragment.java
index ce2c7a09..887ccd27 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SelectCollectionsFragment.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SelectCollectionsFragment.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.syncadapter;
import android.app.ListFragment;
@@ -102,7 +102,7 @@ public class SelectCollectionsFragment extends ListFragment {
accountDetails.setArguments(arguments);
getFragmentManager().beginTransaction()
- .replace(R.id.fragment_container, accountDetails)
+ .replace(R.id.right_pane, accountDetails)
.addToBackStack(null)
.commitAllowingStateLoss();
break;
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SettingsAccountFragment.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/SettingsAccountFragment.java
new file mode 100644
index 00000000..685aef04
--- /dev/null
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SettingsAccountFragment.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2013 – 2015 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
+ */
+
+package at.bitfire.davdroid.syncadapter;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.preference.CheckBoxPreference;
+import android.preference.EditTextPreference;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceFragment;
+
+import at.bitfire.davdroid.R;
+
+public class SettingsAccountFragment extends PreferenceFragment {
+ final static String KEY_ACCOUNT = "account";
+
+ protected Account account;
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ addPreferencesFromResource(R.xml.account_prefs);
+
+ account = getArguments().getParcelable(KEY_ACCOUNT);
+ readFromAccount();
+ }
+
+ public void readFromAccount() {
+ final AccountSettings settings = new AccountSettings(getActivity(), account);
+
+ final EditTextPreference prefUserName = (EditTextPreference)findPreference("username");
+ prefUserName.setSummary(settings.getUserName());
+ prefUserName.setText(settings.getUserName());
+ prefUserName.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ settings.setUserName((String)newValue);
+ readFromAccount();
+ return true;
+ }
+ });
+
+ final EditTextPreference prefPassword = (EditTextPreference)findPreference("password");
+ prefPassword.setText(settings.getPassword());
+ prefPassword.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ settings.setPassword((String)newValue);
+ readFromAccount();
+ return true;
+ }
+ });
+
+ final CheckBoxPreference prefPreemptive = (CheckBoxPreference)findPreference("preemptive");
+ prefPreemptive.setChecked(settings.getPreemptiveAuth());
+ prefPreemptive.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ settings.setPreemptiveAuth((Boolean)newValue);
+ readFromAccount();
+ return true;
+ }
+ });
+
+ final ListPreference prefSyncContacts = (ListPreference)findPreference("sync_interval_contacts");
+ final Long syncIntervalContacts = settings.getContactsSyncInterval();
+ if (syncIntervalContacts != null) {
+ prefSyncContacts.setValue(syncIntervalContacts.toString());
+ if (syncIntervalContacts == AccountSettings.SYNC_INTERVAL_MANUALLY)
+ prefSyncContacts.setSummary(R.string.settings_sync_summary_manually);
+ else
+ prefSyncContacts.setSummary(getString(R.string.settings_sync_summary_periodically, syncIntervalContacts / 60));
+ prefSyncContacts.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ settings.setContactsSyncInterval(Long.parseLong((String)newValue));
+ readFromAccount();
+ return true;
+ }
+ });
+ } else {
+ prefSyncContacts.setEnabled(false);
+ prefSyncContacts.setSummary(R.string.settings_sync_summary_not_available);
+ }
+
+ final ListPreference prefSyncCalendars = (ListPreference)findPreference("sync_interval_calendars");
+ final Long syncIntervalCalendars = settings.getCalendarsSyncInterval();
+ if (syncIntervalCalendars != null) {
+ prefSyncCalendars.setValue(syncIntervalCalendars.toString());
+ if (syncIntervalCalendars == AccountSettings.SYNC_INTERVAL_MANUALLY)
+ prefSyncCalendars.setSummary(R.string.settings_sync_summary_manually);
+ else
+ prefSyncCalendars.setSummary(getString(R.string.settings_sync_summary_periodically, syncIntervalCalendars / 60));
+ prefSyncCalendars.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ settings.setCalendarsSyncInterval(Long.parseLong((String)newValue));
+ readFromAccount();
+ return true;
+ }
+ });
+ } else {
+ prefSyncCalendars.setEnabled(false);
+ prefSyncCalendars.setSummary(R.string.settings_sync_summary_not_available);
+ }
+ }
+}
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SettingsActivity.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/SettingsActivity.java
new file mode 100644
index 00000000..cf2d8979
--- /dev/null
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SettingsActivity.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2013 – 2015 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
+ */
+
+package at.bitfire.davdroid.syncadapter;
+
+import android.accounts.Account;
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.os.Bundle;
+import android.util.Log;
+
+import at.bitfire.davdroid.R;
+
+public class SettingsActivity extends Activity {
+ private final static String KEY_SELECTED_ACCOUNT = "selected_account";
+
+ protected Account selectedAccount;
+ boolean tabletLayout;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.activity_settings);
+
+ tabletLayout = findViewById(R.id.right_pane) != null;
+ if (!tabletLayout)
+ getFragmentManager().beginTransaction()
+ .add(R.id.content_pane, new SettingsScopeFragment())
+ .commit();
+
+ if (savedInstanceState != null) {
+ selectedAccount = savedInstanceState.getParcelable(KEY_SELECTED_ACCOUNT);
+ if (selectedAccount != null)
+ showAccountSettings(selectedAccount);
+ }
+ }
+
+ @Override
+ protected void onSaveInstanceState(Bundle outState) {
+ outState.putParcelable(KEY_SELECTED_ACCOUNT, selectedAccount);
+ super.onSaveInstanceState(outState);
+ }
+
+ void showAccountSettings(Account account) {
+ selectedAccount = account;
+
+ FragmentManager fm = getFragmentManager();
+ Fragment settingsFragment = new SettingsAccountFragment();
+ Bundle args = new Bundle();
+ args.putParcelable(SettingsAccountFragment.KEY_ACCOUNT, account);
+ settingsFragment.setArguments(args);
+
+ FragmentTransaction ft = fm
+ .beginTransaction()
+ .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
+
+ if (tabletLayout)
+ ft .replace(R.id.right_pane, settingsFragment);
+ else // phone layout
+ ft .replace(R.id.content_pane, settingsFragment)
+ .addToBackStack(null);
+
+ ft.commit();
+ }
+}
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SettingsScopeFragment.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/SettingsScopeFragment.java
new file mode 100644
index 00000000..0686374c
--- /dev/null
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SettingsScopeFragment.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2013 – 2015 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
+ */
+
+package at.bitfire.davdroid.syncadapter;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.app.ListFragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+
+import at.bitfire.davdroid.Constants;
+import at.bitfire.davdroid.R;
+
+public class SettingsScopeFragment extends ListFragment {
+ Account[] accounts;
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ final AccountManager manager = AccountManager.get(this.getActivity());
+ accounts = manager.getAccountsByType(Constants.ACCOUNT_TYPE);
+
+ final String[] accountNames = new String[accounts.length];
+ for (int i = 0; i < accounts.length; i++)
+ accountNames[i] = accounts[i].name;
+ setListAdapter(new ArrayAdapter(this.getActivity(), android.R.layout.simple_list_item_activated_1, accountNames));
+
+ return super.onCreateView(inflater, container, savedInstanceState);
+ }
+
+ @Override
+ public void onViewCreated(View view, Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ setEmptyText(getString(R.string.settings_no_accounts));
+ }
+
+ @Override
+ public void onListItemClick(ListView l, View v, int position, long id) {
+ l.clearChoices();
+ ((SettingsActivity)getActivity()).showAccountSettings(accounts[position]);
+ l.setItemChecked(position, true);
+ }
+}
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
index 21bdbfbb..165a5a4f 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.syncadapter;
import android.content.SyncResult;
diff --git a/app/src/main/java/at/bitfire/davdroid/syncadapter/WebDavResourceAdapter.java b/app/src/main/java/at/bitfire/davdroid/syncadapter/WebDavResourceAdapter.java
index 57b73162..26892a07 100644
--- a/app/src/main/java/at/bitfire/davdroid/syncadapter/WebDavResourceAdapter.java
+++ b/app/src/main/java/at/bitfire/davdroid/syncadapter/WebDavResourceAdapter.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.syncadapter;
import android.content.Context;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavAddressbookMultiget.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavAddressbookMultiget.java
index 9b32960f..06785082 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavAddressbookMultiget.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavAddressbookMultiget.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import org.simpleframework.xml.Namespace;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavCalendarMultiget.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavCalendarMultiget.java
index 75a7ce71..9d9640dd 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavCalendarMultiget.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavCalendarMultiget.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import org.simpleframework.xml.Namespace;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavException.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavException.java
index 506af6da..fcd5d51f 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavException.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
public class DavException extends Exception {
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavHref.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavHref.java
index 438c4e49..05dbf662 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavHref.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavHref.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import org.simpleframework.xml.Namespace;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpClient.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpClient.java
index e3c3f9a3..6c917b7e 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpClient.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpClient.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import android.util.Log;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpRequestRetryHandler.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpRequestRetryHandler.java
index c26fac93..9aa6c610 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpRequestRetryHandler.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavHttpRequestRetryHandler.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import org.apache.commons.lang.ArrayUtils;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavIncapableException.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavIncapableException.java
index 794865ec..b82850c6 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavIncapableException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavIncapableException.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
public class DavIncapableException extends DavException {
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavMultiget.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavMultiget.java
index d9d3fb31..beebb04a 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavMultiget.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavMultiget.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import org.simpleframework.xml.Element;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavMultistatus.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavMultistatus.java
index e4b8e8eb..091b41c6 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavMultistatus.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavMultistatus.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import org.simpleframework.xml.ElementList;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavNoContentException.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavNoContentException.java
index 6e3464b9..b73b3a05 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavNoContentException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavNoContentException.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
public class DavNoContentException extends DavException {
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavNoMultiStatusException.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavNoMultiStatusException.java
index 07eb6e18..36f08a7e 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavNoMultiStatusException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavNoMultiStatusException.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
public class DavNoMultiStatusException extends DavException {
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavProp.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavProp.java
index b6b724c0..0bc37c7c 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavProp.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavProp.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import org.simpleframework.xml.Attribute;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavPropfind.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavPropfind.java
index abf4104e..aa68f392 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavPropfind.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavPropfind.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import org.simpleframework.xml.Element;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavPropstat.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavPropstat.java
index 74ee66d6..7aa88afc 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavPropstat.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavPropstat.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import org.simpleframework.xml.Element;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavRedirectStrategy.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavRedirectStrategy.java
index 3dc547d5..6dc75596 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavRedirectStrategy.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavRedirectStrategy.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import android.util.Log;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/DavResponse.java b/app/src/main/java/at/bitfire/davdroid/webdav/DavResponse.java
index 5dc67f38..851121c0 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/DavResponse.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/DavResponse.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import org.simpleframework.xml.Element;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/HttpException.java b/app/src/main/java/at/bitfire/davdroid/webdav/HttpException.java
index 79b48164..9469c2a2 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/HttpException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/HttpException.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import lombok.Getter;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/HttpPropfind.java b/app/src/main/java/at/bitfire/davdroid/webdav/HttpPropfind.java
index c0a39216..239acd98 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/HttpPropfind.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/HttpPropfind.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import android.util.Log;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/HttpReport.java b/app/src/main/java/at/bitfire/davdroid/webdav/HttpReport.java
index c9e902d3..20aefc4a 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/HttpReport.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/HttpReport.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import android.util.Log;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/NotAuthorizedException.java b/app/src/main/java/at/bitfire/davdroid/webdav/NotAuthorizedException.java
index 4eab6adb..7a09cc52 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/NotAuthorizedException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/NotAuthorizedException.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import org.apache.http.HttpStatus;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/NotFoundException.java b/app/src/main/java/at/bitfire/davdroid/webdav/NotFoundException.java
index f612d733..6b845de2 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/NotFoundException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/NotFoundException.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import org.apache.http.HttpStatus;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/PreconditionFailedException.java b/app/src/main/java/at/bitfire/davdroid/webdav/PreconditionFailedException.java
index 064ff38a..49a2889e 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/PreconditionFailedException.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/PreconditionFailedException.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import org.apache.http.HttpStatus;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/TlsSniSocketFactory.java b/app/src/main/java/at/bitfire/davdroid/webdav/TlsSniSocketFactory.java
index ceadc3b7..049b96fc 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/TlsSniSocketFactory.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/TlsSniSocketFactory.java
@@ -1,10 +1,11 @@
/*
- * Copyright (c) 2015 Ricki Hirner (bitfire web engineering).
+ * Copyright (c) 2013 – 2015 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
*/
+
package at.bitfire.davdroid.webdav;
import android.os.Build;
diff --git a/app/src/main/java/at/bitfire/davdroid/webdav/WebDavResource.java b/app/src/main/java/at/bitfire/davdroid/webdav/WebDavResource.java
index 1ad7d2c6..46c6bee7 100644
--- a/app/src/main/java/at/bitfire/davdroid/webdav/WebDavResource.java
+++ b/app/src/main/java/at/bitfire/davdroid/webdav/WebDavResource.java
@@ -1,10 +1,10 @@
-/*******************************************************************************
- * Copyright (c) 2014 Ricki Hirner (bitfire web engineering).
+/*
+ * Copyright (c) 2013 – 2015 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
- ******************************************************************************/
+ */
package at.bitfire.davdroid.webdav;
import android.util.Log;
diff --git a/app/src/main/res/drawable-hdpi/ic_action_settings.png b/app/src/main/res/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..0eb78f7c7341b7a4e8f2fa63bb42068ab72b1ae7
GIT binary patch
literal 953
zcmV;q14jIbP))n4Ni}Vxl$aDGpk&`o
z-$|#_`F!rq-hiL<35!N;xSu1DtsT=t+36NWyh
zR;%H1xm@R7h2Z2aF0Y_x&^a^|RfYF=46j^Ta({w%zbId>!LJv|`(6WJb@`AmOq9s)
z3@(B`mgN%~(7_IWmpEo+2=F6<2z{5)Uc&PU^e40n9Vkwg6lXje
z3}E%es=c%f8FD3s<4plp6M&(0=ria!^eY3oZyF1nM8L_yR~6b#aK6b^t2o#aW8Ofw
z`894cr+WabE*mkA<*wR^0q}%s%I6Mqe-dLma4EUv6aapwt*}U$0|L9EIX(giFAWPZ
z&;ToJ92#s3nZm}<3kHyj*T~6V`1wM)eFA+1-O`*t#Ke)o#u_$GIewG3MgHHgO4ZXk
zpK2%OimFEE25K<2u}wZ3X}1NCr>b37=TlP&7@jJ>LoFRHU1~QMLQStgOSeg8Tu22K
zb6S-!g{d=xU72HB(Qe7nudn(>}YJyET`(&62EQC*nOR
z+nLa5Od@vL=h_}}u9eXyO63$K^TyII43sijBKdowl+lJOjYz|V`i9*$V2|5T_>6FH
z3l3btfye;Vw}y@En0Pw%WW^|GOFk%{_m>K)I7dI{%361-zyXQbW^
zw&;)xlN|dz;PrYk$FgV3-O%^xbQWi$b6WuanvJ@MZS%SCJz1`QaJZhf6;encg%pyT
b{1#vU%aSg@hL7wY00000NkvXXu0mjfhD
literal 0
HcmV?d00001
diff --git a/app/src/main/res/drawable-mdpi/ic_action_settings.png b/app/src/main/res/drawable-mdpi/ic_action_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..c290e5902fd96e62a0a15c6a88d90c5d261b64b2
GIT binary patch
literal 594
zcmV-Y0N@uc4+U<6{Uax;_Qov!pg~0@dGS8KwLAcfmQXM0
z^@7F>#_J%}i$PzJ{wX5ChCe~XT;n!$3yhIT>#jNlmY1A*%BanB`sRE
z=TfQtu@7)wm&k2{a^0ewFAO9M1qm5UgUge-WU7GNDnJE{3~lyOcqY4HPcS}fR@Yhz
z$3(`&rVJn8xjf_z2m1wFi4X~?laTRyTMkULxewzr7||ty=b-`MWZTO~iAK~!X|cg?
zLDDP@3DT4OGbr-@ahvPd)2>&W>o`F8-LB&TU?V}g&231Ap8xBQC@$%Odk3)4T5RG9
gppr@sF24c{01P0jsq^4BjQ{`u07*qoM6N<$f<^ZV0{{R3
literal 0
HcmV?d00001
diff --git a/app/src/main/res/drawable-xhdpi/ic_action_settings.png b/app/src/main/res/drawable-xhdpi/ic_action_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..999d0f0d8c1571d3f90be129c8e4c95e895ee7b9
GIT binary patch
literal 1231
zcmV;=1Tg!FP)hghH17Mrn&ZDP&C4ukZN0TjEU&^6R3zQYP-+@eq8oMeYFz?O9Lg#v&({fS28uqHIV
zBZTqbhuah8N1lBfaT@o1NvAnU}e*7
z6Mu~c1GYh9DTcoSaJFgO(b})HZc5)@8tk=tb92)x+yZcl4FlFTPIAw}3G#_{5JHXi
zB+&Xrhrt~Ko*tAxv`{|E2M!^to71yp2LNFwDL#+r6uLP1AdU}rewa}Fu#A0<0^p6K
z3jEW(UV$b+I!F`Sg=DE7bEO!7&k3NOknBlePLLeUm>g56@#F(ODVqPFi2wXhr!;>_
zGNuZ-QyM>L?GUo(6!pP3INu--`A
z8UU$r5qa`|a{nwnJ~+vdCK8Et#Qc4h!z;q~siuStE#yx%+2W&Zi9I;71>i4J)Rd$v
z7V_tFwy4|zs7M)`>H*6rakF%h
z@{3ZLJVvszAuUQETcbrpCXJa|44`SPQ@&=h+WP3qX+Y08u&I#7oe)R(L2_
zN>Z84sdSrU9vQUAnrRZRR6c<2*&VmH653%4#IuNY)?$pclm*4h2_^0+$=X%;7S%O5
zD>@2X81V3mjU7HUO;KY?y!Hh3g~^MR^TMM5S-~xx#+pG&T7@OF5gk?&PFlVm9qt|A
z={)M99!4(~cvP)Kkc;{%mH!%A@PLg{Gg+>9%
zA;vkmP+=jQ#Pr0zK-9kzU#lSu)=KG`sSI$d@Gz(diN{cMgig)RNEsoXt6F1YMaEb~
zhNt51V2=QNH349r|CqHWVEb~EA7ZN893Zikyh(BYWhdBG$;aLd#L(tHMNa-CrFfB=
zM66KD=B@98>IdKi(}csm3*}umLzyOgz
tRnh7415chjdGh4RlP6D}3ZUNt3;-0k%aSxwCl>$!002ovPDHLkV1nmLGUWgO
literal 0
HcmV?d00001
diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_settings.png b/app/src/main/res/drawable-xxhdpi/ic_action_settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..530227e2d02e54f6434ad23c857249f2998f2369
GIT binary patch
literal 1863
zcmV-N2e|l&P)NHaz<2#8664H95#fe=$06vQx7mXHD!1W44Rz@`casE9pt2I)*i3X~bU;7EZ4
zLi(QiF5ReiyQ}><-P!M(*^%ws-tE2b?R#(EzEy-^Fc=I5gTY`h7z_r3!C){L323-oP94y
z0c_SSn9^|e1>UM6NSMNqgqirSV!=dUGg=pn6wjZMIT?|OInbE1G}0Q-y5q?T=I_FX
z@V!St17UNj-HE^=KOJgc*4G@F?iG;itpQ3Q2JdM^#JB$PS_Q{0hp@TD#
zu8lQjXY5;6A$P=HlLr6K`O;@oV{xM
z%+Ms5j%A#q3_?-{d2Gx1pFt=&1>FInH%qa+e5DIax*l1k7zT
ze9h&A%{xOtMigW!Snr1`bT(e$Bj%MQfL6PC1WXJTMn0iicVtFAJ{E)PG(krSO;o*D
zJA*t|bajrGOkZtjyxmF?K>Gt()4pXe15gNi9>=n;NqfW!`+uN|+DbOo9v}tO`
znrLX(M{G{Qd!o7QT4AP;xT63wG7JGUWmVc6NgDN5XTn^xPbxuC32#ihVyd$U_;1G{
zNO%xH_&tM5V~UP#NRWzyb$!z;r>>$S3PFO;vJ~9jduAGDHX04oyuS^0qOhC<
zYkD@IVL8c1oz}y3KZt+JTXe$0y3T`OQ3b?!W2zT3b<0zB>()?#DcB^B76toGv
zP)F!%ftp0bchIm1>?8D@OF~D%JSLO#$l&?77<_|*gnmzj`B`MIB>38tx5=O2PE?1S
zai7eEPGf82+`A-rmsChv64R7SqAAjHcIUj27au^W1)ISfqOF$pZ;Q$iEl$ah={d6K
zpZKbh_UVLew(M#|LXB3Op-I4dFE-Xm_{YMo63^TAq&FuF_Amjv*b=K($bGV@I1}LW
zcliB#;lDl~lmyT$ur2#W61vd;FML6Yj>cpn>INZV<|2!n?IL0!hx;S6hql26-0N4LG7IsA
zP3J;=I8NsiaP=FLqr@3CkZOopLVcJn4F>)Y(#F2W10Mt5!YcD2y;OtGvo>&+4(cU}
zYj(tHb)R{-2vHlfj$^8*l^;k`r}X=dMmwiO#>C*TcUmRg6zV;I^!bs2uR(HOR_2(h
zB#1Q3!xzPjW1J^I!-{6z!q3EMXI5HE#AThtd>LwECiGVo)TM=*$@RVu=NX%{jB&Jy
zj5tJ1XdwhR61VS>2qVF-1Ev1nP{%XJL7k^Bl>PgHek;j6?kxe=j{T=)G&_|cz~In?
ziR~9mfE!#0m@onEuodDgbWzp4Ab@Omau>C~Dl;HWMKA#sGegrVyja!#0|!hI==K^g
z6+N$l{bw*33
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_details.xml b/app/src/main/res/layout/account_details.xml
index 40790aba..95ab4421 100644
--- a/app/src/main/res/layout/account_details.xml
+++ b/app/src/main/res/layout/account_details.xml
@@ -1,4 +1,12 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/add_account.xml b/app/src/main/res/layout/add_account.xml
index 5bf370dd..cec27c46 100644
--- a/app/src/main/res/layout/add_account.xml
+++ b/app/src/main/res/layout/add_account.xml
@@ -1,6 +1,14 @@
+
+
diff --git a/app/src/main/res/layout/address_books_heading.xml b/app/src/main/res/layout/address_books_heading.xml
index f97ecb90..36186841 100644
--- a/app/src/main/res/layout/address_books_heading.xml
+++ b/app/src/main/res/layout/address_books_heading.xml
@@ -1,4 +1,12 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/login_type.xml b/app/src/main/res/layout/login_type.xml
index 8ce0277e..f0fb7647 100644
--- a/app/src/main/res/layout/login_type.xml
+++ b/app/src/main/res/layout/login_type.xml
@@ -1,4 +1,12 @@
+
+
+
+
diff --git a/app/src/main/res/layout/query_server.xml b/app/src/main/res/layout/query_server.xml
index 5e3f83eb..60959228 100644
--- a/app/src/main/res/layout/query_server.xml
+++ b/app/src/main/res/layout/query_server.xml
@@ -1,4 +1,12 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/menu/account_details.xml b/app/src/main/res/menu/account_details.xml
index e3bfc0b9..424a4789 100644
--- a/app/src/main/res/menu/account_details.xml
+++ b/app/src/main/res/menu/account_details.xml
@@ -1,4 +1,12 @@
+
+
@@ -67,11 +73,11 @@
or purchasing it.
License
- Copyright © 2013 – 2014 Ricki Hirner, Bernhard Stockmann (bitfire web engineering). All rights reserved.
+
Copyright © 2013 – 2015 Ricki Hirner, Bernhard Stockmann (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. As far as Google Play, Samsung
- Store, AndroidPit App Center or Amazon Appstore require other terms, the respective terms apply for versions
+ Store or Amazon Appstore require other terms, the respective terms apply for versions
that are downloaded via these services.
Translation for German is provided by the authors. Translations to other languages have been contributed by
@@ -106,7 +112,45 @@
Preemptive authentication (recommended, but incompatible with Digest auth)
Password:
-
+
+ Settings
+ No DAVdroid accounts found
+ Authentication
+ User name
+ Enter user name:
+ Password
+ Update the password according to your server.
+ Enter your password:
+ Pre-emptive authentication
+ Credentials are sent with every request (recommended)
+ Credentials are sent after server requests them
+ Synchronization
+ Contacts sync. interval
+ Only manually
+ Every %d minutes + immediately on local changes
+ Not available
+ Calendars sync. interval
+
+ - -1
+ - 300
+ - 600
+ - 900
+ - 3600
+ - 7200
+ - 14400
+ - 86400
+
+
+ - Only manually
+ - Every 5 minutes
+ - Every 10 minutes
+ - Every 15 minutes
+ - Every hour
+ - Every 2 hours
+ - Every 4 hours
+ - Once a day
+
+
DAVdroid: Select collections
No CalDAV-/CardDAV service is available at this location.
Add account
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a9661327..37a2b8ff 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,3 +1,11 @@
+
+
+
+ android:accountPreferences="@xml/sync_prefs" />
diff --git a/app/src/main/res/xml/account_prefs.xml b/app/src/main/res/xml/account_prefs.xml
index 7648e8ac..ccac57b7 100644
--- a/app/src/main/res/xml/account_prefs.xml
+++ b/app/src/main/res/xml/account_prefs.xml
@@ -1,11 +1,55 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/xml/contacts.xml b/app/src/main/res/xml/contacts.xml
index 10d6eb36..91dcb48e 100644
--- a/app/src/main/res/xml/contacts.xml
+++ b/app/src/main/res/xml/contacts.xml
@@ -1,4 +1,12 @@
+
+
diff --git a/app/src/main/res/xml/sync_calendars.xml b/app/src/main/res/xml/sync_calendars.xml
index d2ac9b79..7adc91e9 100644
--- a/app/src/main/res/xml/sync_calendars.xml
+++ b/app/src/main/res/xml/sync_calendars.xml
@@ -1,3 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build.gradle b/build.gradle
index d6af282e..7c3f7687 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2013 – 2015 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
+ */
+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e760..ec6ce241 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,3 +1,11 @@
+#
+# Copyright (c) 2013 – 2015 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
+#
+
#Wed Apr 10 15:27:10 PDT 2013
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
diff --git a/res/drawable-hdpi/addressbook.png b/res/drawable-hdpi/addressbook.png
deleted file mode 100644
index 79655934efd520b62f1b1cc08a702d19d2a5a882..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1212
zcmV;t1Vj6YP)0Qsv{h@hdR2lgYQc{R$6Bp!igf8lbm2-xurXR_D(FI7DhjS#
zXf_q9MNDH*8*PhN@uNXY`CAl3uvA?65QHqMNu$Y(oAcy$c$3VVkEE12Ffb%{-us_(
zfA^ew4s@(z9qX8xT@p@gFtc4|*1M996Fgu@DgyfKjWCBLuR%W7^xBY
zLWEjsUBDvns-$06@(^#2#2cL7g39$Aq;A076V;Z(|tPY9t8cmlWvn36PMX7@Pr
zREe(u{lH=1AYi~i)lQV%u{%Quzet)fGm<1}tpic!*$M0f-jnp9M}F9&S&c})pN&IF
zlFWt>egp2$Sl4iND&`SyX6t~5fP<2zT>O*HakZ!(;IO23{TVm-&Q&tjHjGm-XWD!m
z_*Bvn$7aM2Vl_5>z!dONB!1M-&4N4ElaWMnXQx6Agf;_1lD_cBkJP}X_4(zY%y2
zSnoU43w#Zn_A5qdiR|>+a(Aavj@*A<(wPXGLJe%DB)uO+elKtp@UM$M0lXvW_YlH7
zaBIdZ7u|{NA%xROlALQgjY^s`vwIuB=1MPi>wuHM0Z9v9OYU2OjDFxtAZZw(ls{*&
zS!}+OH0J*w1fB#9?{)sbx`qsZ@ZZ06HD5^x}GJ%MLk{A@-L
zyMZIXL_N(dcZ0fE9A%u;<-5K|mYk@yP2y?(b;EJeg~lBDd|yx@`lCj*-v
zuk7O?1VRY8Cl*~aW<|f(%m5p_NcH5vrr_`X1ek1Q)Y7N}i!NflM|J@CHUpdMGO#Il
zxAwNAj8?;R~=?smWZ)UtR=G0iQ{l_OzFU)0!IM
zQ*4g6dceD!1A~#k%Yi{ND|o@GEO9Q{icKSDpyD&meZV;%)>i7k^8##IExz78BCJekgCPMMQ1@Pk`ITm|bh_R}mo$!%X)p^eF5ZSK)%!Fb1F>OK@GN909
z;Bk!mKdiOSV{)(5$Tp6F*VfuE1EG+Jw5hWOl;e&Okzz!)*uhz4U`<3SX=oIr;XW`6
zTyo?gNb!3~1;(NNPkH3f%*$J<4V;G=ZwV>;FVRJv9X^#>!?=
z)PY42nTkZ#8KneGs|c(EBPqQf#R#x2B5#0(k0F7t_ko&vKP%k0v+
z*Q=}+dqkiFJW@k_j^2mBXJgDcW6Y=~{&n@NYjHUMt{7w9hhf-ET1IavZ+$&j1)jz3
zRT4C~N!8(Y?4_3YFgM*`mdH?_b07*qoM6N<$
Ef=HizN&o-=
diff --git a/res/drawable-hdpi/calendar.png b/res/drawable-hdpi/calendar.png
deleted file mode 100644
index 3b5f92c35825f6bc3193d8b688a3bc482a6bb958..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1429
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVip)Y8@5)!e|;$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19ytk=!b*vY~Xr(RHE$SnZc?2=lPS(cjOR+OKs0QR(1
zCQi4Qx#Bbrsy79zTR{FWbHk}uALtl;P}CwtHB1PYen3ok!Ub~RNk26YnBI$k3Hw!J
zm=gm76T7F2V@SoVH<8g8WQw
z>P?2^rIq)q_I_h-F#Ed1L##@roo2M@kDS)a{@>IVPYc#$`nLO$%d-_S$&a*of{OlB
z=e_yQ-VmLt?-Dz0Me$!t2N!F`S&3(TPJiq^!ss8m=vSPgV4d@AW0j*qv#(#VlWMRv
zT4lg6*WnHSqy3qg^*oFVymK=on^y=wW>LAdo+ti-z^kCyOCSCZ`qp{WUVuSTFT4MT
z?h3BLtIu-oWP5G8z01y5>&oO?CRfYdPIwdrPIjA}m?8Qqi2v1ewu73T^;7mv+{ka3
zx`p=*my6gFv#29n3k}O|Epz(iyZRjKd4)B6vu)JaW8T>?DHiAdSbCb$S
zK~!ko?U~POTvZguKl74F6H~BFp*RO>5W4A7FIbAjWhk^1b>${VtxKVQfd7QxA5ca2
z4Mm}3S%Z?mX`xiI&9$_Z$zP_2H!aFd`o5OwQ+;i{u{2ZvM
zrkZN1=~bW*!dTW8QDYRFcK818Dd0Tt4$uUqwX_X%fP28IyYCEo|IiEwA>=oG3}^vY
zfs4Qvurok*510aGfED025Z!%yzs#{3uy6C{fDeJQK&B;s1J8lSz+d8>08Z1KtHD1eK@2x4<8|g$}T*<&%QcEN})`1m*;-Jz&kqH-S?zMvpO)mp3v92{so6iSL0Wckdiz@IgHBo4^Oa6+v#L
z44fuXPG2W-4){pyb>JJIGwifO2-9XZZ)S65w&m`-gXEi87x)!;OMYQy_Ir%+&y-sz
zG{DR-vtz)gQt(2s*&HT3gpdIr1D^oz1FxCc!x&?4kg+kwu9>X^7Zea$g4bS=0a=j&
zy7rbr<+L33S;1>f;0-}ySI^A?JSXMaBq_eQ>Xe9W+6!4uA)K{KxEV+=|kU_oF&=~&R@#o4Ji$#V{COGwxjZ3vqU91rx-u4=hWhGQ@VDfo2mvh
z1+^zYr$nvN8}eKfFgnuJD02K%1NtTL^IUB+PTG~OyzWW{90es;2q^}%b0zWQA#8pU
zczvJlN(OX<;nP5Kl0)PS#uwK(dj!ho`6QBJ(#?%PGWvVP}1v4
zXJPq~C7w)F1KtKMg%D0AI)6JiQYq4NQY~g%x?;*rXNk_W4ct->d>ptQLO3WQ^?)Vd
z3w@S`W#bS+zbm^g*?XE)Y>#{@k=jz0lv$~z%*r^J1h0yH1-Q|N)60w&_3jPH>H$CZ
zH=immX)2MQ5}4To;1pnTxC>_1bN5I4`{+Tvbxz)bVAIl)pMbApjNLM0m2nKVHdGS7
zT7#_;qs1*%lTUJ0Wq!0cExkuKTKr!RcZWE4zJD$nudn4dosz5$g^ubEj+$z!sivAL
Z(La80+4kw-k9hz9002ovPDHLkV1mw7^E3be
diff --git a/res/drawable-hdpi/ic_action_new_account.png b/res/drawable-hdpi/ic_action_new_account.png
deleted file mode 100644
index 9a41829f6dc9044443dbac1e670b889d87f782dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 962
zcmV;z13mnSP)ztmYI&Mbp%#NzTFV;5d@By?1F6$RBP(**cz4!nA-}hdii!QoI
z9mbedeb;uR<0OqSIb%$2rRQwmq(xptFvj!(L%<2(NaT?W@B+9GycLnf@HZ_FAVPi%
za0WO4RDd!NL>|ooJ-|m`LPS2K5kyZ)V@D`hlaK=Y0_o-x!1M
z`z@Ey6<}MP+f`s5_yKGOcI)>A;IfGPY1s-W`4M2G&TSWXEh6K-?@xK2_XOCZE7b>N
zJkOi8SpnCQd=@y|V4O|B?TFmUz$CD&`Edxy*|?Hxxd0o1y%EjFv7|{IP1YfGr2rTN
z25b^JV;MkJFB$}J+!*5n?|_5AvDo`_HUu&>AN{~tprpFbM(owGH4@tZmem>?nL!X+
zsUY_I1sejcMFIo-Rf|kAjsp~d*4U`;`}n?J@jNdZCTfCrKLw^d&r4j)T#MPq7&8Ej
zCLE^#JQR_@#)aG@2N&TZZwlXHexL#Kn@WuQR^XC|yjksJqy^VPHesLdgydI~kZF={7(flT8IF)I
z0(syQa3dtY7IJBA{G9}{ae>FcUA51}q_b*_ae>po05B;cGpQx9o+iX)Q_`T9fTD;5
zDdgaO-Kou`?LzzXDnwp30en>n1u4lm(3K3DVWaU1`&~rx?Q|ZMSz&qINTM%kL24^B
zveDmKIcI=r;AVIX(kTJF2d)9v^?IJf#~TGKB9(~t%Sm0J=`hBO^8cu@8cSYRyV+i?
zD?e*+D(UJMTeT-fi{MC|SuSW`VIVU=E=;F0=#P(#9}w2(ajW^2g0+GyXL
zSqJ%`)|;l|!dZCUDz)=SpR10nXsYJ>s0~aC(
k0-b}7{42JLF4_?P0H#(vhRG5TmH+?%07*qoM6N<$g0B;%*8l(j
diff --git a/res/drawable-hdpi/ic_action_new_event.png b/res/drawable-hdpi/ic_action_new_event.png
deleted file mode 100644
index 5a5d55878ddcfa53078e18f26f9b1432bc1eaee3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 409
zcmV;K0cQS*P)e(6rKz{t}7`Tx&vf&c&jz$HR`l4V&!
zk9cOiXqra&L?HT^=QPrp^)-#kCjtlVDa4*Yv~vB4>LfMnLrHbj*&=XM!z5yx5qQ#g
z7;;<+Mq)dKq>Q#Eyr)#`QN$w=D7BnSRG2&U{Zj*5i`Y~IM+xX^K#mTt{a}>7-3{2h
zx|GqH^*KP1s8|!A6uNCSNSjc&Orex@1PBH98fbkZfOeW&4eSbarOnrkLnO`UEDaLnF9e3fQ%Z&%g1{+006)=-U18&KiW*HU+T?Z00000NkvXXu0mjf
D!qTR`
diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index dce11e1ceec99ed1361a59de5dcfc8547750b31f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5274
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
diff --git a/res/drawable-hdpi/ic_read_only.png b/res/drawable-hdpi/ic_read_only.png
deleted file mode 100644
index aca46301e9644cd1c78dc5eae5c4c3a7220bc4a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1438
zcmV;P1!4M$P)2;5i=~v_D4dD3^a7PqE*%(@gs2oGHr%8jpkSgV`eJ-CA(1y9NPJQs
zcoKsqctH^nFik)npenNT&`_YY^ujH}04E;vpaAc0^
zng0rV97cZj8(ULYehy2S61ChxirJAsBCV5ZDxHp>OiJszsmd
z7F`&mp^(8Yt1lsdBh-9XC?6ZOcJrb~o+0{J!ekbRQjXKeZ1R~a?#PRxjA^9vnQR}!
zDjo}EeyuH|*qyUdJ8yP?o+iqLpS$vs_=#EMA*iH@Mi!Duv1p`~dKx(HH4R^)G}OLl
z2{YWisMngzPVp*lu#|FfPxe^9iwM;eQp!m>SzvgguCkasg#1+$QOba5rb!MYaZ?Y(-`Y3KW7aSWWww2re!xayhA0r{
z_ZJ2&Lp&%~pq)OCgGNR)lDf{VCLg
zm~-(XHB`7}Q$dg(=e(AP9IHi~Wg~+kK%3X%QU(BXs7O@|Ws(D+DATw@zr$jhXqUG{
zK0(gNp%g1x%&Fb1EVH|mA|>1Xqm+Bx2OynX(ZnU>=&el|K!1%|!bI$AO0JUQuuzo}
z`nd<#sDk|5cvVn$6C!
z0hELcCQ!vwEToF)1WZ?JmFaG8fcn5M<7S}OiIb`q)lU$X2!32
z2?6wMwo=M`%Ec*qv8jmSsSvVXS8F^@yGlD@ULDUS7crFxK?Nm^CZC_$W>L)92$L^=
z6Akia95Wx(_Or;nf%sXW$>`f)6azgCebkE~18AicVvC`}BE%+-P}v+Z)+S^i^4Q>6
ze+F6XXD=t@l_XW~09Ed7FpWB`S8F!ozHnwSkszQF;y&l(zSJHefk(zh4ztqfPM{D4
zJB}CWyYQ1vKNkqd=JCDKj2wPo1rTOO;N!Svr`PfhJ$y?WebJYv6d|(M%R1f+e3{5U
s-_}?ByCl3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi#&Ct}+$imdr$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1OzjUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+d7PlC?
zn3-5OIXVK(v%u~ah~5<3ZZW~>7JZ;&^g&UJ6xA>xVEO?u;RzSWfhYacJYae+0w(OB
zPunsW7#L@Hx;TbZ+F}XRH$BVJ_~tbB>ux&w{i&Jpl6k3-y`NvKHk21q
zV1%GG?pIzqOj6l*_t-(U9qjp;vo`HwN=}ep)5vUa_N7?Rr}hN4ng+Fwoh&_BpW+wD
z&uL8OV?3O|erD1ih8>LjGWVRk>cn-L{3q>ay)F~Cc;}xn`8m#J@(k
z@^-_wj*fK>KI!`&dhL6Y6
diff --git a/res/drawable-hdpi/navigation_forward.png b/res/drawable-hdpi/navigation_forward.png
deleted file mode 100644
index 812b3aaf48b3b140a17343d317d2ef7985735e62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1304
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVit(Am`4(%9M5$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1OecUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnrq%
zG!Lpb1-DzAaO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1z77){EW?*3K@^o@a_5?y~}!)#fxe&fZt$}{a4q5e
zyjq9j8_%9cUzr5#cPxvt-pKeuK#U=TLz_XWMU{c|kd%Y$A@&BX7X1dUMFO!*iw;z2
zcc?X(w#dFd`QNvM|8k}{kgI*sENDvLx@i}#u3RAMB79(1hOq4{0mZc9Y|$f<=Yr0k
z{^_9nRr8lY#=_p6vu_^$J=--p!$XcXQP<{&O|d_I1|kfaCUQXf`3V0!J--I?+;AN
zXlPjqVkn<8SDsUuH~B!_9o^TAx+bYJ^tF5c3%fUP2rw!g2x9)jX~1wNq4KVD(EUxI
OvdYud&t;ucLK6U1mCcF(
diff --git a/res/drawable-hdpi/show_sync_settings.png b/res/drawable-hdpi/show_sync_settings.png
deleted file mode 100644
index 4a6fb5b5982798b4183b93efc21e26f94a57a2ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1550
zcmV+p2J!icP)?1)E7k
zK~!ko?U`$6990y@e|L7%ST}vQwoV@?A`ua7ayKEZ4+J3}M8Ei55Uhx3OCO4eTC`}f
zwc1uh`auh#g@Ooz6~PYy3$4xWoW)wJ6-=w9&DJKZt)@+r?C$l0XX?0g^VrElF$abu
zcV_PV&%OWiKj)snlug-`jk#HCM>O`Y16>Z%TAQ-griObij+wCnFCtiLrvZzBhk&NY
zBT3+EU?1>`uU{G?OpRbYOF+a;hAI0q~Mmgsmd@REr9F=;!X;8y}G
zE8O;g??hxZYITFqnw;D}WL7TO}G6hJPG=3l=8Eb8=7H!w7W8FZfh+K@$H=zfbGTIc&z|R9-
z6p>>iU5s*TY;45yJc1w?I|>a$o3PF|A^1uG86EdLFC442)^4`e?z7fz$>nkcK|ng4
zzVd8yb940$Tt#h`MZjMIx`30wdm;F%t!!i-4NGcD9^AxBGM%y=SM1o>2w+q
zISzcP8Mq&K7T6BV2JQw@BJvurMo)1G;FWAPdny{#qjexuneZCWgfyze7YWKGnmcv@
z9s2W0;C|pKYwbJ6m`-ENYGArCCKY|ZlEMu|q2D!g_A6b!3fmyVt$uTJGnq^#JTs?&
z2H*}=t}lUYz;#-R9|T%~WzM+`#bR-DB9ZvnIrp%&HffB>l}e>cB2pTy11EqTkz_SE
z($t^HWWrz9=`pfackxHf&I^GaW6Y)?2s*8``+=8%*4oFFVt%Y{mmaL&D{tG`~A
zXM?VMpYBpEuu-Y|F7OHPp@BemIG!g=x%NJUe*LRPrG)#zy%%qLPXvk&(`8d
zj-UlV6zBzG%nRD+I;tJ*rNCU^o9^!JJB=|LH7+gynUMbz8pIXK>2xBIIGV|1`V>^k
zIro+Zc6TzFT+`m(KB)KR8)Lj|HhX5c#5obI#n6cW2+snPN+qMoaoS&{|KG)b5ClC#
zDbIulaRsN0_LOb_PKihx|79EN|6Wenl>J}qPf43dyh|hhZ~y=R07*qoM6N<$f@ML-
A>i_@%
diff --git a/res/drawable-hdpi/view_website.png b/res/drawable-hdpi/view_website.png
deleted file mode 100644
index 9edbb1b585e93e9ab662c42455f490bc98809b56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1917
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
I&MBb@0Obk&82|tP
diff --git a/res/drawable-mdpi/extra_actions_about.png b/res/drawable-mdpi/extra_actions_about.png
deleted file mode 100644
index 25d68263f402556fa22d663722e81f82ef41c481..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 671
zcmV;Q0$}}#P)4lD#gEc^o$ZAB}^`Wi`L
zcm3I1BjE!JArR1z6Ltwii8<03BsOnxId=B;mNQt~2LsFQ%=^BbdGCD#3oI}ry!WNP
zg-|IeVijluHGB077)ts!cLCmeB;mbZ23kNDSOdNrF(%|1FamnOo}|-cZD|21@^#=Y
za07^dcfb!|Y*Xt%6W9VAZ~(lQv@=aar2zSD;4$zM=t~+*5#0ecfvdnPNuTpXEQJEa
zah&}5Bj79WLej4Ho;Z&4MDIK2J_5IZ4d+}WDJruA%fJ&m-)EAJ(|_Wl+A(CoNEq8%P(qNL@<{Sba
zY#gS0KuW~GlD1n|fGu9NQrk}6P0q2SIk!;@%)w%;SDcQI04?+
zILRPym?<4ttWtKo4m>b3dL3xV1jru(H-Wd3c0wFWQ|vf$&V2zkfIH5)GfDeX9JB-6
z2d)DzC4I_s(6SejZR>FV?n3fkT*)rtQaaab`2q`+!5@hj7xbvI8I%A3002ovPDHLk
FV1g1m7*+rP
diff --git a/res/drawable-mdpi/ic_action_new_account.png b/res/drawable-mdpi/ic_action_new_account.png
deleted file mode 100644
index 10e17d08fa5f1630badcc4b379e77f4d5e4c1111..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 666
zcmV;L0%iS)P)l!ISuPl&lWeltGnx5j=9`(b@Lvjwh_rk^aZ-wj
zSXB{`KHxeq1za{8Ux8P^2UV@-x*<|60D2Y}0#YC`0H=XzU_wOZRCO!VSS2$0N5CbZ
zVMk@)8?XrMSVpcm=a!svS&}4OZI?p;nDZfE1jxLj3&6apE&$JfO~3)8p(Q9sq<$Ev
zHGSIwuG#w_FkodJ4mBFXfl3R~)`3Y883Qf?XH2Jd6aaR;+WXQ6T(#2V&vvNMm=b&e
zezZCBdGX71dk)|xaITBaDPRTI2%V1A!1lWj+y#Dnd}uU9UbA+5sj68|=0K7ph{!nb
zz?|oX-x>jPBCZ2(RCU2Q*9htVj-$9u8wYu*CKZ}yX{|>ufL{W6d;X1kA
zR#jE%Byb+BV?;2yUL$rRFb4<91QK}}lw&Fg_=r@3K!M0r5NHsY;KNguThKwuS|lO1
zOu7enr4BWtN9Q3DK33+Ea?C&gH#bzl4F{K3j&(TWjKzkPam=qR;0a$Vb9Fjwm2QI+Ft}U_y$Z}I5|9fDRGc4SLn#*+0xH4i`|xf4
efDD%K6<`44bW7swvXo!|0000(^b8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H13`I#qK~!jg)tXyuT*rCGe>3OoF1cKiA|;YyB$1*;QHo?smaW*9
z6(_AzJBej0aT3I7g8~Us7%BWvG>FlpF98AsMPj390Y9i{(FQPr)^6;ew$ogkI8JQH
zv1D6vWX0yqBqdS2h!mH%tU87y{g`3RR$Mg11ulrC&=6vdRwzd)&5B>1xVq8cN}{j5U62F317H|
z2?h55<&T_Tb8bhBqHQbX1pqcTcJc7>XZX(3cQG|T93P4Rw^T->j9x`RhANc_@S&=m
zm`Md@ljv?$ufFe~jix@`OnthUY^)0r#n!f_9=>|lzgG#v5a13?$Pk&31uSD`69*rW
z5hA9IRjUyY98D0o;;WAxuT)t|NVd97%@6U|&%THd5@Q0aHB3nRH-!+%rPA+7@avgU
zw45d_sA~1mnkP>G9d&NbzoszSpp9nF){pSXgMZ7F#Zex4_Ffi>SCCSoRABBVG$B`O
zuZlo5C<{~s;Dv)%1}Owm3ZxLE>*HF9f|*y=C}r3ERN4Uy#gd0H;HD*03;k%Lsgyk`
zWrfxXCuP{$+()65=bwJ^8RiP(NFgyoBc-$}CWZjFtF#LBCxitgq)3`k?A$BDQ{Ns>
zNH<+4={eNQjd!=x(w?!gKnQ;L=pa`w7Xi5A3)|UsQ!_vK`$3F0+EM)2Dw
zrx`uFM17;fec$L{er1w>{ONIKmPY-RP+*M22rCQ>1h^w7M#s_wnLMx3M$p`}BwZ&d
zmo)va%<Cye%{grMXfP{~@?dGU!t|J39{1h8mG1o(^zfNE+PWHPY)u1j
zd0?6Ge*4^xeK{OA^0#VXhIy8dz7O~sP})Oj52`dkklWYjF%=-CWM$q9FXfsu48CzS
z{C)CAVg$VX|F)Y@I2ynYm78*Ap|0PJiC`24Tr=OeP^m7y8@4mxrNa-*!Y#sQH&-AkU
z=5~zH{P&}0Sjv|ee0`R?zub$PmUv|wd$#XwBwZ(M%n-gLg6*jgF~QnyCD&bo{1%5QU0Dt&ZLt}(BxY8
z?L9Cktx!s#lxMq+ohxPSIXGYInvTvhsVw_@K3b)L4YZ?uf6g6yz6c1k@fe*w%gLc1
zu)TF3f4b*E0JKp|F81^KrKd4jgCg%rv>FviEn0R%=n5qcW$_JxsDVZUY%5i@D1&WnLZr=GRDqex9#bMHJmJ3(U
zQ1q7QYrlhhVVvgdHrjK$cz5;`*;F&Tw%p34xpSmsnzY-16b@;(fr)%S!_%*EsQVs{
z-Sl+^|M&CPz!bG8DkU}qhD71UB=4WQ_)C6q{sfD~S$aEe53kQGUEso1Tbij)x3W3g
zMOm%z;@}BRzWX=;E!pj>AWh^4_{}@tr~mTHv@~?m+0y5y-Tu_Ef`F-_6lx%PFnG~_
zIM@P4%t&~4
zo}@67^phHhy%^uW3M2xVm^hPaB$wIDWWGNHa%%L46v}y)N^=ZPzsgE^fo!^&rc67X
z&HDf-l=7ho+>kuAE=VJNeVK?A*q2_!O0&1f#gdcKEV^G9}Xw}>@DB&
zL%z$<^y!ema&eCS$(K0PbsxQLM;V!UjV-xu9yt7n4_Glcb&^|qK9`W@jotTf!;ZU1
zyY;+t`DHv+iB;@$O1gid
zDL+zY}u(0}2#%r9RFYd)D&maiRqhU?l6vs9Yp`!7F)rwfS^i$OE9
zJd)V-#B-N;StS6XjmG$yq&5nzHA>mtn9}~yj{{n%C}wEo|MsX$_q|4Iw9#m-
zERh(opiUarOcUhSa^lbjG}rIAo6eR!NEz{~PdCw!X`vzALN>jLYmtZG|#>92+O6p@LolgsHkG1
zJ2D-q-#_XE5fw`d6r1X{@$tQ1p||a*-N1_!DOrcsijJl}K6m(GcD3JHr456QX`{NW
zN+oQ~M)2b|9>r57j^F$Zl<|1-m2Xnkg;+UJqD=*@6$XP8R(sJmf~vBLF-$KEu~c5>
zXwPwu?7Wxd@oijKO1yRHmkG0qw4uXN$~6cW%U%e6_PfWZs1kp1^n08i
ze}R&>RJ*Wc3`XeCf$_7(>cUoM(;i&maq8ViFlP0qxf{E_N?*rO&R=@LO5Z19wNX2z
zsF}=Zqd{9K{_6a{vRt}~rz&A7BM2^5>INf&-JDKr|01bCd($rN+;cythQCWgrk&-|
zRASC-rh~H={)HpGpT<*V&R_ghxbM|Q)ifVq?GJo`J!`EwHS{!v(tKj63zj&otL$A>
zIkWG;pSb?7Id}2j5JJ%2d}!5tn{yu|i6mYwzc|x^#)Lncp#X>-F32VqoGaN|ihlb1$)2yvW@0(1zwpIXRlMJuH_d
z7@B&PBfCG#;KVC`909OCA+$9eX@oVQ!1faa1X8#}m2YqTfoslH@y`s7lV0<=_e21K
zbVFf6$F2U*ZF42971DXnxZiUN3Dl)?G-g}>z+s|VQV_%{xkdg00002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru-UA5`5GcJF`+fib0`*BmK~zY`
z-IYy9R8bVifA`JUq-9!YH1jlUKoN4#c=aeMD6~aIRL~c-=!=LfC|guS(W=M@+LYKL
zu%M_GQuJltB`xaJ4WfuX7&YlRkf5e%4bHsR!k0SEQ`^>EUCuq{fBxs5|G5|b`6ULn
zdLC^?=Sa?4DjQI^FB=DJp8oIvFPLuD4jU{2xm1#ipVa{ZA0k!)fbQou`GnLA^^s}0
z0R-|mjzurfMLwZOeV<)%&RfX_pn`KQ*?n3umR!#rq9_Pr6lhBl7?_rNjWwhL#p*=$
zkr_|Op3Z(21xmO<9kWQoCQeu6^{2r2sE5Q=O{TCC*6l9Ryj<0SdXtM+e%bJ2stG0Jcz>%peh<42vIZrC3&S
z5eplY)33wKr3HXJdX1hsEPytVQeuFhTr1-xQ4|izH(-2bsxu=SIWatgbwm(=pqFy_
z10QGP8%N-AW;rZ&>F4znmo{qY945o5+l$S0d2@)seKht7oKwc$WCl58I(<>O$1xrx
zjaiiW&NEV>U(_e`S-t(|^BF^wHa>A)TJA5i5!Ul*zz-~B5}kue(DJC_8c#4~_sAcK
u9;BXDmKrUI3M|!vfBP5dUfs|Cw0;A{pX}vDOtcUH0000l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVi#&Ct}+$imXp$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1O?oUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1@
zG!Lpb1-Dx)aO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1z*4|&C&cMJZ@9E+g
zQgQ3ebbs!H2{Omc#n}0tv`#21C~#0@f8W4;a{i~dB^meHw?8lo^y+Np_VX($n(_YC
z@+E&a+Mh40ocC+XEx!5ZZ+*78?c#g6#lYQ#qw)iToIq8>mujbJsbce3PBczkwdxup
zkDJUF2f-x=jZU}=Fgph@h!N>j@?Pr!beU|A1vJvL35&6;ySFy-J4wL_Ed=se(2D>)PC;-R9y
zdup`rq1*C;xs&W09=YXh=ju@sDp||AN+rHQcJ=j-`9~Vw?O~j!62JMM+>gE!%~B^t
z*B7ZvUsQj@6<2p>=j`nZl3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s00+w{G(#^lGsVit(Am`4(!{{j$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq!$=9=H^DOIQ4=OLv8`kW|!2W%(B!Jx1#)91+b^B
zGI6@a7`J&)y(!q-0``Zo8&0?A10ACeidv+oh6w@F4~Pj*xIhj(>8Iua(|ZvxVW->w
zWMp7qH1~9I45_%4^ymM7`@;@QYHf^ci}@r9*f%WTo-t#_gjbB-3j27D%9R5gm^fp*bmT?bw)NtP64*!w!jX&gf_AM|GY|@#}
za76!PDT`?lqif%SFf*0gf>(6dPZY6iXY&d
zKCyMEHvZ6`q`Zvzqkodj1BN5-0?t0Mdc-f%{H4CxN=dxqI^)N^2V=z<4l*k2b4wJ_
zVA`m^Wydp?N1Kif_S*A}?V@eF1T%jVx3AH$9!wc0fF1;%TpSKo-M_1yRgL{1^6K
on*T)Nki{)i>CyuZ)(i><82W!kwTWG0bp{nIp00i_>zopr0QoAFhyVZp
diff --git a/res/drawable-mdpi/show_sync_settings.png b/res/drawable-mdpi/show_sync_settings.png
deleted file mode 100644
index 9e7a77563e145b6b44359435b20d86e50b5f2503..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 910
zcmV;919AL`P)Z{%Nt=6|L|Mg${ga0x_
z5s{+bqfWeXB34yIq!L&Jv;nitMh|cic%rJ=f^HnC7=qJBfqLL4;F|+gzz(2QMA}s~
z9oJa0%;*mQ(}BDlC4gSwKJd*lGT%A(&^Z_QzF*RIB8~%gc|9-#2tr4bfRn0v4Y&Y&
z0vs?aZV3`)q<$JuJ!tP6u+Y9I0OPEz)8ZN}2Ls6>pv?kXMPw;36{sXC4uKUDj$
zR054wn!?J&HCj#y-UDAE&ce9JneMPVumq?pp)&?}27HXmjukQ6Z!@p~7zp7ZKPd8Q
zYsU^%4TgmWeBVbzRsvh>@`B+92EYOkKLEE>^_p`oAE*C+OT`h92S!4NRJF_W3TV$3
z>-#vAoQx6qj}Xw>Rkce*@O>ZO_XnJF1K~?VWUh1WvU9FpRUe0)DVCW;u@P&Lw;A96
z0L}x)fUdz&S*A9L$ST{a0{VbjvsEJ^J58^22}EQuu+J_|8`ob@)l9LJipWIZtg&DZ
zFb8-JOaZ!qdB9BIjH+HQSpw%=GqAv%yKF1xoGV&S-}n2SbKij#K&NFY3EVaZwp##~
z;_^Tt?OEWfs!~`{e?-RpFM%6C2e1t|ZROYl)HF3UB>|e7n@g6U)(GdjO}8Kl$s)2I
zSPe7)_kdY84^9AUfZd5iqBWn-p96Y5&%2sRr8*;t$ZFhYAd1sQbynX>>yjGav#O>=
zWdE
kRlEP$b8XZ=+5VdR0ujSAgp{^u?f?J)07*qoM6N<$f@#^2L;wH)
diff --git a/res/drawable-mdpi/view_website.png b/res/drawable-mdpi/view_website.png
deleted file mode 100644
index 7a27476bffcd95139be3c192ba27fe468c005475..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1144
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
aE*_x%^A9#2=*;5*cB#UnlqW)y^Zx-0G=Vz+
diff --git a/res/drawable-xhdpi/extra_actions_about.png b/res/drawable-xhdpi/extra_actions_about.png
deleted file mode 100644
index 69cacb79da36f6b2414cfa2406221ef42c6808a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1455
zcmV;g1yK5lP)Ku;1w2Va
zK~#9!?V3SoTvZf?zxQS)CJ>ueq6s(Djgo-fc{dijh=im8cM8egLig_MLQ7i2?%W4-
z=el|93^8qz#|~R79lO=-p#QfUkhHb_6)5tppT-
zE`4+ds45XeWn`w{`q@?^H@S!SP*LA!JEQrW_TxYh=c}@c3N=i*-t^n6XWW7}q
zf|Qj1NN2|>e;b$+k*%bjd>;wDz%+2)BcTdhYn6mTQUanVa%O+coB2Rz{R?BvP83B?
zpH0%ggE3}DMD7@4x`9_bqAwU@mPF)9TP?s^3(yUG02ojC&qZW8wJ&Nb`oA?8dl|T;W7buMF!c%n(ljAm+a{YVHr@5T86@TZ9ECR~zN)dHRaZivWAvwaj}THQG>&VK}K
zCS3b3sLZXFp)%D}
z#!Q@G(etHzT^U{v@M|IEtyb*mrlV$PZxipQYWCxdvC3S2w3xU>B@?L
zPDa>{7c08;xih?>4kBQPe-B%Cyf8g=0;(PXXF7<0J};)IWbLiDRCp_i1ff-jOPl{HH
zqln0sF-Cw3+TSklGH~7)6Gl<=lY6$=SvsIRehGM$XUpTiA6a?)0LRqmg2WH(9imp6
zi0zNZ1&ISlXmmy95qk%it9p#J=H>Ip^NP$NL^Qf2RZvp?AD5&KA)(c4ay5+r$&5H47QqWjkEd%o|S
zbI(0RLyjCda^%R7D2y?YK1%{#(uPZFU5^1D00GdHG~a1l<_TySV~i;Pp8^MgFM%z<
zN@!>R{0000Je1T-f(S1m<;Q`qfgM1x&G0Y^mWVmvx}^KANhrEhzFMtfjM)L4vFf*!
z?uOQPW57P&_y3jjPi8&97&8G(+usS^bA2|vYeq8NV#n3iFG%HxUH5De1=!_g}N*0F;66
zB;Cz~2N+|fdSv=AMuFeE6hyZ}>uUh}GZO;9UK`I*+<$k6@B!ErN}K`ki7{qV>IpE$
zlz{Pw!<)bXV@x@$zA@$~@KM{&QL(Rd*8#ro7lEk(NEipc@O{4qjQGBP1US?sgl<)<
z)rC0MTS~#%XvG#u-`J$Q(#7~7VqRHy0-C_`fcFFu?x_Pysm}qD0^pg0x$D4UR(63K
zc8iO1osT3fr=9?NdV2sojwCP#-AnCQ(X$T8GkG$;{j^+
ze9&;w7brO}{sgcPlQ@gOB}oledvL*l@^KhHYIDeGN%Jlnre1=|H?2EwwWqrv6eeD%
z2&&l=;%`Y*VO~NpU$)JWhrk4@y}>=eHtU5ifakzH;H9Lcq&mZ1Ldsv3G@E3*+gT16
zFy_l?Hhy3a*htC`OhAN~FR-?ccQ)eMX}e@c4l()hUMF2xk{BdqrC
z=i**qXugku=PhU1Qh!0NW~UZDr*IZ*G>m7al4IRIH{c}|T00000
z6pD$v&~@EHrlsfpkG}8sITKKyS$mQ(_uSv)ZUGOaOQ3iH>VNK^iO-03Sn)SQY6QGQ
zzOYv$keCI0$ruBl(S+qTRRXplbm`UV)-4P&~9$m+#
zV*U85d8^I$KzYDAv~NKIH;4kp{MUibbx587G0|_ChGH#1wErm6G?WEcf|HiOR7HoI
zJHc4ig%iXH7VZS81t0(?m@gz3X;rV_bj=$@o%sct2b^d7JzNu&kidoix3&z9i6$ii
z7IqK?N|V56(F90%*^mek1)?W8J`ETBVA6O*sL?ikvq*$4ZMe)l{x`mCg9I|MfRjhR
zLDvGNKk-*1<>)Rj+#Q$e{
z7yQ#q?=s*tQ*byjs1!`3Coq~EIZe0o&ZdG;A)?`!QWhLfO(+HJ-AD1*_Iuv8n<9h&
zARq+Zr&s9JN$31K2yzhx)e2Y%1*LMCUrM$1r;yHEc0M+)xKJqzQmRgf!hIWV#RHsx
z07QVUf=@WsL>
z!oemQ6Kp0(DhIe}Pa6Qi2zX4IO-4{k4FL}t
z1I*HZHqgBycAgJ>hAMN=yyx8GGV|h3#ry6}-naIgF`gz!fXj^VEtS{LY%#%Ps9}O;
zV=NVPVRBU9rO1cKpc6&%O)XHr>o-r8w$%4&6oe3u3G9=32ts`)tx7(mgOxcXh>V+>
zF)ox6!vs0d20K}9d*D0X;dq~p@}0n83?U92R>s;oez{!64*xrmt{3M7#PQlV{`Ew;
z#*xNwM08H8jjBpB^Ns0j>?aj
z**h6zM*>uy5SL^bcwgEH1Be0PsEm*$nt_|`(A(<3a>g1!%Th1jzo-j1LDZBt;2R%)
z3gJ*JKQKD{RF{9iVIda}y{5?kq5i4{IK)(GK1qitOkw7LSizTpHznTC07YAf(ubm9
zT)T7=MXYmjh)A2&&0UY%uYMGvKxBFx(6FYInheNH!w9Kn#%6jPQ=$yuWfLTQ%H@vS
zPZmv(K$U@&waBh%zOX0)qzVxeBLU-wHl*
zF@uGgS-yLns%rx!1eF(MfDs81FZTD>T|69>BOdWdQ9th-EUH*<=8B{|5v%jeGDSEP
z<--M>5Y{f-f*UWn2X{U3QBazH1?5FSS{SMeyxzc0*}!(B@+{0SLQxU_8;Ln39L<*^
zkrQ|<{A8gh`xIg5+J%?k0}VHVQvZQqo@qNy5Pc(UN?E`OV&l?l@OSV3C4RZ>GkH;?
zpvE|c228~V2rwPS3UQv(BoUjT+UWMcPwpn`_Idb
zbCD+kWJcH%bK;x766OgvQ~H?+A~WJZ4x$uYLruJYdlPFa!qr<@FV<~4axlUMzRoD<
z{W0LBIyNrX2Co2i@%2p$^PfD$Am@O@Gl1D-00qU*w|xqGS{?<{GJ88f$2+JucC%@K
zCbjv(&-`snCNQa2O^^f?(P5K~ke`4f@DpmpX95w-@EikJg3fVr=XPXk5OfN%w)xHT
zU&1Sg?pI8yRSPIHg@UG(4K?hy>^So|-CWGj`_ZBz0l1i$xG5Qa!sjKTAkQDj`F}t#
z=5Y7RNV}5~P{KT@pI%=S6lc|4Wq|*{E8oELZ{6*g9*Fyu`%$jQXM${;%V)!<=8UsN
zMUDrq&IHXd%lBg3pTrv@^5K4gN{j%Sx?e_9*GryVHWo;(a_;))4GZ2c;pF1sJ>SEV
zd+$=sCBTCK!@5vvnjpgo>kBgmhE3{WF(WfENpj!3KNWmtmL$l{D2S(>*||R-Ipr)d
zLZqGbMU*3zIUriSOEY+O|F5uh*LOKS{1K3E>ewCT!`ILN^}7rj>`bs|12m8`lR(G8
zaSdoF=T6W;>D(~ll?8BuvQN+>A^?P7bRdP!=1~neijv9*Dr&-@lwi1b0zEC`evK!^
z(UJfvmlVoV1gHZ_DcbgqfVynKP
zzc_}gzrF;70I4L!Grv8i)W_mMT=%V|9x#LgJ|O+aCh+2a^(t+n@cbi!{Q3LM
zaMRG93y7p#^X?(*^<76tkxaNCgkWB646#x*SvESD#&AzcGlvdN92z(Js%a=x=DGj)
zHr)Nf=fO;!Zh~bK3dxMhle1()UC0Mh5gBAz`o)0A5t^DeHeDL*n!wISyJ1UBcejos
zF)(Spj#8j?->`R0fMDV35~IzD!(;p*4a;I?FWXDo^%lk
z2T;4J6oDW?CM`^B$Kg@QpEx*icm!@nHO{pwqX+~EccflO>s`a+ed@>llC38oeA^4y
zxnJkyf>gX6=9z_u_DzsCV*!2+RpaN`?4r#CvG!85wDjyUqglt{gy#c%U(nk=j-eiP
zKWn5YsC;)b6s`M)K?p%O5NrNTdJ6Bp>(qfiYv;nl-Vk=9G(+#WWk3$aVfY
zKt7CJ5iWH#4S-N9sG*}(QwXd#ZQ^fgO0>jW?vDG`$
z$e;VxueC7tP=XuCV~q)=E)XJEusmi26vn)XI&a}K<#S0x0O)u-F3mtWI6P1_01~jQ
z&T!H)@K7dTBYmZ;OELhY#$9C_$)O!;I2$Z*(6DJ9=GPY~(uujYfQm&Xt)P*><2Qbh}NhYKk%fl=oLIV#>+oiH@8g;eJrM3#P)F%|}B
z5>^@!*B))h
z?!O$jKE`N%qaRza41~B?ylxJ5KGvbsx9%TC$6?j}S1yhsTom*qlz~gB63q~>)HZ?0
zxUz_dWnzi+9s(rkH*!JhTdFS2aF7+-CIbg#X(Kd(ee<1xL4>bO)&`Z!IVQu
zA4o!o$g+Bz@WB=dKd+707S&VRer}dNM;73`gJAB{qwueYif`cH`YwY+PV;vSHj%nD1-7o
z!JVx(sA-x^2J{{q$74S~!rKgVj$@!xU5yr%g|TE^IS3&*_}a`E(6p-$7kz9A2nZIh
zpM%C%viDQIAcErZFgF!bGc|tt*?$Aai*}d^Vp`$RlpaYc59Niyhgv9mY43zsO;dIU
zJU)`f(boseiMD04=7*o0x>C&m4epLdHiMg9D+KTiz4S;xMIZ-K-E|R7w?D
zIFN_xR+r&Dm)3gHzoXlzZ}_YEsH%^nsy>eDx>8it#ZgsPiiY#5jJ8cXdqD_6Bo;*V
zQZqTnsD6D3xCTq}G6ND`>eox{l0T7-@x3x2F>fp%5dy^LMsVKM
zi|~8=YtOGX+8)}~%We4LGtE^o02I$DKt)Ydo`^rm
zEOuR;H0;sAt5n{5e#p#UmsVu(Zwl#R0h
z!3REeh7v6iI9Ry69K-=vdjc0Ofa;}jeDYfxk#SwI6V3HEXc1uTd*`EaQ4G|jpzv(H
z>rzBw0mZ_wNJgFw)u%_bFBZ#_k8&_zil!rHGcR&-LIl-IW6G{%dFM0VI_@}{5Am*F
zxN461(gs_Z5`Tfi^o$ZLTsg-FRy^aNt_znEgkwR}EHCxSU6(J8yn1sX$jv`zG+Qb0
zok-H&Bl$v-b&r)y`8B`*I5%VDD5*3$4*@3tp7U`WIB<|b3geS{PM;uJ5JxBwR^M(R
z4l*>2iA=(8MI>!-_@G6BI0}Nr$hawtP7E0RhXN6VgGD~@6p4vm1W5qlP?47^c10$@
zbt%Rs29R{kENRwBQ}uMJ$}l|>G)?;A#lJ%+5VqE(GD$RcJck#X?m;T!<##S#^%c~X
zt+uw$xGA&@?82V*KVdxMMMNPdf(^CTVo})!1c*A7p=1}fAH5GPeLDdFi!08-<`tjk
z^?%s@HB`jvv1Rp_v)=#U*a>Xg_Y1sv?3pRgdAgMU*HR2N=H{!vBP1{PLxBj^)?SJa
zuDx|i{RW&6mXx21^Otz`7*ckySic+NQn_yABEsl>%Azk=%0ReA0tJH?|__?vUS
zg_YIs%iWNgr&DzWIT$d-E~eNlk?ccT-(Ix!?ZfDVc%rqad>!iNZZNvZxM_5cG@&PP
zMA<%AS$qcKg$qzsyaH9lE0k--CWkPY5!q4#f{k_8+V9a));V+-ZGC%jeBdo)r0wXJ
zt-pz1qysEo@6h|78Zgr{K~zgq@S%OH$BZ8@6V%kT9Z&4N6U1>43&-(=&A;P&^Xtmb
zL`&~(rF~+e4-dWmEjW&YMdfE<%Zi(MT~R?fDvIiq_D>%8Av%WM0s+Cr%WuMhxM#}d
z7B8{B%VmS-@i%^i&Y@;d>f+ob*J5+SX8`~ug>x~tbTPUHo3eC3vv-1wrmm1c8lJ_
z^YO`Hr7jXG5rRfpJ9TPYAQgoW`%!JY$Zdisz+Qe+3;mZLB;fhW5B?=od)tozOoVISYBy5zln4Lox_I^a)en)Ws-1Rm)}Pwqo=jAIRUMlQV!lkN)17S
zfglWtmbaTLnvg|^Eo7J=m75ZmWv)wuDZueIcGY8hE&(7G7EiFoCI^+Vv>9<49Ph+a
zjsJ#JW>Rssg#~fGqNS7~TA)4y9-kO8d#C0-a*3rBv51M_z|esH(RSSZ(r1+g)kv}%9fJozsjFyE
zvCmAl>WvpJQ2H93H2bI0eB^nvcBRourD|lnPXn16AnUksZOGvVvN&NVz?*7kwxJX#
z2o`#;@LSZaAQ(kyv=SwSmAGKV4Je9;hv;3y&7iV6`!qH=h=W}(@b9%{Yf&Cs1lM)Z
zH7p_$hXiris;^_&+)dcD_;0bQYBR5!NF^|u?9UPusD(w5a>S$aQCYea7p=TOnzD<|
zp(g)avJ4u?vIbdkw2i?P)xBYS(ifE_^pS$QD+`s)c^dycLOlYXt
zjE0)c=5W--8*NWmog{TB8c#fj^|e><@-u6%#8YqGiRPZ|cu(E6JkwfJwiY#IYmNR7
zbiRPJn>IDlg2#2|e#Z*Z!H$=mB^+Ab`3B(VXDUlr3#~>1#x`&;yk7N7M2XJEO0G7@>5Anh(1Os7Y+!V$p2GP>D8;3eyz(jf+lu{%n
z`q1A0CI@9QJ%*8FKic~C3Wi9`85!?I=injiIPwU_d>>^1OvSl)pG*}_n`x4X+_~+;
zN@?HFF*F_DB~rxlk6jR=q>oEu^YQh|9!7c5LcXf~r$;VC_s9{*Kfa`h56f7p)givcJ~W7W9z@<&k?TcG@62&Iz0@IfGuq9Q`MPch+heOQHM
z^t}!|y#qkS78prp`PjlPQ$;FOCP<%4DD(
z*$kBz)!?=(oe0ak@X5*7tDizFTsF-gD#}LMYn;+{Kw)-Rs4JMjeviQL
z0lEp29Hb5`B#C!*zR5O^3av~{i#@o~Q
z(2j5WCLw?PJXLZP2^1h$BN12KT})ld>*O*PwS)qNxMux#&``aF=ZVb2)xh`8YsyyR
z6X*Q|Rq++7zsSl!mC=y2BNydifY$*V;DrOf$1k>hTBzB{5`_e^^rj~J?#khwtAu_s
z@I0hc9;~}qyWnzE#O7ej$}eKsyz@lA>~J-y_xp+!%)#d_{4ENDqqua<%?8-2;hyga+_R8V=@b7>5I9Md1lj~-XaZ}onHVz(%NRsJNDoLuV#owaLbu9-qxkds??*Y;xGLgIM0e4uB90jhzraKytjo
zCs44+hy5Z73q^C?FB6`QfkrfU??g%AB4jc>xaO>HgHm9A=~9$L$}pK8hD+0kgvu~B
zIfky`Bj_G(#)i5p@zTLNaQ2daz;lgXu=);teF2FQx3=&8n!tCv;QkjZ@RY+(3MFb{NkYKF4F=#3@
zEe3eI#8?PIvA_Lk{OcoE;j5QFgitWTBNmnOE>ug$Vtyg@#E*J-%+G&hNe(~ZFXTAJ
z)+x%1vUs!_*KPa(dWQF6XuK7#9=2yY*_FK``_VhH9{@p7WC6CU{tDXq-o$~9=M6t$
zGfU7IF%_D6Jeh^#2Ri---+$x^Os2j8Cm&&9qg0cga9j%CXsCM|y+jp#W
z6=&ndi|$8z?|g7z0Rv
zHg=f7yBof3n3LC)GiAm8iyudZ?Tj)Aw~s*SeHPJ>n2fx;QcqA3x_V>^ky&GWl1VNLxuy)$}l$)`}{tEu=1vcJIdb9=_ar{;C1aB-Umx
zl35L|!mojB0(TO1#F*_$K@VnhASs4P7z?;NAyN^D$m3yLD%
zHutf~9z5T8J3jTkyAY37<-lP2(m!nm2qxH%w%)xM812X*DXR3VF}}nIrCyY|E;Y1A
zkL%ahUWI7L!NC)Mlt7(_71bX>{k+Ta&Tn4HS}dD?4Ju2{4`ssTg~KdBUc0wN`y{oXb$`vl%R_8X-v
zk?g?3yFZGtiLShJYw6jB!Lg$l8a<+vA3E_6K6vIIaNo;uB$EA-u*^*I8O<=MBRd^e
zJs?lA6nc)S&9H))xRIk&;lCg}f9EtN^2
zz3*vkT7JF749)ysAI*4sx)Ev;N0LlSdfAs^C5$BU!xq9fbn!40{!e`Qp{NKwMMe}-
zf3;<6(L3@cP8Icz?DsYjYXQT_&`G@?kUQS@%9L229a5%KW&~r0vK9dR_Fj*yh0P3A
z6xU&Ryv?kbB^n-Y#qz2v6@PWIbkZ+qa3)ajCt03EI~;Pc)Rmg@zl;&Sim)eOTqD>+
zA$aY5$*(L~iVtnL19cT=VIF{ezF!)J!?T;)fM>_NMSITac~DSzqNV*>au67qjD
zMS=37g}CLit!V1{GoIQ1E0o2S;=<+EBN!-0A~}grpg8Njo(vTPi$Fnf)8)Uz{$uyx
ztvA1i1!bFX<0b!ryPy3UUO9CCwELXJSCm*JphZ5smMH9_o{uG!AHr+RKSE2-lK_CG
zuC16z58~tJ|6oQ8nDu|?Y>W9_<-5AtswYUJa}Wm>9XQTaLp6E;r=Pgjcw>1hsK)D&>o4&aG%m3+)rJVth3HAF1
zK`2;g&FxI2%pd!hZAxXvj7+MxS$G&>>79kC(kXjOlKOdZGxN!6iO6;`+Ye~W0GO`;
zAi~ji5S`N3Q~{B?5RTV>7NErZvICZwq3r)5enuA4&3FBurc=%UMjj&|9;|SEkmDz&
z8C2N;!G84|kRACugWfgFkTwL1m|x$D^3H+(ZD)WWmOp1!orj^6^0;3P
zMH$KeGya`G1_L7DB2<+xJstNVZG2WiCh8xw_wB{NXadQU8jZB|9mL>h2ZqP(KkUtD
zhKWl|q(*SK^HmIunf*6)?L=Aed;~+;Wx6Q4x00000NkvXXu0mjf5wD~L
diff --git a/res/drawable-xhdpi/ic_read_only.png b/res/drawable-xhdpi/ic_read_only.png
deleted file mode 100644
index 43d966175793c9669525d4b9f8a927eeadb877b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1895
zcmV-t2blPYP)4wld%Z%ck>5UW3$}e<-I>4^RwAZGwGbA
z5k5+r95n;uGT_$pB5k7=2l#xcEI5jVJVgdS;^r-$(HDbDR>=GUUdoz>l|1jxFVX!t
z_tHl^tQmlEzEf}uT*X)TYT*8STJ4TvH^Q-`Oy4pmOqX_X(
z>|c86Nb_^p#5!q~3ueF^mmU@}i!_ZakORh-9u`xTwb!i=k5hA-qSxFw-RPu-pzE@2A9}q|H?~+
zc0a{F-sL_NDVkX+XY^&+Pc4n4X_9jDrWueH<^qFkF+)WI@G{;mdj@OrSjfhL6O&p|
zddS=~y=I%#QxC*hFTMJL9AY8Wq_IVt8}cse$?yw(wurMJ0AicK1r}*sIjb+oepZuUItg>gT#--n8?B2vj6x8$+ZCZ$7_AFVJL~a@)4+q0
zl0K6*mqfFQGJMv^VSPp3VlB`j+e})@dCf2Z0O0Mkg(V>tR@7DCj-GcuK8v|e4x3x%
zh8$ouWu#do-TI2yG~jdAoR@#-sN<;^0N`!6>sTJFj@AbM7@6#KhP(K<9591sNDi}>
z7?otq2|2+dz&qx&8AErhxMRlN!8BR}EW}j3-_J-u*D5(^2F(pQ%}QXAdBu##LQeBX
z<1;w`UdHRRYgm!Xf~vGy{Np(+K%9@sUNdYi$vxCy$#v5!{dDQ{*qVz30AP1;jZX&u
zt(yFkfl42vMfRJt9N`f%Tr|hbRg)>C)hZr9a)jsn?V*NhPV9+*6FyC}f*#}z6yEq+
zOJD%%+B5U8RBa#}V@iCF;T#CdWS1F{tDMn$rxbwG&U%%?Q`1ykfQ3q{*6+`O0CP-_
zxnj;1qcv87`E|GR-uG0cst&MFp&I;C*>LoU%im18IK5W!-hU8mnLYlIP%Ko%9;Py<
z)1FqWW3ke_&q6RN919gn{L^GmjIc$&KZO9CcGeRjRQbNA;;J^VmauH!<1$a{OT|Z4
ztaR_QES!&EVXk`W;5$<|9XlI&oMC*3oOG~UwKTLeKy`9>${3Jy93@49>y$-3>z`LM
zRaL-^G9HR*+$O|;GfQ8~{%+&TL>5)$T45HFJeE8=X$G9R{6H20)iSvP$CX&uB3tToYEXpShN5IG4JlL68U
z)8@={lh)@-%b1Am!GvK{y
z$3sp0JU%f#3u6Olr#2_`X0c2Tnqe?nMp&8+$2eQ{+oK!5hw{)s*T8bS!@D+tEpTSD
zG7$3_>Uhq1z$ph#W?`rJ(SOWCGQ}o-98$EFx7=wHiGj~>GcVLKe4WPtGYTNiPd+dY
zko1$Ad7j|pG?S#;SRw!?!J^2V&u~BJG^bEO?{h$WiDyGg%Xn$*7d_DoG-jvSFblPg
z059izpCjL6YY4u}@7<;nf>7G28AExRIVLHW*`xalbkH4n88M&L(HRkotbk82RzFjQ
zCHwSn?mLdi4!VmOc^R=HsyaphkcVlGIQuMaagG=C?@X$wIikZZW8L^H<64Uzvem?KL6sVesS{O3|z%CIV^PZXwnpj0ePGT5_I!h
zw(Db4@zKJ=?jpe|6tIu>WPbq$oH$S7@fUrSDHT`oG~dnlKEDFQoC-b^ai_cAb{Fv9
h6jyOa?#Tb9{2OSllaQM4uAl$_002ovPDHLkV1mYKcDn!o
diff --git a/res/drawable-xhdpi/navigation_accept.png b/res/drawable-xhdpi/navigation_accept.png
deleted file mode 100644
index b8915716e06792d926f397a7b17346f656c86aa1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1546
zcmaJ>eM}Q~7(NOZ>jx?|Mx7)_1qW{Q?n+DPg;FVn(PM_rcwjwgk7z
zaExq;FcCM$1T(WNW-4=WI(1VrnIo~NbIM>M*htY0#}vP^FxeFW{X=%i-TV8!d7tO~
zdUEwS*{>~}w{ji;01FLSdXr$+1>d=Igzo{O;<{i~@EK-4moDL57>fgGHrj%N1`;d9
zO*m%rRCM7f01z5Ogb|R~a#dE8&^Q=`4tJ)^jrh+MMR3IR69s}KEImMxFjdYS170y97Bn2l!
zc!x&%v?#MN2TZ3~98}8S1S_0`fJq7&qJY&3^{b#9Mqmh$L$E3Vfl;Ljg%NP-kqX&Z
zTM25?XHMl3ZW^hb=NS}&TrQW)l_;axQV3D2)etO)%@DX$DNsRmu?1h*=3L=$S+q
zji`a*c#N{*2E9fqaL5S4h9>Hh6v?`@WTg&HMvx3dtw7Wn3SD|yrV>#pbjUPTPg|WN
zPVv)N+cT_sR%}oVBqLvOnw4(~Yn#0m)vQ=ZC