merge encore
authorPhilippe Lago <lago_p@epitech.net>
Tue, 23 Jun 2009 12:02:25 +0200
changeset 278 8bfaad9cfe93
parent 277 48eaf4f08062 (current diff)
parent 272 08effaddeaa4 (diff)
child 279 af993bc754a5
merge encore
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Tue Jun 23 11:59:21 2009 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java	Tue Jun 23 12:02:25 2009 +0200
@@ -185,7 +185,6 @@
 	sdm.addFeature("http://jabber.org/protocol/disco#info");
 	JingleManager.setJingleServiceEnabled();
 	// sdm.addFeature("http://jabber.org/protocol/nick");
-
     }
 
     /**
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/com/beem/project/beem/service/aidl/IPrivacyListManager.aidl	Tue Jun 23 12:02:25 2009 +0200
@@ -0,0 +1,25 @@
+package com.beem.project.beem.service.aidl;
+
+
+
+/**
+ * An aidl interface for Privacy List Manager.
+ */
+interface IPrivacyListManager {
+
+	/**
+	 *	@return: return a list of blocked users
+	 */
+	List<String> getBlockedUsers();
+	
+	/**
+	 *	@return: return a list of blocked users
+	 */
+	List<String> getBlockedUsersByList(in String listName);
+	
+	/**
+	 *	@param: block an user
+	 */
+	void addBlockedUser(in String jid);
+    
+}
\ No newline at end of file