Merge branch 'develop'

ennswi · Feb 27, 2015 · d359569 · d359569
2 parents d222bcf + 7b3502b
commit d359569
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/ACalDAV/AndroidManifest.xml b/ACalDAV/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="de.we.acaldav"
-    android:versionCode="3"
+    android:versionCode="002"
           android:versionName="0.0.2">
 
     <uses-sdk

diff --git a/ACalDAV/CHANGELOG b/ACalDAV/CHANGELOG
diff --git a/ACalDAV/src/org/gege/caldavsyncadapter/caldav/entities/CalendarEvent.java b/ACalDAV/src/org/gege/caldavsyncadapter/caldav/entities/CalendarEvent.java
@@ -961,8 +961,8 @@ public boolean createAndroidEvent(DavCalendar androidCalendar)
             Uri uri = this.mProvider.insert(asSyncAdapter(Events.CONTENT_URI, this.mAccount.name,
                     this.mAccount.type), this.ContentValues);
 
-            if(uri ==null){
-                throw new ParserException((int)this.getAndroidCalendarId());
+            if (uri == null) {
+                throw new ParserException((int) this.getAndroidCalendarId());
             }
             this.setAndroidEventUri(uri);