Update version to 3.1.1

app/app.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="limelight-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -9,7 +9,6 @@
     <facet type="android" name="Android">
       <configuration>
         <option name="SELECTED_BUILD_VARIANT" value="nonRootDebug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleNonRootDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileNonRootDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleNonRootDebugTest" />
@@ -25,7 +24,6 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/nonRoot/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/nonRoot/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/nonRoot/debug" isTestSource="false" generated="true" />

app/build.gradle

@@ -11,8 +11,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 21
 
-        versionName "3.1"
+        versionName "3.1.1"
-        versionCode = 53
+        versionCode = 54
     }
 
     productFlavors {

app/src/main/java/com/limelight/AppView.java

@@ -127,7 +127,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
             @Override
             public void notifyComputerUpdated(ComputerDetails details) {
                 // Don't care about other computers
-                if (details != computer) {
+                if (!details.uuid.toString().equalsIgnoreCase(uuidString)) {
                     return;
                 }
 
@@ -264,10 +264,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         int runningAppId = -1;
         for (int i = 0; i < appGridAdapter.getCount(); i++) {
             AppObject app = (AppObject) appGridAdapter.getItem(i);
-            if (app.app == null) {
-                continue;
-            }
-
             if (app.app.getIsRunning()) {
                 runningAppId = app.app.getAppId();
                 break;
@@ -282,10 +278,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
         AppObject selectedApp = (AppObject) appGridAdapter.getItem(info.position);
-        if (selectedApp == null || selectedApp.app == null) {
-            return;
-        }
-        
         int runningAppId = getRunningAppId();
         if (runningAppId != -1) {
             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
                     for (int i = 0; i < appGridAdapter.getCount(); i++) {
                         AppObject existingApp = (AppObject) appGridAdapter.getItem(i);
-                        if (existingApp.app == null) {
-                            continue;
-                        }
-
                         if (existingApp.app.getAppId() == app.getAppId()) {
                             // Found the app; update its properties
                             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,
                                     long id) {
                 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
                 if (getRunningAppId() != -1) {
@@ -501,6 +486,9 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         public final NvApp app;
 
         public AppObject(NvApp app) {
+            if (app == null) {
+                throw new IllegalArgumentException("app must not be null");
+            }
             this.app = app;
         }
 

app/src/main/java/com/limelight/PcView.java

@@ -237,8 +237,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
         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();
             return;
         }
@@ -587,6 +586,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         public ComputerDetails details;
 
         public ComputerObject(ComputerDetails details) {
+            if (details == null) {
+                throw new IllegalArgumentException("details must not be null");
+            }
             this.details = details;
         }
 

limelight-android.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
@@ -7,7 +7,9 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />