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

Fix running app state on GFE 3.1

Browse Source
This commit is contained in:
Cameron Gutman 2016-10-21 12:28:15 -07:00
parent a107b5e652
commit 6de4288a85
3 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/libs/limelight-common.jar
View File

Binary file not shown.

32
app/src/main/java/com/limelight/AppView.java
View File

@ -340,27 +340,14 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
stopComputerUpdates(); stopComputerUpdates();
} }
private int getRunningAppId() {
int runningAppId = -1;
for (int i = 0; i < appGridAdapter.getCount(); i++) {
AppObject app = (AppObject) appGridAdapter.getItem(i);
if (app.app.getIsRunning()) {
runningAppId = app.app.getAppId();
break;
}
}
return runningAppId;
}
@Override @Override
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) { public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
super.onCreateContextMenu(menu, v, menuInfo); super.onCreateContextMenu(menu, v, menuInfo);
AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo; AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
AppObject selectedApp = (AppObject) appGridAdapter.getItem(info.position); AppObject selectedApp = (AppObject) appGridAdapter.getItem(info.position);
int runningAppId = getRunningAppId(); if (lastRunningAppId != 0) {
if (runningAppId != -1) { if (lastRunningAppId == selectedApp.app.getAppId()) {
if (runningAppId == selectedApp.app.getAppId()) {
menu.add(Menu.NONE, START_OR_RESUME_ID, 1, getResources().getString(R.string.applist_menu_resume)); menu.add(Menu.NONE, START_OR_RESUME_ID, 1, getResources().getString(R.string.applist_menu_resume));
menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit)); menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit));
} }
@ -436,19 +423,19 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
AppObject existingApp = (AppObject) appGridAdapter.getItem(i); AppObject existingApp = (AppObject) appGridAdapter.getItem(i);
// There can only be one or zero apps running. // There can only be one or zero apps running.
if (existingApp.app.getIsRunning() && if (existingApp.isRunning &&
existingApp.app.getAppId() == details.runningGameId) { existingApp.app.getAppId() == details.runningGameId) {
// This app was running and still is, so we're done now // This app was running and still is, so we're done now
return; return;
} }
else if (existingApp.app.getAppId() == details.runningGameId) { else if (existingApp.app.getAppId() == details.runningGameId) {
// This app wasn't running but now is // This app wasn't running but now is
existingApp.app.setIsRunning(true); existingApp.isRunning = true;
updated = true; updated = true;
} }
else if (existingApp.app.getIsRunning()) { else if (existingApp.isRunning) {
// This app was running but now isn't // This app was running but now isn't
existingApp.app.setIsRunning(false); existingApp.isRunning = false;
updated = true; updated = true;
} }
else { else {
@ -478,10 +465,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
AppObject existingApp = (AppObject) appGridAdapter.getItem(i); AppObject existingApp = (AppObject) appGridAdapter.getItem(i);
if (existingApp.app.getAppId() == app.getAppId()) { if (existingApp.app.getAppId() == app.getAppId()) {
// Found the app; update its properties // Found the app; update its properties
if (existingApp.app.getIsRunning() != app.getIsRunning()) {
existingApp.app.setIsRunning(app.getIsRunning());
updated = true;
}
if (!existingApp.app.getAppName().equals(app.getAppName())) { if (!existingApp.app.getAppName().equals(app.getAppName())) {
existingApp.app.setAppName(app.getAppName()); existingApp.app.setAppName(app.getAppName());
updated = true; updated = true;
@ -551,7 +534,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
AppObject app = (AppObject) appGridAdapter.getItem(pos); AppObject app = (AppObject) appGridAdapter.getItem(pos);
// Only open the context menu if something is running, otherwise start it // Only open the context menu if something is running, otherwise start it
if (getRunningAppId() != -1) { if (lastRunningAppId != 0) {
openContextMenu(arg1); openContextMenu(arg1);
} else { } else {
ServerHelper.doStart(AppView.this, app.app, computer, managerBinder); ServerHelper.doStart(AppView.this, app.app, computer, managerBinder);
@ -564,6 +547,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
public class AppObject { public class AppObject {
public final NvApp app; public final NvApp app;
public boolean isRunning;
public AppObject(NvApp app) { public AppObject(NvApp app) {
if (app == null) { if (app == null) {

2
app/src/main/java/com/limelight/grid/AppGridAdapter.java
View File

@ -101,7 +101,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
@Override @Override
public boolean populateOverlayView(ImageView overlayView, AppView.AppObject obj) { public boolean populateOverlayView(ImageView overlayView, AppView.AppObject obj) {
if (obj.app.getIsRunning()) { if (obj.isRunning) {
// Show the play button overlay // Show the play button overlay
overlayView.setImageResource(R.drawable.ic_play); overlayView.setImageResource(R.drawable.ic_play);
return true; return true;