--- a/src/com/beem/project/beem/service/Contact.java	Sun Jan 02 19:25:34 2011 +0100
+++ b/src/com/beem/project/beem/service/Contact.java	Sun Jan 02 19:52:45 2011 +0100
@@ -105,28 +105,6 @@
     }
 
     /**
-     * Make an xmpp uri for a spcific jid.
-     *
-     * @param jid the jid to represent as an uri
-     * @return an uri representing this jid.
-     */
-    public static Uri makeXmppUri(String jid) {
-	StringBuilder build = new StringBuilder("xmpp:");
-	String name = StringUtils.parseName(jid);
-	build.append(name);
-	if (!"".equals(name))
-	    build.append('@');
-	build.append(StringUtils.parseServer(jid));
-	String resource = StringUtils.parseResource(jid);
-	if (!"".equals(resource)) {
-	    build.append('/');
-	    build.append(resource);
-	}
-	Uri u = Uri.parse(build.toString());
-	return u;
-    }
-
-    /**
      * Constructor.
      * @param jid JID of the contact
      */
@@ -162,6 +140,28 @@
     }
 
     /**
+     * Make an xmpp uri for a spcific jid.
+     *
+     * @param jid the jid to represent as an uri
+     * @return an uri representing this jid.
+     */
+    public static Uri makeXmppUri(String jid) {
+	StringBuilder build = new StringBuilder("xmpp:");
+	String name = StringUtils.parseName(jid);
+	build.append(name);
+	if (!"".equals(name))
+	    build.append('@');
+	build.append(StringUtils.parseServer(jid));
+	String resource = StringUtils.parseResource(jid);
+	if (!"".equals(resource)) {
+	    build.append('/');
+	    build.append(resource);
+	}
+	Uri u = Uri.parse(build.toString());
+	return u;
+    }
+
+    /**
      * {@inheritDoc}
      */
     @Override

--- a/src/com/beem/project/beem/ui/Subscription.java	Sun Jan 02 19:25:34 2011 +0100
+++ b/src/com/beem/project/beem/ui/Subscription.java	Sun Jan 02 19:52:45 2011 +0100
@@ -135,6 +135,11 @@
 	this.unregisterReceiver(mReceiver);
     }
 
+    /**
+     * Send the presence stanza.
+     *
+     * @param p presence stanza
+     */
     private void sendPresence(Presence p) {
 	PresenceAdapter preAdapt = new PresenceAdapter(p);
 	try {