Update version info to 3.1.6

README.md

@@ -1,14 +1,14 @@
-#Limelight
+#Moonlight
 
-Limelight is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
+[Moonlight](http://moonlight-stream.com) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
 We reverse engineered the Shield streaming software and created a version that can be run on any Android device.
 
-Limelight will allow you to stream your full collection of games from your Windows PC to your Android device,
+Moonlight will allow you to stream your full collection of games from your Windows PC to your Android device,
 whether in your own home or over the internet.
 
-[Limelight-pc](https://github.com/limelight-stream/limelight-pc) is also currently in development for Windows, OS X and Linux. Versions for [iOS](https://github.com/limelight-stream/limelight-ios) and [Windows and Windows Phone](https://github.com/limelight-stream/limelight-windows) are also in development.
+[Moonlight-pc](https://github.com/moonlight-stream/moonlight-pc) is also currently in development for Windows, OS X and Linux. Versions for [iOS](https://github.com/moonlight-stream/moonlight-ios) and [Windows and Windows Phone](https://github.com/moonlight-stream/moonlight-windows) are also in development.
 
-Check our [wiki](https://github.com/limelight-stream/limelight-android/wiki) for more detailed information or a troubleshooting guide. 
+Check our [wiki](https://github.com/moonlight-stream/moonlight-android/wiki) for more detailed information or a troubleshooting guide. 
 
 ##Features
 
@@ -18,7 +18,7 @@ Check our [wiki](https://github.com/limelight-stream/limelight-android/wiki) for
 
 ##Installation
 
-* Download and install Limelight for Android from
+* Download and install Moonlight for Android from
 [Google Play](https://play.google.com/store/apps/details?id=com.limelight)
 * Download [GeForce Experience](http://www.geforce.com/geforce-experience) and install on your Windows PC
 
@@ -33,7 +33,7 @@ Check our [wiki](https://github.com/limelight-stream/limelight-android/wiki) for
 * Turn on GameStream in the GFE settings
 * If you are connecting from outside the same network, turn on internet
   streaming
-* When on the same network as your PC, open Limelight and tap on your PC in the list
+* When on the same network as your PC, open Moonlight and tap on your PC in the list
 * Accept the pairing confirmation on your PC
 * Tap your PC again to view the list of apps to stream
 * Play games!
@@ -46,8 +46,6 @@ This project is being actively developed at [XDA Developers](http://forum.xda-de
 2. Write code
 3. Send Pull Requests
 
-Check out our [website](http://limelight-stream.com) for project links and information.
-
 ##Authors
 
 * [Cameron Gutman](https://github.com/cgutman)  
@@ -55,5 +53,5 @@ Check out our [website](http://limelight-stream.com) for project links and infor
 * [Aaron Neyer](https://github.com/Aaronneyer)  
 * [Andrew Hennessy](https://github.com/yetanothername)
 
-Limelight is the work of students at [Case Western](http://case.edu) and was
+Moonlight is the work of students at [Case Western](http://case.edu) and was
 started as a project at [MHacks](http://mhacks.org).

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.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="moonlight-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -12,8 +12,9 @@
         <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="assembleNonRootDebugAndroidTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateNonRootDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleNonRootDebugAndroidTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileNonRootDebugAndroidTestSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateNonRootDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -115,4 +116,3 @@
     <orderEntry type="library" exported="" name="okio-1.2.0" level="project" />
   </component>
 </module>
-

app/build.gradle

@@ -11,8 +11,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 22
 
-        versionName "3.1.3"
+        versionName "3.1.6"
-        versionCode = 58
+        versionCode = 61
     }
 
     productFlavors {

app/src/main/java/com/limelight/binding/input/ControllerHandler.java

@@ -1,10 +1,10 @@
 package com.limelight.binding.input;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import android.hardware.input.InputManager;
 import android.os.SystemClock;
+import android.util.SparseArray;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
@@ -31,7 +31,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
 
     private final Vector2d inputVector = new Vector2d();
 
-    private final HashMap<String, ControllerContext> contexts = new HashMap<String, ControllerContext>();
+    private final SparseArray<ControllerContext> contexts = new SparseArray<ControllerContext>();
 
     private final NvConnection conn;
     private final double stickDeadzone;
@@ -97,18 +97,6 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
         return range;
     }
 
-    private short assignNewControllerNumber() {
-        for (short i = 0; i < 4; i++) {
-            if ((currentControllers & (1 << i)) == 0) {
-                // Found an unused controller value
-                currentControllers |= (1 << i);
-                return i;
-            }
-        }
-
-        return 0;
-    }
-
     @Override
     public void onInputDeviceAdded(int deviceId) {
         // Nothing happening here yet
@@ -116,13 +104,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
 
     @Override
     public void onInputDeviceRemoved(int deviceId) {
-        for (Map.Entry<String, ControllerContext> device : contexts.entrySet()) {
+        ControllerContext context = contexts.get(deviceId);
-            if (device.getValue().id == deviceId) {
+        if (context != null) {
-                LimeLog.info("Removed controller: "+device.getValue().name);
+            LimeLog.info("Removed controller: "+context.name+" ("+deviceId+")");
-                releaseControllerNumber(device.getValue().controllerNumber);
+            releaseControllerNumber(context);
-                contexts.remove(device.getKey());
+            contexts.remove(deviceId);
-                return;
-            }
         }
     }
 
@@ -133,9 +119,47 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
         onInputDeviceAdded(deviceId);
     }
 
-    private void releaseControllerNumber(int controllerNumber) {
+    private void releaseControllerNumber(ControllerContext context) {
-        LimeLog.info("Controller number "+controllerNumber+" is now available");
+        if (context.reservedControllerNumber) {
-        currentControllers &= ~(1 << controllerNumber);
+            LimeLog.info("Controller number "+context.controllerNumber+" is now available");
+            currentControllers &= ~(1 << context.controllerNumber);
+        }
+    }
+
+    // Called before sending input but after we've determined that this
+    // is definitely a controller (not a keyboard, mouse, or something else)
+    private void assignControllerNumberIfNeeded(ControllerContext context) {
+        if (context.assignedControllerNumber) {
+            return;
+        }
+
+        LimeLog.info(context.name+" ("+context.id+") needs a controller number assigned");
+        if (context.name != null && context.name.contains("gpio-keys")) {
+            // This is the back button on Shield portable consoles
+            LimeLog.info("Built-in buttons hardcoded as controller 0");
+            context.controllerNumber = 0;
+        }
+        else if (multiControllerEnabled && context.hasJoystickAxes) {
+            context.controllerNumber = 0;
+
+            LimeLog.info("Reserving the next available controller number");
+            for (short i = 0; i < 4; i++) {
+                if ((currentControllers & (1 << i)) == 0) {
+                    // Found an unused controller value
+                    currentControllers |= (1 << i);
+                    context.controllerNumber = i;
+                    context.reservedControllerNumber = true;
+                    break;
+                }
+            }
+        }
+        else {
+            LimeLog.info("Not reserving a controller number");
+            context.controllerNumber = 0;
+        }
+
+        LimeLog.info("Assigned as controller "+context.controllerNumber);
+        context.assignedControllerNumber = true;
     }
 
     private ControllerContext createContextForDevice(InputDevice dev) {
@@ -282,23 +306,16 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
                 context.leftStickDeadzoneRadius = 0.07f;
                 context.rightStickDeadzoneRadius = 0.07f;
             }
+            // Samsung's face buttons appear as a non-virtual button so we'll classify them as remotes
+            // so the back button gets passed through to exit streaming
+            else if (devName.equals("sec_touchscreen")) {
+                context.isRemote = true;
+            }
         }
 
         LimeLog.info("Analog stick deadzone: "+context.leftStickDeadzoneRadius+" "+context.rightStickDeadzoneRadius);
         LimeLog.info("Trigger deadzone: "+context.triggerDeadzone);
 
-        if (devName != null && devName.equals("gpio-keys")) {
-            // This is the back button on Shield portable consoles
-            context.controllerNumber = 0;
-        }
-        else if (multiControllerEnabled && context.hasJoystickAxes) {
-            context.controllerNumber = assignNewControllerNumber();
-        }
-        else {
-            context.controllerNumber = 0;
-        }
-        LimeLog.info("Assigned as controller "+context.controllerNumber);
-
         return context;
     }
 
@@ -308,22 +325,21 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
             return defaultContext;
         }
 
-        String descriptor = dev.getDescriptor();
-
         // Return the existing context if it exists
-        ControllerContext context = contexts.get(descriptor);
+        ControllerContext context = contexts.get(dev.getId());
         if (context != null) {
             return context;
         }
 
         // Otherwise create a new context
         context = createContextForDevice(dev);
-        contexts.put(descriptor, context);
+        contexts.put(dev.getId(), context);
 
         return context;
     }
 
     private void sendControllerInputPacket(ControllerContext context) {
+        assignControllerNumberIfNeeded(context);
         conn.sendControllerInput(context.controllerNumber, context.inputMap,
                 context.leftTrigger, context.rightTrigger,
                 context.leftStickX, context.leftStickY,
@@ -804,6 +820,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
         public boolean isRemote;
         public boolean hasJoystickAxes;
 
+        public boolean assignedControllerNumber;
+        public boolean reservedControllerNumber;
         public short controllerNumber;
 
         public short inputMap = 0x0000;

app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java

@@ -39,6 +39,7 @@ public class MediaCodecHelper {
         directSubmitPrefixes.add("omx.intel");
         directSubmitPrefixes.add("omx.brcm");
         directSubmitPrefixes.add("omx.TI");
+        directSubmitPrefixes.add("omx.arc");
     }
 
 	static {

app/src/main/java/com/limelight/computers/ComputerManagerService.java

@@ -81,6 +81,7 @@ public class ComputerManagerService extends Service {
             if (!pollComputer(details)) {
                 if (!newPc && offlineCount < OFFLINE_POLL_TRIES) {
                     // Return without calling the listener
+                    releaseLocalDatabaseReference();
                     return false;
                 }
 

app/src/main/java/com/limelight/grid/AppGridAdapter.java

@@ -40,7 +40,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
             dp = LARGE_WIDTH_DP;
         }
 
-        double scalingDivisor = ART_WIDTH_PX / (dp * (dpi / 160));
+        double scalingDivisor = ART_WIDTH_PX / (dp * (dpi / 160.0));
         if (scalingDivisor < 1.0) {
             // We don't want to make them bigger before draw-time
             scalingDivisor = 1.0;

app/src/main/java/com/limelight/grid/assets/CachedAppAssetLoader.java

@@ -10,6 +10,7 @@ import android.widget.ImageView;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvApp;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -97,6 +98,11 @@ public class CachedAppAssetLoader {
                 // Write the stream straight to disk
                 diskLoader.populateCacheWithStream(tuple, in);
 
+                // Close the network input stream
+                try {
+                    in.close();
+                } catch (IOException ignored) {}
+
                 // If there's a task associated with this load, we should return the bitmap
                 if (task != null) {
                     return diskLoader.loadBitmapFromCache(tuple, (int) scalingDivider);

app/src/main/java/com/limelight/utils/CacheHelper.java

@@ -61,6 +61,10 @@ public class CacheHelper {
             sb.append(buf, 0, bytesRead);
         }
 
+        try {
+            in.close();
+        } catch (IOException ignored) {}
+
         return sb.toString();
     }
 

app/src/main/res/values-it/strings.xml

@@ -102,7 +102,7 @@
 
     <string name="category_ui_settings">Impostazioni Interfaccia</string>
     <string name="title_language_list">Lingua</string>
-    <string name="summary_language_list">Lingua da usare in Limelight</string>
+    <string name="summary_language_list">Lingua da usare in Moonlight</string>
     <string name="title_checkbox_list_mode">Usa lista invece della griglia</string>
     <string name="summary_checkbox_list_mode">Visualizza applicazioni e computers in una lista invece di una griglia</string>
     <string name="title_checkbox_small_icon_mode">Usa icone piccole</string>

app/src/main/res/values/strings.xml

@@ -102,7 +102,7 @@
 
     <string name="category_ui_settings">UI Settings</string>
     <string name="title_language_list">Language</string>
-    <string name="summary_language_list">Language to use for Limelight</string>
+    <string name="summary_language_list">Language to use for Moonlight</string>
     <string name="title_checkbox_list_mode">Use lists instead of grids</string>
     <string name="summary_checkbox_list_mode">Display apps and PCs in lists instead of grids</string>
     <string name="title_checkbox_small_icon_mode">Use small icons</string>

app/src/nonRoot/AndroidManifest.xml

@@ -2,5 +2,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Non-root application name -->
-    <application android:label="Limelight" />
+    <application android:label="Moonlight" />
 </manifest>

app/src/root/AndroidManifest.xml

@@ -5,5 +5,5 @@
     <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
 
     <!-- Root application name -->
-    <application android:label="Limelight (Root)" />
+    <application android:label="Moonlight (Root)" />
 </manifest>

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.2.2'
     }
 }
 

moonlight-android.iml

@@ -1,9 +1,10 @@
 <?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.id="moonlight-android" 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">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
@@ -16,4 +17,3 @@
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
-