1 files changed, 0 insertions, 293 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/ServiceDiscoveryResult.java b/src/main/java/de/thedevstack/conversationsplus/entities/ServiceDiscoveryResult.java
deleted file mode 100644
index 562d95b7..00000000
--- a/src/main/java/de/thedevstack/conversationsplus/entities/ServiceDiscoveryResult.java
+++ /dev/null
@@ -1,293 +0,0 @@
-package de.thedevstack.conversationsplus.entities;
-
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.util.Base64;
-import java.io.UnsupportedEncodingException;
-import java.lang.Comparable;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import de.thedevstack.conversationsplus.xml.Element;
-import de.thedevstack.conversationsplus.xmpp.forms.Data;
-import de.thedevstack.conversationsplus.xmpp.forms.Field;
-import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
-
-public class ServiceDiscoveryResult {
-	public static final String TABLENAME = "discovery_results";
-	public static final String HASH = "hash";
-	public static final String VER = "ver";
-	public static final String RESULT = "result";
-
-	protected static String blankNull(String s) {
-		return s == null ? "" : s;
-	}
-
-	public static class Identity implements Comparable {
-		protected final String category;
-		protected final String type;
-		protected final String lang;
-		protected final String name;
-
-		public Identity(final String category, final String type, final String lang, final String name) {
-			this.category = category;
-			this.type = type;
-			this.lang = lang;
-			this.name = name;
-		}
-
-		public Identity(final Element el) {
-			this(
-				el.getAttribute("category"),
-				el.getAttribute("type"),
-				el.getAttribute("xml:lang"),
-				el.getAttribute("name")
-			);
-		}
-
-		public Identity(final JSONObject o) {
-			this(
-				o.optString("category", null),
-				o.optString("type", null),
-				o.optString("lang", null),
-				o.optString("name", null)
-			);
-		}
-
-		public String getCategory() {
-			return this.category;
-		}
-
-		public String getType() {
-			return this.type;
-		}
-
-		public String getLang() {
-			return this.lang;
-		}
-
-		public String getName() {
-			return this.name;
-		}
-
-		public int compareTo(Object other) {
-			Identity o = (Identity)other;
-			int r = blankNull(this.getCategory()).compareTo(blankNull(o.getCategory()));
-			if(r == 0) {
-				r = blankNull(this.getType()).compareTo(blankNull(o.getType()));
-			}
-			if(r == 0) {
-				r = blankNull(this.getLang()).compareTo(blankNull(o.getLang()));
-			}
-			if(r == 0) {
-				r = blankNull(this.getName()).compareTo(blankNull(o.getName()));
-			}
-
-			return r;
-		}
-
-		public JSONObject toJSON() {
-			try {
-				JSONObject o = new JSONObject();
-				o.put("category", this.getCategory());
-				o.put("type", this.getType());
-				o.put("lang", this.getLang());
-				o.put("name", this.getName());
-				return o;
-			} catch(JSONException e) {
-				return null;
-			}
-		}
-	}
-
-	protected final String hash;
-	protected final byte[] ver;
-	protected final List<Identity> identities;
-	protected final List<String> features;
-	protected final List<Data> forms;
-
-	public ServiceDiscoveryResult(final IqPacket packet) {
-		this.identities = new ArrayList<>();
-		this.features = new ArrayList<>();
-		this.forms = new ArrayList<>();
-		this.hash = "sha-1"; // We only support sha-1 for now
-
-		final List<Element> elements = packet.query().getChildren();
-
-		for (final Element element : elements) {
-			if (element.getName().equals("identity")) {
-				Identity id = new Identity(element);
-				if (id.getType() != null && id.getCategory() != null) {
-					identities.add(id);
-				}
-			} else if (element.getName().equals("feature")) {
-				if (element.getAttribute("var") != null) {
-					features.add(element.getAttribute("var"));
-				}
-			} else if (element.getName().equals("x") && "jabber:x:data".equals(element.getAttribute("xmlns"))) {
-				forms.add(Data.parse(element));
-			}
-		}
-		this.ver = this.mkCapHash();
-	}
-
-	public ServiceDiscoveryResult(String hash, byte[] ver, JSONObject o) throws JSONException {
-		this.identities = new ArrayList<>();
-		this.features = new ArrayList<>();
-		this.forms = new ArrayList<>();
-		this.hash = hash;
-		this.ver = ver;
-
-		JSONArray identities = o.optJSONArray("identities");
-		if (identities != null) {
-			for (int i = 0; i < identities.length(); i++) {
-				this.identities.add(new Identity(identities.getJSONObject(i)));
-			}
-		}
-		JSONArray features = o.optJSONArray("features");
-		if (features != null) {
-			for (int i = 0; i < features.length(); i++) {
-				this.features.add(features.getString(i));
-			}
-		}
-	}
-
-	public String getVer() {
-		return new String(Base64.encode(this.ver, Base64.DEFAULT));
-	}
-
-	public ServiceDiscoveryResult(Cursor cursor) throws JSONException {
-		this(
-			cursor.getString(cursor.getColumnIndex(HASH)),
-			Base64.decode(cursor.getString(cursor.getColumnIndex(VER)), Base64.DEFAULT),
-			new JSONObject(cursor.getString(cursor.getColumnIndex(RESULT)))
-		);
-	}
-
-	public List<Identity> getIdentities() {
-		return this.identities;
-	}
-
-	public List<String> getFeatures() {
-		return this.features;
-	}
-
-	public boolean hasIdentity(String category, String type) {
-		for(Identity id : this.getIdentities()) {
-			if((category == null || id.getCategory().equals(category)) &&
-			   (type == null || id.getType().equals(type))) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	public String getExtendedDiscoInformation(String formType, String name) {
-		for(Data form : this.forms) {
-			if (formType.equals(form.getFormType())) {
-				for(Field field: form.getFields()) {
-					if (name.equals(field.getFieldName())) {
-						return field.getValue();
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	protected byte[] mkCapHash() {
-		StringBuilder s = new StringBuilder();
-
-		List<Identity> identities = this.getIdentities();
-		Collections.sort(identities);
-
-		for(Identity id : identities) {
-			s.append(
-				blankNull(id.getCategory()) + "/" +
-				blankNull(id.getType()) + "/" +
-				blankNull(id.getLang()) + "/" +
-				blankNull(id.getName()) + "<"
-			);
-		}
-
-		List<String> features = this.getFeatures();
-		Collections.sort(features);
-
-		for (String feature : features) {
-			s.append(feature + "<");
-		}
-
-		Collections.sort(forms, new Comparator<Data>() {
-			@Override
-			public int compare(Data lhs, Data rhs) {
-				return lhs.getFormType().compareTo(rhs.getFormType());
-			}
-		});
-
-		for(Data form : forms) {
-			s.append(form.getFormType() + "<");
-			List<Field> fields = form.getFields();
-			Collections.sort(fields, new Comparator<Field>() {
-				@Override
-				public int compare(Field lhs, Field rhs) {
-					return lhs.getFieldName().compareTo(rhs.getFieldName());
-				}
-			});
-			for(Field field : fields) {
-				s.append(field.getFieldName()+"<");
-				List<String> values = field.getValues();
-				Collections.sort(values);
-				for(String value : values) {
-					s.append(value+"<");
-				}
-			}
-		}
-
-		MessageDigest md;
-		try {
-			md = MessageDigest.getInstance("SHA-1");
-		} catch (NoSuchAlgorithmException e) {
-			return null;
-		}
-
-		try {
-			return md.digest(s.toString().getBytes("UTF-8"));
-		} catch(UnsupportedEncodingException e) {
-			return null;
-		}
-	}
-
-	public JSONObject toJSON() {
-		try {
-			JSONObject o = new JSONObject();
-
-			JSONArray ids = new JSONArray();
-			for(Identity id : this.getIdentities()) {
-				ids.put(id.toJSON());
-			}
-			o.put("identites", ids);
-
-			o.put("features", new JSONArray(this.getFeatures()));
-
-			return o;
-		} catch(JSONException e) {
-			return null;
-		}
-	}
-
-	public ContentValues getContentValues() {
-		final ContentValues values = new ContentValues();
-		values.put(HASH, this.hash);
-		values.put(VER, getVer());
-		values.put(RESULT, this.toJSON().toString());
-		return values;
-	}
-}