Merge change Ia6fc04c8 into eclair (255d51cc) · Commits · e / os / android_frameworks_base

core/java/android/syncml/package.html

deleted100644 → 0

+0 −6

Original line number	Diff line number	Diff line
		<HTML>
		<BODY>
		Support classes for SyncML.
		{@hide}
		</BODY>
		</HTML>
		No newline at end of file

core/java/android/syncml/pim/PropertyNode.java

deleted100644 → 0

+0 −324

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.syncml.pim;

		import android.content.ContentValues;

		import org.apache.commons.codec.binary.Base64;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.HashSet;
		import java.util.List;
		import java.util.Set;
		import java.util.Map.Entry;
		import java.util.regex.Pattern;

		@Deprecated
		public class PropertyNode {

		public String propName;

		public String propValue;

		public List<String> propValue_vector;

		/** Store value as byte[],after decode.
		* Used when propValue is encoded by something like BASE64, QUOTED-PRINTABLE, etc.
		*/
		public byte[] propValue_bytes;

		/** param store: key=paramType, value=paramValue
		* Note that currently PropertyNode class does not support multiple param-values
		* defined in vCard 3.0 (See also RFC 2426). multiple-values are stored as
		* one String value like "A,B", not ["A", "B"]...
		* TODO: fix this.
		*/
		public ContentValues paramMap;

		/** Only for TYPE=??? param store. */
		public Set<String> paramMap_TYPE;

		/** Store group values. Used only in VCard. */
		public Set<String> propGroupSet;

		public PropertyNode() {
		propName = "";
		propValue = "";
		propValue_vector = new ArrayList<String>();
		paramMap = new ContentValues();
		paramMap_TYPE = new HashSet<String>();
		propGroupSet = new HashSet<String>();
		}

		public PropertyNode(
		String propName, String propValue, List<String> propValue_vector,
		byte[] propValue_bytes, ContentValues paramMap, Set<String> paramMap_TYPE,
		Set<String> propGroupSet) {
		if (propName != null) {
		this.propName = propName;
		} else {
		this.propName = "";
		}
		if (propValue != null) {
		this.propValue = propValue;
		} else {
		this.propValue = "";
		}
		if (propValue_vector != null) {
		this.propValue_vector = propValue_vector;
		} else {
		this.propValue_vector = new ArrayList<String>();
		}
		this.propValue_bytes = propValue_bytes;
		if (paramMap != null) {
		this.paramMap = paramMap;
		} else {
		this.paramMap = new ContentValues();
		}
		if (paramMap_TYPE != null) {
		this.paramMap_TYPE = paramMap_TYPE;
		} else {
		this.paramMap_TYPE = new HashSet<String>();
		}
		if (propGroupSet != null) {
		this.propGroupSet = propGroupSet;
		} else {
		this.propGroupSet = new HashSet<String>();
		}
		}

		@Override
		public boolean equals(Object obj) {
		if (!(obj instanceof PropertyNode)) {
		return false;
		}

		PropertyNode node = (PropertyNode)obj;

		if (propName == null \|\| !propName.equals(node.propName)) {
		return false;
		} else if (!paramMap.equals(node.paramMap)) {
		return false;
		} else if (!paramMap_TYPE.equals(node.paramMap_TYPE)) {
		return false;
		} else if (!propGroupSet.equals(node.propGroupSet)) {
		return false;
		}

		if (propValue_bytes != null && Arrays.equals(propValue_bytes, node.propValue_bytes)) {
		return true;
		} else {
		// Log.d("@@@", propValue + ", " + node.propValue);
		if (!propValue.equals(node.propValue)) {
		return false;
		}

		// The value in propValue_vector is not decoded even if it should be
		// decoded by BASE64 or QUOTED-PRINTABLE. When the size of propValue_vector
		// is 1, the encoded value is stored in propValue, so we do not have to
		// check it.
		return (propValue_vector.equals(node.propValue_vector) \|\|
		propValue_vector.size() == 1 \|\|
		node.propValue_vector.size() == 1);
		}
		}

		@Override
		public String toString() {
		StringBuilder builder = new StringBuilder();
		builder.append("propName: ");
		builder.append(propName);
		builder.append(", paramMap: ");
		builder.append(paramMap.toString());
		builder.append(", propmMap_TYPE: ");
		builder.append(paramMap_TYPE.toString());
		builder.append(", propGroupSet: ");
		builder.append(propGroupSet.toString());
		if (propValue_vector != null && propValue_vector.size() > 1) {
		builder.append(", propValue_vector size: ");
		builder.append(propValue_vector.size());
		}
		if (propValue_bytes != null) {
		builder.append(", propValue_bytes size: ");
		builder.append(propValue_bytes.length);
		}
		builder.append(", propValue: ");
		builder.append(propValue);
		return builder.toString();
		}

		/**
		* Encode this object into a string which can be decoded.
		*/
		public String encode() {
		// PropertyNode#toString() is for reading, not for parsing in the future.
		// We construct appropriate String here.
		StringBuilder builder = new StringBuilder();
		if (propName.length() > 0) {
		builder.append("propName:[");
		builder.append(propName);
		builder.append("],");
		}
		int size = propGroupSet.size();
		if (size > 0) {
		Set<String> set = propGroupSet;
		builder.append("propGroup:[");
		int i = 0;
		for (String group : set) {
		// We do not need to double quote groups.
		// group = 1*(ALPHA / DIGIT / "-")
		builder.append(group);
		if (i < size - 1) {
		builder.append(",");
		}
		i++;
		}
		builder.append("],");
		}

		if (paramMap.size() > 0 \|\| paramMap_TYPE.size() > 0) {
		ContentValues values = paramMap;
		builder.append("paramMap:[");
		size = paramMap.size();
		int i = 0;
		for (Entry<String, Object> entry : values.valueSet()) {
		// Assuming param-key does not contain NON-ASCII nor symbols.
		//
		// According to vCard 3.0:
		// param-name = iana-token / x-name
		builder.append(entry.getKey());

		// param-value may contain any value including NON-ASCIIs.
		// We use the following replacing rule.
		// \ -> \\
		// , -> \,
		// In String#replaceAll(), "\\\\" means a single backslash.
		builder.append("=");
		builder.append(entry.getValue().toString()
		.replaceAll("\\\\", "\\\\\\\\")
		.replaceAll(",", "\\\\,"));
		if (i < size -1) {
		builder.append(",");
		}
		i++;
		}

		Set<String> set = paramMap_TYPE;
		size = paramMap_TYPE.size();
		if (i > 0 && size > 0) {
		builder.append(",");
		}
		i = 0;
		for (String type : set) {
		builder.append("TYPE=");
		builder.append(type
		.replaceAll("\\\\", "\\\\\\\\")
		.replaceAll(",", "\\\\,"));
		if (i < size - 1) {
		builder.append(",");
		}
		i++;
		}
		builder.append("],");
		}

		size = propValue_vector.size();
		if (size > 0) {
		builder.append("propValue:[");
		List<String> list = propValue_vector;
		for (int i = 0; i < size; i++) {
		builder.append(list.get(i)
		.replaceAll("\\\\", "\\\\\\\\")
		.replaceAll(",", "\\\\,"));
		if (i < size -1) {
		builder.append(",");
		}
		}
		builder.append("],");
		}

		return builder.toString();
		}

		public static PropertyNode decode(String encodedString) {
		PropertyNode propertyNode = new PropertyNode();
		String trimed = encodedString.trim();
		if (trimed.length() == 0) {
		return propertyNode;
		}
		String[] elems = trimed.split("],");

		for (String elem : elems) {
		int index = elem.indexOf('[');
		String name = elem.substring(0, index - 1);
		Pattern pattern = Pattern.compile("(?<!\\\\),");
		String[] values = pattern.split(elem.substring(index + 1), -1);
		if (name.equals("propName")) {
		propertyNode.propName = values[0];
		} else if (name.equals("propGroupSet")) {
		for (String value : values) {
		propertyNode.propGroupSet.add(value);
		}
		} else if (name.equals("paramMap")) {
		ContentValues paramMap = propertyNode.paramMap;
		Set<String> paramMap_TYPE = propertyNode.paramMap_TYPE;
		for (String value : values) {
		String[] tmp = value.split("=", 2);
		String mapKey = tmp[0];
		// \, -> ,
		// \\ -> \
		// In String#replaceAll(), "\\\\" means a single backslash.
		String mapValue =
		tmp[1].replaceAll("\\\\,", ",").replaceAll("\\\\\\\\", "\\\\");
		if (mapKey.equalsIgnoreCase("TYPE")) {
		paramMap_TYPE.add(mapValue);
		} else {
		paramMap.put(mapKey, mapValue);
		}
		}
		} else if (name.equals("propValue")) {
		StringBuilder builder = new StringBuilder();
		List<String> list = propertyNode.propValue_vector;
		int length = values.length;
		for (int i = 0; i < length; i++) {
		String normValue = values[i]
		.replaceAll("\\\\,", ",")
		.replaceAll("\\\\\\\\", "\\\\");
		list.add(normValue);
		builder.append(normValue);
		if (i < length - 1) {
		builder.append(";");
		}
		}
		propertyNode.propValue = builder.toString();
		}
		}

		// At this time, QUOTED-PRINTABLE is already decoded to Java String.
		// We just need to decode BASE64 String to binary.
		String encoding = propertyNode.paramMap.getAsString("ENCODING");
		if (encoding != null &&
		(encoding.equalsIgnoreCase("BASE64") \|\|
		encoding.equalsIgnoreCase("B"))) {
		propertyNode.propValue_bytes =
		Base64.decodeBase64(propertyNode.propValue_vector.get(0).getBytes());
		}

		return propertyNode;
		}
		}

core/java/android/syncml/pim/VBuilder.java

deleted100644 → 0

+0 −68

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.syncml.pim;

		import java.util.List;

		@Deprecated
		public interface VBuilder {
		void start();

		void end();

		/**
		* @param type
		* VXX <br>
		* BEGIN:VXX
		*/
		void startRecord(String type);

		/** END:VXX */
		void endRecord();

		void startProperty();

		void endProperty();

		/**
		* @param group
		*/
		void propertyGroup(String group);

		/**
		* @param name
		* N <br>
		* N
		*/
		void propertyName(String name);

		/**
		* @param type
		* LANGUAGE \ ENCODING <br>
		* ;LANGUage= \ ;ENCODING=
		*/
		void propertyParamType(String type);

		/**
		* @param value
		* FR-EN \ GBK <br>
		* FR-EN \ GBK
		*/
		void propertyParamValue(String value);

		void propertyValues(List<String> values);
		}

core/java/android/syncml/pim/VBuilderCollection.java

deleted100644 → 0

+0 −101

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.syncml.pim;

		import java.util.Collection;
		import java.util.List;

		@Deprecated
		public class VBuilderCollection implements VBuilder {

		private final Collection<VBuilder> mVBuilderCollection;

		public VBuilderCollection(Collection<VBuilder> vBuilderCollection) {
		mVBuilderCollection = vBuilderCollection;
		}

		public Collection<VBuilder> getVBuilderCollection() {
		return mVBuilderCollection;
		}

		public void start() {
		for (VBuilder builder : mVBuilderCollection) {
		builder.start();
		}
		}

		public void end() {
		for (VBuilder builder : mVBuilderCollection) {
		builder.end();
		}
		}

		public void startRecord(String type) {
		for (VBuilder builder : mVBuilderCollection) {
		builder.startRecord(type);
		}
		}

		public void endRecord() {
		for (VBuilder builder : mVBuilderCollection) {
		builder.endRecord();
		}
		}

		public void startProperty() {
		for (VBuilder builder : mVBuilderCollection) {
		builder.startProperty();
		}
		}


		public void endProperty() {
		for (VBuilder builder : mVBuilderCollection) {
		builder.endProperty();
		}
		}

		public void propertyGroup(String group) {
		for (VBuilder builder : mVBuilderCollection) {
		builder.propertyGroup(group);
		}
		}

		public void propertyName(String name) {
		for (VBuilder builder : mVBuilderCollection) {
		builder.propertyName(name);
		}
		}

		public void propertyParamType(String type) {
		for (VBuilder builder : mVBuilderCollection) {
		builder.propertyParamType(type);
		}
		}

		public void propertyParamValue(String value) {
		for (VBuilder builder : mVBuilderCollection) {
		builder.propertyParamValue(value);
		}
		}

		public void propertyValues(List<String> values) {
		for (VBuilder builder : mVBuilderCollection) {
		builder.propertyValues(values);
		}
		}
		}

core/java/android/syncml/pim/VDataBuilder.java

deleted100644 → 0

+0 −312

File deleted.

Preview size limit exceeded, changes collapsed.