Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65307f9d authored by Ricki Hirner's avatar Ricki Hirner
Browse files

ical4j update, clean up XML requests 

* ical4j update to 2.0-beta1 (fixes #509, fixes #606)
* only run sync adapters in :sync process, set thread context class loaders appropriately
* remove "class" attribute from XML requests (fixes #615)
parent 78b32ee1

app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -48,9 +48,9 @@ dependencies { 
    compile 'org.apache.commons:commons-lang3:3.4'

    compile 'commons-io:commons-io:2.4'

    // Lombok for useful @helpers

    provided 'org.projectlombok:lombok:1.16.4'

    provided 'org.projectlombok:lombok:1.16.6'

    // ical4j for parsing/generating iCalendars

    compile('org.mnode.ical4j:ical4j:2.0-alpha1') {

    compile('org.mnode.ical4j:ical4j:2.0-beta1') {

        // we don't need content builders, see https://github.com/ical4j/ical4j/wiki/Groovy

        exclude group: 'org.codehaus.groovy', module: 'groovy-all'

    }

app/src/androidTest/java/at/bitfire/davdroid/resource/ContactTest.java

+0 −3
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ package at.bitfire.davdroid.resource; 


import android.content.res.AssetManager;

import android.test.InstrumentationTestCase;

import android.util.Log;



import org.apache.commons.io.IOUtils;

import org.apache.commons.lang3.CharEncoding;
@@ -19,10 +18,8 @@ import java.io.InputStream; 
import java.net.URI;

import java.net.URISyntaxException;

import java.nio.charset.Charset;

import java.nio.charset.StandardCharsets;

import java.util.Arrays;



import at.bitfire.davdroid.ArrayUtils;

import at.bitfire.davdroid.webdav.DavException;

import at.bitfire.davdroid.webdav.HttpException;

import ezvcard.VCardVersion;

app/src/main/AndroidManifest.xml

+8 −6
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ 
        android:allowBackup="true"

        android:icon="@drawable/ic_launcher"

        android:label="@string/app_name"

        android:theme="@style/AppTheme"

        android:process=":sync">

        android:theme="@style/AppTheme">



        <service

            android:name=".syncadapter.AccountAuthenticatorService"
@@ -49,7 +48,8 @@ 
        </service>

        <service

            android:name=".syncadapter.ContactsSyncAdapterService"

            android:exported="true" >

            android:exported="true"

            android:process=":sync">

            <intent-filter>

                <action android:name="android.content.SyncAdapter" />

            </intent-filter>
@@ -62,7 +62,8 @@ 
        </service>

        <service

            android:name=".syncadapter.CalendarsSyncAdapterService"

            android:exported="true" >

            android:exported="true"

            android:process=":sync">

            <intent-filter>

                <action android:name="android.content.SyncAdapter" />

            </intent-filter>
@@ -72,7 +73,8 @@ 
        </service>

        <service

            android:name=".syncadapter.TasksSyncAdapterService"

            android:exported="true" >

            android:exported="true"

            android:process=":sync">

            <intent-filter>

                <action android:name="android.content.SyncAdapter" />

            </intent-filter>

app/src/main/java/at/bitfire/davdroid/DateUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import java.util.SimpleTimeZone; 
public class DateUtils {

    private final static String TAG = "davdroid.DateUtils";



	public final static TimeZoneRegistry tzRegistry = TimeZoneRegistryFactory.getInstance().createRegistry();

	public static final TimeZoneRegistry tzRegistry = TimeZoneRegistryFactory.getInstance().createRegistry();



	static {

		// disable automatic time-zone updates (causes unwanted network traffic)

app/src/main/java/at/bitfire/davdroid/resource/iCalendar.java

+6 −1
Original line number Diff line number Diff line
@@ -154,9 +154,14 @@ public abstract class iCalendar extends Resource { 


		public static class Factory implements ParameterFactory {

			@Override

			public Parameter createParameter(String name, String value) throws URISyntaxException {

			public Parameter createParameter(String value) throws URISyntaxException {

				return new Email(value);

			}



			@Override

			public boolean supports(String name) {

				return PARAMETER_NAME.equalsIgnoreCase(name);

			}

		}

	}