Re-release of 4.5.6 with fixed Gen 4 streaming

app/build.gradle

@@ -11,8 +11,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 23
 
-        versionName "4.5.5"
-        versionCode = 93
+        versionName "4.5.6"
+        versionCode = 95
     }
 
     productFlavors {

app/src/main/java/com/limelight/PcView.java

@@ -327,7 +327,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                         Dialog.displayDialog(PcView.this, getResources().getString(R.string.pair_pairing_title),
                                 getResources().getString(R.string.pair_pairing_msg)+" "+pinStr, false);
 
-                        PairingManager.PairState pairState = httpConn.pair(pinStr);
+                        PairingManager.PairState pairState = httpConn.pair(httpConn.getServerInfo(), pinStr);
                         if (pairState == PairingManager.PairState.PIN_WRONG) {
                             message = getResources().getString(R.string.pair_incorrect_pin);
                         }

app/src/main/jni/jnienet/jnienet.c

@@ -1,6 +1,8 @@
 #include "enet/enet.h"
 
 #include <stdlib.h>
+#include <string.h>
+
 #include <jni.h>
 
 #define CLIENT_TO_LONG(x) ((intptr_t)(x))
@@ -135,12 +137,12 @@ Java_com_limelight_nvstream_enet_EnetConnection_writePacket(JNIEnv *env, jobject
     return ret;
 }
 
-JNIEXPORT jint JNICALL
+JNIEXPORT void JNICALL
 Java_com_limelight_nvstream_enet_EnetConnection_destroyClient(JNIEnv *env, jobject class, jlong client) {
     enet_host_destroy(LONG_TO_CLIENT(client));
 }
 
-JNIEXPORT jint JNICALL
+JNIEXPORT void JNICALL
 Java_com_limelight_nvstream_enet_EnetConnection_disconnectPeer(JNIEnv *env, jobject class, jlong peer) {
     enet_peer_disconnect_now(LONG_TO_PEER(peer), 0);
 }

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-beta6'
+        classpath 'com.android.tools.build:gradle:2.1.0-alpha4'
     }
 }