# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1252592968 -7200
# Node ID b4d1b0652ddbe9547751f29b6e6d56acbf82d9f4
# Parent  284a4c4e8a11854e52c12a0ae7446c01643fd089# Parent  76bfb3e8e129a22bba0fe18799830abcc117a4cd
merge

diff -r 76bfb3e8e129 -r b4d1b0652ddb AndroidManifest.xml
--- a/AndroidManifest.xml	Tue Sep 08 16:14:44 2009 +0200
+++ b/AndroidManifest.xml	Thu Sep 10 16:29:28 2009 +0200
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.beem.project.beem" android:versionCode="1"
 	android:versionName="1.0">
-	<application android:label="@string/app_name" android:icon="@drawable/signal" android:theme="@style/Theme.BEEM.Default">
+	<application android:label="@string/app_name" android:icon="@drawable/signal" android:theme="@style/Theme.BEEM.Default" android:debuggable="true">
 		<activity android:name=".ui.Login" android:label="@string/app_name"
 			android:launchMode="singleTask">
 			<intent-filter>
diff -r 76bfb3e8e129 -r b4d1b0652ddb src/com/beem/project/beem/service/Contact.java
--- a/src/com/beem/project/beem/service/Contact.java	Tue Sep 08 16:14:44 2009 +0200
+++ b/src/com/beem/project/beem/service/Contact.java	Thu Sep 10 16:29:28 2009 +0200
@@ -94,7 +94,7 @@
     public Contact(final Uri uri) {
 	if (!"xmpp".equals(uri.getScheme()))
 	    throw new IllegalArgumentException();
-	mJID = uri.getSchemeSpecificPart();
+	mJID = uri.getEncodedSchemeSpecificPart();
     }
 
     /**