ical4j-vcard-telephone-uri-mikma.diff

diff -r e1a813d49fd4 src/main/java/net/fortuna/ical4j/vcard/property/Telephone.java
--- a/src/main/java/net/fortuna/ical4j/vcard/property/Telephone.java	Tue Oct 01 20:54:12 2013 +1000
+++ b/src/main/java/net/fortuna/ical4j/vcard/property/Telephone.java	Thu Nov 14 20:31:48 2013 +0100
@@ -176,6 +176,12 @@
         for (Parameter param : getParameters()) {
         	final Parameter.Id id = param.getId();
 
+		// Value and parameter MUST match.
+		if ((Value.TEXT.equals(param) && uri == null) ||
+		    (Value.URI.equals(param) && uri != null)) {
+		    continue;
+		}
+
         	if (!Parameter.Id.PID.equals(id) &&
        			!Parameter.Id.PREF.equals(id) &&
        			!Parameter.Id.TYPE.equals(id)) {

Reqired by branch sip_addr.
https://github.com/mikma/davdroid/tree/sip_addr