Compare commits

..
6 Commits
5 changed files with 8 additions and 6 deletions

No files matched your search

+2 -2
View File
@@ -11,8 +11,8 @@ android {
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 23 targetSdkVersion 23
versionName "4.5.5" versionName "4.5.6"
versionCode = 93 versionCode = 95
} }
productFlavors { productFlavors {
Binary file not shown.
+1 -1
View File
@@ -327,7 +327,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
Dialog.displayDialog(PcView.this, getResources().getString(R.string.pair_pairing_title), Dialog.displayDialog(PcView.this, getResources().getString(R.string.pair_pairing_title),
getResources().getString(R.string.pair_pairing_msg)+" "+pinStr, false); 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) { if (pairState == PairingManager.PairState.PIN_WRONG) {
message = getResources().getString(R.string.pair_incorrect_pin); message = getResources().getString(R.string.pair_incorrect_pin);
} }
+4 -2
View File
@@ -1,6 +1,8 @@
#include "enet/enet.h" #include "enet/enet.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <jni.h> #include <jni.h>
#define CLIENT_TO_LONG(x) ((intptr_t)(x)) #define CLIENT_TO_LONG(x) ((intptr_t)(x))
@@ -135,12 +137,12 @@ Java_com_limelight_nvstream_enet_EnetConnection_writePacket(JNIEnv *env, jobject
return ret; return ret;
} }
JNIEXPORT jint JNICALL JNIEXPORT void JNICALL
Java_com_limelight_nvstream_enet_EnetConnection_destroyClient(JNIEnv *env, jobject class, jlong client) { Java_com_limelight_nvstream_enet_EnetConnection_destroyClient(JNIEnv *env, jobject class, jlong client) {
enet_host_destroy(LONG_TO_CLIENT(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) { Java_com_limelight_nvstream_enet_EnetConnection_disconnectPeer(JNIEnv *env, jobject class, jlong peer) {
enet_peer_disconnect_now(LONG_TO_PEER(peer), 0); enet_peer_disconnect_now(LONG_TO_PEER(peer), 0);
} }
+1 -1
View File
@@ -4,7 +4,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.0.0-beta6' classpath 'com.android.tools.build:gradle:2.1.0-alpha4'
} }
} }