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 00000000..0eb78f7c Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_action_settings.png differ 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 00000000..c290e590 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_action_settings.png differ 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 00000000..999d0f0d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_action_settings.png differ 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 00000000..530227e2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_action_settings.png differ diff --git a/app/src/main/res/layout-sw720dp/activity_settings.xml b/app/src/main/res/layout-sw720dp/activity_settings.xml new file mode 100644 index 00000000..1cf7aa2b --- /dev/null +++ b/app/src/main/res/layout-sw720dp/activity_settings.xml @@ -0,0 +1,27 @@ + + + + + + + + + + \ 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 @@ + + + + + + - + + diff --git a/app/src/main/res/menu/only_next.xml b/app/src/main/res/menu/only_next.xml index bd075ce5..b46b39a2 100644 --- a/app/src/main/res/menu/only_next.xml +++ b/app/src/main/res/menu/only_next.xml @@ -1,4 +1,12 @@ + + + + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 52d79bc2..3159c144 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1,4 +1,12 @@ + + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 409aac8e..781b44d7 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,8 +1,15 @@ + + DAVdroid - DAVdroid-Website Weiter Hilfe @@ -102,6 +109,34 @@ Präemptive Authentifizierung (empfohlen, aber nicht kompatibel mit Digest-Auth.) Passwort: + + Einstellungen + Keine DAVdroid-Konten gefunden + Anmeldeinformationen + Benutzername + Benutzername eingeben: + Passwort + Aktualisieren Sie Ihr Passwort gemäß den Server-Einstellungen. + Passwort eingeben: + Präemptive Authentifizierung + Anmeldeinformationen werden bei jeder Anfrage gesendet (empfohlen) + Anmeldeinformationen werden nur auf Anforderung gesendet + Synchronisierung + Häufigkeit der Kontakte-Synchronisierung + Nur manuell + Alle %d Minuten + sofort bei lokalen Änderungen + Nicht verfügbar + Häufigkeit der Kalender-Synchronisierung + + Nur manuell + Alle 5 Minuten + Alle 10 Minuten + Alle 15 Minuten + Stündlich + Alle 2 Stunden + Alle 4 Stunden + Täglich + DAVdroid: Ordner auswählen An dieser Adresse konnte kein CalDAV- oder CardDAV-Dienst gefunden werden. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e1970073..da7c83c9 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,4 +1,12 @@ + + DAVdroid diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 537c97f2..c50be593 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1,4 +1,12 @@ + + DAVdroid diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 2b1e1a6b..2105f511 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1,4 +1,12 @@ + + diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 1110c9e0..a469df2b 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -1,4 +1,12 @@ + + diff --git a/app/src/main/res/values-zh-rcn/strings.xml b/app/src/main/res/values-zh-rcn/strings.xml index 6f577395..827161b1 100644 --- a/app/src/main/res/values-zh-rcn/strings.xml +++ b/app/src/main/res/values-zh-rcn/strings.xml @@ -1,4 +1,12 @@ + + diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml new file mode 100644 index 00000000..fc0104a5 --- /dev/null +++ b/app/src/main/res/values/dimen.xml @@ -0,0 +1,12 @@ + + + + + 300dp + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7fdc21bf..c2e99059 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,10 +1,16 @@ + + DAVdroid - - DAVdroid Web site Next Help @@ -16,7 +22,7 @@ Manage sync accounts - + Thank you for buying DAVdroid via Google Play and thus supporting the project. Unfortunately, there are two issues with Google Play:

@@ -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 79655934..00000000 Binary files a/res/drawable-hdpi/addressbook.png and /dev/null differ diff --git a/res/drawable-hdpi/alerts_and_states_warning.png b/res/drawable-hdpi/alerts_and_states_warning.png deleted file mode 100644 index a82ac4ac..00000000 Binary files a/res/drawable-hdpi/alerts_and_states_warning.png and /dev/null differ diff --git a/res/drawable-hdpi/calendar.png b/res/drawable-hdpi/calendar.png deleted file mode 100644 index 3b5f92c3..00000000 Binary files a/res/drawable-hdpi/calendar.png and /dev/null differ diff --git a/res/drawable-hdpi/extra_actions_about.png b/res/drawable-hdpi/extra_actions_about.png deleted file mode 100644 index e5582f4c..00000000 Binary files a/res/drawable-hdpi/extra_actions_about.png and /dev/null differ 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 9a41829f..00000000 Binary files a/res/drawable-hdpi/ic_action_new_account.png and /dev/null differ 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 5a5d5587..00000000 Binary files a/res/drawable-hdpi/ic_action_new_event.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index dce11e1c..00000000 Binary files a/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_read_only.png b/res/drawable-hdpi/ic_read_only.png deleted file mode 100644 index aca46301..00000000 Binary files a/res/drawable-hdpi/ic_read_only.png and /dev/null differ diff --git a/res/drawable-hdpi/navigation_accept.png b/res/drawable-hdpi/navigation_accept.png deleted file mode 100644 index 58bf9721..00000000 Binary files a/res/drawable-hdpi/navigation_accept.png and /dev/null differ diff --git a/res/drawable-hdpi/navigation_forward.png b/res/drawable-hdpi/navigation_forward.png deleted file mode 100644 index 812b3aaf..00000000 Binary files a/res/drawable-hdpi/navigation_forward.png and /dev/null differ diff --git a/res/drawable-hdpi/show_sync_settings.png b/res/drawable-hdpi/show_sync_settings.png deleted file mode 100644 index 4a6fb5b5..00000000 Binary files a/res/drawable-hdpi/show_sync_settings.png and /dev/null differ diff --git a/res/drawable-hdpi/view_website.png b/res/drawable-hdpi/view_website.png deleted file mode 100644 index 9edbb1b5..00000000 Binary files a/res/drawable-hdpi/view_website.png and /dev/null differ diff --git a/res/drawable-mdpi/addressbook.png b/res/drawable-mdpi/addressbook.png deleted file mode 100644 index 4779b7dd..00000000 Binary files a/res/drawable-mdpi/addressbook.png and /dev/null differ diff --git a/res/drawable-mdpi/alerts_and_states_warning.png b/res/drawable-mdpi/alerts_and_states_warning.png deleted file mode 100644 index f620ca52..00000000 Binary files a/res/drawable-mdpi/alerts_and_states_warning.png and /dev/null differ diff --git a/res/drawable-mdpi/calendar.png b/res/drawable-mdpi/calendar.png deleted file mode 100644 index 1bb6a071..00000000 Binary files a/res/drawable-mdpi/calendar.png and /dev/null differ diff --git a/res/drawable-mdpi/extra_actions_about.png b/res/drawable-mdpi/extra_actions_about.png deleted file mode 100644 index 25d68263..00000000 Binary files a/res/drawable-mdpi/extra_actions_about.png and /dev/null differ 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 10e17d08..00000000 Binary files a/res/drawable-mdpi/ic_action_new_account.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_action_new_event.png b/res/drawable-mdpi/ic_action_new_event.png deleted file mode 100644 index e8b7e41a..00000000 Binary files a/res/drawable-mdpi/ic_action_new_event.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index d4520816..00000000 Binary files a/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_read_only.png b/res/drawable-mdpi/ic_read_only.png deleted file mode 100644 index b2434f76..00000000 Binary files a/res/drawable-mdpi/ic_read_only.png and /dev/null differ diff --git a/res/drawable-mdpi/navigation_accept.png b/res/drawable-mdpi/navigation_accept.png deleted file mode 100644 index cf5fab3a..00000000 Binary files a/res/drawable-mdpi/navigation_accept.png and /dev/null differ diff --git a/res/drawable-mdpi/navigation_forward.png b/res/drawable-mdpi/navigation_forward.png deleted file mode 100644 index 75700a7f..00000000 Binary files a/res/drawable-mdpi/navigation_forward.png and /dev/null differ diff --git a/res/drawable-mdpi/show_sync_settings.png b/res/drawable-mdpi/show_sync_settings.png deleted file mode 100644 index 9e7a7756..00000000 Binary files a/res/drawable-mdpi/show_sync_settings.png and /dev/null differ diff --git a/res/drawable-mdpi/view_website.png b/res/drawable-mdpi/view_website.png deleted file mode 100644 index 7a27476b..00000000 Binary files a/res/drawable-mdpi/view_website.png and /dev/null differ diff --git a/res/drawable-xhdpi/addressbook.png b/res/drawable-xhdpi/addressbook.png deleted file mode 100644 index 3090e596..00000000 Binary files a/res/drawable-xhdpi/addressbook.png and /dev/null differ diff --git a/res/drawable-xhdpi/alerts_and_states_warning.png b/res/drawable-xhdpi/alerts_and_states_warning.png deleted file mode 100644 index 126fc78e..00000000 Binary files a/res/drawable-xhdpi/alerts_and_states_warning.png and /dev/null differ diff --git a/res/drawable-xhdpi/calendar.png b/res/drawable-xhdpi/calendar.png deleted file mode 100644 index 5fd726a7..00000000 Binary files a/res/drawable-xhdpi/calendar.png and /dev/null differ diff --git a/res/drawable-xhdpi/extra_actions_about.png b/res/drawable-xhdpi/extra_actions_about.png deleted file mode 100644 index 69cacb79..00000000 Binary files a/res/drawable-xhdpi/extra_actions_about.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_action_new_account.png b/res/drawable-xhdpi/ic_action_new_account.png deleted file mode 100644 index addee18c..00000000 Binary files a/res/drawable-xhdpi/ic_action_new_account.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_action_new_event.png b/res/drawable-xhdpi/ic_action_new_event.png deleted file mode 100644 index f2435cb3..00000000 Binary files a/res/drawable-xhdpi/ic_action_new_event.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index e4b9000a..00000000 Binary files a/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_read_only.png b/res/drawable-xhdpi/ic_read_only.png deleted file mode 100644 index 43d96617..00000000 Binary files a/res/drawable-xhdpi/ic_read_only.png and /dev/null differ diff --git a/res/drawable-xhdpi/navigation_accept.png b/res/drawable-xhdpi/navigation_accept.png deleted file mode 100644 index b8915716..00000000 Binary files a/res/drawable-xhdpi/navigation_accept.png and /dev/null differ diff --git a/res/drawable-xhdpi/navigation_forward.png b/res/drawable-xhdpi/navigation_forward.png deleted file mode 100644 index 1f60fc63..00000000 Binary files a/res/drawable-xhdpi/navigation_forward.png and /dev/null differ diff --git a/res/drawable-xhdpi/show_sync_settings.png b/res/drawable-xhdpi/show_sync_settings.png deleted file mode 100644 index 64bcc5f7..00000000 Binary files a/res/drawable-xhdpi/show_sync_settings.png and /dev/null differ diff --git a/res/drawable-xhdpi/view_website.png b/res/drawable-xhdpi/view_website.png deleted file mode 100644 index aba86f0b..00000000 Binary files a/res/drawable-xhdpi/view_website.png and /dev/null differ diff --git a/res/drawable-xxhdpi/addressbook.png b/res/drawable-xxhdpi/addressbook.png deleted file mode 100644 index c23e339e..00000000 Binary files a/res/drawable-xxhdpi/addressbook.png and /dev/null differ diff --git a/res/drawable-xxhdpi/alerts_and_states_warning.png b/res/drawable-xxhdpi/alerts_and_states_warning.png deleted file mode 100644 index c858e047..00000000 Binary files a/res/drawable-xxhdpi/alerts_and_states_warning.png and /dev/null differ diff --git a/res/drawable-xxhdpi/calendar.png b/res/drawable-xxhdpi/calendar.png deleted file mode 100644 index e604ef5d..00000000 Binary files a/res/drawable-xxhdpi/calendar.png and /dev/null differ diff --git a/res/drawable-xxhdpi/extra_actions_about.png b/res/drawable-xxhdpi/extra_actions_about.png deleted file mode 100644 index c01120fd..00000000 Binary files a/res/drawable-xxhdpi/extra_actions_about.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_action_new_account.png b/res/drawable-xxhdpi/ic_action_new_account.png deleted file mode 100644 index 53c08a8c..00000000 Binary files a/res/drawable-xxhdpi/ic_action_new_account.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_action_new_event.png b/res/drawable-xxhdpi/ic_action_new_event.png deleted file mode 100644 index ebd24107..00000000 Binary files a/res/drawable-xxhdpi/ic_action_new_event.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 126ae37e..00000000 Binary files a/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_read_only.png b/res/drawable-xxhdpi/ic_read_only.png deleted file mode 100644 index 6ce79f86..00000000 Binary files a/res/drawable-xxhdpi/ic_read_only.png and /dev/null differ diff --git a/res/drawable-xxhdpi/navigation_accept.png b/res/drawable-xxhdpi/navigation_accept.png deleted file mode 100644 index 6fda89ec..00000000 Binary files a/res/drawable-xxhdpi/navigation_accept.png and /dev/null differ diff --git a/res/drawable-xxhdpi/navigation_forward.png b/res/drawable-xxhdpi/navigation_forward.png deleted file mode 100644 index a4e6f382..00000000 Binary files a/res/drawable-xxhdpi/navigation_forward.png and /dev/null differ diff --git a/res/drawable-xxhdpi/show_sync_settings.png b/res/drawable-xxhdpi/show_sync_settings.png deleted file mode 100644 index 209f8917..00000000 Binary files a/res/drawable-xxhdpi/show_sync_settings.png and /dev/null differ diff --git a/res/drawable-xxhdpi/view_website.png b/res/drawable-xxhdpi/view_website.png deleted file mode 100644 index 05de707e..00000000 Binary files a/res/drawable-xxhdpi/view_website.png and /dev/null differ diff --git a/res/layout/account_details.xml b/res/layout/account_details.xml deleted file mode 100644 index 40790aba..00000000 --- a/res/layout/account_details.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml deleted file mode 100644 index 1337c4e4..00000000 --- a/res/layout/activity_main.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/res/layout/add_account.xml b/res/layout/add_account.xml deleted file mode 100644 index 5bf370dd..00000000 --- a/res/layout/add_account.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/res/layout/address_books_heading.xml b/res/layout/address_books_heading.xml deleted file mode 100644 index f97ecb90..00000000 --- a/res/layout/address_books_heading.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout/calendars_heading.xml b/res/layout/calendars_heading.xml deleted file mode 100644 index 770eb099..00000000 --- a/res/layout/calendars_heading.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout/login_email.xml b/res/layout/login_email.xml deleted file mode 100644 index 8e5a0a78..00000000 --- a/res/layout/login_email.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/res/layout/login_type.xml b/res/layout/login_type.xml deleted file mode 100644 index 8ce0277e..00000000 --- a/res/layout/login_type.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - diff --git a/res/layout/login_url.xml b/res/layout/login_url.xml deleted file mode 100644 index a712b08f..00000000 --- a/res/layout/login_url.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/layout/query_server.xml b/res/layout/query_server.xml deleted file mode 100644 index 5e3f83eb..00000000 --- a/res/layout/query_server.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - diff --git a/res/layout/select_collections_header.xml b/res/layout/select_collections_header.xml deleted file mode 100644 index 521dc124..00000000 --- a/res/layout/select_collections_header.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/res/menu/account_details.xml b/res/menu/account_details.xml deleted file mode 100644 index e3bfc0b9..00000000 --- a/res/menu/account_details.xml +++ /dev/null @@ -1,11 +0,0 @@ - -

- - - - - diff --git a/res/menu/add_account.xml b/res/menu/add_account.xml deleted file mode 100644 index 6892f08d..00000000 --- a/res/menu/add_account.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/res/menu/debug_settings.xml b/res/menu/debug_settings.xml deleted file mode 100644 index 40f8ba75..00000000 --- a/res/menu/debug_settings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/res/menu/main_activity.xml b/res/menu/main_activity.xml deleted file mode 100644 index 132a9981..00000000 --- a/res/menu/main_activity.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/res/menu/only_next.xml b/res/menu/only_next.xml deleted file mode 100644 index bd075ce5..00000000 --- a/res/menu/only_next.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml deleted file mode 100644 index 64132a6c..00000000 --- a/res/values-ca/strings.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - DAVdroid - - Lloc web de DAVdroid - Següent - Ajuda - - Error HTTP: %s - Falten capacitats: %s - Error E/S: %s - URI invàlida: %s - - - Gestioneu els comptes a sincronitzar - Gràcies per comprar DAVDroid a travès de Google Play i així donar suport al projecte. De totes formes, hi ha dos incidències amb el Google Play:

- -

1. Les comptes poden desaparèixer desprès de reiniciar

-

Podeu trobar-vos amb el problema de que totes les vostres comptes de DAVdroid (contactes i events inclosos) han desaparegut - desprès de reiniciar el dispositiu. La raó és un error de Android - que causa que totes les comptes de les aplicacións de pagament s\'eliminen al iniciar perquè els fitxers (encriptats) APK es - carreguen desprès de revisar si existeixen comptes orfanes.

-

Usuaris afectats:
- * Tots els usuaris de Android 4.1 que han obtingut el DAVdroid del Play Store;
- * El usuaris de Android 4.2 que han obtingut el DAVdroid del Play Store només en alguns dispositius (per exemple, la majoria de dispositius Samsung)

- -

2. Els comptes poden desaparèixer desprès d\'actualitar el DAVdroid

-

Podeu trobar-vos amb el problema de que totes les vostres comptes de DAVdroid (contactes i events inclosos) han desaparegut quan el Play Store - actualitza el DAVdroid. La raó és unaltre error de Android - que causa que les comptes del les aplicacións de pagament s\'esborrin al actualitzar per alguna raó similar.

-

Usuaris afectats: alguns de Android 4.4.2 que han obtingut el DAVdroid desde el Play Store (es coneix per dispositius Nexus i Moto G)

- -

Si esteu afectats per algun d\'aquests errors, sisuplau instaleu el - DAVdroid JB Workaround.

- ]]> - Benvingut a DAVdroid/%s! - -

DAVdroid es un adaptador de Android 4+ per la sincronització de CalDAV/CardDAV. Per a utilitzar-lo afegieu una compte de DAVdroid - pel vostre servidor de CalDAV/CardDAV i els vostres contactes/esdeveiments es sincronitzaràn de forma bidireccional.

- -

Per mes informació, podeu visitar la pàgina web de DAVdroid. - També hi ha una guia de configuració. El DAVdroid respecta - la teva privacitat, feu una ullada a la nostra politica de privacitat.

- -

Si feu servir CyanogenMod, "Privacy Guard" ha d\'estar deshabilitat pel DAVdroid. Si no es així, el DAVdroid no pot accedir ni sincronitzar - els vostres contactes i events.

- -

En cas de problemes, sisplau llegiu el FAQ primer. - Si trobeu una errada que està clarament relacionada amb el DAVdroid, afegiu-la directament a - Github en comptes de contactar-nos directament o de donar una - valoració pobra de l\'aplicació.

- -

Codi Obert

-

DAVdroid està disenyat per a ser un proejcte de codi obert desde bon principi. Sempres es possible compilar l\'aplicació per la vostra part - i utilitzar-la gratuitament sense cap obligació. El codi font es troba - app yourself and use it for free without any obligations. The source code is - disponible a Github, i també podeu - descarregar l\'aplicació al F-droid.

- -

De totes formes, es va fer molta feina per crear aquesta applicació, així que vam decidir ficar-la a les tendes comercials per un petit import. - Si voleu suportar aquest project, siusplau considereu fer una donació a DAVdroid - o comprar-lo.

- -

Llicència

-

Copyright (c) 2013 – 2014 Ricki Hirner (bitfire web engineering). Tots els drets reservats. - Aquest programa i tots els materials que l\'acompanyen estan disponibles sota els termes de la GNU Public License v3.0 que acompanya - aquesta distribució i està disponible a http://www.gnu.org/licenses/gpl.html. Respecte al Google Play, Samsung - Store, AndroidPit App Center o Amazon Appstore que requereixen altres condicions, els termes respectius apliquen per les versions - que s\'han descàrregat a travès d\'aquests serveis.

- -

La traducció alemana es realitzada pels mateixos autors. Les traduccions a altres idiomes han estat contribucións de varies persones que es mencionen en el seu idioma específic. -

-

Traducció: - Català: Sergi Almacellas Abellana -

- -

Llibraries de tercers utilitzades

-

- * iCal4j (New BSD License)
- * ez-vcard (New BSD License)
- * Simple XML Serialization (Apache License, Version 2.0)
- * Project Lombok (MIT License)

- * dnsjava – BSD License

- ]]> - - - Entra amb una adreça de correu electrònic - Els detalls del servei es detectaran automàticament amb el nom del servidor. Per exemple: elmeucompte@icloud.com - Entra amb una URL i un nom d\'usuari - Els detalls del servei es detectaran de forma automàtica amb al URL inicial i el nom d\'usuari. Normalment utilitzat per servers allotjats en servidors propis. - - Si us plau, introduïu la vostra adreça de correu electrònic. El seu nom de domini s\'utiltizara per auto-detectar la configuració dels serveis. - Correu electrònic: - - http:// - https:// - - - "Si no feu servir cap encriptació (HTTPS), altres usuaris poden interceptar fàcilment les vostres credencials, contactes i events." - Nom d\'usuari: - URL Arrel (les coleccions es detecten automàticament): - Autentificació preferent (recomanat però incompatible amb l\'autentificació Digest) - Contrasenya: - DAVdroid: Seleccioneu col·leccions - Ni CalDAV ni CardDAV estan disponibles a aquesta ubicació. - - Afegir compte - Contactant servidor. Espereu sisuplau. - Quines col·leccions s\'han de sincronitzar? - Llibretes de contactes - Llibreta de contactes - Calendaris - Calendari - Seleccioneu com a molt una llibreta de contactes (Polseu de nou per deseleccionar): - Seleccioneu els vostres calendaris: - - Detalls del compte - Nom del compte: - El meu compte CalDAV/CardDAV - Correu electrònic: - "ORGANITZADOR dels teus events. Es requereix si feu servir la informació dels assitents" - "Podeu fer servir la vostra addreça de correu electrònic com a nom de la compta ja que el Android utiltizar el nom de la compta com a camp ORGANITZADOR pels events que vosaltres creeu. No podeu tenir dos comptes amb el mateix nom. - només-lectura - - - Configuració general - Configuració deputarció - Desactiva compressió HTTP - La compressió HTTP està desactivada (mode depuració) - La compressió HTTP s\'utilitza quan es possible. - Registra el tràfic de xarxa - Tot el tràfic de xarxa es reigstra (mode depuració) - No es registra el tràfic de xarxa - Informa d\'un error - - - diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml deleted file mode 100644 index c74d42dc..00000000 --- a/res/values-cs/strings.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - DAVdroid - - Webová stránka DAVdroid - Další - Pomoc - - HTTP chyba: %s - Chybějící možnosti: %s - I/O chyba: %s - Neplatné URI: %s - - - Spravovat synchronizované účty - - Thank you for buying DAVdroid via Google Play and thus supporting the project. Unfortunately, there are two issues with Google Play:

- -

1. Accounts may be gone after a reboot

-

You may encounter the problem that all your DAVdroid accounts (including contacts and events) are gone - after rebooting your device. The reason is a bug in Android - that causes accounts of paid apps to be removed on start-up because the (encrypted) APK files are - loaded after checking for orphaned accounts.

-

Affected users:
- * all Android 4.1 users who have got DAVdroid from Play Store;
- * Android 4.2 users who have got DAVdroid from Play Store only with certain devices (for instance, most Samsung devices)

- -

2. Accounts may be gone after upgrading DAVdroid

-

You may encounter the problem that all your DAVdroid accounts (including contacts and events) when Play Store - updates DAVdroid. The reason is another bug in Android - that causes accounts of paid apps to be removed when upgrading for a similar reason.

-

Affected users: some Android 4.4.2 users who have got DAVdroid from Play Store (known for Nexus devices and Moto G)

- -

If you\'re affected by one of these bugs, please install the - DAVdroid JB Workaround.

- ]]> - Vítejte do aplikace DAVdroid/%s! - -

DAVdroid je aplikace pro Android 4+ na synchronizaci CalDAV/CardDAV účtů. Stačí přidat účet DAVdroid - pro CalDAV/CardDAV server a vaše kontakty/události budou synchronizovány oběma směry.

- -

Pro více informací se podívejte na domovskou stránku aplikace DAVdroid. - Najdete tam i návod pro nastavení. DAVdroid respektuje - vaše soukromí, přečtěte si naši Privacy Policy.

- -

If you use CyanogenMod, "Privacy Guard" must be disabled for DAVdroid. Otherwise, DAVdroid is not allowed to access - and synchronize your contacts and events.

- -

In case of problems, please read the FAQ first. - If you encounter a bug that is clearly related to DAVdroid, enter it on - Github issues instead of contacting us directly or giving a poor - rating for the app.

- -

Open-source

-

DAVdroid is designed to be an open-source project from the very first beginning. It is always possible to compile the - app yourself and use it for free without any obligations. The source code is - available on Github, and you can - download the app on F-droid.

- -

However, it was much work to create this app, so we have decided to put it into the commercial stores for a small fee. - If you want to support this project, please consider donating to DAVdroid - or purchasing it.

- -

License

-

Copyright (c) 2013 – 2014 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 - that are downloaded via these services.

- -

Překlad. - Čeština: Jaroslav Lichtblau -

- -

Použité knihovny třetích stran

-

- * Apache HttpClient (httpclientandroidlib flavour) – Apache License, Version 2.0
- * iCal4j – New BSD License)
- * ez-vcard – New BSD License
- * Simple XML Serialization – Apache License, Version 2.0
- * Project Lombok – MIT License
- * dnsjava – BSD License

- ]]> - - - Přihlášení s emailovou adresou - Detaily účtu budou automaticky detekovány podle doménového jména. Příkald: mujucet@icloud.com - Přihlášení s URL a uživatelským jménem - Detaily účtu budou automaticky rozpoznány podle URL a uživatelského jména. Nejčastější volba pro vlastní servery. - - Vložte prosím svou emailovou adresu. Její doménová adresa bude použita pro automatické zjištění nastavení služby. - Email: - - - http:// - https:// - - "Pokud nepoužijete šifrované připojení (HTTPS), ostatní budou moci lehce získat vaše přihlašovací údaje, kontakty a události." - Uživatelské jméno: - Kořenová URL (sbírky budou detekovány automaticky): - Preemptivní ověření (doporučeno, ale není kompatibilní s Digest ověřením) - - Heslo: - - DAVdroid: Vybrat sbírky - V tomto umístění není CalDAV-/CardDAV služba dostupná. - Přidat účet - Probíhá komunikace se serverem. Chvilku strpení… - Které sbírky mají být synchronizovány? - Adresáře - Adresář - Kalendáře - Kalendář - Vybrat alespoň jeden adresář (opakovaně tapnout pro odebrání): - Vybrat své kalendáře: - - Detaily účtu - Jméno účtu: - Můj CalDAV/CardDAV účet - Emailová adresa: - "ORGANIZÁTOR událostí; vyžadováno pokud budete přidávat účastníky" - "Použijte svou emailovou adresu jako jméno účtu. Android bude používat tuto hodnotu jako jméno ORGANIZÁTORA událostí které vytvoříte. Nelze mít dva účty se stejným jménem. - pouze pro čtení - - - Obecná nastavení - Ladící nastavení - Vypnout HTTP kompresi - HTTP komprese je vypnuta (ladící mód) - HTTP komprese je použita všude kde možno - Logovat síťový provoz - Veškerý síťový provoz je detailně logován (ladící mód) - Síťový provoz není logován - Nahlásit problém - - diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml deleted file mode 100644 index d77ccd47..00000000 --- a/res/values-de/strings.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - DAVdroid-Website - Weiter - Hilfe - - HTTP-Fehler: %s - Fehlende Server-Unterstützung: %s - E/A-Fehler: %s - URI ungültig: %s - - - Sync-Konten anzeigen - - Vielen Dank, dass Sie DAVdroid im Play Store erworben haben und das Projekt dadurch unterstützen. - Leider gibt es derzeit zwei Probleme, die vom Play Store verursacht werden:

- -

1. DAVdroid-Accounts verschwinden nach einem Neustart

-

Möglicherweise verschwinden alle Ihre DAVdroid-Accounts samt Kontakten und Terminen nach einem Neustart - des Geräts. Die Ursache ist ein Fehler in Android, - der zur irrtümlichen Entfernung von Accounts von Bezahlapps bei einem Neustart führt, da die Prüfung auf verwaiste - und damit zu löschende Accounts schon *vor* dem Entschlüsseln der App erfolgt.

-

Betroffene Benutzer*Innen:
- * alle mit Android 4.1, die DAVdroid über Play Store bezogen haben;
- * einige mit Android 4.2, die DAVdroid über Play Store bezogen und bestimmte Geräte haben (zB die meisten Samsung-Geräte)

- -

2. DAVdroid-Accounts verschwinden nach einer DAVdroid-Aktualisierung

-

Möglicherweise verschwinden alle Ihre DAVdroid-Accounts samt Kontakten und Terminen während eines - DAVdroid-Updates, das von Play Store durchgeführt wird. Die Ursache ist ein - anderer Fehler in Android, - der zur irrtümlichen Entfernung von Accounts von Bezahlapps bei der Aktualisierung dieser Apps führt.

-

Betroffene Benutzer*Innen:
- einige mit Android 4.4.2, die DAVdroid über Play Store bezogen haben (bekannt sind Nexus-Geräte und Moto G)

- -

Sollten Sie von einem dieser Fehler betroffen sein, installieren - Sie den DAVdroid JB Workaround.

- ]]> - Willkommen bei DAVdroid/%s! - -

DAVdroid ist ein Android 4+-CalDAV/CardDAV-Sync-Adapter. Um ihn zu verwenden, müssen Sie ein DAVdroid-Konto - für Ihren Server hinzufügen. Die Kontakte/Termine werden dann automatisch in beide Richtungen synchronisiert.

- -

Wenn Sie CyanogenMod benutzen, muss die "Datenschutz"-Funktion für DAVdroid deaktiviert sein, da DAVdroid sonst - keinen Zugriff auf die Kontakte und Kalendar hat und auch nicht synchronisieren kann.

- -

Weitere Informationen erhalten Sie auf der DAVdroid-Homepage. - Dort finden Sie auch eine Anleitung zum Einrichten. - DAVdroid respektiert Ihre Privatsphäre (siehe Datenschutzrichtlinie).

- -

Bei Problemen lesen Sie bitte die häufig gestellten Fragen. - Im Falle eines Fehlers, der eindeutig durch DAVdroid verursacht wird, berichten Sie diesen wenn möglich auf - Github Issues, anstatt uns direkt zu kontaktieren oder die App - schlecht zu bewerten.

- -

Open-Source

-

DAVdroid ist von Anfang an als Open-Source-Projekt ausgelegt. Der Quellcode kann jederzeit selbst kompiliert und - die App unter den Bedingungen der GPLv3 verwendet werden. Der Quellcode ist - auf Github verfügbar, die App kann auch - über F-Droid bezogen werden.

- -

Es ist jedoch viel Arbeit, die App zu entwickeln und besser zu machen. Daher haben wir uns entschlossen, sie - auch gegen eine kleine Gebühr in die kommerziellen App-Stores zu stellen. Wenn Sie das Projekt unterstützen wollen, können Sie - für DAVdroid spenden oder die App kaufen.

- -

Lizenz

-

Copyright (c) 2013 – 2014 Ricki Hirner, Bernhard Stockmann (bitfire web engineering), alle Rechte - vorbehalten. Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU - General Public License Version 3, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren. - Sofern Google Play oder Samsung Store andere Bedingungen benötigen, gelten für über den jeweiligen Markt heruntergeladene - Apps diese Bedingungen.

- -

Die Übersetzung auf Deutsch wird von den Autoren zur Verfügung gestellt. Übersetzungen für andere Sprachen - wurden von verschiedenen Leuten beigetragen, die in der jeweiligen Sprachversion erwähnt sind.

- -

Verwendete Bibliotheken

-

- * Apache HttpClient (mittels httpclientandroidlib) – Apache License, Version 2.0
- * iCal4j – New BSD License
- * ez-vcard – New BSD License
- * Simple XML Serialization – Apache License, Version 2.0
- * Project Lombok – MIT License
- * dnsjava – BSD License

- ]]> - - - Mit Email-Adresse anmelden - Domänenname wird verwendet, um die Servereinstellungen herauszufinden. Beispiel: myaccount@icloud.com - Mit URL und Benutzername anmelden - Basis-URL und Benutzername werden verwendet, um die Servereinstellungen herauszufinden; z.B. bei einem eigenen Server. - - Geben Sie Ihre Email-Adresse ein. Der Domänenname wird verwendet, um die Servereinstellungen herauszufinden. - Email: - - Ohne Verschlüsselung (HTTPS) können Ihre Zugangsdaten, Kontakte und Termine leicht abgefangen werden. - Benutzername: - Basis-URL (Ordner werden automatisch gefunden): - Präemptive Authentifizierung (empfohlen, aber nicht kompatibel mit Digest-Auth.) - - Passwort: - - DAVdroid: Ordner auswählen - An dieser Adresse konnte kein CalDAV- oder CardDAV-Dienst gefunden werden. - Konto hinzufügen - Daten werden vom Server abgefragt. Bitte warten… - Welche Ordner sollen synchronisiert werden? - Adressbücher - Adressbuch - Kalender - Kalender - Ein oder kein Adressbuch auswählen (nochmal berühren, um abzuwählen): - Kalender zur Synchronisation auswählen: - - Konto-Details - Kontoname: - Mein CalDAV/CardDAV-Konto - Email-Adresse: - "ORGANIZER der von Ihnen angelegten Termine; notwendig für Teilnehmer-Info" - "Verwenden Sie Ihre Email-Adresse als Kontoname, da Android den Kontonamen als ORGANIZER-Feld in Terminen benutzt. Sie können keine zwei Konten mit dem gleichen Namen anlegen. - schreibgeschützt - - - Hilfe zu DAVdroid - - Allgemeine Einstellungen - Einstellungen zur Fehlersuche - HTTP-Komprimierung deaktivieren - HTTP-Komprimierung ist deaktiviert (zur Fehlersuche) - HTTP-Komprimierung wird verwendet, falls möglich - Netzwerkverkehr aufzeichnen - Der gesamte Netzwerkverkehr wird in den Android-Logs mitgeschrieben (zur Fehlersuche) - Netzwerkverkehr wird nicht aufgezeichnet - Problem berichten - - \ No newline at end of file diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml deleted file mode 100644 index da7c99c6..00000000 --- a/res/values-es/strings.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - DAVdroid - Ajustes - - - http:// - https:// - - - "Si no usas encriptación (HTTPS), otras personas pueden interceptar fácilmente tus datos de ingreso, contactos y eventos." - Nombre de usuario: - Contraseña: - URL raiz (colecciones autodetectadas): - Siguiente - Ayuda - URL base no válida: - DAVdroid: Selecciona las colecciones - I/O error: %s - URI no válida: %s - Se han perdido capacidades: %s - Ni CalDAV ni CardDAV están disponibles - Añadir cuenta - Consultando el servidor. Espera, por favor… - error HTTP: %s - Qué colecciones quieres sincronizar? - Agendas - Calendarios - Seleciona una agenda (pulsar de nuevo para desmarcar): - Selecciona tus calendarios: - Autentificación preferente (recomendado, pero incompatible con la autentificación de Digest) - - Ayuda de DAVdroid - Administrar las cuentas sincronizadas - Sitio web de DAVdroid - ¡Bienvenido a DAVdroid/%s! - -

DAVdroid es un adaptador de sincronización entre Android 4+ y CalDAV/CardDAV. Para usarlo, simplemente añade una cuenta DAVdroid para tu servidor de CalDAV/CardDAV, así tus contactos y eventos serán sincronizados en ambas direcciones.

- -

Si usas CyanogenMod, debes desactivar "Privacy Guard" para DAVdroid. De otro modo, DAVdroid no tendrá autorización para acceder y sincronizar tus contactos y eventos.

- -

Para más información, por favor lee la página de DAVdroid. - También hay una Guía de configuración. DAVdroid respeta tu privacidad, lee nuestra Politica de Privacidad.

- -

Si tienes problemas, por favor lee las FAQ primero. - Si te encuentras un bug que esté claramente relacionado con DAVdroid, entra en - Github issues en lugar de contactar con nosotros directamente o de darle una mala votación a la aplicación.

- -

Código abierto

-

DAVdroid ha sido diseñado como un proyecto de código abierto desde sus inicios. Siempre es posible compilar la app por ti mismo y usarla de forma gratuita sin ninguna obligación. El código fuente está disponible en Github, y puedes descargar la app desde F-droid.

- -

Sin embargo, hay mucho trabajo detrás de la creación de esta aplicación, así que hemos decidido ponerla en las tiendas (Google Play, - Samsung Store) a cambio de un pequeño pago. - Si quieres apoyar este proyecto, por favor piensa en hacer una donación a DAVdroid - o en comprar la app.

- -

Licencia

-

Copyright (c) 2013 – 2014 Richard Hirner (bitfire web engineering). Todos los derechos reservados. - Este programa y los materiales que la acompañan está disponible bajo las condiciones de la GNU Public License v3.0 que acompaña a esta distribución, y está a tu disposición en http://www.gnu.org/licenses/gpl.html. En lo relativo a Google Play or Samsung requieren otras condiciones, éstas han sido descargadas a través de estos servicios.

- -

Translations. - Catalanian: @pokoli, - Chinese (simplified): @phy25, - Czech: Jaroslav Lichtblau, - Serbian: @pejakm, - Spanish: @xphnx -

- -

Librerías third-party usadas

-

- * iCal4j (Licencia New BSD)
- * ez-vcard (Licencia New BSD)
- * Simple XML Serialization (Licencia Apache Version 2.0)
- * Project Lombok (Licencia MIT)

- ]]> - Detalles de la cuenta - Nombre de la cuenta: - Mi cuenta CalDAV/CardDAV - Dirección de correo: - "ORGANIZADOR de tus eventos; se necesita si se usa información de los asistentes" - "Usa tu dirección de correo electrónico como nombre de cuenta porque Android usará el nombre de cuenta como campo de ORGANIZADOR para los eventos que crees. No puedes tener dos cuentas con el mismo nombre. - - diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml deleted file mode 100644 index c6a8aa2f..00000000 --- a/res/values-fr/strings.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - DAVdroid - Paramètres - - - http:// - https:// - - - Si vous n\'utilisez pas de chiffrement(HTTPS), d\'autres personnes peuvent facilement intercepter vos informations de connexion, contacts et événements. - Utilisateur: - Mot de passe: - URL racine(les collections seront autodétectées): - Suivant - Aide - Racine de l\'URL incorrecte: - DAVdroid: Sélectionnez les collections - Erreur I/O: %s - URI incorrecte: %s - Capacités manquantes: %s - Aucun CalDAV ou CardDAV disponible - Ajouter un compte - Interroge le serveur. Patientez svp. - Erreur HTTP: %s - Quelles collections doivent être synchronisées ? - Carnets d\'adresses - Agendas - Choisissez un carnet d\'adresses(toucher à nouveau pour désélectionner): - Choisissez vos agendas: - Authentification préventive(recommandé, mais incompatible avec l\'authentification Digest) - - Aide de DAVdroid - Gérer les comptes synchronisés - Site Web de DAVdroid - Bienvenue dans DAVdroid/%s! - -

DAVdroid est un connecteur de synhronisation entre Android 4+ et CalDAV/CardDAV. Pour l\'utiliser, il suffit d\'ajouter un compte DAVdroid - pour votre serveur CalDAV/CardDAV, et vos contacts/évènements seront synchronisés dans les deux sens.

- -

Si vous utilisez CyanogenMod, "Privacy Guard" doit être désactivé pour DAVdroid. Sinon DAVdroid ne sera pas en mesure d\'accéder - et synchroniser vos contacts et évènements

- -

Pour plus d\'informations, visitez la page d\'accueil de DAVdroid. - Il y a Un guide d\'installation également. DAVdroid respecte - votre vie privée, see our Politique de confidentialité.

- -

En cas de problème, merci de lire la FAQ en premier lieu. - Si vous rencontrer un bug qui est clairement lié à DAVdroid, svp saisissez le sur - Github issues au lieu de nous contacter directement ou d\'attribuer une mauvaise appréciation à l\'application.

- -

Open-source

-

DAVdroid est conçu depuis le début comme étant open-source. Il est toujours possible de le compiler vous-même l\'application - et l\'utiliser gratuitement sans autre obligation. Le code source est - disponible sur Github, et vous pouvez - télécharger l\'application sur F-droid.

- -

Néanmoins étant donné que créer cette application nécessite du travail, nous avons décidé de la mettre sur les Stores (Google Play, - Samsung Store) pour un faible coût. - Si vous voulez aider ce projet faites un don à DAVdroid ou achetez le

- -

License

-

Copyright (c) 2013 – 2014 Ricki Hirner (bitfire web engineering). All rights reserved. - Ce programme et les documents qui l\'accompagnent sont mis à disposition sous les termes de la Licence Public GNU v3.0 qui - accompagne cette distribution, et est disponible à http://www.gnu.org/licenses/gpl.html. En ce qui concerne Google Play ou Samsung Store, les conditions respectives s\'appliquent pour les versions qui sont téléchargées via ces services.

- -

Translations. - Catalanian: @pokoli, - Chinese (simplified): @phy25, - Czech: Jaroslav Lichtblau, - Serbian: @pejakm, - Spanish: @xphnx -

- -

Bibliothèques tiers

-

- * iCal4j (New BSD License)
- * ez-vcard (New BSD License)
- * Simple XML Serialization (Apache License, Version 2.0)
- * Project Lombok (MIT License)

- ]]> - Détails du compte - Nom du compte: - Mon compte CalDAV/CardDAV - Adresse Email: - ORGANISATEUR de vos événements; nécessaire pour l\'information des participants - Utilisez votre adresse email en tant que nom de compte car Android utilise ce nom pour le champ ORGANISATEUR des évènements que vous créez." - Vous ne pouvez pas avoir deux comptes du même nom. - - diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml deleted file mode 100644 index e8d159dd..00000000 --- a/res/values-hu/strings.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - - DAVdroid - - DAVdroid web oldal - Tovább - Súgó - - HTTP hiba: %s - Hiányzó szolgáltatás: %s - I/O hiba: %s - Érvénytelen URI: %s - - - Szinkronizációs fiókok kezelése - - Köszönjük, hogy megvásárolta a DAVdroid alkalmazást a Google Play áruházban, támogatva ezzel a projektet. Sajnos, - a Google Play áruházzal két probléma is van:

-

1. A fiókok az eszköz újraindítása után eltűnhetnek

-

Előfordulhat, hogy az eszköz újraindítása után az összes DAVdroid fiók (beleértve hozzájuk tartozó - névjegyeket és eseményeket) eltűnik. Ezt egy - Android szoftverhiba okozza, melynek - következtében a nem ingyenes alkalmazásokhoz tartozó fiókok az eszköz indításakor törlődnek. A hiba hátterében az áll, - hogy a (kódolt) APK fájlok a létrehozó nélküli ("megárvult") fiókok törlése után töltődnek be.

-

Érintett felhasználók:
- * minden Android 4.1 felhasználó, aki a DAVdroid alkalmazást a Google Play áruházból töltötte le;
- * egyes Android 4.2 felhasználók, akik a DAVdroid alkalmazást a Google Play áruházból töltötték le, a használt eszköz - típusától függően (például egyes Samsung eszközök felhasználói)

-

2. A fiókok a DAVdroid frissítése után eltűnhetnek

-

Előfordulhat, hogy az összes DAVdroid fiók (beleértve a hozzájuk tartozó névjegyeket és eseményeket) - eltűnik, miután a Google Play áruház frissítette a DAVdroid alkalmazást. Ezt szintén egy, az előzőhöz hasonló, - Android szoftverhiba okozza. -

Érintett felhasználók:
- * egyes Android 4.4.2 felhasználók, akik a DAVdroid alkalmazást a Google Play áruházból töltötték le, a használt eszköz - típusától függően (például Nexus és Moto G eszközök felhasználói)

-

A probléma a JB DAVdroid gyorsjavítás - telepítésével kiküszöbölhető.

- ]]> - Üdvözöljük a DAVdroid/%s felhasználók között! -

DAVdroid egy Android 4+ CalDAV/CardDAV szinkronizációs adapter. Használatához hozzon létre egy DAVdroid fiókot a használni - kívánt CalDAV/CardDav szerverhez. Ezt követően a névjegyek és események szinkronizálva lesznek, mindkét irányban.

-

További információkat a DAVdroid - honlap tartalmaz. A beállításokkal kapcsolatban a - beállítások oldalon - találhat információkat. A DAVdroid tiszteletben tartja adatait bizalmasságát, részleteket az - adatkezelési nyilatkozat - tartalmaz.

-

Ha Ön CyanogenMod felhasználó, vonja ki a DAVdroidot a "Privacy Guard" hatálya alól, különben a DAVdroid nem fog tudni - hozzáférni a névjegyekhez és eseményekhez.

-

Probléma esetén olvassa el a - GYIK-et. Ha - egyértelműen a DAVdroidhoz köthető hibába ütközik, ahelyett, hogy közvetlenül keresne minket, vagy lepontozná az alkalmazást, - inkább a Problémák oldalon jelentse be.

-

Nyílt forráskód

-

A DAVdroid kezdettől fogva nyílt forráskódú projekt. Bármikor lehetősége van az alkalmazást lefordítani és használni, - mindenféle kötelezettség nélkül. A forráskód elérhető a Githubon, a - lefordított alkalmazás pedig az - F-droidon.

-

Mindemellett, az alkalmazás kifejlesztése sok munkát igényelt, ezért úgy döntöttünk, hogy az alkalmazást más áruházakban - is elérhetővé tesszük, egy szerény díj ellenében. Ha szeretné támogatni ezt a projektet, kérjük, fontolja meg az alkalmazás - megvásárlását vagy közvetlen - támogatását.

-

Licenc

-

Copyright (c) 2013 – 2014 Ricki Hirner (bitfire web engineering). Minden jog fenntartva. - Ez a program és a kapcsolódó anyagok a GNU Public License v3.0 hatálya alatt állnak, amely részét képezi a jelen csomagnak, és - amely elérhető - http://www.gnu.org/licenses/gpl.html oldalon. Amennyiben a Google Play, Samsung - Store, AndroidPit App Center vagy Amazon Appstore áruház eltérő feltételeket szab, akkor annak az áruháznak a szabályai - irányadóak, ahonnan az alkalmazást letöltötte.

-

Fordítások. - cseh: Jaroslav Lichtblau, - katalán: @pokoli, - kínai (egyszerűsített): @phy25, - magyar: Gábor J.Tóth, - szerb: @pejakm, - spanyol: @xphnx. -

-

Harmadik felek által fejlesztett programcsomagok

-

- * Apache HttpClient ( - httpclientandroidlib változat) – Apache License, Version 2.0
- * iCal4j – - New BSD License
- * ez-vcard – - New BSD License
- * Simple XML Serialization – - Apache License, Version 2.0
- * Project Lombok – MIT License

- ]]> - - - Bejelentkezés email cím segítségével - A szolgáltatás részleteinek automatikus detektálása a tartománynév alapján történik. Példa: myaccount@icloud.com - Bejelentkezés URL és felhasználónév segítségével - A szolgáltatás részleteinek automatikus detektálása a kiinduló URL és a felhasználónév alapján történik. Elsősorban privát szolgáltatásoknál ajánlott. - - Kérjük, adja meg email címét. A szolgáltatás részleteinek automatikus detektálása ennek - tartománynév-része alapján fog történni. - Email: - - - http:// - https:// - - "Titkosítás (HTTPS) nélkül a bejelentkezési azonosítókat, névjegyeket és eseményeket könnyen megismerhetik mások is." - Felhasználónév: - Fiók URL (a gyűjtemények detektálása automatikus): - Preemptív authentikáció (ajánlott, de Digest authentikációval nem működik) - - Jelszó: - - DAVdroid: Gyűjtemény kiválasztása - Nincs CalDAV-/CardDAV szolgáltatás a megadott helyen. - Fiók hozzáadása - Kapcsolódás a szerverhez. Egy pillanat… - Melyik gyűjtemények legyenek szinkronizálva? - Címjegyzékek - Címjegyzék - Naptárak - Naptár - Egy címjegyzék választható (a kijelölés visszavonása újbóli érintéssel vagy másik tétel kiválasztásával): - Naptárak kiválasztása: - - További beállítások - A fiók neve: - CalDAV/CardDAV fiók - Email cím: - "Szervező (ORGANIZER mező értéke), résztvevők kezelése esetén" - "Használja az email címet fióknévként, mert később a létrehozandó események szervezőjeként (ORGANIZER mező) az Android ezt fogja használni. Két fiókot nem lehet azonos néven létrehozni. - csak olvasható - - - Általános beállítások - Hibakeresési beállítások - HTTP tömörítés kikapcsolása - HTTP tömörítés kikapcsolva (hibakeresés) - HTTP tömörítés bekapcsolva (ahol csak lehetséges) - Hálózati forgalom naplózása - A teljes hálózati forgalom részletes naplózása (hibakeresés) - A hálózati forgalom naplózása kikapcsolva - Probléma bejelentése - - \ No newline at end of file diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml deleted file mode 100644 index ebf462b7..00000000 --- a/res/values-sr/strings.xml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - ДАВдроид - - ДАВдроид вебсајт - Следеће - Помоћ - - ХТТП грешка: %s - Недостају могућности: %s - У/И грешка: %s - Неисправан УРИ: %s - - - Управљај налозима синхронизације - - Хвала вам што сте купили ДАВдроид преко Google Play сервиса и тиме подржали овај пројекат. Нажалост, постоје два проблема са Google Play сервисом:

- -

1. Налози могу нестати након поновног покретања

-

Може вам се десити да сви ваши ДАВдроид налози (укључујући контакте и догађаје) нестану након - поновног покретања вашег уређаја. Разлог је грешка у Андроиду - која узрокује уклањање налога плаћених апликација приликом покретања јер се (шифровани) АПК фајлови - учитавају након провере за налоге без апликација.

-

Захваћени корисници:
- * сви корисници Андроида 4.1 који су инсталирали ДАВдроид са Play Store сервиса;
- * корисници Андроида 4.2 који су инсталирали ДАВдроид са Play Store сервиса само на неким уређајима (нпр. већина Самсунгових уређаја)

- -

2. Налози могу да нестану након надоградње ДАВдроида

-

Може вам се десити да сви ваши ДАВдроид налози (укључујући контакте и догађаје) нестану након - надоградње ДАВдроида. Разлог је опет грешка у Андроиду - која узрокује уклањање налога плаћених апликација приликом надоградње из сличног разлога.

-

Захваћени корисници: неки корисници Андроида 4.4.2 који су инсталирали ДАВдроид са Play Store сервиса (Нексус и Мото Г уређаји)

- -

Ако имате један од наведених проблема, инсталирајте „DAVdroid JB Workaround“.

- ]]> - Добро дошли у ДАВдроид/%s! - -

ДАВдроид (DAVdroid) је Андроид 4+ адаптер синхронизације за КалДАВ/КардДАВ (CalDAV/CardDAV). Да бисте га користили, - само додајте ДАВдроид налог за ваш КалДАВ/КардДАВ сервер и ваши контакти/догађаји ће бити синхронизовани у оба смера.

- -

За више информација погледајте ДАВдроид вебсајт. - Постоји и водич за поставку. ДАВдроид поштује - вашу приватност, погледајте нашу политику приватности.

- -

Ако користите Цијаноген Мод, „Privacy Guard“ мора бити онемогућен за ДАВдроид. У супротном, ДАВдроиду неће бити дозвољени - приступ и синхронизација ваших контаката и догађаја.

- -

У случају проблема, најпре прочитајте најчешћа питања. - Ако вам се деси грешка која је сигурно везана за ДАВдроид, поднесите пријаву на - Гитхабовом пратиоцу уместо да нас контактирате директно или да апликацији дате лошу оцену.

- -

Отворени код

-

ДАВдроид је испочетка дизајниран као пројекат отвореног кода. Увек је могуће да сами компајлирате - апликацију и да је слободно користите без икаквих обавеза. Изворни код је - доступан на Гитхабу, а можете и - преузети апликацију са Ф-Дроида.

- -

Међутим, уложено је много рада у ову апликацију па смо одлучили да је ставимо у комерцијалне продавнице за малу накнаду. - Ако желите да подржите овај пројекат, донирајте ДАВдроиду - или га купите.

- -

Лиценца

-

Ауторско право © 2013 – 2014 Рики Хирнер (Ricki Hirner), Бернхарт Стокман (Bernhard Stockmann) (Битфајер веб инжињеринг). Сва права задржана. - Овај програм и пратећи материјали су доступни под условима ГНУ-ове Јавне Лиценце в3.0 која је приложена, - и доступна на http://www.gnu.org/licenses/gpl.html. Ако сервиси „Google Play“, - „Samsung Store“, „AndroidPit App Center“ или „Amazon Appstore“ захтевају друге услове, исти важе за издања преузета са ових сервиса.

- -

Превод на српски: @pejakm. Превод на немачки: аутори. Остале преводе - допринели су људи поменути у преводима одговарајућих језика.

- -

Коришћене друге библиотеке

-

- * Апачи ХТТП клијент (httpclientandroidlib издање) – Апачи лиценца, издање 2.0
- * iCal4j – Нова БСД лиценца)
- * ez-vcard – Нова БСД лиценца
- * Симпле ИксМЛ серијализација – Апачи лиценца, издање 2.0
- * Пројекат Ломбок – МИТ лиценца

- * dnsjava – БСД лиценца

- ]]> - - - Пријавите се адресом е-поште - Детаљи сервиса ће бити аутоматски откривени по имену домена. Пример: mojnalog@icloud.com - Пријавите се УРЛ-ом и корисничким именом - Детаљи сервиса ће бити аутоматски откривени по почетном УРЛ-у и корисничком имену. Углавном се користи за самохостоване сервисе. - - Унесите вашу адресу е-поште. Име домена ће бити коришћено за аутоматско откривање поставки сервиса. - Е-адреса: - - - http:// - https:// - - "Ако не користите шифровање (ХТТПС), други људи вам лако могу пресрести детаље пријаве, контакте и догађаје." - Корисничко име: - Корени УРЛ (збирке ће бити аутоматски откривене): - Превентивна аутентификација (препоручено, али некомпатибилно са Дигест аутентификацијом) - - Лозинка: - - ДАВдроид: Изаберите збирке - Нема доступног КалДАВ/КардДАВ сервиса на овој локацији. - Додај налог - Шаљем упит серверу. Сачекајте… - Које збирке да синхронизујем? - Адресари - Адресар - Календари - Календар - Изаберите један адресар (додирните поново да поништите избор): - Изаберите ваше календаре: - - Детаљи налога - Име налога: - Мој КалДАВ/КардДАВ налог - Е-адреса: - "ОРГАНИЗАТОР ваших догађаја; потребно ако користите податке о учеснику" - "Користите вашу е-адресу као име налога јер Андроид користи име налога за поље ОРГАНИЗАТОР за догађаје које направите. Не можете имати два налога истог имена. - само-за-читање - - - Опште поставке - Поставке проналаска грешака - Онемогући ХТТП компресију - ХТТП компресија је онемогућена (режим проналаска грешака) - ХТТП компресија се користи кад год је могуће - Бележи мрежни саобраћај - Сав мрежни саобраћај се исцрпно бележи у дневник (режим проналаска грешака) - Мрежни саобраћај се не бележи у дневник - Пријави грешку - - diff --git a/res/values-zh-rcn/strings.xml b/res/values-zh-rcn/strings.xml deleted file mode 100644 index 48694a4c..00000000 --- a/res/values-zh-rcn/strings.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - - DAVdroid - - DAVdroid 网站 - 继续 - 帮助 - - HTTP 错误: %s - 服务器缺少功能: %s - I/O 错误: %s - URI 无效: %s - - - 管理同步账户 - - 感谢您在 Google Play 上购买 DAVdroid 支持本项目。然而 Google Play 版应用有两个问题：

- -

1. 账户可能在重启后消失

-

您可能会遇到以下问题：您所有的 DAVdroid 同步账户（包括通讯录和日历）在设备重启后消失。这是由于 Android 系统的一个 BUG，开机时，在检查完孤立账户后才会载入（加密的）程序文件，从而导致了付费应用创建的账户被移除。

-

受影响的用户：
- * 从 Play 商店安装 DAVdroid 的所有 Android 4.1 用户；
- * 从 Play 商店安装 DAVdroid 的部分设备（如大部分的三星设备）的 Android 4.2 用户。

- -

2. 账户可能会在升级 DAVdroid 后消失

-

您可能会遇到以下问题：您所有的 DAVdroid 同步账户（包括通讯录和日历）在使用 Play 商店升级 DAVdroid 后消失。这是 Android 系统的另一个 BUG，由于相似的原因，使得在升级应用后，付费应用创建的账户被移除。

-

受影响的用户：从 Play 商店安装 DAVdroid 的部分 Android 4.4.2 用户（如 Nexus 设备和 Moto G）。

- -

如果您遇到了这些问题，请安装 - DAVdroid JB 修复程序。

- ]]> - 欢迎使用 DAVdroid/%s！ - -

DAVdroid 是一个 Android 4+ 的 CalDAV/CardDAV 同步程序。开始使用本程序，只需增加一个 DAVdroid 账户，在其中设置 CalDAV/CardDAV 服务器，您的通讯录和日程就可以被双向同步了。

- -

更多信息请查阅 DAVdroid 英文主页，其中包括首次使用的配置指南。DAVdroid 尊重您的隐私，请查阅我们的隐私政策。

- -

如果您使用 CyanogenMod 等修改版系统，请停用针对 DAVdroid 的“隐私防护”功能，否则 DAVdroid 无法访问、同步您的通讯录和日程。

- -

如果您在使用中遇到问题，请先阅读 FAQ。如果您遇到了明显与 DAVdroid 有关的 BUG，请在 Github issues 上提交，不要直接联系我们，甚至给应用差评。

- -

开源

-

DAVdroid 从一开始就是开源项目。您可以自己编译应用，并可以没有限制地免费使用。源代码 - 存放在 Github 上，您也可以 - 在 F-droid 上下载应用。

- -

然而，编写这个应用是一个大工程，所以我们已经决定把它作为付费应用放在应用商店上，收一笔小费。 - 如果您想支持这个项目，请考虑 给 DAVdroid 捐款 或购买其付费版。

- -

许可

-

Copyright (c) 2013 – 2014 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. As far as Google Play, Samsung - Store, AndroidPit App Center 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. Translation for Chinese Simplified is by @phy25. Translations to other languages have been contributed by - various people which are mentioned in their respective language version.

- -

使用的第三方程序库

-

- * Apache HttpClient (httpclientandroidlib flavour) – Apache License, Version 2.0
- * iCal4j – New BSD License)
- * ez-vcard – New BSD License
- * Simple XML Serialization – Apache License, Version 2.0
- * Project Lombok – MIT License
- * dnsjava – BSD License

- ]]> - - - 使用邮箱地址登录 - 服务器信息会通过域名进行发现。例如: myaccount@icloud.com - 使用 URL 和用户名登录 - 服务器信息会通过 URL 和用户名进行发现。个人搭建的服务通常使用此项。 - - 请输入您的邮箱地址。邮箱的域名会被用来自动发现服务器信息。 - Email： - - - http:// - https:// - - "如果不使用加密连接 (HTTPS)，其他人将很容易获取到你的登录信息、通讯录和日程。" - 用户名： - 服务器根地址（集合会自动检测）： - 抢先认证模式（推荐使用，但不兼容 Digest 认证方式） - - 密码： - - DAVdroid: 选择同步项 - 找不到可用的 CalDAV-/CardDAV 服务。 - 增加账户 - 正在请求，请稍等… - 需要同步哪些集合？ - 通讯录 - 通讯录 - 日历 - 日历 - 最多选择一个通讯录：（再次点按可取消选择） - 选择日历： - - 账户信息 - 账户显示名： - 我的 CalDAV/CardDAV 账户 - Email 地址： - "日程的组织者 (ORGANIZER)；如果您使用参与者信息，则必填" - "请使用您的 E-mail 地址作为账户名，因为 Android 会将帐户名用于您创建的日程的参与者 (ORGANIZER) 项。您不能有两个重名的账户。 - 只读 - - - 普通设置 - 调试设置 - 停用 HTTP 压缩 - HTTP 压缩已停用（调试模式） - HTTP 压缩会在可用时使用 - 记录网络传输 - 传输内容会被日志记录（调试模式） - 传输内容不会被日志记录 - 报告问题 - - diff --git a/res/values/strings.xml b/res/values/strings.xml deleted file mode 100644 index 91a64e75..00000000 --- a/res/values/strings.xml +++ /dev/null @@ -1,140 +0,0 @@ - - - - - DAVdroid - - DAVdroid Web site - Next - Help - - HTTP error: %s - Missing capabilities: %s - I/O error: %s - Invalid URI: %s - - - Manage sync accounts - - Thank you for buying DAVdroid via Google Play and thus supporting the project. Unfortunately, there are two issues with Google Play:

- -

1. Accounts may be gone after a reboot

-

You may encounter the problem that all your DAVdroid accounts (including contacts and events) are gone - after rebooting your device. The reason is a bug in Android - that causes accounts of paid apps to be removed on start-up because the (encrypted) APK files are - loaded after checking for orphaned accounts.

-

Affected users:
- * all Android 4.1 users who have got DAVdroid from Play Store;
- * Android 4.2 users who have got DAVdroid from Play Store only with certain devices (for instance, most Samsung devices)

- -

2. Accounts may be gone after upgrading DAVdroid

-

You may encounter the problem that all your DAVdroid accounts (including contacts and events) when Play Store - updates DAVdroid. The reason is another bug in Android - that causes accounts of paid apps to be removed when upgrading for a similar reason.

-

Affected users: some Android 4.4.2 users who have got DAVdroid from Play Store (known for Nexus devices and Moto G)

- -

If you\'re affected by one of these bugs, please install the - DAVdroid JB Workaround.

- ]]> - Welcome to DAVdroid/%s! - -

DAVdroid is an Android 4+ sync adapter for CalDAV/CardDAV. To use it, just add a DAVdroid account - for your CalDAV/CardDAV server and your contacts/events will be synchronized in both directions.

- -

For more information, please see the DAVdroid homepage. - There\'s a Setup guide, too. DAVdroid respects - your privacy, see our Privacy Policy.

- -

If you use CyanogenMod, "Privacy Guard" must be disabled for DAVdroid. Otherwise, DAVdroid is not allowed to access - and synchronize your contacts and events.

- -

In case of problems, please read the FAQ first. - If you encounter a bug that is clearly related to DAVdroid, enter it on - Github issues instead of contacting us directly or giving a poor - rating for the app.

- -

Open-source

-

DAVdroid is designed to be an open-source project from the very first beginning. It is always possible to compile the - app yourself and use it for free without any obligations. The source code is - available on Github, and you can - download the app on F-droid.

- -

However, it was much work to create this app, so we have decided to put it into the commercial stores for a small fee. - If you want to support this project, please consider donating to DAVdroid - or purchasing it.

- -

License

-

Copyright (c) 2013 – 2014 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 - that are downloaded via these services.

- -

Translation for German is provided by the authors. Translations to other languages have been contributed by - various people which are mentioned in their respective language version.

- -

Used third-party libraries

-

- * Apache HttpClient (httpclientandroidlib flavour) – Apache License, Version 2.0
- * iCal4j – New BSD License)
- * ez-vcard – New BSD License
- * Simple XML Serialization – Apache License, Version 2.0
- * Project Lombok – MIT License
- * dnsjava – BSD License

- ]]> - - - Login with email address - Service details will be auto-detected by domain name. Example: myaccount@icloud.com - Login with URL and user name - Service details will be auto-detected by initial URL and user name. Mostly used for self-hosted services. - - Please enter your email address. Its domain name will be used to auto-detect service settings. - Email: - - - http:// - https:// - - "If you don't use encryption (HTTPS), other people may easily intercept your login details, contacts and events." - User name: - Base URL (collections will be auto-detected): - Preemptive authentication (recommended, but incompatible with Digest auth) - - Password: - - DAVdroid: Select collections - No CalDAV-/CardDAV service is available at this location. - Add account - Querying server. Please wait… - Which collections shall be synchronized? - Address books - Address book - Calendars - Calendar - Select up to one address book (tap again to unselect): - Select your calendars: - - Account details - Account name: - My CalDAV/CardDAV Account - Email address: - "ORGANIZER of your events; required if you use attendee info" - "Use your email address as account name because Android will use the account name as ORGANIZER field for events you create. You can't have two accounts with the same name. - read-only - - - General settings - Debug settings - Disable HTTP compression - HTTP compression is disabled (debug mode) - HTTP compression is used whenever possible - Log network traffic - All network traffic is being logged verbosely (debug mode) - Network traffic is not being logged - Report an issue - - diff --git a/res/values/styles.xml b/res/values/styles.xml deleted file mode 100644 index a9661327..00000000 --- a/res/values/styles.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/res/xml/account_authenticator.xml b/res/xml/account_authenticator.xml deleted file mode 100644 index 542950e6..00000000 --- a/res/xml/account_authenticator.xml +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/res/xml/account_prefs.xml b/res/xml/account_prefs.xml deleted file mode 100644 index 7648e8ac..00000000 --- a/res/xml/account_prefs.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/res/xml/contacts.xml b/res/xml/contacts.xml deleted file mode 100644 index 10d6eb36..00000000 --- a/res/xml/contacts.xml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/xml/general_settings.xml b/res/xml/general_settings.xml deleted file mode 100644 index be95c323..00000000 --- a/res/xml/general_settings.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/res/xml/sync_calendars.xml b/res/xml/sync_calendars.xml deleted file mode 100644 index d2ac9b79..00000000 --- a/res/xml/sync_calendars.xml +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/res/xml/sync_contacts.xml b/res/xml/sync_contacts.xml deleted file mode 100644 index 3a35ac92..00000000 --- a/res/xml/sync_contacts.xml +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/settings.gradle b/settings.gradle index e7b4def4..874f90b7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,9 @@ +/* + * 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 + */ + include ':app'