Mercurial Mercurial > beem > jingle / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
adding a new patch for asmack for jingle support
authorNikita Kozlov <nikita@beem-project.com>
Mon, 17 Jan 2011 23:34:24 +0100
changeset 842 aa80be833fc6
parent 841 dfee4a6ffdad
child 843 237157f79737
adding a new patch for asmack for jingle support
doc/asmack-beem/beem_patches/50-jingle-ext.patch file | annotate | diff | comparison | revisions
libs/asmack-android-7-beem.jar file | annotate | diff | comparison | revisions 
--- a/doc/asmack-beem/beem_patches/50-jingle-ext.patch	Tue Dec 28 16:23:06 2010 +0100
+++ b/doc/asmack-beem/beem_patches/50-jingle-ext.patch	Mon Jan 17 23:34:24 2011 +0100
@@ -1,7 +1,7 @@
 Index: org/jivesoftware/smackx/packet/JingleContentInfo.java
 ===================================================================
---- org/jivesoftware/smackx/packet/JingleContentInfo.java	(révision 11644)
-+++ org/jivesoftware/smackx/packet/JingleContentInfo.java	(copie de travail)
+--- org/jivesoftware/smackx/packet/JingleContentInfo.java	(revision 11644)
++++ org/jivesoftware/smackx/packet/JingleContentInfo.java	(working copy)
 @@ -96,7 +96,7 @@
       */
      public static class Audio extends JingleContentInfo {
@@ -13,8 +13,8 @@
              super(mi);
 Index: org/jivesoftware/smackx/packet/JingleError.java
 ===================================================================
---- org/jivesoftware/smackx/packet/JingleError.java	(révision 11644)
-+++ org/jivesoftware/smackx/packet/JingleError.java	(copie de travail)
+--- org/jivesoftware/smackx/packet/JingleError.java	(revision 11644)
++++ org/jivesoftware/smackx/packet/JingleError.java	(working copy)
 @@ -27,7 +27,7 @@
  
  public class JingleError implements PacketExtension {
@@ -26,8 +26,8 @@
  
 Index: org/jivesoftware/smackx/packet/JingleTransport.java
 ===================================================================
---- org/jivesoftware/smackx/packet/JingleTransport.java	(révision 11644)
-+++ org/jivesoftware/smackx/packet/JingleTransport.java	(copie de travail)
+--- org/jivesoftware/smackx/packet/JingleTransport.java	(revision 11644)
++++ org/jivesoftware/smackx/packet/JingleTransport.java	(working copy)
 @@ -270,7 +270,7 @@
       * RTP-ICE profile
       */
@@ -48,21 +48,57 @@
              super();
 Index: org/jivesoftware/smackx/packet/JingleContentDescription.java
 ===================================================================
---- org/jivesoftware/smackx/packet/JingleContentDescription.java	(révision 11644)
-+++ org/jivesoftware/smackx/packet/JingleContentDescription.java	(copie de travail)
-@@ -172,7 +172,7 @@
+--- org/jivesoftware/smackx/packet/JingleContentDescription.java	(revision 11644)
++++ org/jivesoftware/smackx/packet/JingleContentDescription.java	(working copy)
+@@ -66,6 +66,13 @@
+     public abstract String getNamespace();
+ 
+     /**
++     * Return the media type.
++     *
++     * @return The media type
++     */
++    public abstract String getMediaType();
++
++    /**
+      * Adds a audio payload type to the packet.
+      *
+      * @param pt the audio payload type to add.
+@@ -153,7 +160,8 @@
+         synchronized (payloads) {
+             if (payloads.size() > 0) {
+                 buf.append("<").append(getElementName());
+-                buf.append(" xmlns=\"").append(getNamespace()).append("\" >");
++                buf.append(" xmlns=\"").append(getNamespace()).append("\"");
++                buf.append(" media=\"").append(getMediaType()).append("\" >");
+ 
+                 Iterator pt = payloads.listIterator();
+                 while (pt.hasNext()) {
+@@ -172,7 +180,8 @@
       */
      public static class Audio extends JingleContentDescription {
  
 -        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
 +        public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1";
++        public static final String MEDIA_TYPE = "audio";
  
          public Audio() {
              super();
+@@ -189,6 +198,10 @@
+         public String getNamespace() {
+             return NAMESPACE;
+         }
++
++        public String getMediaType() {
++            return MEDIA_TYPE;
++        }
+     }
+ 
+     /**
 Index: org/jivesoftware/smackx/packet/Jingle.java
 ===================================================================
---- org/jivesoftware/smackx/packet/Jingle.java	(révision 11644)
-+++ org/jivesoftware/smackx/packet/Jingle.java	(copie de travail)
+--- org/jivesoftware/smackx/packet/Jingle.java	(revision 11644)
++++ org/jivesoftware/smackx/packet/Jingle.java	(working copy)
 @@ -44,7 +44,7 @@
  
      // static
@@ -74,21 +110,56 @@
  
 Index: org/jivesoftware/smackx/packet/JingleDescription.java
 ===================================================================
---- org/jivesoftware/smackx/packet/JingleDescription.java	(révision 11644)
-+++ org/jivesoftware/smackx/packet/JingleDescription.java	(copie de travail)
-@@ -179,7 +179,7 @@
+--- org/jivesoftware/smackx/packet/JingleDescription.java	(revision 11644)
++++ org/jivesoftware/smackx/packet/JingleDescription.java	(working copy)
+@@ -69,6 +69,13 @@
+     public abstract String getNamespace();
+ 
+     /**
++     * Return the media type.
++     *
++     * @return The media type
++     */
++    public abstract String getMediaType();
++
++    /**
+      * Adds a audio payload type to the packet.
+      *
+      * @param pt the audio payload type to add.
+@@ -160,7 +167,8 @@
+         synchronized (payloads) {
+             if (payloads.size() > 0) {
+                 buf.append("<").append(getElementName());
+-                buf.append(" xmlns=\"").append(getNamespace()).append("\" >");
++                buf.append(" xmlns=\"").append(getNamespace()).append("\"");
++                buf.append(" media=\"").append(getMediaType()).append("\" >");
+ 
+                 for (PayloadType payloadType : payloads) {
+                     if (payloadType != null) {
+@@ -179,7 +187,8 @@
       */
      public static class Audio extends JingleDescription {
  
 -        public static final String NAMESPACE = "urn:xmpp:tmp:jingle:apps:rtp";
 +        public static final String NAMESPACE = "urn:xmpp:jingle:apps:rtp:1";
++        public static final String MEDIA_TYPE = "audio";
  
          public Audio() {
              super();
+@@ -196,5 +205,9 @@
+         public String getNamespace() {
+             return NAMESPACE;
+         }
++
++        public String getMediaType() {
++            return MEDIA_TYPE;
++        }
+     }
+ }
 Index: org/jivesoftware/smackx/jingle/JingleManager.java
 ===================================================================
---- org/jivesoftware/smackx/jingle/JingleManager.java	(révision 11644)
-+++ org/jivesoftware/smackx/jingle/JingleManager.java	(copie de travail)
+--- org/jivesoftware/smackx/jingle/JingleManager.java	(revision 11644)
++++ org/jivesoftware/smackx/jingle/JingleManager.java	(working copy)
 @@ -255,7 +255,7 @@
       */
      public static void setJingleServiceEnabled() {
Binary file libs/asmack-android-7-beem.jar has changed
BEEM-Jingle