From ec4fedf04e17aa3694beda613043103aacf09d5c Mon Sep 17 00:00:00 2001 From: rfc2822 Date: Wed, 11 Dec 2013 17:08:10 +0100 Subject: [PATCH] Version bump to 0.5.2-alpha --- AndroidManifest.xml | 4 ++-- res/values-de/strings.xml | 5 ++++- res/values/strings.xml | 5 ++++- src/at/bitfire/davdroid/Constants.java | 2 +- src/at/bitfire/davdroid/resource/Contact.java | 3 +-- src/at/bitfire/davdroid/resource/Event.java | 8 ++------ src/at/bitfire/davdroid/resource/LocalAddressBook.java | 2 +- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 07096be7..d1b80be8 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="20" + android:versionName="0.5.2-alpha" > DAVdroid JB Workaround installieren, um Datenverlust beim Neustart zu vermeiden (dies ist ein Android/Play Store-Bug).

+

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).

@@ -71,7 +74,7 @@

Benutzte Bibliotheken

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

]]> diff --git a/res/values/strings.xml b/res/values/strings.xml index c46da07d..e5f43001 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -49,6 +49,9 @@ DAVdroid JB Workaround to prevent data-loss on reboot (it\'s an Android/Play Store bug).

+

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

+

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

@@ -79,7 +82,7 @@

Used third-party libraries

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

]]> diff --git a/src/at/bitfire/davdroid/Constants.java b/src/at/bitfire/davdroid/Constants.java index 6b415537..55d95815 100644 --- a/src/at/bitfire/davdroid/Constants.java +++ b/src/at/bitfire/davdroid/Constants.java @@ -9,7 +9,7 @@ package at.bitfire.davdroid; public class Constants { public static final String - APP_VERSION = "0.5.1-alpha", + APP_VERSION = "0.5.2-alpha", ACCOUNT_TYPE = "bitfire.at.davdroid", diff --git a/src/at/bitfire/davdroid/resource/Contact.java b/src/at/bitfire/davdroid/resource/Contact.java index 9e0595cf..6818bad2 100644 --- a/src/at/bitfire/davdroid/resource/Contact.java +++ b/src/at/bitfire/davdroid/resource/Contact.java @@ -92,8 +92,7 @@ public class Contact extends Resource { } public Contact(long localID, String resourceName, String eTag) { - super(resourceName, eTag); - this.localID = localID; + super(localID, resourceName, eTag); } @Override diff --git a/src/at/bitfire/davdroid/resource/Event.java b/src/at/bitfire/davdroid/resource/Event.java index ab453eb1..273bbea1 100644 --- a/src/at/bitfire/davdroid/resource/Event.java +++ b/src/at/bitfire/davdroid/resource/Event.java @@ -62,7 +62,7 @@ import at.bitfire.davdroid.syncadapter.DavSyncAdapter; public class Event extends Resource { private final static String TAG = "davdroid.Event"; - private TimeZoneRegistry tzRegistry; + private TimeZoneRegistry tzRegistry = new DefaultTimeZoneRegistryFactory().createRegistry(); @Getter @Setter private String summary, location, description; @@ -93,14 +93,10 @@ public class Event extends Resource { public Event(String name, String ETag) { super(name, ETag); - - DefaultTimeZoneRegistryFactory factory = new DefaultTimeZoneRegistryFactory(); - tzRegistry = factory.createRegistry(); } public Event(long localID, String name, String ETag) { - this(name, ETag); - this.localID = localID; + super(localID, name, ETag); } @Override diff --git a/src/at/bitfire/davdroid/resource/LocalAddressBook.java b/src/at/bitfire/davdroid/resource/LocalAddressBook.java index 94c15561..da1059bc 100644 --- a/src/at/bitfire/davdroid/resource/LocalAddressBook.java +++ b/src/at/bitfire/davdroid/resource/LocalAddressBook.java @@ -464,7 +464,7 @@ public class LocalAddressBook extends LocalCollection { @Override protected Builder buildEntry(Builder builder, Resource resource) { Contact contact = (Contact)resource; - + return builder .withValue(RawContacts.ACCOUNT_NAME, account.name) .withValue(RawContacts.ACCOUNT_TYPE, account.type)