Merge pull request TooTallNate#351 from davideandreuzza/String-isEmpty-Fix

marci4 · web-flow · commit e00cfaf8afff · 2017-04-03T19:46:17.000+02:00
Replaced String.isEmpty() with String.length() for Android API level 8 compatibility
diff --git a/src/main/java/org/java_websocket/drafts/Draft_76.java b/src/main/java/org/java_websocket/drafts/Draft_76.java
@@ -130,7 +130,7 @@ public HandshakeState acceptHandshakeAsClient( ClientHandshake request, ServerHa
 
 	@Override
 	public HandshakeState acceptHandshakeAsServer( ClientHandshake handshakedata ) {
-		if( handshakedata.getFieldValue( "Upgrade" ).equals( "WebSocket" ) && handshakedata.getFieldValue( "Connection" ).contains( "Upgrade" ) && handshakedata.getFieldValue( "Sec-WebSocket-Key1" ).length() > 0 && !handshakedata.getFieldValue( "Sec-WebSocket-Key2" ).isEmpty() && handshakedata.hasFieldValue( "Origin" ) )
+		if( handshakedata.getFieldValue( "Upgrade" ).equals( "WebSocket" ) && handshakedata.getFieldValue( "Connection" ).contains( "Upgrade" ) && handshakedata.getFieldValue( "Sec-WebSocket-Key1" ).length() > 0 && handshakedata.getFieldValue( "Sec-WebSocket-Key2" ).length() > 0 && handshakedata.hasFieldValue( "Origin" ) )
 			return HandshakeState.MATCHED;
 		return HandshakeState.NOT_MATCHED;
 	}

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public HandshakeState acceptHandshakeAsClient( ClientHandshake request, ServerHa`
`130`	`130`
`131`	`131`	`@Override`
`132`	`132`	`public HandshakeState acceptHandshakeAsServer( ClientHandshake handshakedata ) {`
`133`		`- if( handshakedata.getFieldValue( "Upgrade" ).equals( "WebSocket" ) && handshakedata.getFieldValue( "Connection" ).contains( "Upgrade" ) && handshakedata.getFieldValue( "Sec-WebSocket-Key1" ).length() > 0 && !handshakedata.getFieldValue( "Sec-WebSocket-Key2" ).isEmpty() && handshakedata.hasFieldValue( "Origin" ) )`
	`133`	`+ if( handshakedata.getFieldValue( "Upgrade" ).equals( "WebSocket" ) && handshakedata.getFieldValue( "Connection" ).contains( "Upgrade" ) && handshakedata.getFieldValue( "Sec-WebSocket-Key1" ).length() > 0 && handshakedata.getFieldValue( "Sec-WebSocket-Key2" ).length() > 0 && handshakedata.hasFieldValue( "Origin" ) )`
`134`	`134`	`return HandshakeState.MATCHED;`
`135`	`135`	`return HandshakeState.NOT_MATCHED;`
`136`	`136`	`}`