arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-16 17:42:03 +00:00
Code Issues Releases Wiki Activity

Version bump to 0.5.1; fix crash bug (fixes #108)

Browse Source
This commit is contained in:
rfc2822 2013-12-08 14:00:48 +01:00
parent 33b8aa8e05
commit b35273a6d5
5 changed files with 9 additions and 6 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"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="at.bitfire.davdroid" package="at.bitfire.davdroid"
android:versionCode="18" android:versionCode="19"
android:versionName="0.5-alpha" > android:versionName="0.5.1-alpha" >
<uses-sdk <uses-sdk
android:minSdkVersion="14" android:minSdkVersion="14"

2
README.md
View File

@ -6,7 +6,7 @@ USED THIRD-PARTY LIBRARIES
========================== ==========================
* [iCal4j](http://ical4j.sourceforge.net/) ([New BSD License](http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE)) * [iCal4j](http://ical4j.sourceforge.net/) ([New BSD License](http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE))
* [iCal4j-vcard](http://wiki.modularity.net.au/ical4j/index.php?title=VCard) ([New BSD License](http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE)) * [ez-vcard](https://code.google.com/p/ez-vcard/) ([New BSD License](http://opensource.org/licenses/BSD-3-Clause))
* [Simple XML Serialization](http://simple.sourceforge.net/) ([Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0)) * [Simple XML Serialization](http://simple.sourceforge.net/) ([Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0))
* [Project Lombok](http://projectlombok.org/) ([MIT License](http://opensource.org/licenses/mit-license.php)) * [Project Lombok](http://projectlombok.org/) ([MIT License](http://opensource.org/licenses/mit-license.php))

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

@ -9,7 +9,7 @@ package at.bitfire.davdroid;
public class Constants { public class Constants {
public static final String public static final String
APP_VERSION = "0.5-alpha", APP_VERSION = "0.5.1-alpha",
ACCOUNT_TYPE = "bitfire.at.davdroid", ACCOUNT_TYPE = "bitfire.at.davdroid",

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

@ -38,7 +38,6 @@ import ezvcard.property.Nickname;
import ezvcard.property.Note; import ezvcard.property.Note;
import ezvcard.property.Organization; import ezvcard.property.Organization;
import ezvcard.property.Photo; import ezvcard.property.Photo;
import ezvcard.property.ProductId;
import ezvcard.property.RawProperty; import ezvcard.property.RawProperty;
import ezvcard.property.Revision; import ezvcard.property.Revision;
import ezvcard.property.Role; import ezvcard.property.Role;
@ -258,7 +257,7 @@ public class Contact extends Resource {
if (birthDay != null) if (birthDay != null)
vcard.setBirthday(birthDay); vcard.setBirthday(birthDay);
vcard.setProdId(new ProductId("DAVdroid/" + Constants.APP_VERSION)); vcard.setProdId("DAVdroid/" + Constants.APP_VERSION);
vcard.setRevision(Revision.now()); vcard.setRevision(Revision.now());
return Ezvcard return Ezvcard
.write(vcard) .write(vcard)

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

@ -42,6 +42,7 @@ import net.fortuna.ical4j.model.property.DtStart;
import net.fortuna.ical4j.model.property.Duration; import net.fortuna.ical4j.model.property.Duration;
import net.fortuna.ical4j.model.property.ExDate; import net.fortuna.ical4j.model.property.ExDate;
import net.fortuna.ical4j.model.property.ExRule; import net.fortuna.ical4j.model.property.ExRule;
import net.fortuna.ical4j.model.property.LastModified;
import net.fortuna.ical4j.model.property.Location; import net.fortuna.ical4j.model.property.Location;
import net.fortuna.ical4j.model.property.Organizer; import net.fortuna.ical4j.model.property.Organizer;
import net.fortuna.ical4j.model.property.ProdId; import net.fortuna.ical4j.model.property.ProdId;
@ -216,6 +217,7 @@ public class Event extends Resource {
event.getAlarms().addAll(alarms); event.getAlarms().addAll(alarms);
props.add(new LastModified());
ical.getComponents().add(event); ical.getComponents().add(event);
// add VTIMEZONE components // add VTIMEZONE components
@ -296,6 +298,8 @@ public class Event extends Resource {
} }
protected boolean hasNoTime(DateProperty date) { protected boolean hasNoTime(DateProperty date) {
if (date == null)
return false;
return !(date.getDate() instanceof DateTime); return !(date.getDate() instanceof DateTime);
} }