arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-11-12 18:59:10 +00:00
Code Issues Releases Wiki Activity

Preserve order in multiget requests (thanks Marten, fixes #65)

Browse Source
This commit is contained in:
rfc2822 2013-11-15 11:19:41 +01:00
parent 6889559fef
commit b802ed07d9
7 changed files with 71 additions and 13 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"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="at.bitfire.davdroid"
android:versionCode="12"
android:versionName="0.3.8-alpha" >
android:versionCode="13"
android:versionName="0.4-alpha" >
<uses-sdk
android:minSdkVersion="14"

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

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

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

@ -43,7 +43,7 @@ public class URIUtils {
url = url.replace(String.valueOf(c), "%" + Integer.toHexString(c));
if (!url.equals(original))
Log.w(TAG, "Tried to repair invalid URL/URL path: " + original + " -> " + url);
Log.w(TAG, "Trying to repair invalid URL: " + original + " -> " + url);
return url;
}
}

2
src/at/bitfire/davdroid/webdav/DavMultiget.java
View File

@ -11,7 +11,9 @@ import java.util.List;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.ElementList;
import org.simpleframework.xml.Order;
@Order(elements={"prop","href"})
public class DavMultiget {
@Element
DavProp prop;

16
src/at/bitfire/davdroid/webdav/WebDavResource.java
View File

@ -286,7 +286,7 @@ public class WebDavResource {
return false;
}
public boolean multiGet(String[] names, MultigetType type) throws IOException, InvalidDavResponseException, HttpException {
public void multiGet(String[] names, MultigetType type) throws IOException, InvalidDavResponseException, HttpException {
DavMultiget multiget = (type == MultigetType.ADDRESS_BOOK) ? new DavAddressbookMultiget() : new DavCalendarMultiget();
multiget.prop = new DavProp();
@ -305,9 +305,9 @@ public class WebDavResource {
StringWriter writer = new StringWriter();
try {
serializer.write(multiget, writer);
} catch (Exception e) {
Log.e(TAG, e.getLocalizedMessage());
return false;
} catch (Exception ex) {
Log.e(TAG, "Couldn't create XML multi-get request", ex);
throw new InvalidDavResponseException();
}
HttpReport report = new HttpReport(location, writer.toString());
@ -322,15 +322,14 @@ public class WebDavResource {
multistatus = serializer.read(DavMultistatus.class, is, false);
Log.d(TAG, "Received multistatus response: " + baos.toString("UTF-8"));
} catch (Exception e) {
Log.e(TAG, e.getLocalizedMessage());
return false;
} catch (Exception ex) {
Log.e(TAG, "Couldn't parse multi-get response", ex);
throw new InvalidDavResponseException();
}
processMultiStatus(multistatus);
} else
throw new InvalidDavResponseException();
return true;
}
@ -390,6 +389,7 @@ public class WebDavResource {
Log.w(TAG, "Ignoring illegal member URI in multi-status response", ex);
continue;
}
Log.d(TAG, "Processing multi-status element: " + href);
// about which resource is this response?
WebDavResource referenced = null;

47
test/robohydra/plugins/dav-default/index.js
View File

@ -155,7 +155,52 @@ exports.getBodyParts = function(conf) {
} else if (req.method == "DELETE")
res.statusCode = 204;
}
})
}),
/* address-book multiget */
new RoboHydraHeadDAV({
path: "/dav/addressbooks/default.vcf/",
handler: function(req,res,next) {
if (req.method == "REPORT" && req.rawBody.toString().match(/addressbook-multiget[\s\S]+<prop>[\s\S]+<href>/m)) {
res.statusCode = 207;
res.write('\<?xml version="1.0" encoding="utf-8" ?>\
<multistatus xmlns="DAV:" xmlns:CARD="urn:ietf:params:xml:ns:carddav">\
<response>\
<href>/dav/addressbooks/default.vcf/1.vcf</href>\
<propstat>\
<prop>\
<getetag/>\
<CARD:address-data>BEGIN:VCARD\
VERSION:3.0\
NICKNAME:MULTIGET1\
UID:1\
END:VCARD\
</CARD:address-data>\
</prop>\
<status>HTTP/1.1 200 OK</status>\
</propstat>\
</response>\
<response>\
<href>/dav/addressbooks/default.vcf/2.vcf</href>\
<propstat>\
<prop>\
<getetag/>\
<CARD:address-data>BEGIN:VCARD\
VERSION:3.0\
NICKNAME:MULTIGET2\
UID:2\
END:VCARD\
</CARD:address-data>\
</prop>\
<status>HTTP/1.1 200 OK</status>\
</propstat>\
</response>\
</multistatus>\
');
}
}
}),
]
};
};

11
test/src/at/bitfire/davdroid/webdav/test/WebDavResourceTest.java
View File

@ -11,9 +11,11 @@ import org.apache.http.HttpException;
import android.content.res.AssetManager;
import android.test.InstrumentationTestCase;
import at.bitfire.davdroid.webdav.HttpPropfind;
import at.bitfire.davdroid.webdav.InvalidDavResponseException;
import at.bitfire.davdroid.webdav.NotFoundException;
import at.bitfire.davdroid.webdav.PreconditionFailedException;
import at.bitfire.davdroid.webdav.WebDavResource;
import at.bitfire.davdroid.webdav.WebDavResource.MultigetType;
import at.bitfire.davdroid.webdav.WebDavResource.PutMode;
// tests require running robohydra!
@ -142,6 +144,15 @@ public class WebDavResourceTest extends InstrumentationTestCase {
));
}
public void testMultiGet() throws InvalidDavResponseException, IOException, HttpException {
WebDavResource davAddressBook = new WebDavResource(davCollection, "addressbooks/default.vcf", true);
davAddressBook.multiGet(new String[] { "1.vcf", "2.vcf" }, MultigetType.ADDRESS_BOOK);
assertEquals(2, davAddressBook.getMembers().size());
for (WebDavResource member : davAddressBook.getMembers()) {
assertNotNull(member.getContent());
}
}
public void testPutAddDontOverwrite() throws IOException, HttpException {
// should succeed on a non-existing file
davNonExistingFile.put(SAMPLE_CONTENT, PutMode.ADD_DONT_OVERWRITE);