Changeset 2998

Timestamp:

07/06/10 11:16:10 (14 years ago)

Author:

alexandrecorreia

Message:

Ticket #1116 - Melhorias para a implementacao  http://xmpp.org/rfcs/rfc3921, secao 8.2.1, happy path

Location:

trunk/jmessenger/js

Files:

• jscode/loadIM.js (modified) (2 diffs)
• trophyim.js (modified) (6 diffs)

trunk/jmessenger/js/jscode/loadIM.js

@@ -887 +887 @@
                                 
                                 TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribe');
-                                //TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribed');
                                 break;
                                 
@@ -898 +897 @@
                         case 'not-in-roster':
                                         
-                                /*setTimeout(function()
-                                        {
-                                        var _add = "";
-                                
-                                        if( ( _add = confirm("Deseja adicionar o usuario!")) )          
-                                        {
-                                                addUser.add( jidTo );
-                                        }
-                                        
-                                        },100);*/
-                                
-                                        addUser.add( jidTo );
+                                TrophyIM.setAutorization( jidTo, Base64.decode(this.getUserCurrent().jid), 'subscribe');
+                                addUser.add( jidTo );
                                 
                                         break;

trunk/jmessenger/js/trophyim.js

@@ -595 +595 @@
                                 }
 
+                                /*if( getAttribute('jid') == 'teste9@im.pr.gov.br' || getAttribute('jid') == 'alexandrecorreia@im.pr.gov.br' )
+                                {
+                                        alert(  "JID : " + getAttribute('jid') + "\n" +
+                                                        "ASK : " + getAttribute('ask') + "\n" + 
+                                                        "SUBSCRIPTION : " + getAttribute('subscription') );
+                                }*/
+                                
+                                
                                 if( getAttribute('ask') && getAttribute('ask').toString() === "subscribe" )
                                 {
@@ -604 +612 @@
                                         if( getAttribute('subscription').toString() === "remove" )
                                         {
-                                                TrophyIM.rosterObj.removeContact(getAttribute('jid'));
+                                                TrophyIM.rosterObj.removeContact( getAttribute('jid').toString() );
                                         }
                                 }
@@ -611 +619 @@
                                         if( getAttribute('subscription').toString() === "remove" )
                                         {
-                                                TrophyIM.rosterObj.removeContact(getAttribute('jid'));
+                                                TrophyIM.rosterObj.removeContact( getAttribute('jid').toString() );
                                         }
                                         else
@@ -1888 +1896 @@
         var jid_lower   = barejid.toLowerCase();
         
+        /**
+         * COMENTADO PARA TESTES
+         * 
         if( show != 'unavailable' && show != 'error' )
-                {
+        if( show != 'unavailable' )
+                {
+        */
             if (!this.roster[jid_lower])
                         {
@@ -1908 +1921 @@
             }
             
-            this.roster[jid_lower]['presence'][resource] = presence;
+            this.roster[jid_lower]['presence'][resource] = presence;    
+
+       /**      
+         * COMENTADO PARA TESTES
+         *
         }
         else 
@@ -1916 +1933 @@
         
                 this.addChange(jid_lower);
+                */
     }