Version 5.7.3

.gitignore

@@ -30,7 +30,7 @@ Thumbs.db
 #.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
 .gradle
 build/
-app/app.iml
+*.iml
 
 # Compiled JNI libraries folder
 **/jniLibs

app/build.gradle

@@ -7,8 +7,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 27
 
-        versionName "5.7.2"
+        versionName "5.7.3"
-        versionCode = 150
+        versionCode = 151
     }
 
     flavorDimensions "root"

app/src/main/AndroidManifest.xml

@@ -99,10 +99,11 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.limelight.PcView" />
         </activity>
+        <!-- This will fall back to sensorLandscape at runtime on Android 4.2 and below -->
         <activity
             android:name=".Game"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
-            android:screenOrientation="sensorLandscape"
+            android:screenOrientation="userLandscape"
             android:noHistory="true"
             android:supportsPictureInPicture="true"
             android:resizeableActivity="true"

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

@@ -69,6 +69,13 @@ public class AppViewShortcutTrampoline extends Activity {
                                             blockingLoadSpinner = null;
                                         }
 
+                                        // If the managerBinder was destroyed before this callback,
+                                        // just finish the activity.
+                                        if (managerBinder == null) {
+                                            finish();
+                                            return;
+                                        }
+
                                         if (details.state == ComputerDetails.State.ONLINE) {
                                             // Close this activity
                                             finish();

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

@@ -39,6 +39,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.hardware.input.InputManager;
@@ -95,6 +96,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     private boolean displayedFailureDialog = false;
     private boolean connecting = false;
     private boolean connected = false;
+    private boolean surfaceCreated = false;
+    private boolean attemptedConnection = false;
 
     private InputCaptureProvider inputCaptureProvider;
     private int modifierFlags = 0;
@@ -158,6 +161,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
         }
 
+        // We specified userLandscape in the manifest which isn't supported until 4.3,
+        // so we must fall back at runtime to sensorLandscape.
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR2) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
+        }
+
         // Listen for UI visibility events
         getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(this);
 
@@ -961,6 +970,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                     lastMouseX = (int)event.getX();
                     lastMouseY = (int)event.getY();
                 }
+                else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                    // We get a normal (non-relative) MotionEvent when starting pointer capture to synchronize the
+                    // location of the cursor with our app. We don't want this, so we must discard this event.
+                    lastMouseX = (int)event.getX();
+                    lastMouseY = (int)event.getY();
+                }
                 else {
                     // First process the history
                     for (int i = 0; i < event.getHistorySize(); i++) {
@@ -1193,8 +1208,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             spinner = null;
         }
 
-        connecting = false;
         connected = true;
+        connecting = false;
 
         runOnUiThread(new Runnable() {
             @Override
@@ -1233,12 +1248,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
     @Override
     public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-    }
+        if (!surfaceCreated) {
+            throw new IllegalStateException("Surface changed before creation!");
+        }
 
-    @Override
+        if (!attemptedConnection) {
-    public void surfaceCreated(SurfaceHolder holder) {
+            attemptedConnection = true;
-        if (!connected && !connecting) {
-            connecting = true;
 
             decoderRenderer.setRenderTarget(holder);
             conn.start(PlatformBinding.getAudioRenderer(), decoderRenderer, Game.this);
@@ -1246,12 +1261,23 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     }
 
     @Override
-    public void surfaceDestroyed(SurfaceHolder holder) {
+    public void surfaceCreated(SurfaceHolder holder) {
-        // Let the decoder know immediately that the surface is gone
+        surfaceCreated = true;
-        decoderRenderer.prepareForStop();
+    }
 
-        if (connected) {
+    @Override
-            stopConnection();
+    public void surfaceDestroyed(SurfaceHolder holder) {
+        if (!surfaceCreated) {
+            throw new IllegalStateException("Surface destroyed before creation!");
+        }
+
+        if (attemptedConnection) {
+            // Let the decoder know immediately that the surface is gone
+            decoderRenderer.prepareForStop();
+
+            if (connected) {
+                stopConnection();
+            }
         }
     }
 

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

@@ -161,7 +161,9 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                 continue;
             }
 
-            if ((dev.getSources() & InputDevice.SOURCE_JOYSTICK) != 0) {
+            if ((dev.getSources() & InputDevice.SOURCE_JOYSTICK) != 0 &&
+                    getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_X) != null &&
+                    getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Y) != null) {
                 LimeLog.info("Counting InputDevice: "+dev.getName());
                 mask |= 1 << count++;
             }

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

@@ -718,7 +718,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                     LimeLog.info("Patching level_idc to 31");
                     sps.levelIdc = 31;
                 }
-                if (initialWidth <= 1280 && initialHeight <= 720) {
+                else if (initialWidth <= 1280 && initialHeight <= 720) {
                     // Max 5 buffered frames at 1280x720x60
                     LimeLog.info("Patching level_idc to 32");
                     sps.levelIdc = 32;

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

@@ -336,7 +336,7 @@ public class MediaCodecHelper {
 
 		// This device seems to crash constantly at 720p, so try disabling
 		// RFI to see if we can get that under control.
-		if (Build.PRODUCT.equalsIgnoreCase("b3_att_us")) {
+		if (Build.BRAND.toLowerCase().equals("lge") && Build.PRODUCT.toLowerCase().startsWith("b3_")) {
 			return false;
 		}
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.0-rc03'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Sep 03 12:51:12 PDT 2017
+#Tue Mar 20 18:12:28 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip

moonlight-android.iml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="moonlight-android" 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>
-        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
-        <option name="BUILDABLE" value="false" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-    </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>