arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-12-23 07:08:16 +00:00
Code Issues Releases Wiki Activity

Version bump to 0.5.2-alpha

Browse Source
This commit is contained in:
rfc2822 2013-12-11 17:08:10 +01:00
parent d30715f813
commit ec4fedf04e
7 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="at.bitfire.davdroid"
android:versionCode="19"
android:versionName="0.5.1-alpha" >
android:versionCode="20"
android:versionName="0.5.2-alpha" >
<uses-sdk
android:minSdkVersion="14"

5
res/values-de/strings.xml
View File

@ -41,6 +41,9 @@
<a href="https://play.google.com/store/apps/details?id=at.bitfire.davdroid.jbworkaround">DAVdroid JB Workaround</a>
installieren, um Datenverlust beim Neustart zu vermeiden (dies ist ein Android/Play Store-Bug).</p>
<p>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.</p>
<p>Weitere Informationen erhalten Sie auf der <a href="http://davdroid.bitfire.at?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">DAVdroid-Homepage</a>.
Dort finden Sie auch eine <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">Anleitung zum Einrichten</a>.
DAVdroid respektiert Ihre Privatsphäre (siehe <a href="http://davdroid.bitfire.at/privacy?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">Datenschutzrichtlinie</a>).</p>
@ -71,7 +74,7 @@
<h2>Benutzte Bibliotheken</h2>
<p>
* <a href="http://ical4j.sourceforge.net/">iCal4j<a> (<a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">New BSD License</a>)<br/>
* <a href="http://wiki.modularity.net.au/ical4j/index.php?title=VCard">iCal4j-vcard</a> (<a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">New BSD License</a>)<br/>
* <a href="https://code.google.com/p/ez-vcard/">ez-vcard</a> (<a href="http://opensource.org/licenses/BSD-3-Clause">New BSD License</a>)<br/>
* <a href="http://simple.sourceforge.net/">Simple XML Serialization</a> (<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>)<br/>
* <a href="http://projectlombok.org/">Project Lombok</a> (<a href="http://opensource.org/licenses/mit-license.php">MIT License</a>)</p>
]]></string>

5
res/values/strings.xml
View File

@ -49,6 +49,9 @@
<a href="https://play.google.com/store/apps/details?id=at.bitfire.davdroid.jbworkaround">DAVdroid JB Workaround</a>
to prevent data-loss on reboot (it\'s an Android/Play Store bug).</p>
<p>If you use CyanogenMod, "Privacy Guard" must be disabled for DAVdroid. Otherwise, DAVdroid is not allowed to access
and synchronize your contacts and events.</p>
<p>For more information, please see the <a href="http://davdroid.bitfire.at?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">DAVdroid homepage</a>.
There\'s a <a href="http://davdroid.bitfire.at/configuration?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">Setup guide</a>, too. DAVdroid respects
your privacy, see our <a href="http://davdroid.bitfire.at/privacy?pk_campaign=davdroid-app&amp;pk_kwd=main-activity">Privacy Policy</a>.</p>
@ -79,7 +82,7 @@
<h2>Used third-party libraries</h2>
<p>
* <a href="http://ical4j.sourceforge.net/">iCal4j<a> (<a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">New BSD License</a>)<br/>
* <a href="http://wiki.modularity.net.au/ical4j/index.php?title=VCard">iCal4j-vcard</a> (<a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">New BSD License</a>)<br/>
* <a href="https://code.google.com/p/ez-vcard/">ez-vcard</a> (<a href="http://opensource.org/licenses/BSD-3-Clause">New BSD License</a>)<br/>
* <a href="http://simple.sourceforge.net/">Simple XML Serialization</a> (<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>)<br/>
* <a href="http://projectlombok.org/">Project Lombok</a> (<a href="http://opensource.org/licenses/mit-license.php">MIT License</a>)</p>
]]></string>

2
src/at/bitfire/davdroid/Constants.java
View File

@ -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",

3
src/at/bitfire/davdroid/resource/Contact.java
View File

@ -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

8
src/at/bitfire/davdroid/resource/Event.java
View File

@ -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

2
src/at/bitfire/davdroid/resource/LocalAddressBook.java
View File

@ -464,7 +464,7 @@ public class LocalAddressBook extends LocalCollection<Contact> {
@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)