moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-19 19:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display a more detailed error when attempting to resume another device's session

Browse Source
This commit is contained in:
Cameron Gutman 2014-01-11 10:43:29 -05:00
parent 042f67506c
commit 421d73b28a
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
moonlight-common/src/com/limelight/nvstream/NvConnection.java
View File

@ -17,6 +17,7 @@ import com.limelight.nvstream.av.audio.AudioRenderer;
import com.limelight.nvstream.av.video.VideoDecoderRenderer;
import com.limelight.nvstream.av.video.VideoStream;
import com.limelight.nvstream.control.ControlStream;
import com.limelight.nvstream.http.GfeHttpResponseException;
import com.limelight.nvstream.http.NvApp;
import com.limelight.nvstream.http.NvHTTP;
import com.limelight.nvstream.input.NvController;
@ -151,9 +152,23 @@ public class NvConnection {
// If there's a game running, resume it
if (h.getCurrentGame() != 0) {
if (!h.resumeApp()) {
listener.displayMessage("Failing to resume existing session");
return false;
try {
if (!h.resumeApp()) {
listener.displayMessage("Failed to resume existing session");
return false;
}
} catch (GfeHttpResponseException e) {
if (e.getErrorCode() == 470) {
// This is the error you get when you try to resume a session that's not yours.
// Because this is fairly common, we'll display a more detailed message.
listener.displayMessage("This session wasn't started by this device," +
" so it cannot be resumed. End streaming on the original " +
"device or the PC itself and try again. (Error code: "+e.getErrorCode()+")");
return false;
}
else {
throw e;
}
}
System.out.println("Resumed existing game session");
}

8
moonlight-common/src/com/limelight/nvstream/http/GfeHttpResponseException.java
View File

@ -13,6 +13,14 @@ public class GfeHttpResponseException extends IOException {
this.errorMsg = errorMsg;
}
public int getErrorCode() {
return errorCode;
}
public String getErrorMessage() {
return errorMsg;
}
@Override
public String getMessage() {
return "GFE error: "+errorMsg+" (Error code: "+errorCode+")";