# HG changeset patch
# User Nikita Kozlov <nikita@beem-project.com>
# Date 1295178299 -3600
# Node ID 30d32b73be7c03a860480bb38b3db53913195041
# Parent  ddaa0b718f2adea50e660d823578a0e4563f4db9
fix Bug #321
I have commented the PrivacyListManagerAdapter initialization because the exception came from the underneath code.
Also, since the feature isn't finished (especially tested) and enabled in the gui, it will be safer.

diff -r ddaa0b718f2a -r 30d32b73be7c src/com/beem/project/beem/BeemService.java
--- a/src/com/beem/project/beem/BeemService.java	Sun Jan 16 12:01:15 2011 +0100
+++ b/src/com/beem/project/beem/BeemService.java	Sun Jan 16 12:44:59 2011 +0100
@@ -331,7 +331,7 @@
 	pm.addIQProvider("query", "http://jabber.org/protocol/disco#info", new DiscoverInfoProvider());
 
 	// Privacy
-	pm.addIQProvider("query", "jabber:iq:privacy", new PrivacyProvider());
+	//pm.addIQProvider("query", "jabber:iq:privacy", new PrivacyProvider());
 	// Delayed Delivery only the new version
 	pm.addExtensionProvider("delay", "urn:xmpp:delay", new DelayInfoProvider());
 
diff -r ddaa0b718f2a -r 30d32b73be7c src/com/beem/project/beem/service/XmppConnectionAdapter.java
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Sun Jan 16 12:01:15 2011 +0100
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Sun Jan 16 12:44:59 2011 +0100
@@ -238,7 +238,9 @@
 
 	    mAdaptee.login(mLogin, mPassword, mResource);
 	    mChatManager = new BeemChatManager(mAdaptee.getChatManager(), mService);
-	    mPrivacyListManager = new PrivacyListManagerAdapter(PrivacyListManager.getInstanceFor(mAdaptee));
+	    //nikita: I commented this line because of the logs provided in http://www.beem-project.com/issues/321 
+	    //Also, since the privacylistmanager isn't finished and used, it will be safer to not initialize it
+	    //mPrivacyListManager = new PrivacyListManagerAdapter(PrivacyListManager.getInstanceFor(mAdaptee));
 	    mService.initJingle(mAdaptee);
 	    discoverServerFeatures();
 
@@ -460,7 +462,8 @@
 	    sdm = new ServiceDiscoveryManager(mAdaptee);
 
 	sdm.addFeature("http://jabber.org/protocol/disco#info");
-	sdm.addFeature("jabber:iq:privacy");
+	//nikita: must be uncommented when the feature will be enabled 
+	//sdm.addFeature("jabber:iq:privacy");
 	sdm.addFeature("http://jabber.org/protocol/caps");
 	sdm.addFeature("urn:xmpp:avatar:metadata");
 	sdm.addFeature("urn:xmpp:avatar:metadata+notify");