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

Commit 5aa7caec authored by Ricki Hirner's avatar Ricki Hirner
Browse files

First use of dav4android for resource detection 

* replaced Apache httplib by gradle version because it will be removed completely anyway
parent 448e0529

.gitmodules

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

	path = dav4android

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

app/build.gradle

+8 −5
Original line number Diff line number Diff line
@@ -9,13 +9,14 @@ 
apply plugin: 'com.android.application'



android {

    compileSdkVersion 22

    buildToolsVersion '22.0.1'

    compileSdkVersion 23

    buildToolsVersion '23.0.1'

    useLibrary 'org.apache.http.legacy'



    defaultConfig {

        applicationId "at.bitfire.davdroid"

        minSdkVersion 14

        targetSdkVersion 22

        targetSdkVersion 23

    }



    buildTypes {
@@ -66,11 +67,13 @@ dependencies { 
    // dnsjava for querying SRV/TXT records

    compile 'dnsjava:dnsjava:2.1.7'

    // HttpClient 4.3, Android flavour for WebDAV operations

    //compile 'org.apache.httpcomponents:httpclient-android:4.3.5.1'

    compile project(':lib:httpclient-android')

    compile 'org.apache.httpcomponents:httpclient-android:4.3.5.1'

    //compile project(':lib:httpclient-android')

    // SimpleXML for parsing and generating WebDAV messages

    compile('org.simpleframework:simple-xml:2.7.1') {

        exclude group: 'stax', module: 'stax-api'

        exclude group: 'xpp3', module: 'xpp3'

    }



    compile project(':dav4android')

}

app/src/main/AndroidManifest.xml

+0 −4
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 
    android:versionCode="72" android:versionName="0.8.4.1"

    android:installLocation="internalOnly">



    <uses-sdk

        android:minSdkVersion="14"

        android:targetSdkVersion="22" />



    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />

    <uses-permission android:name="android.permission.GET_ACCOUNTS" />

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

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


import net.fortuna.ical4j.model.property.ProdId;



import org.slf4j.Logger;

import org.slf4j.LoggerFactory;



public class Constants {

	public static final String

		APP_VERSION = "0.8.4.1",
@@ -18,4 +21,6 @@ public class Constants { 
		WEB_URL_VIEW_LOGS = "https://github.com/bitfireAT/davdroid/wiki/How-to-view-the-logs";



	public static final ProdId ICAL_PRODID = new ProdId("-//bitfire web engineering//DAVdroid " + Constants.APP_VERSION + " (ical4j 2.0-beta1)//EN");



    public static final Logger log = LoggerFactory.getLogger("DAVdroid");

}

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

+171 −212

File changed.

Preview size limit exceeded, changes collapsed.