[Sync] Relax checks for received XMPP messages

jingle/notifier/listener/listen_task.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "jingle/notifier/listener/listen_task.h"
 
 #include "base/logging.h"
 #include "jingle/notifier/listener/notification_constants.h"
 #include "jingle/notifier/listener/xml_element_util.h"
 #include "talk/base/task.h"
@@ skipping 47 matching lines @@
   //          <Type int="#"/>
   //          <Read bool="{true/false}"/>
   //        </State>
   //        <ClientActive bool="{true/false}"/>
   //      </Result>
   //    </not:getAll>
   //  </iq> "
   // Note that there can be multiple "Result" elements, so we need to loop
   // through all of them.
   bool update_signaled = false;
+  const buzz::QName kQnNotifierGetAll(kNotifierNamespace, "getAll");
   const buzz::XmlElement* get_all_element =
-      stanza->FirstNamed(buzz::QName("google:notifier", "getAll"));
+      stanza->FirstNamed(kQnNotifierGetAll);
   if (get_all_element) {
     const buzz::XmlElement* result_element =
         get_all_element->FirstNamed(
             buzz::QName(buzz::STR_EMPTY, "Result"));
     while (result_element) {
       IncomingNotificationData notification_data;
       const buzz::XmlElement* id_element =
           result_element->FirstNamed(buzz::QName(buzz::STR_EMPTY, "Id"));
       if (id_element) {
         const buzz::XmlElement* service_url_element =
@@ skipping 38 matching lines @@
   // TODO(akalin): Do more verification on stanza depending on
   // the sync notification method
   if (IsValidNotification(stanza)) {
     QueueStanza(stanza);
     return true;
   }
   return false;
 }
 
 bool ListenTask::IsValidNotification(const buzz::XmlElement* stanza) {
-  static const buzz::QName kQnNotifierGetAll(
-      kNotifierNamespace, "getAll");
-  // An update notificaiton has the following form.
-  //  <cli:iq from="{bare_jid}" to="{full_jid}"
-  //      id="#" type="set" xmlns:cli="jabber:client">
-  //    <not:getAll xmlns:not="google:notifier">
-  //      <Timestamp long="#" xmlns=""/>
-  //    </not:getAll>
-  //  </cli:iq>
-  return
-      (MatchRequestIq(stanza, buzz::STR_SET, kQnNotifierGetAll) &&
-       (stanza->Attr(buzz::QN_TO) == GetClient()->jid().Str()) &&
-       (stanza->Attr(buzz::QN_FROM) == GetClient()->jid().BareJid().Str()));
+  const buzz::QName kQnNotifierGetAll(kNotifierNamespace, "getAll");
+  return MatchRequestIq(stanza, buzz::STR_SET, kQnNotifierGetAll);

[sanjeevr, 2011/01/30 22:55:07]

Nit: Leave the original comment about the format of the notification.

[akalin, 2011/01/31 09:54:17]

Done.

 }
 
 }  // namespace notifier