Fix root build

.github/no-response.yml

@@ -0,0 +1,8 @@
+# ProBot No Response (https://probot.github.io/apps/no-response/)
+
+daysUntilClose: 7
+responseRequiredLabel: 'need more info'
+closeComment: >
+  This issue has been automatically closed because there was no response to a
+  request for more information from the issue opener. Please leave a comment or
+  open a new issue if you have additional information related to this issue.

.github/stale.yml

@@ -0,0 +1,14 @@
+# ProBot Stale (https://probot.github.io/apps/stale/)
+
+daysUntilStale: 90
+daysUntilClose: 7
+exemptLabels:
+  - accepted
+  - bug
+  - enhancement
+  - meta
+staleLabel: stale
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs.
+closeComment: false

README.md

@@ -1,4 +1,4 @@
-# Moonlight
+# Moonlight Android
 
 [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.
@@ -6,8 +6,6 @@ We reverse engineered the Shield streaming software and created a version that c
 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.
 
-[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/moonlight-stream/moonlight-docs/wiki) for more detailed information or a troubleshooting guide. 
 
 ## Features

app/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    buildToolsVersion '28.0.1'
+    buildToolsVersion '28.0.3'
     compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
 
-        versionName "5.9"
+        versionName "5.9.3"
-        versionCode = 168
+        versionCode = 172
     }
 
     flavorDimensions "root"

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

@@ -28,6 +28,7 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -257,10 +258,9 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 
         String computerName = getIntent().getStringExtra(NAME_EXTRA);
 
-        String labelText = getResources().getString(R.string.title_applist)+" "+computerName;
         TextView label = findViewById(R.id.appListText);
-        setTitle(labelText);
+        setTitle(computerName);
-        label.setText(labelText);
+        label.setText(computerName);
 
         // Add a launcher shortcut for this PC (forced, since this is user interaction)
         shortcutHelper.createAppViewShortcut(uuidString, computerName, uuidString, true);
@@ -344,7 +344,17 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         menu.add(Menu.NONE, VIEW_DETAILS_ID, 3, getResources().getString(R.string.applist_menu_details));
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            menu.add(Menu.NONE, CREATE_SHORTCUT_ID, 4, getResources().getString(R.string.applist_menu_scut));
+            // Only add an option to create shortcut if box art is loaded
+            // and when we're in grid-mode (not list-mode).
+            ImageView appImageView = info.targetView.findViewById(R.id.grid_image);
+            if (appImageView != null) {
+                // We have a grid ImageView, so we must be in grid-mode
+                BitmapDrawable drawable = (BitmapDrawable)appImageView.getDrawable();
+                if (drawable != null && drawable.getBitmap() != null) {
+                    // We have a bitmap loaded too
+                    menu.add(Menu.NONE, CREATE_SHORTCUT_ID, 4, getResources().getString(R.string.applist_menu_scut));
+                }
+            }
         }
     }
 

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

@@ -105,6 +105,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     private boolean grabbedInput = true;
     private boolean grabComboDown = false;
     private StreamView streamView;
+    private boolean gotBackPointerEvent = false;
+    private boolean syntheticBackDown = false;
 
     private ShortcutHelper shortcutHelper;
 
@@ -839,7 +841,9 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         if ((event.getSource() == InputDevice.SOURCE_MOUSE ||
                 event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) &&
                 event.getKeyCode() == KeyEvent.KEYCODE_BACK &&
-                event.getRepeatCount() == 0) {
+                event.getRepeatCount() == 0 &&
+                !gotBackPointerEvent) {
+            syntheticBackDown = true;
             conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
             return true;
         }
@@ -891,7 +895,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         // create as a result of a right-click.
         if ((event.getSource() == InputDevice.SOURCE_MOUSE ||
                 event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) &&
-                event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+                event.getKeyCode() == KeyEvent.KEYCODE_BACK &&
+                (!gotBackPointerEvent || syntheticBackDown)) {
+            // We need to raise the button if gotBackPointerEvent is true
+            // in the case where it transitioned to true after we already
+            // sent the right click down event.
+            syntheticBackDown = false;
             conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
             return true;
         }
@@ -999,6 +1008,11 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                     else {
                         conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
                     }
+
+                    // Don't use the KEYCODE_BACK hack (which interferes with mice
+                    // with actual back buttons) since we're getting right clicks
+                    // using this callback.
+                    gotBackPointerEvent = true;
                 }
 
                 if ((changedButtons & MotionEvent.BUTTON_TERTIARY) != 0) {
@@ -1010,6 +1024,28 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                     }
                 }
 
+                if ((changedButtons & MotionEvent.BUTTON_BACK) != 0) {
+                    if ((event.getButtonState() & MotionEvent.BUTTON_BACK) != 0) {
+                        conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_X1);
+                    }
+                    else {
+                        conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_X1);
+                    }
+
+                    // Don't use the KEYCODE_BACK hack. That will cause this
+                    // button press to trigger a right-click.
+                    gotBackPointerEvent = true;
+                }
+
+                if ((changedButtons & MotionEvent.BUTTON_FORWARD) != 0) {
+                    if ((event.getButtonState() & MotionEvent.BUTTON_FORWARD) != 0) {
+                        conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_X2);
+                    }
+                    else {
+                        conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_X2);
+                    }
+                }
+
                 // Get relative axis values if we can
                 if (inputCaptureProvider.eventHasRelativeMouseAxes(event)) {
                     // Send the deltas straight from the motion event
@@ -1360,6 +1396,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         case EvdevListener.BUTTON_RIGHT:
             buttonIndex = MouseButtonPacket.BUTTON_RIGHT;
             break;
+        case EvdevListener.BUTTON_X1:
+            buttonIndex = MouseButtonPacket.BUTTON_X1;
+            break;
+        case EvdevListener.BUTTON_X2:
+            buttonIndex = MouseButtonPacket.BUTTON_X2;
+            break;
         default:
             LimeLog.warning("Unhandled button: "+buttonId);
             return;

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

@@ -112,11 +112,15 @@ public class ShortcutTrampoline extends Activity {
                                                     // Now start the activities
                                                     startActivities(intentStack.toArray(new Intent[]{}));
                                                 } else {
+                                                    // Create the start intent immediately, so we can safely unbind the managerBinder
+                                                    // below before we return.
+                                                    final Intent startIntent = ServerHelper.createStartIntent(ShortcutTrampoline.this,
+                                                            new NvApp("app", Integer.parseInt(appIdString), false), details, managerBinder);
+
                                                     UiHelper.displayQuitConfirmationDialog(ShortcutTrampoline.this, new Runnable() {
                                                         @Override
                                                         public void run() {
-                                                            intentStack.add(ServerHelper.createStartIntent(ShortcutTrampoline.this,
+                                                            intentStack.add(startIntent);
-                                                                    new NvApp("app", Integer.parseInt(appIdString), false), details, managerBinder));
 
                                                             // Close this activity
                                                             finish();

app/src/main/java/com/limelight/binding/input/evdev/EvdevListener.java

@@ -4,6 +4,8 @@ public interface EvdevListener {
     int BUTTON_LEFT = 1;
     int BUTTON_MIDDLE = 2;
     int BUTTON_RIGHT = 3;
+    int BUTTON_X1 = 4;
+    int BUTTON_X2 = 5;
 
     void mouseMove(int deltaX, int deltaY);
     void mouseButtonEvent(int buttonId, boolean down);

app/src/main/java/com/limelight/ui/StreamView.java

@@ -62,9 +62,8 @@ public class StreamView extends SurfaceView {
     @Override
     public boolean onKeyPreIme(int keyCode, KeyEvent event) {
         // This callbacks allows us to override dumb IME behavior like when
-        // Samsung's default keyboard consumes Shift+Space. We'll process
+        // Samsung's default keyboard consumes Shift+Space.
-        // the input event directly if any modifier keys are down.
+        if (inputCallbacks != null) {
-        if (inputCallbacks != null && event.getModifiers() != 0) {
             if (event.getAction() == KeyEvent.ACTION_DOWN) {
                 if (inputCallbacks.handleKeyDown(event)) {
                     return true;

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

@@ -61,7 +61,6 @@
     <string name="lost_connection">Conexión perdida</string>
 
     <!-- AppList activity -->
-    <string name="title_applist">Aplicaciones en</string>
     <string name="applist_menu_resume">Reanudar sesión</string>
     <string name="applist_menu_quit">Cerrar sesión</string>
     <string name="applist_menu_quit_and_start">Cerrar juego actual e iniciar</string>

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

@@ -71,7 +71,6 @@
     <string name="help">Aide</string>
 
     <!-- AppList activity -->
-    <string name="title_applist">Applications sur</string>
     <string name="applist_connect_msg">Connexion au PC…</string>
     <string name="applist_menu_resume">Reprise de la session</string>
     <string name="applist_menu_quit">Quitter la session</string>

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

@@ -76,7 +76,6 @@
     <string name="help">Assistenza</string>
 
     <!-- AppList activity -->
-    <string name="title_applist">Applicazioni su</string>
     <string name="applist_connect_msg">Connessione al PC in corso…</string>
     <string name="applist_menu_resume">Riprendi sessione</string>
     <string name="applist_menu_quit">Chiudi sessione</string>

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

@@ -57,7 +57,6 @@
     <string name="lost_connection">コンピュータとの接続が失われました</string>
 
     <!-- AppList activity -->
-    <string name="title_applist">ゲーム</string>
     <string name="applist_menu_resume">セッションを続ける</string>
     <string name="applist_menu_quit">セッションを終了する</string>
     <string name="applist_menu_quit_and_start">現在のゲームを終了して新しいゲームを始める</string>

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

@@ -71,7 +71,6 @@
     <string name="help">도움말</string>
 
     <!-- AppList activity -->
-    <string name="title_applist">앱 사용 가능</string>
     <string name="applist_connect_msg">PC에 연결중…</string>
     <string name="applist_menu_resume">세션 계속</string>
     <string name="applist_menu_quit">세션 종료</string>

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

@@ -61,7 +61,6 @@
   <string name="lost_connection">Verbinding met PC verloren</string>
 
   <!-- AppList activity -->
-  <string name="title_applist">Apps op</string>
   <string name="applist_menu_resume">Hervat Sessie</string>
   <string name="applist_menu_quit">Stop Sessie</string>
   <string name="applist_menu_quit_and_start">Stop Huidige Spel en Start</string>

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

@@ -62,7 +62,6 @@
     <string name="lost_connection">Потеряно соединение с PC</string>
 
     <!-- AppList activity -->
-    <string name="title_applist">Приложения на</string>
     <string name="applist_menu_resume">Возобновить сессию</string>
     <string name="applist_menu_quit">Выйти из сессии</string>
     <string name="applist_menu_quit_and_start">Выйти из текущей игры и запустить</string>

app/src/main/res/values-v21/styles.xml

@@ -7,6 +7,8 @@
     -->
     <style name="AppBaseTheme" parent="android:Theme.Material">
         <!-- API 21 theme customizations can go here. -->
+        <item name="android:statusBarColor">#212121</item>
+        <item name="android:navigationBarColor">#212121</item>
     </style>
 
 </resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -71,7 +71,6 @@
     <string name="help">帮助</string>
 
     <!-- AppList activity -->
-    <string name="title_applist">Apps on</string>
     <string name="applist_connect_msg"> 连接到电脑中…… </string>
     <string name="applist_menu_resume"> 恢复串流 </string>
     <string name="applist_menu_quit"> 退出串流 </string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -71,7 +71,6 @@
     <string name="help">幫助</string>
 
     <!-- AppList activity -->
-    <string name="title_applist">Apps on</string>
     <string name="applist_connect_msg"> 連接到電腦中…… </string>
     <string name="applist_menu_resume"> 恢復串流 </string>
     <string name="applist_menu_quit"> 退出串流 </string>

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

@@ -85,7 +85,6 @@
     <string name="help">Help</string>
 
     <!-- AppList activity -->
-    <string name="title_applist">Apps on</string>
     <string name="applist_connect_msg">Connecting to PC…</string>
     <string name="applist_menu_resume">Resume Session</string>
     <string name="applist_menu_quit">Quit Session</string>

app/src/root/java/com.limelight/binding/input/evdev/EvdevCaptureProvider.java

@@ -151,7 +151,15 @@ public class EvdevCaptureProvider extends InputCaptureProvider {
                                 break;
 
                             case EvdevEvent.BTN_SIDE:
+                                listener.mouseButtonEvent(EvdevListener.BUTTON_X1,
+                                        event.value != 0);
+                                break;
+
                             case EvdevEvent.BTN_EXTRA:
+                                listener.mouseButtonEvent(EvdevListener.BUTTON_X2,
+                                        event.value != 0);
+                                break;
+
                             case EvdevEvent.BTN_FORWARD:
                             case EvdevEvent.BTN_BACK:
                             case EvdevEvent.BTN_TASK:

build.gradle

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