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

Remove redundant null checks

Browse Source
This commit is contained in:
Cameron Gutman 2015-02-08 23:44:33 -05:00
parent 5519d92243
commit aee34f6365
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,10 +264,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
int runningAppId = -1; int runningAppId = -1;
for (int i = 0; i < appGridAdapter.getCount(); i++) { for (int i = 0; i < appGridAdapter.getCount(); i++) {
AppObject app = (AppObject) appGridAdapter.getItem(i); AppObject app = (AppObject) appGridAdapter.getItem(i);
if (app.app == null) {
continue;
}
if (app.app.getIsRunning()) { if (app.app.getIsRunning()) {
runningAppId = app.app.getAppId(); runningAppId = app.app.getAppId();
break; break;
@ -282,10 +278,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo; AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
AppObject selectedApp = (AppObject) appGridAdapter.getItem(info.position); AppObject selectedApp = (AppObject) appGridAdapter.getItem(info.position);
if (selectedApp == null || selectedApp.app == null) {
return;
}
int runningAppId = getRunningAppId(); int runningAppId = getRunningAppId();
if (runningAppId != -1) { if (runningAppId != -1) {
if (runningAppId == selectedApp.app.getAppId()) { if (runningAppId == selectedApp.app.getAppId()) {
@ -380,10 +372,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
// Try to update an existing app in the list first // Try to update an existing app in the list first
for (int i = 0; i < appGridAdapter.getCount(); i++) { for (int i = 0; i < appGridAdapter.getCount(); i++) {
AppObject existingApp = (AppObject) appGridAdapter.getItem(i); AppObject existingApp = (AppObject) appGridAdapter.getItem(i);
if (existingApp.app == null) {
continue;
}
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()) { if (existingApp.app.getIsRunning() != app.getIsRunning()) {
@ -481,9 +469,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
public void onItemClick(AdapterView<?> arg0, View arg1, int pos, public void onItemClick(AdapterView<?> arg0, View arg1, int pos,
long id) { long id) {
AppObject app = (AppObject) appGridAdapter.getItem(pos); AppObject app = (AppObject) appGridAdapter.getItem(pos);
if (app == null || app.app == null) {
return;
}
// 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 (getRunningAppId() != -1) {
@ -501,6 +486,9 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
public final NvApp app; public final NvApp app;
public AppObject(NvApp app) { public AppObject(NvApp app) {
if (app == null) {
throw new IllegalArgumentException("app must not be null");
}
this.app = app; this.app = app;
} }

6
app/src/main/java/com/limelight/PcView.java
View File

@ -237,8 +237,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo; AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position); ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
if (computer == null || computer.details == null || if (computer.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
computer.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
startComputerUpdates(); startComputerUpdates();
return; return;
} }
@ -587,6 +586,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
public ComputerDetails details; public ComputerDetails details;
public ComputerObject(ComputerDetails details) { public ComputerObject(ComputerDetails details) {
if (details == null) {
throw new IllegalArgumentException("details must not be null");
}
this.details = details; this.details = details;
} }