moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-02-16 10:31:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test network when the connection terminates due to lack of video traffic

Browse Source
This commit is contained in:
Cameron Gutman
2020-08-06 22:01:45 -07:00
parent 7b14e54eab
commit 9669da026f
4 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/com/limelight/Game.java
View File

@@ -1586,14 +1586,30 @@ public class Game extends Activity implements SurfaceHolder.Callback,
if (errorCode != MoonBridge.ML_ERROR_GRACEFUL_TERMINATION) {
String message;
switch (errorCode) {
case MoonBridge.ML_ERROR_NO_VIDEO_TRAFFIC:
message = getResources().getString(R.string.no_video_received_error);
break;
// Perform a connection test if the failure could be due to a blocked port
int portFlags = MoonBridge.getPortFlagsFromTerminationErrorCode(errorCode);
int portTestResult;
if (portFlags != 0) {
portTestResult = MoonBridge.testClientConnectivity(ServerHelper.CONNECTION_TEST_SERVER, 443, portFlags);
}
else {
portTestResult = MoonBridge.ML_TEST_RESULT_INCONCLUSIVE;
}
default:
message = getResources().getString(R.string.conn_terminated_msg);
break;
if (portTestResult != MoonBridge.ML_TEST_RESULT_INCONCLUSIVE && portTestResult != 0) {
// If we got a blocked result, that supersedes any other error message
message = getResources().getString(R.string.nettest_text_blocked);
}
else {
switch (errorCode) {
case MoonBridge.ML_ERROR_NO_VIDEO_TRAFFIC:
message = getResources().getString(R.string.no_video_received_error);
break;
default:
message = getResources().getString(R.string.conn_terminated_msg);
break;
}
}
Dialog.displayDialog(Game.this, getResources().getString(R.string.conn_terminated_title),

2
app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java
View File

@@ -298,5 +298,7 @@ public class MoonBridge {
public static native int getPortFlagsFromStage(int stage);
public static native int getPortFlagsFromTerminationErrorCode(int errorCode);
public static native void init();
}

2
app/src/main/jni/moonlight-core/moonlight-common-c

Submodule app/src/main/jni/moonlight-core/moonlight-common-c updated: 6010367637...2fdcfb9429

5
app/src/main/jni/moonlight-core/simplejni.c
View File

@@ -129,4 +129,9 @@ Java_com_limelight_nvstream_jni_MoonBridge_getProtocolFromPortFlagIndex(JNIEnv *
JNIEXPORT jint JNICALL
Java_com_limelight_nvstream_jni_MoonBridge_getPortFlagsFromStage(JNIEnv *env, jclass clazz, jint stage) {
return LiGetPortFlagsFromStage(stage);
}
JNIEXPORT jint JNICALL
Java_com_limelight_nvstream_jni_MoonBridge_getPortFlagsFromTerminationErrorCode(JNIEnv *env, jclass clazz, jint errorCode) {
return LiGetPortFlagsFromTerminationErrorCode(errorCode);
}