Changeset 574:6e81709820b4 in qutecom-2.2 for libs/sipwrapper/src/phapi/PhApiWrapper.cpp

Timestamp:

Mar 10, 2010 4:06:04 PM (3 years ago)

Author:

laurent@…

Branch:

default

Message:

implement rfc 4480 for presence

File:

• libs/sipwrapper/src/phapi/PhApiWrapper.cpp (modified) (7 diffs)

libs/sipwrapper/src/phapi/PhApiWrapper.cpp

@@ -159 +159 @@
  
 
-        isOnline = false;
+        isOpen = false;
+        presence_activities = "close";
 
 }
@@ -348 +349 @@
                 }
 
-                publishOffline(String::null);
+                publishPresence(false,"offline",String::null);
                 sleep(2);
                 owplLineDelete(lineId, force);
@@ -685 +686 @@
         switch(state) {
         case EnumPresenceState::PresenceStateOnline:
-                publishOnline(PresenceStateOnline);
+                publishPresence(true,"unknow",note);
                 break;
 
         case EnumPresenceState::PresenceStateAway:
-                publishOnline(PresenceStateAway);
+                publishPresence(true,"away",note);
                 break;
 
         case EnumPresenceState::PresenceStateDoNotDisturb:
-                publishOnline(PresenceStateDoNotDisturb);
+                publishPresence(false,"busy",note);
                 break;
 
         case EnumPresenceState::PresenceStateUserDefined:
                 if (!sipOptions.sip_p2p_presence)
-                  publishOnline(note);
+                  publishPresence(true,presence_activities,note);
                 break;
 
         case EnumPresenceState::PresenceStateInvisible:
+                        publishPresence(false,"unknow",note);
+                break;
+                        
         case EnumPresenceState::PresenceStateOffline:
-                publishOffline(note);
+                publishPresence(false,"unknow",note);
                 break;
 
@@ -729 +733 @@
 }
 
-void PhApiWrapper::publishOnline(const std::string & note) {
+/*void PhApiWrapper::publishOnline(const std::string & note) {
         if (_isInitialized) {
                 publishPresence(true, note);
@@ -739 +743 @@
                 publishPresence(false, note);
         }
-}
-
-void PhApiWrapper::publishPresence(bool online, const std::string & note) {
+}*/
+
+void PhApiWrapper::publishPresence(bool open, const std::string & activities, const std::string & note) {
         static const std::string contentType = "application/pidf+xml";
 
         if (_isInitialized) {
-          isOnline = online;
+          isOpen = open;
+          presence_activities = activities;
           presence_note = note;
 
@@ -752 +757 @@
               for (InSubIter isub = _incomingSubscriptions.begin(); isub != _incomingSubscriptions.end(); isub++)
                 if (isub->second.state == SUBCONFIRMED)
-                  owplPresenceNotify(_wengoVline, isub->first, (online)?1:0, note.c_str(), 0);
+                  owplPresenceNotify(_wengoVline, isub->first, (open)?1:0, activities.c_str(), note.c_str(), 0);
               
               myPresenceStatusEvent(*this, EnumPresenceState::MyPresenceStatusOk, note);
 
             }
-          else  if(owplPresencePublish(_wengoVline, (online)?1:0, note.c_str(), NULL) != OWPL_RESULT_SUCCESS) {
+          else  if(owplPresencePublish(_wengoVline, (open)?1:0, activities.c_str(),  note.c_str()) != OWPL_RESULT_SUCCESS) {
                         myPresenceStatusEvent(*this, EnumPresenceState::MyPresenceStatusError, note);
                 } else {
@@ -806 +811 @@
 
   // FIXME:  will not work in multiline mode
-  owplSubscribeAccept(_wengoVline, sid, 202, (int) isOnline , presence_note.c_str());
+  owplSubscribeAccept(_wengoVline, sid, 202, (int) isOpen , presence_activities.c_str() , presence_note.c_str());