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

Remove isRunning property from apps (since it's gone in GFE 3.1)

Browse Source
This commit is contained in:
Cameron Gutman 2016-10-21 12:16:43 -07:00
parent ba398e4073
commit 61f89a2d4c
3 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,18 +197,15 @@ public class NvConnection {
} }
} }
// Update the running status of the app
app.setIsRunning(h.getCurrentGame(serverInfo) == app.getAppId());
// If there's a game running, resume it // If there's a game running, resume it
if (h.getCurrentGame(serverInfo) != 0) { if (h.getCurrentGame(serverInfo) != 0) {
try { try {
if (app.getIsRunning()) { if (h.getCurrentGame(serverInfo) == app.getAppId()) {
if (!h.resumeApp(context)) { if (!h.resumeApp(context)) {
context.connListener.displayMessage("Failed to resume existing session"); context.connListener.displayMessage("Failed to resume existing session");
return false; return false;
} }
} else if (h.getCurrentGame(serverInfo) != app.getAppId()) { } else {
return quitAndLaunch(h, app); return quitAndLaunch(h, app);
} }
} catch (GfeHttpResponseException e) { } catch (GfeHttpResponseException e) {

13
moonlight-common/src/com/limelight/nvstream/http/NvApp.java
View File

@ -5,7 +5,6 @@ import com.limelight.LimeLog;
public class NvApp { public class NvApp {
private String appName = ""; private String appName = "";
private int appId; private int appId;
private boolean isRunning;
private boolean initialized; private boolean initialized;
public NvApp() {} public NvApp() {}
@ -38,14 +37,6 @@ public class NvApp {
this.initialized = true; this.initialized = true;
} }
public void setIsRunning(String isRunning) {
this.isRunning = isRunning.equals("1");
}
public void setIsRunning(boolean isRunning) {
this.isRunning = isRunning;
}
public String getAppName() { public String getAppName() {
return this.appName; return this.appName;
} }
@ -54,10 +45,6 @@ public class NvApp {
return this.appId; return this.appId;
} }
public boolean getIsRunning() {
return this.isRunning;
}
public boolean isInitialized() { public boolean isInitialized() {
return this.initialized; return this.initialized;
} }

4
moonlight-common/src/com/limelight/nvstream/http/NvHTTP.java
View File

@ -516,8 +516,6 @@ public class NvHTTP {
app.setAppName(xpp.getText().trim()); app.setAppName(xpp.getText().trim());
} else if (currentTag.peek().equals("ID")) { } else if (currentTag.peek().equals("ID")) {
app.setAppId(xpp.getText().trim()); app.setAppId(xpp.getText().trim());
} else if (currentTag.peek().equals("IsRunning")) {
app.setIsRunning(xpp.getText().trim());
} }
break; break;
} }
@ -536,7 +534,7 @@ public class NvHTTP {
// Remove uninitialized apps // Remove uninitialized apps
if (!app.isInitialized()) { if (!app.isInitialized()) {
LimeLog.warning("GFE returned incomplete app: "+app.getAppId()+" "+app.getAppName()+" "+app.getIsRunning()); LimeLog.warning("GFE returned incomplete app: "+app.getAppId()+" "+app.getAppName());
i.remove(); i.remove();
} }
} }