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

Better handle offline PCs in launcher shortcuts

Browse Source
This commit is contained in:
Cameron Gutman 2016-11-06 00:24:04 -07:00
parent 6ad001e8be
commit 92f8425ace
1 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
app/src/main/java/com/limelight/AppViewShortcutTrampoline.java
View File

@ -12,6 +12,7 @@ import com.limelight.computers.ComputerManagerListener;
import com.limelight.computers.ComputerManagerService; import com.limelight.computers.ComputerManagerService;
import com.limelight.nvstream.http.ComputerDetails; import com.limelight.nvstream.http.ComputerDetails;
import com.limelight.nvstream.http.NvApp; import com.limelight.nvstream.http.NvApp;
import com.limelight.utils.Dialog;
import com.limelight.utils.ServerHelper; import com.limelight.utils.ServerHelper;
import com.limelight.utils.SpinnerDialog; import com.limelight.utils.SpinnerDialog;
import com.limelight.utils.UiHelper; import com.limelight.utils.UiHelper;
@ -58,20 +59,45 @@ public class AppViewShortcutTrampoline extends Activity {
} }
if (details.state != ComputerDetails.State.UNKNOWN) { if (details.state != ComputerDetails.State.UNKNOWN) {
// Close this activity runOnUiThread(new Runnable() {
finish(); @Override
public void run() {
// Stop showing the spinner
if (blockingLoadSpinner != null) {
blockingLoadSpinner.dismiss();
blockingLoadSpinner = null;
}
if (details.runningGameId != 0) { if (details.state == ComputerDetails.State.ONLINE) {
// A game is running so launch straight to the game activity // Close this activity
ServerHelper.doStart(AppViewShortcutTrampoline.this, finish();
new NvApp("app", details.runningGameId), details, managerBinder);
} if (details.runningGameId != 0) {
else { // A game is running so launch straight to the game activity
// No game running or computer offline - launch to the AppView ServerHelper.doStart(AppViewShortcutTrampoline.this,
Intent i = new Intent(getIntent()); new NvApp("app", details.runningGameId), details, managerBinder);
i.setClass(AppViewShortcutTrampoline.this, AppView.class); }
startActivity(i); else {
} // No game running - launch to the AppView
Intent i = new Intent(getIntent());
i.setClass(AppViewShortcutTrampoline.this, AppView.class);
i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
startActivity(i);
}
}
else if (details.state == ComputerDetails.State.OFFLINE) {
// Computer offline - display an error dialog
Dialog.displayDialog(AppViewShortcutTrampoline.this,
getResources().getString(R.string.conn_error_title),
getResources().getString(R.string.error_pc_offline),
true);
}
// We don't want any more callbacks from now on
managerBinder.stopPolling();
managerBinder = null;
}
});
} }
} }
}); });
@ -104,7 +130,12 @@ public class AppViewShortcutTrampoline extends Activity {
protected void onPause() { protected void onPause() {
super.onPause(); super.onPause();
blockingLoadSpinner.dismiss(); if (blockingLoadSpinner != null) {
blockingLoadSpinner.dismiss();
blockingLoadSpinner = null;
}
Dialog.closeDialogs();
if (managerBinder != null) { if (managerBinder != null) {
unbindService(serviceConnection); unbindService(serviceConnection);