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

Commit a4d1c2ab authored by Ricki Hirner's avatar Ricki Hirner
Browse files

First implementation of CardDAV sync with dav4android and vcard4android 

* try to get rid of Apache Commons
parent 0d26eac2

.gitmodules

+3 −0
Original line number Diff line number Diff line 
[submodule "dav4android"]

	path = dav4android

	url = git@gitlab.com:bitfireAT/dav4android.git

[submodule "vcard4android"]

	path = vcard4android

	url = git@gitlab.com:bitfireAT/vcard4android.git

app/build.gradle

+1 −8
Original line number Diff line number Diff line
@@ -56,14 +56,6 @@ dependencies { 
        exclude group: 'org.codehaus.groovy', module: 'groovy-all'

    }

    compile('org.slf4j:slf4j-android:1.7.12')       // slf4j is used by ical4j

    // ez-vcard for parsing/generating VCards

    compile('com.googlecode.ez-vcard:ez-vcard:0.9.6') {

        // hCard functionality not needed

        exclude group: 'org.jsoup', module: 'jsoup'

        exclude group: 'org.freemarker', module: 'freemarker'

        // jCard functionality not needed

        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'

    }

    // dnsjava for querying SRV/TXT records

    compile 'dnsjava:dnsjava:2.1.7'

    // HttpClient 4.3, Android flavour for WebDAV operations
@@ -76,4 +68,5 @@ dependencies { 
    }



    compile project(':dav4android')

    compile project(':vcard4android')

}

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

deleted100644 → 0
+0 −109
Original line number Diff line number Diff line 
/*

 * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).

 * All rights reserved. This program and the accompanying materials

 * are made available under the terms of the GNU Public License v3.0

 * which accompanies this distribution, and is available at

 * http://www.gnu.org/licenses/gpl.html

 */

package at.bitfire.davdroid.resource;



import android.content.res.AssetManager;

import android.test.InstrumentationTestCase;



import org.apache.commons.io.IOUtils;

import org.apache.commons.lang3.CharEncoding;



import java.io.IOException;

import java.io.InputStream;

import java.net.URI;

import java.net.URISyntaxException;

import java.nio.charset.Charset;

import java.util.Arrays;



import at.bitfire.davdroid.webdav.DavException;

import at.bitfire.davdroid.webdav.HttpException;

import ezvcard.VCardVersion;

import ezvcard.property.Email;

import ezvcard.property.Telephone;

import lombok.Cleanup;



public class ContactTest extends InstrumentationTestCase {

	AssetManager assetMgr;

	

	public void setUp() throws IOException, InvalidResourceException {

		assetMgr = getInstrumentation().getContext().getResources().getAssets();

	}



	public void testGenerateDifferentVersions() throws Exception {

		Contact c = new Contact("test.vcf", null);



		// should generate VCard 3.0 by default

		assertEquals("text/vcard; charset=utf-8", c.getContentType().toString().toLowerCase());

		assertTrue(new String(c.toEntity().toByteArray()).contains("VERSION:3.0"));



		// now let's generate VCard 4.0

		c.vCardVersion = VCardVersion.V4_0;

		assertEquals("text/vcard; version=4.0", c.getContentType().toString());

		assertTrue(new String(c.toEntity().toByteArray()).contains("VERSION:4.0"));

	}

	

	public void testReferenceVCard3() throws IOException, InvalidResourceException {

		Contact c = parseVCF("reference-vcard3.vcf", Charset.forName(CharEncoding.UTF_8));



		assertEquals("Gümp", c.familyName);

		assertEquals("Förrest", c.givenName);

		assertEquals("Förrest Gümp", c.displayName);

		assertEquals("Bubba Gump Shrimpß Co.", c.organization.getValues().get(0));

		assertEquals("Shrimp Man", c.jobTitle);

		

		Telephone phone1 = c.getPhoneNumbers().get(0);

		assertEquals("(111) 555-1212", phone1.getText());

		assertEquals("WORK", phone1.getParameters("TYPE").get(0));

		assertEquals("VOICE", phone1.getParameters("TYPE").get(1));

		

		Telephone phone2 = c.getPhoneNumbers().get(1);

		assertEquals("(404) 555-1212", phone2.getText());

		assertEquals("HOME", phone2.getParameters("TYPE").get(0));

		assertEquals("VOICE", phone2.getParameters("TYPE").get(1));

		

		Email email = c.getEmails().get(0);

		assertEquals("forrestgump@example.com", email.getValue());

		assertEquals("PREF", email.getParameters("TYPE").get(0));

		assertEquals("INTERNET", email.getParameters("TYPE").get(1));



		@Cleanup InputStream photoStream = assetMgr.open("davdroid-logo-192.png", AssetManager.ACCESS_STREAMING);

		byte[] expectedPhoto = IOUtils.toByteArray(photoStream);

		assertTrue(Arrays.equals(c.photo, expectedPhoto));

	}



	public void testParseInvalidUnknownProperties() throws IOException {

		Contact c = parseVCF("invalid-unknown-properties.vcf");

		assertEquals("VCard with invalid unknown properties", c.displayName);

		assertNull(c.unknownProperties);

	}



	public void testParseLatin1() throws IOException {

		Contact c = parseVCF("latin1.vcf", Charset.forName(CharEncoding.ISO_8859_1));

		assertEquals("Özkan Äuçek", c.displayName);

		assertEquals("Özkan", c.givenName);

		assertEquals("Äuçek", c.familyName);

		assertNull(c.unknownProperties);

	}

	

	

	protected Contact parseVCF(String fname, Charset charset) throws IOException {

		@Cleanup InputStream in = assetMgr.open(fname, AssetManager.ACCESS_STREAMING);

		Contact c = new Contact(fname, null);

		c.parseEntity(in, charset, new Resource.AssetDownloader() {

            @Override

            public byte[] download(URI uri) throws URISyntaxException, IOException, HttpException, DavException {

                return IOUtils.toByteArray(uri);

            }

        });

		return c;

	}



	protected Contact parseVCF(String fname) throws IOException {

		return parseVCF(fname, null);

	}

}

app/src/androidTest/java/at/bitfire/davdroid/syncadapter/DavResourceFinderTest.java

+0 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ public class DavResourceFinderTest extends InstrumentationTestCase { 
	

	@Override

	protected void tearDown() throws IOException {

		finder.close();

	}
@@ -39,7 +38,6 @@ public class DavResourceFinderTest extends InstrumentationTestCase { 
		finder.findResources(info);

		

		/*** CardDAV ***/

		assertTrue(info.isCardDAV());

		List<ResourceInfo> collections = info.getAddressBooks();

		// two address books

		assertEquals(2, collections.size());
@@ -52,7 +50,6 @@ public class DavResourceFinderTest extends InstrumentationTestCase { 
		assertEquals("Absolute URI VCard Book", collection.getDescription());



		/*** CalDAV ***/

		assertTrue(info.isCalDAV());

		collections = info.getCalendars();

		assertEquals(2, collections.size());

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

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
/*

 * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering).

 * All rights reserved. This program and the accompanying materials

 * are made available under the terms of the GNU Public License v3.0

 * which accompanies this distribution, and is available at

 * http://www.gnu.org/licenses/gpl.html

 */

package at.bitfire.davdroid.resource;



import org.apache.http.impl.client.CloseableHttpClient;



import java.net.URISyntaxException;



import at.bitfire.davdroid.syncadapter.AccountSettings;

import at.bitfire.davdroid.webdav.DavMultiget;

import ezvcard.VCardVersion;



public class CardDavAddressBook extends WebDavCollection<Contact> {

	AccountSettings accountSettings;



	@Override

	protected String memberAcceptedMimeTypes() {

		return "text/vcard;q=0.8, text/vcard;version=4.0";

	}

	

	@Override

	protected DavMultiget.Type multiGetType() {

		return accountSettings.getAddressBookVCardVersion() == VCardVersion.V4_0 ?

				DavMultiget.Type.ADDRESS_BOOK_V4 : DavMultiget.Type.ADDRESS_BOOK;

	}



	@Override

	protected Contact newResourceSkeleton(String name, String ETag) {

		return new Contact(name, ETag);

	}

	



	public CardDavAddressBook(AccountSettings settings, CloseableHttpClient httpClient, String baseURL, String user, String password, boolean preemptiveAuth) throws URISyntaxException {

		super(httpClient, baseURL, user, password, preemptiveAuth);

		accountSettings = settings;

	}

}