Reverts feecacefc58e54e83bef527af5b4e058cdcc0403 (username attribute hack).

This commit is contained in:
Boris Grozev 2017-08-18 23:19:25 -05:00
parent 9da28850f5
commit 4c5cc1642a

View File

@ -17,8 +17,6 @@
*/ */
package org.ice4j.attribute; package org.ice4j.attribute;
import org.ice4j.*;
import java.util.*; import java.util.*;
/** /**
@ -35,24 +33,6 @@ public class UsernameAttribute extends Attribute
*/ */
public static final String NAME = "USERNAME"; public static final String NAME = "USERNAME";
/**
* The name of the property which controls whether trailing zeroes should
* be stripped when decoding USERNAME attributes.
*/
public static final String STRIP_TRAILING_ZEROES_PNAME
= "org.ice4j.attribute.UsernameAttribute.STRIP_TRAILING_ZEROES";
/**
* Whether trailing zeroes should be stripped when decoding USERNAME
* attributes. This is necessary to work around a bug in Edge described
* here:
* https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/12332457/
* and here:
* https://github.com/jitsi/lib-jitsi-meet/issues/498
*/
private boolean stripTrailingZeroes
= StackProperties.getBoolean(STRIP_TRAILING_ZEROES_PNAME, false);
/** /**
* Username value. * Username value.
*/ */
@ -79,14 +59,6 @@ public class UsernameAttribute extends Attribute
@Override @Override
void decodeAttributeBody(byte[] attributeValue, char offset, char length) void decodeAttributeBody(byte[] attributeValue, char offset, char length)
{ {
if (stripTrailingZeroes)
{
while (length > 0 && attributeValue[offset + length - 1] == 0)
{
length--;
}
}
username = new byte[length]; username = new byte[length];
System.arraycopy(attributeValue, offset, username, 0, length); System.arraycopy(attributeValue, offset, username, 0, length);
} }