Improve scaling of lock icon by increasing dimensions

It doesn't actually fix the bug.

This reverts commit 16b845ab84.

.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

.gitignore

@@ -1,6 +1,9 @@
-#built application files
+# built application files
 *.apk
 *.ap_
+*.aab
+output.json
+out/
 
 # files for the dex VM
 *.dex

README.md

@@ -1,13 +1,11 @@
-# Moonlight
+# Moonlight Android
 
-[Moonlight](http://moonlight-stream.com) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
+[Moonlight](https://moonlight-stream.org) 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.
 
 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,14 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    buildToolsVersion '28.0.3'
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
 
-        versionName "5.7.4"
-        versionCode = 153
+        versionName "7.0.1"
+        versionCode = 188
     }
 
     flavorDimensions "root"
@@ -45,9 +46,27 @@ android {
         disable 'MissingTranslation'
     }
 
+    bundle {
+        language {
+            // Avoid splitting by language, since we allow users
+            // to manually switch language in settings.
+            enableSplit = false
+        }
+        density {
+            // FIXME: This should not be neccessary but we get
+            // weird crashes due to missing drawable resources
+            // when this split is enabled.
+            enableSplit = false
+        }
+    }
+
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
+
+            minifyEnabled true
+            useProguard false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
             // To whomever is releasing/using an APK in release mode with
@@ -82,8 +101,8 @@ android {
             // TL;DR: Leave the following line alone!
             applicationIdSuffix ".unofficial"
 
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt')
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 

app/proguard-rules.pro

@@ -0,0 +1,27 @@
+# Don't obfuscate code
+-dontobfuscate
+
+# Our code
+-keep class com.limelight.binding.input.evdev.* {*;}
+
+# Moonlight common
+-keep class com.limelight.nvstream.jni.* {*;}
+
+# Okio
+-keep class sun.misc.Unsafe {*;}
+-dontwarn java.nio.file.*
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+-dontwarn okio.**
+
+# BouncyCastle
+-keep class org.bouncycastle.jcajce.provider.asymmetric.* {*;}
+-keep class org.bouncycastle.jcajce.provider.asymmetric.util.* {*;}
+-keep class org.bouncycastle.jcajce.provider.asymmetric.rsa.* {*;}
+-keep class org.bouncycastle.jcajce.provider.digest.** {*;}
+-keep class org.bouncycastle.jcajce.provider.symmetric.** {*;}
+-keep class org.bouncycastle.jcajce.spec.* {*;}
+-keep class org.bouncycastle.jce.** {*;}
+-dontwarn javax.naming.**
+
+# jMDNS
+-dontwarn javax.jmdns.impl.DNSCache

app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
@@ -67,8 +68,9 @@
         </activity>
         <!-- Small hack to support launcher shortcuts without relaunching over and over again when the back button is pressed -->
         <activity
-            android:name=".AppViewShortcutTrampoline"
+            android:name=".ShortcutTrampoline"
             android:noHistory="true"
+            android:exported="true"
             android:resizeableActivity="true"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
             <meta-data

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

@@ -1,8 +1,8 @@
 package com.limelight;
 
+import java.io.IOException;
 import java.io.StringReader;
 import java.util.List;
-import java.util.UUID;
 
 import com.limelight.computers.ComputerManagerListener;
 import com.limelight.computers.ComputerManagerService;
@@ -26,6 +26,9 @@ import android.app.Service;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.view.ContextMenu;
@@ -36,10 +39,13 @@ import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 
+import org.xmlpull.v1.XmlPullParserException;
+
 public class AppView extends Activity implements AdapterFragmentCallbacks {
     private AppGridAdapter appGridAdapter;
     private String uuidString;
@@ -56,7 +62,9 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
     private final static int START_OR_RESUME_ID = 1;
     private final static int QUIT_ID = 2;
     private final static int CANCEL_ID = 3;
-    private final static int START_WTIH_QUIT = 4;
+    private final static int START_WITH_QUIT = 4;
+    private final static int VIEW_DETAILS_ID = 5;
+    private final static int CREATE_SHORTCUT_ID = 6;
 
     public final static String NAME_EXTRA = "Name";
     public final static String UUID_EXTRA = "UUID";
@@ -74,11 +82,8 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                     // Wait for the binder to be ready
                     localBinder.waitForReady();
 
-                    // Now make the binder visible
-                    managerBinder = localBinder;
-
                     // Get the computer object
-                    computer = managerBinder.getComputer(UUID.fromString(uuidString));
+                    computer = localBinder.getComputer(uuidString);
                     if (computer == null) {
                         finish();
                         return;
@@ -88,13 +93,18 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                         appGridAdapter = new AppGridAdapter(AppView.this,
                                 PreferenceConfiguration.readPreferences(AppView.this).listMode,
                                 PreferenceConfiguration.readPreferences(AppView.this).smallIconMode,
-                                computer, managerBinder.getUniqueId());
+                                computer, localBinder.getUniqueId());
                     } catch (Exception e) {
                         e.printStackTrace();
                         finish();
                         return;
                     }
 
+                    // Now make the binder visible. We must do this after appGridAdapter
+                    // is set to prevent us from reaching updateUiWithServerinfo() and
+                    // touching the appGridAdapter prior to initialization.
+                    managerBinder = localBinder;
+
                     // Load the app grid with cached data (if possible).
                     // This must be done _before_ startComputerUpdates()
                     // so the initial serverinfo response can update the running
@@ -147,7 +157,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                 }
 
                 // Don't care about other computers
-                if (!details.uuid.toString().equalsIgnoreCase(uuidString)) {
+                if (!details.uuid.equalsIgnoreCase(uuidString)) {
                     return;
                 }
 
@@ -171,7 +181,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                         @Override
                         public void run() {
                             // Disable shortcuts referencing this PC for now
-                            shortcutHelper.disableShortcut(details.uuid.toString(),
+                            shortcutHelper.disableShortcut(details.uuid,
                                     getResources().getString(R.string.scut_not_paired));
 
                             // Display a toast to the user and quit the activity
@@ -207,7 +217,9 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                         blockingLoadSpinner.dismiss();
                         blockingLoadSpinner = null;
                     }
-                } catch (Exception ignored) {}
+                } catch (XmlPullParserException | IOException e) {
+                    e.printStackTrace();
+                }
             }
         });
 
@@ -251,10 +263,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);
-        label.setText(labelText);
+        setTitle(computerName);
+        label.setText(computerName);
 
         // Add a launcher shortcut for this PC (forced, since this is user interaction)
         shortcutHelper.createAppViewShortcut(uuidString, computerName, uuidString, true);
@@ -272,7 +283,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
             List<NvApp> applist = NvHTTP.getAppListByReader(new StringReader(lastRawApplist));
             updateUiWithAppList(applist);
             LimeLog.info("Loaded applist from cache");
-        } catch (Exception e) {
+        } catch (IOException | XmlPullParserException e) {
             if (lastRawApplist != null) {
                 LimeLog.warning("Saved applist corrupted: "+lastRawApplist);
                 e.printStackTrace();
@@ -331,10 +342,25 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                 menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit));
             }
             else {
-                menu.add(Menu.NONE, START_WTIH_QUIT, 1, getResources().getString(R.string.applist_menu_quit_and_start));
+                menu.add(Menu.NONE, START_WITH_QUIT, 1, getResources().getString(R.string.applist_menu_quit_and_start));
                 menu.add(Menu.NONE, CANCEL_ID, 2, getResources().getString(R.string.applist_menu_cancel));
             }
         }
+        menu.add(Menu.NONE, VIEW_DETAILS_ID, 3, getResources().getString(R.string.applist_menu_details));
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            // 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));
+                }
+            }
+        }
     }
 
     @Override
@@ -346,7 +372,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
         final AppObject app = (AppObject) appGridAdapter.getItem(info.position);
         switch (item.getItemId()) {
-            case START_WTIH_QUIT:
+            case START_WITH_QUIT:
                 // Display a confirmation dialog first
                 UiHelper.displayQuitConfirmationDialog(this, new Runnable() {
                     @Override
@@ -367,8 +393,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                     @Override
                     public void run() {
                         suspendGridUpdates = true;
-                        ServerHelper.doQuit(AppView.this,
-                                ServerHelper.getCurrentAddressFromComputer(computer),
+                        ServerHelper.doQuit(AppView.this, computer,
                                 app.app, managerBinder, new Runnable() {
                             @Override
                             public void run() {
@@ -386,6 +411,19 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
             case CANCEL_ID:
                 return true;
 
+            case VIEW_DETAILS_ID:
+                Dialog.displayDialog(AppView.this, getResources().getString(R.string.title_details),
+                        getResources().getString(R.string.applist_details_id) + " " + app.app.getAppId(), false);
+                return true;
+
+            case CREATE_SHORTCUT_ID:
+                ImageView appImageView = info.targetView.findViewById(R.id.grid_image);
+                Bitmap appBits = ((BitmapDrawable)appImageView.getDrawable()).getBitmap();
+                if (!shortcutHelper.createPinnedGameShortcut(uuidString + Integer.valueOf(app.app.getAppId()).toString(), appBits, computer, app.app)) {
+                    Toast.makeText(AppView.this, getResources().getString(R.string.unable_to_pin_shortcut), Toast.LENGTH_LONG).show();
+                }
+                return true;
+
             default:
                 return super.onContextItemSelected(item);
         }

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

@@ -1,171 +0,0 @@
-package com.limelight;
-
-import android.app.Activity;
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.IBinder;
-
-import com.limelight.computers.ComputerManagerListener;
-import com.limelight.computers.ComputerManagerService;
-import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.NvApp;
-import com.limelight.utils.Dialog;
-import com.limelight.utils.ServerHelper;
-import com.limelight.utils.SpinnerDialog;
-import com.limelight.utils.UiHelper;
-
-import java.util.ArrayList;
-import java.util.UUID;
-
-public class AppViewShortcutTrampoline extends Activity {
-    private String uuidString;
-
-    private ComputerDetails computer;
-    private SpinnerDialog blockingLoadSpinner;
-
-    public final static String UUID_EXTRA = "UUID";
-
-    private ComputerManagerService.ComputerManagerBinder managerBinder;
-    private final ServiceConnection serviceConnection = new ServiceConnection() {
-        public void onServiceConnected(ComponentName className, IBinder binder) {
-            final ComputerManagerService.ComputerManagerBinder localBinder =
-                    ((ComputerManagerService.ComputerManagerBinder)binder);
-
-            // Wait in a separate thread to avoid stalling the UI
-            new Thread() {
-                @Override
-                public void run() {
-                    // Wait for the binder to be ready
-                    localBinder.waitForReady();
-
-                    // Now make the binder visible
-                    managerBinder = localBinder;
-
-                    // Get the computer object
-                    computer = managerBinder.getComputer(UUID.fromString(uuidString));
-
-                    // Force CMS to repoll this machine
-                    managerBinder.invalidateStateForComputer(computer.uuid);
-
-                    // Start polling
-                    managerBinder.startPolling(new ComputerManagerListener() {
-                        @Override
-                        public void notifyComputerUpdated(final ComputerDetails details) {
-                            // Don't care about other computers
-                            if (!details.uuid.toString().equalsIgnoreCase(uuidString)) {
-                                return;
-                            }
-
-                            if (details.state != ComputerDetails.State.UNKNOWN) {
-                                runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        // Stop showing the spinner
-                                        if (blockingLoadSpinner != null) {
-                                            blockingLoadSpinner.dismiss();
-                                            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();
-
-                                            // Create a new activity stack for this launch
-                                            ArrayList<Intent> intentStack = new ArrayList<>();
-                                            Intent i;
-
-                                            // Add the PC view at the back (and clear the task)
-                                            i = new Intent(AppViewShortcutTrampoline.this, PcView.class);
-                                            i.setAction(Intent.ACTION_MAIN);
-                                            i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
-                                            intentStack.add(i);
-
-                                            // Take this intent's data and create an intent to start the app view
-                                            i = new Intent(getIntent());
-                                            i.setClass(AppViewShortcutTrampoline.this, AppView.class);
-                                            intentStack.add(i);
-
-                                            // If a game is running, we'll make the stream the top level activity
-                                            if (details.runningGameId != 0) {
-                                                intentStack.add(ServerHelper.createStartIntent(AppViewShortcutTrampoline.this,
-                                                        new NvApp("app", details.runningGameId, false), details, managerBinder));
-                                            }
-
-                                            // Now start the activities
-                                            startActivities(intentStack.toArray(new Intent[]{}));
-                                        }
-                                        else if (details.state == ComputerDetails.State.OFFLINE) {
-                                            // Computer offline - display an error dialog
-                                            Dialog.displayDialog(AppViewShortcutTrampoline.this,
-                                                    getResources().getString(R.string.conn_error_title),
-                                                    getResources().getString(R.string.error_pc_offline),
-                                                    true);
-                                        }
-
-                                        // We don't want any more callbacks from now on, so go ahead
-                                        // and unbind from the service
-                                        if (managerBinder != null) {
-                                            managerBinder.stopPolling();
-                                            unbindService(serviceConnection);
-                                            managerBinder = null;
-                                        }
-                                    }
-                                });
-                            }
-                        }
-                    });
-                }
-            }.start();
-        }
-
-        public void onServiceDisconnected(ComponentName className) {
-            managerBinder = null;
-        }
-    };
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        UiHelper.notifyNewRootView(this);
-
-        uuidString = getIntent().getStringExtra(UUID_EXTRA);
-
-        // Bind to the computer manager service
-        bindService(new Intent(this, ComputerManagerService.class), serviceConnection,
-                Service.BIND_AUTO_CREATE);
-
-        blockingLoadSpinner = SpinnerDialog.displayDialog(this, getResources().getString(R.string.conn_establishing_title),
-                getResources().getString(R.string.applist_connect_msg), true);
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-
-        if (blockingLoadSpinner != null) {
-            blockingLoadSpinner.dismiss();
-            blockingLoadSpinner = null;
-        }
-
-        Dialog.closeDialogs();
-
-        if (managerBinder != null) {
-            managerBinder.stopPolling();
-            unbindService(serviceConnection);
-            managerBinder = null;
-        }
-
-        finish();
-    }
-}

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

@@ -40,6 +40,7 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.hardware.input.InputManager;
@@ -67,10 +68,16 @@ import android.widget.FrameLayout;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
+import java.io.ByteArrayInputStream;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Locale;
+
 
 public class Game extends Activity implements SurfaceHolder.Callback,
     OnGenericMotionListener, OnTouchListener, NvConnectionListener, EvdevListener,
-    OnSystemUiVisibilityChangeListener, GameGestures
+    OnSystemUiVisibilityChangeListener, GameGestures, StreamView.InputCallbacks
 {
     private int lastMouseX = Integer.MIN_VALUE;
     private int lastMouseY = Integer.MIN_VALUE;
@@ -131,10 +138,10 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     public static final String EXTRA_APP_NAME = "AppName";
     public static final String EXTRA_APP_ID = "AppId";
     public static final String EXTRA_UNIQUEID = "UniqueId";
-    public static final String EXTRA_STREAMING_REMOTE = "Remote";
     public static final String EXTRA_PC_UUID = "UUID";
     public static final String EXTRA_PC_NAME = "PcName";
     public static final String EXTRA_APP_HDR = "HDR";
+    public static final String EXTRA_SERVER_CERT = "ServerCert";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -145,10 +152,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         // We don't want a title bar
         requestWindowFeature(Window.FEATURE_NO_TITLE);
 
-        // Full-screen and don't let the display go off
-        getWindow().addFlags(
-                WindowManager.LayoutParams.FLAG_FULLSCREEN |
-                WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        // Full-screen
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
 
         // If we're going to use immersive mode, we want to have
         // the entire screen
@@ -184,11 +189,18 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         prefConfig = PreferenceConfiguration.readPreferences(this);
         tombstonePrefs = Game.this.getSharedPreferences("DecoderTombstone", 0);
 
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && prefConfig.stretchVideo) {
+            // Allow the activity to layout under notches if the fill-screen option
+            // was turned on by the user
+            getWindow().getAttributes().layoutInDisplayCutoutMode =
+                    WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+        }
 
         // Listen for events on the game surface
         streamView = findViewById(R.id.surfaceView);
         streamView.setOnGenericMotionListener(this);
         streamView.setOnTouchListener(this);
+        streamView.setInputCallbacks(this);
 
         inputCaptureProvider = InputCaptureManager.getInputCaptureProvider(this, this);
 
@@ -220,10 +232,20 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         String appName = Game.this.getIntent().getStringExtra(EXTRA_APP_NAME);
         int appId = Game.this.getIntent().getIntExtra(EXTRA_APP_ID, StreamConfiguration.INVALID_APP_ID);
         String uniqueId = Game.this.getIntent().getStringExtra(EXTRA_UNIQUEID);
-        boolean remote = Game.this.getIntent().getBooleanExtra(EXTRA_STREAMING_REMOTE, false);
         String uuid = Game.this.getIntent().getStringExtra(EXTRA_PC_UUID);
         String pcName = Game.this.getIntent().getStringExtra(EXTRA_PC_NAME);
         boolean willStreamHdr = Game.this.getIntent().getBooleanExtra(EXTRA_APP_HDR, false);
+        byte[] derCertData = Game.this.getIntent().getByteArrayExtra(EXTRA_SERVER_CERT);
+
+        X509Certificate serverCert = null;
+        try {
+            if (derCertData != null) {
+                serverCert = (X509Certificate) CertificateFactory.getInstance("X.509")
+                        .generateCertificate(new ByteArrayInputStream(derCertData));
+            }
+        } catch (CertificateException e) {
+            e.printStackTrace();
+        }
 
         if (appId == StreamConfiguration.INVALID_APP_ID) {
             finish();
@@ -305,8 +327,10 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         }
 
         int gamepadMask = ControllerHandler.getAttachedControllerMask(this);
-        if (!prefConfig.multiController && gamepadMask != 0) {
-            // If any gamepads are present in non-MC mode, set only gamepad 1.
+        if (!prefConfig.multiController) {
+            // Always set gamepad 1 present for when multi-controller is
+            // disabled for games that don't properly support detection
+            // of gamepads removed and replugged at runtime.
             gamepadMask = 1;
         }
         if (prefConfig.onscreenController) {
@@ -338,8 +362,13 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         // Hopefully, we can get rid of this once someone comes up with a better way
         // to track the state of the pipeline and time frames.
         int roundedRefreshRate = Math.round(displayRefreshRate);
-        if (!prefConfig.disableFrameDrop && prefConfig.fps >= roundedRefreshRate) {
-            if (roundedRefreshRate <= 49) {
+        if ((!prefConfig.disableFrameDrop || prefConfig.unlockFps) && prefConfig.fps >= roundedRefreshRate) {
+            if (prefConfig.unlockFps) {
+                // Use frame drops when rendering above the screen frame rate
+                decoderRenderer.enableLegacyFrameDropRendering();
+                LimeLog.info("Using drop mode for FPS > Hz");
+            }
+            else if (roundedRefreshRate <= 49) {
                 // Let's avoid clearly bogus refresh rates and fall back to legacy rendering
                 decoderRenderer.enableLegacyFrameDropRendering();
                 LimeLog.info("Bogus refresh rate: "+roundedRefreshRate);
@@ -362,8 +391,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 .setBitrate(prefConfig.bitrate)
                 .setEnableSops(prefConfig.enableSops)
                 .enableLocalAudioPlayback(prefConfig.playHostAudio)
-                .setMaxPacketSize((remote || prefConfig.width <= 1920) ? 1024 : 1292)
-                .setRemote(remote)
+                .setMaxPacketSize(1392)
+                .setRemoteConfiguration(StreamConfiguration.STREAM_CFG_AUTO)
                 .setHevcBitratePercentageMultiplier(75)
                 .setHevcSupported(decoderRenderer.isHevcSupported())
                 .setEnableHdr(willStreamHdr)
@@ -375,7 +404,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 .build();
 
         // Initialize the connection
-        conn = new NvConnection(host, uniqueId, config, PlatformBinding.getCryptoProvider(this));
+        conn = new NvConnection(host, uniqueId, config, PlatformBinding.getCryptoProvider(this), serverCert);
         controllerHandler = new ControllerHandler(this, conn, this, prefConfig);
 
         InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
@@ -396,10 +425,11 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
         if (prefConfig.onscreenController) {
             // create virtual onscreen controller
-            virtualController = new VirtualController(conn,
+            virtualController = new VirtualController(controllerHandler,
                     (FrameLayout)streamView.getParent(),
                     this);
             virtualController.refreshLayout();
+            virtualController.show();
         }
 
         if (prefConfig.usbDriver) {
@@ -424,19 +454,46 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         streamView.getHolder().addCallback(this);
     }
 
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+
+        if (virtualController != null) {
+            // Refresh layout of OSC for possible new screen size
+            virtualController.refreshLayout();
+
+            // Hide OSC in PiP
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                if (isInPictureInPictureMode()) {
+                    virtualController.hide();
+                }
+                else {
+                    virtualController.show();
+                }
+            }
+        }
+    }
+
     @Override
     public void onUserLeaveHint() {
         super.onUserLeaveHint();
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             if (prefConfig.enablePip && connected) {
-                enterPictureInPictureMode(
-                        new PictureInPictureParams.Builder()
-                                .setAspectRatio(new Rational(prefConfig.width, prefConfig.height))
-                                .setSourceRectHint(new Rect(
-                                        streamView.getLeft(), streamView.getTop(),
-                                        streamView.getRight(), streamView.getBottom()))
-                                .build());
+                try {
+                    // This has thrown all sorts of weird exceptions on Samsung devices
+                    // running Oreo. Just eat them and close gracefully on leave, rather
+                    // than crashing.
+                    enterPictureInPictureMode(
+                            new PictureInPictureParams.Builder()
+                                    .setAspectRatio(new Rational(prefConfig.width, prefConfig.height))
+                                    .setSourceRectHint(new Rect(
+                                            streamView.getLeft(), streamView.getTop(),
+                                            streamView.getRight(), streamView.getBottom()))
+                                    .build());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
             }
         }
     }
@@ -464,8 +521,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             Display.Mode bestMode = display.getMode();
             for (Display.Mode candidate : display.getSupportedModes()) {
-                boolean refreshRateOk = candidate.getRefreshRate() >= bestMode.getRefreshRate() &&
-                        candidate.getRefreshRate() < 63;
+                boolean refreshRateOk = candidate.getRefreshRate() >= bestMode.getRefreshRate();
                 boolean resolutionOk = candidate.getPhysicalWidth() >= bestMode.getPhysicalWidth() &&
                         candidate.getPhysicalHeight() >= bestMode.getPhysicalHeight() &&
                         candidate.getPhysicalWidth() <= 4096;
@@ -481,6 +537,13 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                     }
                 }
 
+                // Ensure the frame rate stays around 60 Hz for <= 60 FPS streams
+                if (prefConfig.fps <= 60) {
+                    if (candidate.getRefreshRate() >= 63) {
+                        continue;
+                    }
+                }
+
                 // Make sure the refresh rate doesn't regress
                 if (!refreshRateOk) {
                     continue;
@@ -498,12 +561,20 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             windowLayoutParams.preferredDisplayModeId = bestMode.getModeId();
             displayRefreshRate = bestMode.getRefreshRate();
         }
-        // On L, we can at least tell the OS that we want 60 Hz
+        // On L, we can at least tell the OS that we want a refresh rate
         else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             float bestRefreshRate = display.getRefreshRate();
             for (float candidate : display.getSupportedRefreshRates()) {
-                if (candidate > bestRefreshRate && candidate < 63) {
+                if (candidate > bestRefreshRate) {
                     LimeLog.info("Examining refresh rate: "+candidate);
+
+                    // Ensure the frame rate stays around 60 Hz for <= 60 FPS streams
+                    if (prefConfig.fps <= 60) {
+                        if (candidate >= 63) {
+                            continue;
+                        }
+                    }
+
                     bestRefreshRate = candidate;
                 }
             }
@@ -645,6 +716,10 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         SpinnerDialog.closeDialogs(this);
         Dialog.closeDialogs();
 
+        if (virtualController != null) {
+            virtualController.hide();
+        }
+
         if (conn != null) {
             int videoFormat = decoderRenderer.getActiveVideoFormat();
 
@@ -788,25 +863,30 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
+        return handleKeyDown(event) || super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public boolean handleKeyDown(KeyEvent event) {
         // Pass-through virtual navigation keys
         if ((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) != 0) {
-            return super.onKeyDown(keyCode, event);
+            return false;
         }
 
         // Handle a synthetic back button event that some Android OS versions
-        // create as a result of a right-click.
-        if (event.getSource() == InputDevice.SOURCE_MOUSE && event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+        // create as a result of a right-click. This event WILL repeat if
+        // the right mouse button is held down, so we ignore those.
+        if (!prefConfig.mouseNavButtons &&
+                (event.getSource() == InputDevice.SOURCE_MOUSE ||
+                event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) &&
+                event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
             conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
             return true;
         }
 
         boolean handled = false;
 
-        boolean detectedGamepad = event.getDevice() != null && ((event.getDevice().getSources() & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK ||
-                (event.getDevice().getSources() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD);
-        if (detectedGamepad || (event.getDevice() == null ||
-                event.getDevice().getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC
-        )) {
+        if (ControllerHandler.isGameControllerDevice(event.getDevice())) {
             // Always try the controller handler first, unless it's an alphanumeric keyboard device.
             // Otherwise, controller handler will eat keyboard d-pad events.
             handled = controllerHandler.handleButtonDown(event);
@@ -816,20 +896,25 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             // Try the keyboard handler
             short translated = KeyboardTranslator.translate(event.getKeyCode());
             if (translated == 0) {
-                return super.onKeyDown(keyCode, event);
+                return false;
             }
 
             // Let this method take duplicate key down events
-            if (handleSpecialKeys(keyCode, true)) {
+            if (handleSpecialKeys(event.getKeyCode(), true)) {
                 return true;
             }
 
             // Pass through keyboard input if we're not grabbing
             if (!grabbedInput) {
-                return super.onKeyDown(keyCode, event);
+                return false;
             }
 
-            conn.sendKeyboardInput(translated, KeyboardPacket.KEY_DOWN, getModifierState(event));
+            byte modifiers = getModifierState(event);
+            if (KeyboardTranslator.needsShift(event.getKeyCode())) {
+                modifiers |= KeyboardPacket.MODIFIER_SHIFT;
+                conn.sendKeyboardInput((short) 0x8010, KeyboardPacket.KEY_DOWN, modifiers);
+            }
+            conn.sendKeyboardInput(translated, KeyboardPacket.KEY_DOWN, modifiers);
         }
 
         return true;
@@ -837,24 +922,28 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
     @Override
     public boolean onKeyUp(int keyCode, KeyEvent event) {
+        return handleKeyUp(event) || super.onKeyUp(keyCode, event);
+    }
+
+    @Override
+    public boolean handleKeyUp(KeyEvent event) {
         // Pass-through virtual navigation keys
         if ((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) != 0) {
-            return super.onKeyUp(keyCode, event);
+            return false;
         }
 
         // Handle a synthetic back button event that some Android OS versions
         // create as a result of a right-click.
-        if (event.getSource() == InputDevice.SOURCE_MOUSE && event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
+        if (!prefConfig.mouseNavButtons &&
+                (event.getSource() == InputDevice.SOURCE_MOUSE ||
+                event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) &&
+                event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
             conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
             return true;
         }
 
         boolean handled = false;
-        boolean detectedGamepad = event.getDevice() != null && ((event.getDevice().getSources() & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK ||
-                (event.getDevice().getSources() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD);
-        if (detectedGamepad || (event.getDevice() == null ||
-                event.getDevice().getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC
-        )) {
+        if (ControllerHandler.isGameControllerDevice(event.getDevice())) {
             // Always try the controller handler first, unless it's an alphanumeric keyboard device.
             // Otherwise, controller handler will eat keyboard d-pad events.
             handled = controllerHandler.handleButtonUp(event);
@@ -864,19 +953,26 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             // Try the keyboard handler
             short translated = KeyboardTranslator.translate(event.getKeyCode());
             if (translated == 0) {
-                return super.onKeyUp(keyCode, event);
+                return false;
             }
 
-            if (handleSpecialKeys(keyCode, false)) {
+            if (handleSpecialKeys(event.getKeyCode(), false)) {
                 return true;
             }
 
             // Pass through keyboard input if we're not grabbing
             if (!grabbedInput) {
-                return super.onKeyUp(keyCode, event);
+                return false;
             }
 
-            conn.sendKeyboardInput(translated, KeyboardPacket.KEY_UP, getModifierState(event));
+            byte modifiers = getModifierState(event);
+            if (KeyboardTranslator.needsShift(event.getKeyCode())) {
+                modifiers |= KeyboardPacket.MODIFIER_SHIFT;
+            }
+            conn.sendKeyboardInput(translated, KeyboardPacket.KEY_UP, modifiers);
+            if (KeyboardTranslator.needsShift(event.getKeyCode())) {
+                conn.sendKeyboardInput((short) 0x8010, KeyboardPacket.KEY_UP, getModifierState(event));
+            }
         }
 
         return true;
@@ -916,6 +1012,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         {
             // This case is for mice
             if (event.getSource() == InputDevice.SOURCE_MOUSE ||
+                    event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE ||
                     (event.getPointerCount() >= 1 &&
                             event.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE))
             {
@@ -931,6 +1028,13 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                     byte vScrollClicks = (byte) event.getAxisValue(MotionEvent.AXIS_VSCROLL);
                     conn.sendMouseScroll(vScrollClicks);
                 }
+                else if (event.getActionMasked() == MotionEvent.ACTION_HOVER_ENTER ||
+                         event.getActionMasked() == MotionEvent.ACTION_HOVER_EXIT) {
+                    // On some devices (Galaxy S8 without Oreo pointer capture), we can
+                    // get spurious ACTION_HOVER_ENTER events when right clicking with
+                    // incorrect X and Y coordinates. Just eat this event without processing it.
+                    return true;
+                }
 
                 if ((changedButtons & MotionEvent.BUTTON_PRIMARY) != 0) {
                     if ((event.getButtonState() & MotionEvent.BUTTON_PRIMARY) != 0) {
@@ -959,6 +1063,26 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                     }
                 }
 
+                if (prefConfig.mouseNavButtons) {
+                    if ((changedButtons & MotionEvent.BUTTON_BACK) != 0) {
+                        if ((event.getButtonState() & MotionEvent.BUTTON_BACK) != 0) {
+                            conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_X1);
+                        }
+                        else {
+                            conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_X1);
+                        }
+                    }
+
+                    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
@@ -977,12 +1101,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                     lastMouseY = (int)event.getY();
                 }
                 else {
-                    // First process the history
-                    for (int i = 0; i < event.getHistorySize(); i++) {
-                        updateMousePosition((int)event.getHistoricalX(i), (int)event.getHistoricalY(i));
-                    }
-
-                    // Now process the current values
+                    // Don't process the history. We just want the current position now.
                     updateMousePosition((int)event.getX(), (int)event.getY());
                 }
 
@@ -1130,10 +1249,15 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     }
 
     @Override
-    public void stageStarting(String stage) {
-        if (spinner != null) {
-            spinner.setMessage(getResources().getString(R.string.conn_starting)+" "+stage);
-        }
+    public void stageStarting(final String stage) {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (spinner != null) {
+                    spinner.setMessage(getResources().getString(R.string.conn_starting) + " " + stage);
+                }
+            }
+        });
     }
 
     @Override
@@ -1144,6 +1268,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         if (connecting || connected) {
             connecting = connected = false;
 
+            controllerHandler.stop();
+
             // Stop may take a few hundred ms to do some network I/O to tell
             // the server we're going away and clean up. Let it run in a separate
             // thread to keep things smooth for the UI. Inside moonlight-common,
@@ -1158,70 +1284,85 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     }
 
     @Override
-    public void stageFailed(String stage, long errorCode) {
-        if (spinner != null) {
-            spinner.dismiss();
-            spinner = null;
-        }
+    public void stageFailed(final String stage, final long errorCode) {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (spinner != null) {
+                    spinner.dismiss();
+                    spinner = null;
+                }
 
-        // Enable cursor visibility again
-        inputCaptureProvider.disableCapture();
+                if (!displayedFailureDialog) {
+                    displayedFailureDialog = true;
+                    LimeLog.severe(stage + " failed: " + errorCode);
 
-        if (!displayedFailureDialog) {
-            displayedFailureDialog = true;
-            LimeLog.severe(stage+" failed: "+errorCode);
-
-            // If video initialization failed and the surface is still valid, display extra information for the user
-            if (stage.contains("video") && streamView.getHolder().getSurface().isValid()) {
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
+                    // If video initialization failed and the surface is still valid, display extra information for the user
+                    if (stage.contains("video") && streamView.getHolder().getSurface().isValid()) {
                         Toast.makeText(Game.this, "Video decoder failed to initialize. Your device may not support the selected resolution.", Toast.LENGTH_LONG).show();
                     }
-                });
-            }
 
-            Dialog.displayDialog(this, getResources().getString(R.string.conn_error_title),
-                    getResources().getString(R.string.conn_error_msg)+" "+stage, true);
-        }
+                    Dialog.displayDialog(Game.this, getResources().getString(R.string.conn_error_title),
+                            getResources().getString(R.string.conn_error_msg) + " " + stage, true);
+                }
+            }
+        });
     }
 
     @Override
-    public void connectionTerminated(long errorCode) {
-        // Enable cursor visibility again
-        inputCaptureProvider.disableCapture();
+    public void connectionTerminated(final long errorCode) {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                // Let the display go to sleep now
+                getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
-        if (!displayedFailureDialog) {
-            displayedFailureDialog = true;
-            LimeLog.severe("Connection terminated: "+errorCode);
-            stopConnection();
+                // Enable cursor visibility again
+                inputCaptureProvider.disableCapture();
 
-            Dialog.displayDialog(this, getResources().getString(R.string.conn_terminated_title),
-                    getResources().getString(R.string.conn_terminated_msg), true);
-        }
+                if (!displayedFailureDialog) {
+                    displayedFailureDialog = true;
+                    LimeLog.severe("Connection terminated: " + errorCode);
+                    stopConnection();
+
+                    // Display the error dialog if it was an unexpected termination.
+                    // Otherwise, just finish the activity immediately.
+                    if (errorCode != 0) {
+                        Dialog.displayDialog(Game.this, getResources().getString(R.string.conn_terminated_title),
+                                getResources().getString(R.string.conn_terminated_msg), true);
+                    }
+                    else {
+                        finish();
+                    }
+                }
+            }
+        });
     }
 
     @Override
     public void connectionStarted() {
-        if (spinner != null) {
-            spinner.dismiss();
-            spinner = null;
-        }
-
-        connected = true;
-        connecting = false;
-
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
+                if (spinner != null) {
+                    spinner.dismiss();
+                    spinner = null;
+                }
+
+                connected = true;
+                connecting = false;
+
                 // Hide the mouse cursor now. Doing it before
                 // dismissing the spinner seems to be undone
                 // when the spinner gets displayed.
                 inputCaptureProvider.enableCapture();
+
+                // Keep the display on
+                getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+
+                hideSystemUi(1000);
             }
         });
-
-        hideSystemUi(1000);
     }
 
     @Override
@@ -1246,6 +1387,13 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         }
     }
 
+    @Override
+    public void rumble(short controllerNumber, short lowFreqMotor, short highFreqMotor) {
+        LimeLog.info(String.format((Locale)null, "Rumble on gamepad %d: %04x %04x", controllerNumber, lowFreqMotor, highFreqMotor));
+
+        controllerHandler.handleRumble(controllerNumber, lowFreqMotor, highFreqMotor);
+    }
+
     @Override
     public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
         if (!surfaceCreated) {
@@ -1301,6 +1449,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/PcView.java

@@ -28,6 +28,7 @@ import com.limelight.utils.ShortcutHelper;
 import com.limelight.utils.UiHelper;
 
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.app.Service;
 import android.content.ComponentName;
 import android.content.Intent;
@@ -52,6 +53,8 @@ import android.widget.RelativeLayout;
 import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 
+import org.xmlpull.v1.XmlPullParserException;
+
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.opengles.GL10;
 
@@ -112,6 +115,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     private final static int DELETE_ID = 5;
     private final static int RESUME_ID = 6;
     private final static int QUIT_ID = 7;
+    private final static int VIEW_DETAILS_ID = 8;
 
     private void initializeViews() {
         setContentView(R.layout.activity_pc_view);
@@ -311,8 +315,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
 
         // Inflate the context menu
-        if (computer.details.reachability == ComputerDetails.Reachability.OFFLINE ||
-            computer.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
+        if (computer.details.state == ComputerDetails.State.OFFLINE ||
+            computer.details.state == ComputerDetails.State.UNKNOWN) {
             menu.add(Menu.NONE, WOL_ID, 1, getResources().getString(R.string.pcview_menu_send_wol));
             menu.add(Menu.NONE, DELETE_ID, 2, getResources().getString(R.string.pcview_menu_delete_pc));
         }
@@ -332,6 +336,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
             // it with delete which actually work
             menu.add(Menu.NONE, DELETE_ID, 4, getResources().getString(R.string.pcview_menu_delete_pc));
         }
+        menu.add(Menu.NONE, VIEW_DETAILS_ID, 5,  getResources().getString(R.string.pcview_menu_details));
     }
 
     @Override
@@ -343,7 +348,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     }
 
     private void doPair(final ComputerDetails computer) {
-        if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
+        if (computer.state == ComputerDetails.State.OFFLINE ||
+                ServerHelper.getCurrentAddressFromComputer(computer) == null) {
             Toast.makeText(PcView.this, getResources().getString(R.string.pair_pc_offline), Toast.LENGTH_SHORT).show();
             return;
         }
@@ -369,9 +375,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
                     httpConn = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer),
                             managerBinder.getUniqueId(),
-                            PlatformBinding.getDeviceName(),
+                            computer.serverCert,
                             PlatformBinding.getCryptoProvider(PcView.this));
-                    if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
+                    if (httpConn.getPairState() == PairState.PAIRED) {
                         // Don't display any toast, but open the app list
                         message = null;
                         success = true;
@@ -383,21 +389,26 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                         Dialog.displayDialog(PcView.this, getResources().getString(R.string.pair_pairing_title),
                                 getResources().getString(R.string.pair_pairing_msg)+" "+pinStr, false);
 
-                        PairingManager.PairState pairState = httpConn.pair(httpConn.getServerInfo(), pinStr);
-                        if (pairState == PairingManager.PairState.PIN_WRONG) {
+                        PairingManager pm = httpConn.getPairingManager();
+
+                        PairState pairState = pm.pair(httpConn.getServerInfo(), pinStr);
+                        if (pairState == PairState.PIN_WRONG) {
                             message = getResources().getString(R.string.pair_incorrect_pin);
                         }
-                        else if (pairState == PairingManager.PairState.FAILED) {
+                        else if (pairState == PairState.FAILED) {
                             message = getResources().getString(R.string.pair_fail);
                         }
-                        else if (pairState == PairingManager.PairState.ALREADY_IN_PROGRESS) {
+                        else if (pairState == PairState.ALREADY_IN_PROGRESS) {
                             message = getResources().getString(R.string.pair_already_in_progress);
                         }
-                        else if (pairState == PairingManager.PairState.PAIRED) {
+                        else if (pairState == PairState.PAIRED) {
                             // Just navigate to the app view without displaying a toast
                             message = null;
                             success = true;
 
+                            // Pin this certificate for later HTTPS use
+                            managerBinder.getComputer(computer.uuid).serverCert = pm.getPairedCert();
+
                             // Invalidate reachability information after pairing to force
                             // a refresh before reading pair state again
                             managerBinder.invalidateStateForComputer(computer.uuid);
@@ -411,7 +422,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                     message = getResources().getString(R.string.error_unknown_host);
                 } catch (FileNotFoundException e) {
                     message = getResources().getString(R.string.error_404);
-                } catch (Exception e) {
+                } catch (XmlPullParserException | IOException e) {
                     e.printStackTrace();
                     message = e.getMessage();
                 }
@@ -452,7 +463,6 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
             return;
         }
 
-        Toast.makeText(PcView.this, getResources().getString(R.string.wol_waking_pc), Toast.LENGTH_SHORT).show();
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -476,7 +486,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     }
 
     private void doUnpair(final ComputerDetails computer) {
-        if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
+        if (computer.state == ComputerDetails.State.OFFLINE ||
+                ServerHelper.getCurrentAddressFromComputer(computer) == null) {
             Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
             return;
         }
@@ -494,7 +505,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 try {
                     httpConn = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer),
                             managerBinder.getUniqueId(),
-                            PlatformBinding.getDeviceName(),
+                            computer.serverCert,
                             PlatformBinding.getCryptoProvider(PcView.this));
                     if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
                         httpConn.unpair();
@@ -512,8 +523,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                     message = getResources().getString(R.string.error_unknown_host);
                 } catch (FileNotFoundException e) {
                     message = getResources().getString(R.string.error_404);
-                } catch (Exception e) {
+                } catch (XmlPullParserException | IOException e) {
                     message = e.getMessage();
+                    e.printStackTrace();
                 }
 
                 final String toastMessage = message;
@@ -528,7 +540,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     }
 
     private void doAppList(ComputerDetails computer) {
-        if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
+        if (computer.state == ComputerDetails.State.OFFLINE) {
             Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
             return;
         }
@@ -539,7 +551,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
         Intent i = new Intent(this, AppView.class);
         i.putExtra(AppView.NAME_EXTRA, computer.name);
-        i.putExtra(AppView.UUID_EXTRA, computer.uuid.toString());
+        i.putExtra(AppView.UUID_EXTRA, computer.uuid);
         startActivity(i);
     }
 
@@ -561,12 +573,21 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 return true;
 
             case DELETE_ID:
-                if (managerBinder == null) {
-                    Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
+                if (ActivityManager.isUserAMonkey()) {
+                    LimeLog.info("Ignoring delete PC request from monkey");
                     return true;
                 }
-                managerBinder.removeComputer(computer.details.name);
-                removeComputer(computer.details);
+                UiHelper.displayDeletePcConfirmationDialog(this, computer.details, new Runnable() {
+                    @Override
+                    public void run() {
+                        if (managerBinder == null) {
+                            Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
+                            return;
+                        }
+                        managerBinder.removeComputer(computer.details.name);
+                        removeComputer(computer.details);
+                    }
+                }, null);
                 return true;
 
             case APP_LIST_ID:
@@ -592,13 +613,16 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 UiHelper.displayQuitConfirmationDialog(this, new Runnable() {
                     @Override
                     public void run() {
-                        ServerHelper.doQuit(PcView.this,
-                                ServerHelper.getCurrentAddressFromComputer(computer.details),
+                        ServerHelper.doQuit(PcView.this, computer.details,
                                 new NvApp("app", 0, false), managerBinder, null);
                     }
                 }, null);
                 return true;
 
+            case VIEW_DETAILS_ID:
+                Dialog.displayDialog(PcView.this, getResources().getString(R.string.title_details), computer.details.toString(), false);
+                return true;
+
             default:
                 return super.onContextItemSelected(item);
         }
@@ -610,7 +634,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
             if (details.equals(computer.details)) {
                 // Disable or delete shortcuts referencing this PC
-                shortcutHelper.disableShortcut(details.uuid.toString(),
+                shortcutHelper.disableShortcut(details.uuid,
                         getResources().getString(R.string.scut_deleted_pc));
 
                 pcGridAdapter.removeComputer(computer);
@@ -641,7 +665,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
         // Add a launcher shortcut for this PC
         if (details.pairState == PairState.PAIRED) {
-            shortcutHelper.createAppViewShortcut(details.uuid.toString(), details, false);
+            shortcutHelper.createAppViewShortcut(details.uuid, details, false);
         }
 
         if (existingEntry != null) {
@@ -675,8 +699,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
             public void onItemClick(AdapterView<?> arg0, View arg1, int pos,
                                     long id) {
                 ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(pos);
-                if (computer.details.reachability == ComputerDetails.Reachability.UNKNOWN ||
-                    computer.details.reachability == ComputerDetails.Reachability.OFFLINE) {
+                if (computer.details.state == ComputerDetails.State.UNKNOWN ||
+                    computer.details.state == ComputerDetails.State.OFFLINE) {
                     // Open the context menu if a PC is offline or refreshing
                     openContextMenu(arg1);
                 } else if (computer.details.pairState != PairState.PAIRED) {

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

@@ -0,0 +1,275 @@
+package com.limelight;
+
+import android.app.Activity;
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+
+import com.limelight.computers.ComputerManagerListener;
+import com.limelight.computers.ComputerManagerService;
+import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.nvstream.http.NvApp;
+import com.limelight.nvstream.http.PairingManager;
+import com.limelight.utils.Dialog;
+import com.limelight.utils.ServerHelper;
+import com.limelight.utils.SpinnerDialog;
+import com.limelight.utils.UiHelper;
+
+import java.util.ArrayList;
+import java.util.UUID;
+
+public class ShortcutTrampoline extends Activity {
+    private String uuidString;
+    private String appIdString;
+    private ArrayList<Intent> intentStack = new ArrayList<>();
+
+    private ComputerDetails computer;
+    private SpinnerDialog blockingLoadSpinner;
+
+    public final static String APP_ID_EXTRA = "AppId";
+
+    private ComputerManagerService.ComputerManagerBinder managerBinder;
+    private final ServiceConnection serviceConnection = new ServiceConnection() {
+        public void onServiceConnected(ComponentName className, IBinder binder) {
+            final ComputerManagerService.ComputerManagerBinder localBinder =
+                    ((ComputerManagerService.ComputerManagerBinder)binder);
+
+            // Wait in a separate thread to avoid stalling the UI
+            new Thread() {
+                @Override
+                public void run() {
+                    // Wait for the binder to be ready
+                    localBinder.waitForReady();
+
+                    // Now make the binder visible
+                    managerBinder = localBinder;
+
+                    // Get the computer object
+                    computer = managerBinder.getComputer(uuidString);
+
+                    if (computer == null) {
+                        Dialog.displayDialog(ShortcutTrampoline.this,
+                                getResources().getString(R.string.conn_error_title),
+                                getResources().getString(R.string.scut_pc_not_found),
+                                true);
+
+                        if (blockingLoadSpinner != null) {
+                            blockingLoadSpinner.dismiss();
+                            blockingLoadSpinner = null;
+                        }
+
+                        if (managerBinder != null) {
+                            unbindService(serviceConnection);
+                            managerBinder = null;
+                        }
+
+                        return;
+                    }
+
+                    // Force CMS to repoll this machine
+                    managerBinder.invalidateStateForComputer(computer.uuid);
+
+                    // Start polling
+                    managerBinder.startPolling(new ComputerManagerListener() {
+                        @Override
+                        public void notifyComputerUpdated(final ComputerDetails details) {
+                            // Don't care about other computers
+                            if (!details.uuid.equalsIgnoreCase(uuidString)) {
+                                return;
+                            }
+
+                            if (details.state != ComputerDetails.State.UNKNOWN) {
+                                runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        // Stop showing the spinner
+                                        if (blockingLoadSpinner != null) {
+                                            blockingLoadSpinner.dismiss();
+                                            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 && details.pairState == PairingManager.PairState.PAIRED) {
+                                            
+                                            // Launch game if provided app ID, otherwise launch app view
+                                            if (appIdString != null && appIdString.length() > 0) {
+                                                if (details.runningGameId == 0 || details.runningGameId == Integer.parseInt(appIdString)) {
+                                                    intentStack.add(ServerHelper.createStartIntent(ShortcutTrampoline.this,
+                                                            new NvApp("app", Integer.parseInt(appIdString), false), details, managerBinder));
+
+                                                    // Close this activity
+                                                    finish();
+
+                                                    // 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(startIntent);
+
+                                                            // Close this activity
+                                                            finish();
+
+                                                            // Now start the activities
+                                                            startActivities(intentStack.toArray(new Intent[]{}));
+                                                        }
+                                                    }, new Runnable() {
+                                                        @Override
+                                                        public void run() {
+                                                            // Close this activity
+                                                            finish();
+                                                        }
+                                                    });
+                                                }
+                                            } else {
+                                                // Close this activity
+                                                finish();
+
+                                                // Add the PC view at the back (and clear the task)
+                                                Intent i;
+                                                i = new Intent(ShortcutTrampoline.this, PcView.class);
+                                                i.setAction(Intent.ACTION_MAIN);
+                                                i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+                                                intentStack.add(i);
+
+                                                // Take this intent's data and create an intent to start the app view
+                                                i = new Intent(getIntent());
+                                                i.setClass(ShortcutTrampoline.this, AppView.class);
+                                                intentStack.add(i);
+
+                                                // If a game is running, we'll make the stream the top level activity
+                                                if (details.runningGameId != 0) {
+                                                    intentStack.add(ServerHelper.createStartIntent(ShortcutTrampoline.this,
+                                                            new NvApp("app", details.runningGameId, false), details, managerBinder));
+                                                }
+
+                                                // Now start the activities
+                                                startActivities(intentStack.toArray(new Intent[]{}));
+                                            }
+                                            
+                                        }
+                                        else if (details.state == ComputerDetails.State.OFFLINE) {
+                                            // Computer offline - display an error dialog
+                                            Dialog.displayDialog(ShortcutTrampoline.this,
+                                                    getResources().getString(R.string.conn_error_title),
+                                                    getResources().getString(R.string.error_pc_offline),
+                                                    true);
+                                        } else if (details.pairState != PairingManager.PairState.PAIRED) {
+                                            // Computer not paired - display an error dialog
+                                            Dialog.displayDialog(ShortcutTrampoline.this,
+                                                    getResources().getString(R.string.conn_error_title),
+                                                    getResources().getString(R.string.scut_not_paired),
+                                                    true);
+                                        }
+
+                                        // We don't want any more callbacks from now on, so go ahead
+                                        // and unbind from the service
+                                        if (managerBinder != null) {
+                                            managerBinder.stopPolling();
+                                            unbindService(serviceConnection);
+                                            managerBinder = null;
+                                        }
+                                    }
+                                });
+                            }
+                        }
+                    });
+                }
+            }.start();
+        }
+
+        public void onServiceDisconnected(ComponentName className) {
+            managerBinder = null;
+        }
+    };
+
+    protected boolean validateInput() {
+        // Validate UUID
+        if (uuidString == null) {
+            Dialog.displayDialog(ShortcutTrampoline.this,
+                    getResources().getString(R.string.conn_error_title),
+                    getResources().getString(R.string.scut_invalid_uuid),
+                    true);
+            return false;
+        }
+
+        try {
+            UUID.fromString(uuidString);
+        } catch (IllegalArgumentException ex) {
+            Dialog.displayDialog(ShortcutTrampoline.this,
+                    getResources().getString(R.string.conn_error_title),
+                    getResources().getString(R.string.scut_invalid_uuid),
+                    true);
+            return false;
+        }
+
+        // Validate App ID (if provided)
+        if (appIdString != null && !appIdString.isEmpty()) {
+            try {
+                Integer.parseInt(appIdString);
+            } catch (NumberFormatException ex) {
+                Dialog.displayDialog(ShortcutTrampoline.this,
+                        getResources().getString(R.string.conn_error_title),
+                        getResources().getString(R.string.scut_invalid_app_id),
+                        true);
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        UiHelper.notifyNewRootView(this);
+
+        uuidString = getIntent().getStringExtra(AppView.UUID_EXTRA);
+        appIdString = getIntent().getStringExtra(APP_ID_EXTRA);
+
+        if (validateInput()) {
+            // Bind to the computer manager service
+            bindService(new Intent(this, ComputerManagerService.class), serviceConnection,
+                    Service.BIND_AUTO_CREATE);
+
+            blockingLoadSpinner = SpinnerDialog.displayDialog(this, getResources().getString(R.string.conn_establishing_title),
+                    getResources().getString(R.string.applist_connect_msg), true);
+        }
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        if (blockingLoadSpinner != null) {
+            blockingLoadSpinner.dismiss();
+            blockingLoadSpinner = null;
+        }
+
+        Dialog.closeDialogs();
+
+        if (managerBinder != null) {
+            managerBinder.stopPolling();
+            unbindService(serviceConnection);
+            managerBinder = null;
+        }
+
+        finish();
+    }
+}

app/src/main/java/com/limelight/binding/crypto/AndroidCryptoProvider.java

@@ -12,7 +12,6 @@ import java.security.KeyFactory;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
 import java.security.Provider;
 import java.security.SecureRandom;
 import java.security.cert.CertificateException;
@@ -155,7 +154,7 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
         } catch (Exception e) {
             // Nothing should go wrong here
             e.printStackTrace();
-            return false;
+            throw new RuntimeException(e);
         }
 
         LimeLog.info("Generated a new key pair");

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

@@ -4,7 +4,11 @@ import android.content.Context;
 import android.hardware.input.InputManager;
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbManager;
+import android.media.AudioAttributes;
+import android.os.Build;
 import android.os.SystemClock;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
 import android.util.SparseArray;
 import android.view.InputDevice;
 import android.view.InputEvent;
@@ -13,6 +17,7 @@ import android.view.MotionEvent;
 import android.widget.Toast;
 
 import com.limelight.LimeLog;
+import com.limelight.binding.input.driver.AbstractController;
 import com.limelight.binding.input.driver.UsbDriverListener;
 import com.limelight.binding.input.driver.UsbDriverService;
 import com.limelight.nvstream.NvConnection;
@@ -22,6 +27,7 @@ import com.limelight.preferences.PreferenceConfiguration;
 import com.limelight.ui.GameGestures;
 import com.limelight.utils.Vector2d;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -49,6 +55,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     private final double stickDeadzone;
     private final InputDeviceContext defaultContext = new InputDeviceContext();
     private final GameGestures gestures;
+    private final Vibrator deviceVibrator;
     private boolean hasGameController;
 
     private final PreferenceConfiguration prefConfig;
@@ -59,6 +66,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         this.conn = conn;
         this.gestures = gestures;
         this.prefConfig = prefConfig;
+        this.deviceVibrator = (Vibrator) activityContext.getSystemService(Context.VIBRATOR_SERVICE);
 
         // HACK: For now we're hardcoding a 10% deadzone. Some deadzone
         // is required for controller batching support to work.
@@ -149,6 +157,42 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         onInputDeviceAdded(deviceId);
     }
 
+    public void stop() {
+        for (int i = 0; i < inputDeviceContexts.size(); i++) {
+            InputDeviceContext deviceContext = inputDeviceContexts.valueAt(i);
+
+            if (deviceContext.vibrator != null) {
+                deviceContext.vibrator.cancel();
+            }
+        }
+
+        deviceVibrator.cancel();
+    }
+
+    private static boolean hasJoystickAxes(InputDevice device) {
+        return (device.getSources() & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK &&
+                getMotionRangeForJoystickAxis(device, MotionEvent.AXIS_X) != null &&
+                getMotionRangeForJoystickAxis(device, MotionEvent.AXIS_Y) != null;
+    }
+
+    private static boolean hasGamepadButtons(InputDevice device) {
+        return (device.getSources() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD;
+    }
+
+    public static boolean isGameControllerDevice(InputDevice device) {
+        if (device == null) {
+            return true;
+        }
+
+        if (hasJoystickAxes(device) || hasGamepadButtons(device)) {
+            // Has real joystick axes or gamepad buttons
+            return true;
+        }
+
+        // Otherwise, we'll try anything that claims to be a non-alphabetic keyboard
+        return device.getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC;
+    }
+
     public static short getAttachedControllerMask(Context context) {
         int count = 0;
         short mask = 0;
@@ -161,9 +205,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                 continue;
             }
 
-            if ((dev.getSources() & InputDevice.SOURCE_JOYSTICK) != 0 &&
-                    getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_X) != null &&
-                    getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Y) != null) {
+            if (hasJoystickAxes(dev)) {
                 LimeLog.info("Counting InputDevice: "+dev.getName());
                 mask |= 1 << count++;
             }
@@ -182,6 +224,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             }
         }
 
+        if (PreferenceConfiguration.readPreferences(context).onscreenController) {
+            LimeLog.info("Counting OSC gamepad");
+            mask |= 1;
+        }
+
         LimeLog.info("Enumerated "+count+" gamepads");
         return mask;
     }
@@ -274,10 +321,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         context.assignedControllerNumber = true;
     }
 
-    private UsbDeviceContext createUsbDeviceContextForDevice(int deviceId) {
+    private UsbDeviceContext createUsbDeviceContextForDevice(AbstractController device) {
         UsbDeviceContext context = new UsbDeviceContext();
 
-        context.id = deviceId;
+        context.id = device.getControllerId();
+        context.device = device;
 
         context.leftStickDeadzoneRadius = (float) stickDeadzone;
         context.rightStickDeadzoneRadius = (float) stickDeadzone;
@@ -286,6 +334,79 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         return context;
     }
 
+    private static boolean isExternal(InputDevice dev) {
+        try {
+            // Landroid/view/InputDevice;->isExternal()Z is on the light graylist in Android P
+            return (Boolean)dev.getClass().getMethod("isExternal").invoke(dev);
+        } catch (NoSuchMethodException e) {
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+        } catch (ClassCastException e) {
+            e.printStackTrace();
+        }
+
+        // Answer true if we don't know
+        return true;
+    }
+
+    private boolean shouldIgnoreBack(InputDevice dev) {
+        String devName = dev.getName();
+
+        // The Serval has a Select button but the framework doesn't
+        // know about that because it uses a non-standard scancode.
+        if (devName.contains("Razer Serval")) {
+            return true;
+        }
+
+        // Classify this device as a remote by name if it has no joystick axes
+        if (getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_X) == null &&
+                getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Y) == null &&
+                devName.toLowerCase().contains("remote")) {
+            return true;
+        }
+
+        // Otherwise, dynamically try to determine whether we should allow this
+        // back button to function for navigation.
+        //
+        // First, check if this is an internal device we're being called on.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && !isExternal(dev)) {
+            InputManager im = (InputManager) activityContext.getSystemService(Context.INPUT_SERVICE);
+
+            boolean foundInternalGamepad = false;
+            boolean foundInternalSelect = false;
+            for (int id : im.getInputDeviceIds()) {
+                InputDevice currentDev = im.getInputDevice(id);
+
+                // Ignore external devices
+                if (currentDev == null || isExternal(currentDev)) {
+                    continue;
+                }
+
+                // Note that we are explicitly NOT excluding the current device we're examining here,
+                // since the other gamepad buttons may be on our current device and that's fine.
+                boolean[] keys = currentDev.hasKeys(KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BUTTON_A);
+                if (keys[0]) {
+                    foundInternalSelect = true;
+                }
+                if (keys[1]) {
+                    foundInternalGamepad = true;
+                }
+            }
+
+            // Allow the back button to function for navigation if we either:
+            // a) have no internal gamepad (most phones)
+            // b) have an internal gamepad but also have an internal select button (GPD XD)
+            // but not:
+            // c) have an internal gamepad but no internal select button (NVIDIA SHIELD Portable)
+            return !foundInternalGamepad || foundInternalSelect;
+        }
+
+        return false;
+    }
+
     private InputDeviceContext createInputDeviceContextForDevice(InputDevice dev) {
         InputDeviceContext context = new InputDeviceContext();
         String devName = dev.getName();
@@ -296,6 +417,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         context.name = devName;
         context.id = dev.getId();
 
+        if (dev.getVibrator().hasVibrator()) {
+            context.vibrator = dev.getVibrator();
+        }
+
         context.leftStickXAxis = MotionEvent.AXIS_X;
         context.leftStickYAxis = MotionEvent.AXIS_Y;
         if (getMotionRangeForJoystickAxis(dev, context.leftStickXAxis) != null &&
@@ -418,6 +543,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             }
         }
 
+        context.ignoreBack = shouldIgnoreBack(dev);
+
         if (devName != null) {
             // For the Nexus Player (and probably other ATV devices), we should
             // use the back button as start since it doesn't have a start/menu button
@@ -437,30 +564,15 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                 // so we increase the deadzone on them to minimize this
                 context.triggerDeadzone = 0.30f;
             }
-            // Classify this device as a remote by name
-            else if (devName.toLowerCase().contains("remote")) {
-                // It's only a remote if it doesn't any sticks
-                if (!context.hasJoystickAxes) {
-                    context.ignoreBack = true;
-                }
-            }
             // SHIELD controllers will use small stick deadzones
             else if (devName.contains("SHIELD")) {
                 context.leftStickDeadzoneRadius = 0.07f;
                 context.rightStickDeadzoneRadius = 0.07f;
             }
-            // Samsung's face buttons appear as a non-virtual button so we'll explicitly ignore
-            // back presses on this device. The Goodix buttons on the Nokia 6 also appear
-            // non-virtual so we'll ignore those too.
-            else if (devName.equals("sec_touchscreen") || devName.equals("sec_touchkey") ||
-                    devName.equals("goodix_fp")) {
-                context.ignoreBack = true;
-            }
             // The Serval has a couple of unknown buttons that are start and select. It also has
             // a back button which we want to ignore since there's already a select button.
             else if (devName.contains("Razer Serval")) {
                 context.isServal = true;
-                context.ignoreBack = true;
             }
             // The Xbox One S Bluetooth controller has some mappings that need fixing up.
             // However, Microsoft released a firmware update with no change to VID/PID
@@ -530,7 +642,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
 
     private short getActiveControllerMask() {
         if (prefConfig.multiController) {
-            return (short)(currentControllers | initialControllers);
+            return (short)(currentControllers | initialControllers | (prefConfig.onscreenController ? 1 : 0));
         }
         else {
             // Only Player 1 is active with multi-controller disabled
@@ -837,16 +949,16 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             // to normal behavior, so ignore triggersIdleNegative for each trigger until
             // first touch.
             if (lt != 0) {
-                context.leftTriggerUsed = true;
+                context.leftTriggerAxisUsed = true;
             }
             if (rt != 0) {
-                context.rightTriggerUsed = true;
+                context.rightTriggerAxisUsed = true;
             }
             if (context.triggersIdleNegative) {
-                if (context.leftTriggerUsed) {
+                if (context.leftTriggerAxisUsed) {
                     lt = (lt + 1) / 2;
                 }
-                if (context.rightTriggerUsed) {
+                if (context.rightTriggerAxisUsed) {
                     rt = (rt + 1) / 2;
                 }
             }
@@ -959,6 +1071,86 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         }
     }
 
+    private void rumbleVibrator(Vibrator vibrator, short lowFreqMotor, short highFreqMotor) {
+        // Since we can only use a single amplitude value, compute the desired amplitude
+        // by taking 75% of the big motor and 25% of the small motor.
+        // NB: This value is now 0-255 as required by VibrationEffect.
+        short lowFreqMotorMSB = (short)((lowFreqMotor >> 8) & 0xFF);
+        short highFreqMotorMSB = (short)((highFreqMotor >> 8) & 0xFF);
+        int simulatedAmplitude = (int)((lowFreqMotorMSB * 0.75) + (highFreqMotorMSB * 0.25));
+
+        if (simulatedAmplitude == 0) {
+            // This case is easy - just cancel the current effect and get out.
+            // NB: We cannot simply check lowFreqMotor == highFreqMotor == 0
+            // because our simulatedAmplitude could be 0 even though our inputs
+            // are not (ex: lowFreqMotor == 0 && highFreqMotor == 1).
+            vibrator.cancel();
+            return;
+        }
+
+        // Attempt to use amplitude-based control if we're on Oreo and the device
+        // supports amplitude-based vibration control.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (vibrator.hasAmplitudeControl()) {
+                VibrationEffect effect = VibrationEffect.createOneShot(60000, simulatedAmplitude);
+                AudioAttributes audioAttributes = new AudioAttributes.Builder()
+                        .setUsage(AudioAttributes.USAGE_GAME)
+                        .build();
+                vibrator.vibrate(effect, audioAttributes);
+                return;
+            }
+        }
+
+        // If we reach this point, we don't have amplitude controls available, so
+        // we must emulate it by PWMing the vibration. Ick.
+        long pwmPeriod = 20;
+        long onTime = (long)((simulatedAmplitude / 255.0) * pwmPeriod);
+        long offTime = pwmPeriod - onTime;
+        vibrator.vibrate(new long[]{0, onTime, offTime}, 0);
+    }
+
+    public void handleRumble(short controllerNumber, short lowFreqMotor, short highFreqMotor) {
+        boolean foundMatchingDevice = false;
+        boolean vibrated = false;
+
+        for (int i = 0; i < inputDeviceContexts.size(); i++) {
+            InputDeviceContext deviceContext = inputDeviceContexts.valueAt(i);
+
+            if (deviceContext.controllerNumber == controllerNumber) {
+                foundMatchingDevice = true;
+
+                if (deviceContext.vibrator != null) {
+                    vibrated = true;
+                    rumbleVibrator(deviceContext.vibrator, lowFreqMotor, highFreqMotor);
+                }
+            }
+        }
+
+        for (int i = 0; i < usbDeviceContexts.size(); i++) {
+            UsbDeviceContext deviceContext = usbDeviceContexts.valueAt(i);
+
+            if (deviceContext.controllerNumber == controllerNumber) {
+                foundMatchingDevice = vibrated = true;
+                deviceContext.device.rumble((short)lowFreqMotor, (short)highFreqMotor);
+            }
+        }
+
+        // We may decide to rumble the device for player 1
+        if (controllerNumber == 0) {
+            // If we didn't find a matching device, it must be the on-screen
+            // controls that triggered the rumble. Vibrate the device if
+            // the user has requested that behavior.
+            if (!foundMatchingDevice && prefConfig.onscreenController && !prefConfig.onlyL3R3 && prefConfig.vibrateOsc) {
+                rumbleVibrator(deviceVibrator, lowFreqMotor, highFreqMotor);
+            }
+            else if (foundMatchingDevice && !vibrated && prefConfig.vibrateFallbackToDevice) {
+                // We found a device to vibrate but it didn't have rumble support. The user
+                // has requested us to vibrate the device in this case.
+                rumbleVibrator(deviceVibrator, lowFreqMotor, highFreqMotor);
+            }
+        }
+    }
+
     public boolean handleButtonUp(KeyEvent event) {
         InputDeviceContext context = getContextForEvent(event);
         if (context == null) {
@@ -1042,15 +1234,15 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             context.inputMap &= ~ControllerPacket.RS_CLK_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_L2:
-            if (context.leftTriggerAxis >= 0) {
-                // Suppress this digital event if an analog trigger is present
+            if (context.leftTriggerAxisUsed) {
+                // Suppress this digital event if an analog trigger is active
                 return true;
             }
             context.leftTrigger = 0;
             break;
         case KeyEvent.KEYCODE_BUTTON_R2:
-            if (context.rightTriggerAxis >= 0) {
-                // Suppress this digital event if an analog trigger is present
+            if (context.rightTriggerAxisUsed) {
+                // Suppress this digital event if an analog trigger is active
                 return true;
             }
             context.rightTrigger = 0;
@@ -1162,15 +1354,15 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             context.inputMap |= ControllerPacket.RS_CLK_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_L2:
-            if (context.leftTriggerAxis >= 0) {
-                // Suppress this digital event if an analog trigger is present
+            if (context.leftTriggerAxisUsed) {
+                // Suppress this digital event if an analog trigger is active
                 return true;
             }
             context.leftTrigger = (byte)0xFF;
             break;
         case KeyEvent.KEYCODE_BUTTON_R2:
-            if (context.rightTriggerAxis >= 0) {
-                // Suppress this digital event if an analog trigger is present
+            if (context.rightTriggerAxisUsed) {
+                // Suppress this digital event if an analog trigger is active
                 return true;
             }
             context.rightTrigger = (byte)0xFF;
@@ -1210,12 +1402,30 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         return true;
     }
 
+    public void reportOscState(short buttonFlags,
+                               short leftStickX, short leftStickY,
+                               short rightStickX, short rightStickY,
+                               byte leftTrigger, byte rightTrigger) {
+        defaultContext.leftStickX = leftStickX;
+        defaultContext.leftStickY = leftStickY;
+
+        defaultContext.rightStickX = rightStickX;
+        defaultContext.rightStickY = rightStickY;
+
+        defaultContext.leftTrigger = leftTrigger;
+        defaultContext.rightTrigger = rightTrigger;
+
+        defaultContext.inputMap = buttonFlags;
+
+        sendControllerInputPacket(defaultContext);
+    }
+
     @Override
     public void reportControllerState(int controllerId, short buttonFlags,
                                       float leftStickX, float leftStickY,
                                       float rightStickX, float rightStickY,
                                       float leftTrigger, float rightTrigger) {
-        UsbDeviceContext context = usbDeviceContexts.get(controllerId);
+        GenericControllerContext context = usbDeviceContexts.get(controllerId);
         if (context == null) {
             return;
         }
@@ -1250,19 +1460,19 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     }
 
     @Override
-    public void deviceRemoved(int controllerId) {
-        UsbDeviceContext context = usbDeviceContexts.get(controllerId);
+    public void deviceRemoved(AbstractController controller) {
+        UsbDeviceContext context = usbDeviceContexts.get(controller.getControllerId());
         if (context != null) {
-            LimeLog.info("Removed controller: "+controllerId);
+            LimeLog.info("Removed controller: "+controller.getControllerId());
             releaseControllerNumber(context);
-            usbDeviceContexts.remove(controllerId);
+            usbDeviceContexts.remove(controller.getControllerId());
         }
     }
 
     @Override
-    public void deviceAdded(int controllerId) {
-        UsbDeviceContext context = createUsbDeviceContextForDevice(controllerId);
-        usbDeviceContexts.put(controllerId, context);
+    public void deviceAdded(AbstractController controller) {
+        UsbDeviceContext context = createUsbDeviceContextForDevice(controller);
+        usbDeviceContexts.put(controller.getControllerId(), context);
     }
 
     class GenericControllerContext {
@@ -1291,6 +1501,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
 
     class InputDeviceContext extends GenericControllerContext {
         public String name;
+        public Vibrator vibrator;
 
         public int leftStickXAxis = -1;
         public int leftStickYAxis = -1;
@@ -1301,7 +1512,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         public int leftTriggerAxis = -1;
         public int rightTriggerAxis = -1;
         public boolean triggersIdleNegative;
-        public boolean leftTriggerUsed, rightTriggerUsed;
+        public boolean leftTriggerAxisUsed, rightTriggerAxisUsed;
 
         public int hatXAxis = -1;
         public int hatYAxis = -1;
@@ -1328,5 +1539,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         public long startDownTime = 0;
     }
 
-    class UsbDeviceContext extends GenericControllerContext {}
+    class UsbDeviceContext extends GenericControllerContext {
+        public AbstractController device;
+    }
 }

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

@@ -47,7 +47,21 @@ public class KeyboardTranslator {
 	public static final int VK_BACK_QUOTE = 192;
 	public static final int VK_QUOTE = 222;
 	public static final int VK_PAUSE = 19;
-	
+
+	public static boolean needsShift(int keycode) {
+		switch (keycode)
+		{
+			case KeyEvent.KEYCODE_AT:
+			case KeyEvent.KEYCODE_POUND:
+			case KeyEvent.KEYCODE_PLUS:
+			case KeyEvent.KEYCODE_STAR:
+				return true;
+
+			default:
+				return false;
+		}
+	}
+
 	/**
 	 * Translates the given keycode and returns the GFE keycode
 	 * @param keycode the code to be translated
@@ -116,7 +130,8 @@ public class KeyboardTranslator {
 			case KeyEvent.KEYCODE_ENTER:
 				translated = 0x0d;
 				break;
-				
+
+			case KeyEvent.KEYCODE_PLUS:
 			case KeyEvent.KEYCODE_EQUALS:
 				translated = 0xbb;
 				break;
@@ -257,7 +272,19 @@ public class KeyboardTranslator {
 			case KeyEvent.KEYCODE_NUMPAD_DOT:
 				translated = 0x6E;
 				break;
-				
+
+			case KeyEvent.KEYCODE_AT:
+				translated = 2 + VK_0;
+				break;
+
+			case KeyEvent.KEYCODE_POUND:
+				translated = 3 + VK_0;
+				break;
+
+			case KeyEvent.KEYCODE_STAR:
+				translated = 8 + VK_0;
+				break;
+
 			default:
 				System.out.println("No key for "+keycode);
 				return 0;

app/src/main/java/com/limelight/binding/input/capture/AndroidNativePointerCaptureProvider.java

@@ -43,11 +43,19 @@ public class AndroidNativePointerCaptureProvider extends InputCaptureProvider {
 
     @Override
     public float getRelativeAxisX(MotionEvent event) {
-        return event.getX();
+        float x = event.getX();
+        for (int i = 0; i < event.getHistorySize(); i++) {
+            x += event.getHistoricalX(i);
+        }
+        return x;
     }
 
     @Override
     public float getRelativeAxisY(MotionEvent event) {
-        return event.getY();
+        float y = event.getY();
+        for (int i = 0; i < event.getHistorySize(); i++) {
+            y += event.getHistoricalY(i);
+        }
+        return y;
     }
 }

app/src/main/java/com/limelight/binding/input/driver/AbstractController.java

@@ -37,11 +37,13 @@ public abstract class AbstractController {
         this.listener = listener;
     }
 
+    public abstract void rumble(short lowFreqMotor, short highFreqMotor);
+
     protected void notifyDeviceRemoved() {
-        listener.deviceRemoved(deviceId);
+        listener.deviceRemoved(this);
     }
 
     protected void notifyDeviceAdded() {
-        listener.deviceAdded(deviceId);
+        listener.deviceAdded(this);
     }
 }

app/src/main/java/com/limelight/binding/input/driver/AbstractXboxController.java

@@ -131,6 +131,9 @@ public abstract class AbstractXboxController extends AbstractController {
 
         stopped = true;
 
+        // Cancel any rumble effects
+        rumble((short)0, (short)0);
+
         // Stop the input thread
         if (inputThread != null) {
             inputThread.interrupt();

app/src/main/java/com/limelight/binding/input/driver/UsbDriverListener.java

@@ -6,6 +6,6 @@ public interface UsbDriverListener {
                                float rightStickX, float rightStickY,
                                float leftTrigger, float rightTrigger);
 
-    void deviceRemoved(int controllerId);
-    void deviceAdded(int controllerId);
+    void deviceRemoved(AbstractController controller);
+    void deviceAdded(AbstractController controller);
 }

app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java

@@ -47,26 +47,21 @@ public class UsbDriverService extends Service implements UsbDriverListener {
     }
 
     @Override
-    public void deviceRemoved(int controllerId) {
+    public void deviceRemoved(AbstractController controller) {
         // Remove the the controller from our list (if not removed already)
-        for (AbstractController controller : controllers) {
-            if (controller.getControllerId() == controllerId) {
-                controllers.remove(controller);
-                break;
-            }
-        }
+        controllers.remove(controller);
 
         // Call through to the client's listener
         if (listener != null) {
-            listener.deviceRemoved(controllerId);
+            listener.deviceRemoved(controller);
         }
     }
 
     @Override
-    public void deviceAdded(int controllerId) {
+    public void deviceAdded(AbstractController controller) {
         // Call through to the client's listener
         if (listener != null) {
-            listener.deviceAdded(controllerId);
+            listener.deviceAdded(controller);
         }
     }
 
@@ -113,7 +108,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {
             // Report all controllerMap that already exist
             if (listener != null) {
                 for (AbstractController controller : controllers) {
-                    listener.deviceAdded(controller.getControllerId());
+                    listener.deviceAdded(controller);
                 }
             }
         }

app/src/main/java/com/limelight/binding/input/driver/Xbox360Controller.java

@@ -14,6 +14,7 @@ public class Xbox360Controller extends AbstractXboxController {
     private static final int XB360_IFACE_PROTOCOL = 1; // Wired only
 
     private static final int[] SUPPORTED_VENDORS = {
+            0x0079, // GPD Win 2
             0x044f, // Thrustmaster
             0x045e, // Microsoft
             0x046d, // Logitech
@@ -23,6 +24,7 @@ public class Xbox360Controller extends AbstractXboxController {
             0x07ff, // Mad Catz
             0x0e6f, // Unknown
             0x0f0d, // Hori
+            0x1038, // SteelSeries
             0x11c9, // Nacon
             0x12ab, // Unknown
             0x1430, // RedOctane
@@ -137,4 +139,17 @@ public class Xbox360Controller extends AbstractXboxController {
         // No need to fail init if the LED command fails
         return true;
     }
+
+    @Override
+    public void rumble(short lowFreqMotor, short highFreqMotor) {
+        byte[] data = {
+                0x00, 0x08, 0x00,
+                (byte)(lowFreqMotor >> 8), (byte)(highFreqMotor >> 8),
+                0x00, 0x00, 0x00
+        };
+        int res = connection.bulkTransfer(outEndpt, data, data.length, 100);
+        if (res != data.length) {
+            LimeLog.warning("Rumble transfer failed: "+res);
+        }
+    }
 }

app/src/main/java/com/limelight/binding/input/driver/XboxOneController.java

@@ -8,6 +8,7 @@ import com.limelight.LimeLog;
 import com.limelight.nvstream.input.ControllerPacket;
 
 import java.nio.ByteBuffer;
+import java.util.Arrays;
 
 public class XboxOneController extends AbstractXboxController {
 
@@ -23,8 +24,31 @@ public class XboxOneController extends AbstractXboxController {
             0x24c6, // PowerA
     };
 
-    // FIXME: odata_serial
-    private static final byte[] XB1_INIT_DATA = {0x05, 0x20, 0x00, 0x01, 0x00};
+    private static final byte[] FW2015_INIT = {0x05, 0x20, 0x00, 0x01, 0x00};
+    private static final byte[] HORI_INIT = {0x01, 0x20, 0x00, 0x09, 0x00, 0x04, 0x20, 0x3a,
+            0x00, 0x00, 0x00, (byte)0x80, 0x00};
+    private static final byte[] PDP_INIT1 = {0x0a, 0x20, 0x00, 0x03, 0x00, 0x01, 0x14};
+    private static final byte[] PDP_INIT2 = {0x06, 0x20, 0x00, 0x02, 0x01, 0x00};
+    private static final byte[] RUMBLE_INIT1 = {0x09, 0x00, 0x00, 0x09, 0x00, 0x0F, 0x00, 0x00,
+            0x1D, 0x1D, (byte)0xFF, 0x00, 0x00};
+    private static final byte[] RUMBLE_INIT2 = {0x09, 0x00, 0x00, 0x09, 0x00, 0x0F, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00};
+
+    private static InitPacket[] INIT_PKTS = {
+            new InitPacket(0x0e6f, 0x0165, HORI_INIT),
+            new InitPacket(0x0f0d, 0x0067, HORI_INIT),
+            new InitPacket(0x0000, 0x0000, FW2015_INIT),
+            new InitPacket(0x0e6f, 0x0000, PDP_INIT1),
+            new InitPacket(0x0e6f, 0x0000, PDP_INIT2),
+            new InitPacket(0x24c6, 0x541a, RUMBLE_INIT1),
+            new InitPacket(0x24c6, 0x542a, RUMBLE_INIT1),
+            new InitPacket(0x24c6, 0x543a, RUMBLE_INIT1),
+            new InitPacket(0x24c6, 0x541a, RUMBLE_INIT2),
+            new InitPacket(0x24c6, 0x542a, RUMBLE_INIT2),
+            new InitPacket(0x24c6, 0x543a, RUMBLE_INIT2),
+    };
+
+    private byte seqNum = 0;
 
     public XboxOneController(UsbDevice device, UsbDeviceConnection connection, int deviceId, UsbDriverListener listener) {
         super(device, connection, deviceId, listener);
@@ -111,13 +135,55 @@ public class XboxOneController extends AbstractXboxController {
 
     @Override
     protected boolean doInit() {
-        // Send the initialization packet
-        int res = connection.bulkTransfer(outEndpt, XB1_INIT_DATA, XB1_INIT_DATA.length, 3000);
-        if (res != XB1_INIT_DATA.length) {
-            LimeLog.warning("Initialization transfer failed: "+res);
-            return false;
+        // Send all applicable init packets
+        for (InitPacket pkt : INIT_PKTS) {
+            if (pkt.vendorId != 0 && device.getVendorId() != pkt.vendorId) {
+                continue;
+            }
+
+            if (pkt.productId != 0 && device.getProductId() != pkt.productId) {
+                continue;
+            }
+
+            byte[] data = Arrays.copyOf(pkt.data, pkt.data.length);
+
+            // Populate sequence number
+            data[2] = seqNum++;
+
+            // Send the initialization packet
+            int res = connection.bulkTransfer(outEndpt, data, data.length, 3000);
+            if (res != data.length) {
+                LimeLog.warning("Initialization transfer failed: "+res);
+                return false;
+            }
         }
 
         return true;
     }
+
+    @Override
+    public void rumble(short lowFreqMotor, short highFreqMotor) {
+        byte[] data = {
+                0x09, 0x00, seqNum++, 0x09, 0x00,
+                0x0F, 0x00, 0x00,
+                (byte)(lowFreqMotor >> 9), (byte)(highFreqMotor >> 9),
+                (byte)0xFF, 0x00, (byte)0xFF
+        };
+        int res = connection.bulkTransfer(outEndpt, data, data.length, 100);
+        if (res != data.length) {
+            LimeLog.warning("Rumble transfer failed: "+res);
+        }
+    }
+
+    private static class InitPacket {
+        final int vendorId;
+        final int productId;
+        final byte[] data;
+
+        InitPacket(int vendorId, int productId, byte[] data) {
+            this.vendorId = vendorId;
+            this.productId = productId;
+            this.data = data;
+        }
+    }
 }

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/binding/input/virtual_controller/AnalogStick.java

@@ -210,7 +210,7 @@ public class AnalogStick extends VirtualControllerElement {
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         // calculate new radius sizes depending
-        radius_complete = getPercent(getCorrectWidth() / 2, 90);
+        radius_complete = getPercent(getCorrectWidth() / 2, 100);
         radius_dead_zone = getPercent(getCorrectWidth() / 2, 30);
         radius_analog_stick = getPercent(getCorrectWidth() / 2, 20);
 
@@ -338,6 +338,7 @@ public class AnalogStick extends VirtualControllerElement {
         } else {
             stick_state = STICK_STATE.NO_MOVEMENT;
             notifyOnRevoke();
+
             // not longer pressed reset analog stick
             notifyOnMovement(0, 0);
         }

app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java

@@ -13,10 +13,13 @@ import android.widget.RelativeLayout;
 import android.widget.Toast;
 
 import com.limelight.R;
+import com.limelight.binding.input.ControllerHandler;
 import com.limelight.nvstream.NvConnection;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
 
 public class VirtualController {
     public class ControllerInputContext {
@@ -36,12 +39,14 @@ public class VirtualController {
 
     private static final boolean _PRINT_DEBUG_INFORMATION = false;
 
-    private NvConnection connection = null;
+    private ControllerHandler controllerHandler;
     private Context context = null;
 
     private FrameLayout frame_layout = null;
     private RelativeLayout relative_layout = null;
 
+    private Timer retransmitTimer;
+
     ControllerMode currentMode = ControllerMode.Active;
     ControllerInputContext inputContext = new ControllerInputContext();
 
@@ -49,8 +54,8 @@ public class VirtualController {
 
     private List<VirtualControllerElement> elements = new ArrayList<>();
 
-    public VirtualController(final NvConnection conn, FrameLayout layout, final Context context) {
-        this.connection = conn;
+    public VirtualController(final ControllerHandler controllerHandler, FrameLayout layout, final Context context) {
+        this.controllerHandler = controllerHandler;
         this.frame_layout = layout;
         this.context = context;
 
@@ -60,6 +65,7 @@ public class VirtualController {
 
         buttonConfigure = new Button(context);
         buttonConfigure.setAlpha(0.25f);
+        buttonConfigure.setFocusable(false);
         buttonConfigure.setBackgroundResource(R.drawable.ic_settings);
         buttonConfigure.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -86,6 +92,27 @@ public class VirtualController {
         });
     }
 
+    public void hide() {
+        retransmitTimer.cancel();
+        relative_layout.setVisibility(View.INVISIBLE);
+    }
+
+    public void show() {
+        relative_layout.setVisibility(View.VISIBLE);
+
+        // HACK: GFE sometimes discards gamepad packets when they are received
+        // very shortly after another. This can be critical if an axis zeroing packet
+        // is lost and causes an analog stick to get stuck. To avoid this, we send
+        // a gamepad input packet every 100 ms to ensure any loss can be recovered.
+        retransmitTimer = new Timer("OSC timer", true);
+        retransmitTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                sendControllerInputContext();
+            }
+        }, 100, 100);
+    }
+
     public void removeElements() {
         for (VirtualControllerElement element : elements) {
             relative_layout.removeView(element);
@@ -140,32 +167,23 @@ public class VirtualController {
         return inputContext;
     }
 
-    public void sendControllerInputContext() {
-        sendControllerInputPacket();
-    }
+    void sendControllerInputContext() {
+        _DBG("INPUT_MAP + " + inputContext.inputMap);
+        _DBG("LEFT_TRIGGER " + inputContext.leftTrigger);
+        _DBG("RIGHT_TRIGGER " + inputContext.rightTrigger);
+        _DBG("LEFT STICK X: " + inputContext.leftStickX + " Y: " + inputContext.leftStickY);
+        _DBG("RIGHT STICK X: " + inputContext.rightStickX + " Y: " + inputContext.rightStickY);
 
-    private void sendControllerInputPacket() {
-        try {
-            _DBG("INPUT_MAP + " + inputContext.inputMap);
-            _DBG("LEFT_TRIGGER " + inputContext.leftTrigger);
-            _DBG("RIGHT_TRIGGER " + inputContext.rightTrigger);
-            _DBG("LEFT STICK X: " + inputContext.leftStickX + " Y: " + inputContext.leftStickY);
-            _DBG("RIGHT STICK X: " + inputContext.rightStickX + " Y: " + inputContext.rightStickY);
-            _DBG("RIGHT STICK X: " + inputContext.rightStickX + " Y: " + inputContext.rightStickY);
-
-            if (connection != null) {
-                connection.sendControllerInput(
-                        inputContext.inputMap,
-                        inputContext.leftTrigger,
-                        inputContext.rightTrigger,
-                        inputContext.leftStickX,
-                        inputContext.leftStickY,
-                        inputContext.rightStickX,
-                        inputContext.rightStickY
-                );
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
+        if (controllerHandler != null) {
+            controllerHandler.reportOscState(
+                    inputContext.inputMap,
+                    inputContext.leftStickX,
+                    inputContext.leftStickY,
+                    inputContext.rightStickX,
+                    inputContext.rightStickY,
+                    inputContext.leftTrigger,
+                    inputContext.rightTrigger
+            );
         }
     }
 }

app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualControllerElement.java

@@ -166,58 +166,54 @@ public abstract class VirtualControllerElement extends View {
     }
 
     protected void showConfigurationDialog() {
-        try {
-            AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getContext());
+        AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getContext());
 
-            alertBuilder.setTitle("Configuration");
+        alertBuilder.setTitle("Configuration");
 
-            CharSequence functions[] = new CharSequence[]{
-                    "Move",
-                    "Resize",
-                /*election
-                "Set n
-                Disable color sormal color",
-                "Set pressed color",
+        CharSequence functions[] = new CharSequence[]{
+                "Move",
+                "Resize",
+            /*election
+            "Set n
+            Disable color sormal color",
+            "Set pressed color",
+            */
+                "Cancel"
+        };
+
+        alertBuilder.setItems(functions, new DialogInterface.OnClickListener() {
+
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                switch (which) {
+                    case 0: { // move
+                        actionEnableMove();
+                        break;
+                    }
+                    case 1: { // resize
+                        actionEnableResize();
+                        break;
+                    }
+                /*
+                case 2:	{ // set default color
+                    actionShowNormalColorChooser();
+                    break;
+                }
+                case 3:	{ // set pressed color
+                    actionShowPressedColorChooser();
+                    break;
+                }
                 */
-                    "Cancel"
-            };
-
-            alertBuilder.setItems(functions, new DialogInterface.OnClickListener() {
-
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    switch (which) {
-                        case 0: { // move
-                            actionEnableMove();
-                            break;
-                        }
-                        case 1: { // resize
-                            actionEnableResize();
-                            break;
-                        }
-                    /*
-                    case 2:	{ // set default color
-                        actionShowNormalColorChooser();
+                    default: { // cancel
+                        actionCancel();
                         break;
                     }
-                    case 3:	{ // set pressed color
-                        actionShowPressedColorChooser();
-                        break;
-                    }
-                    */
-                        default: { // cancel
-                            actionCancel();
-                            break;
-                        }
-                    }
                 }
-            });
-            AlertDialog alert = alertBuilder.create();
-            // show menu
-            alert.show();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+            }
+        });
+        AlertDialog alert = alertBuilder.create();
+        // show menu
+        alert.show();
     }
 
     @Override

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

@@ -1,7 +1,6 @@
 package com.limelight.binding.video;
 
 import java.nio.ByteBuffer;
-import java.util.Arrays;
 import java.util.Locale;
 
 import org.jcodec.codecs.h264.H264Utils;
@@ -41,7 +40,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
 
     private MediaCodec videoDecoder;
     private Thread rendererThread;
-    private Thread[] spinnerThreads;
     private boolean needsSpsBitstreamFixup, isExynos4;
     private boolean adaptivePlayback, directSubmit;
     private boolean constrainedHighProfile;
@@ -132,14 +130,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         this.consecutiveCrashCount = consecutiveCrashCount;
         this.glRenderer = glRenderer;
 
-        // Disable spinner threads in battery saver mode or 4K
-        if (prefs.batterySaver || prefs.height >= 2160) {
-            spinnerThreads = new Thread[0];
-        }
-        else {
-            spinnerThreads = new Thread[Runtime.getRuntime().availableProcessors()];
-        }
-
         avcDecoder = findAvcDecoder();
         if (avcDecoder != null) {
             LimeLog.info("Selected AVC decoder: "+avcDecoder.getName());
@@ -217,15 +207,10 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     }
 
     public void notifyVideoForeground() {
-        startSpinnerThreads();
         foreground = true;
     }
 
     public void notifyVideoBackground() {
-        // Signal the spinner threads to stop but
-        // don't wait for them to terminate to avoid
-        // delaying the state transition
-        signalSpinnerStop();
         foreground = false;
     }
 
@@ -420,10 +405,17 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                             }
 
                             // Render the last buffer
-                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && !legacyFrameDropRendering) {
-                                // Use a PTS that will cause this frame to never be dropped if frame dropping
-                                // is disabled
-                                videoDecoder.releaseOutputBuffer(lastIndex, 0);
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                                if (legacyFrameDropRendering) {
+                                    // Use a PTS that will cause this frame to be dropped if another comes in within
+                                    // the same V-sync period
+                                    videoDecoder.releaseOutputBuffer(lastIndex, System.nanoTime());
+                                }
+                                else {
+                                    // Use a PTS that will cause this frame to never be dropped if frame dropping
+                                    // is disabled
+                                    videoDecoder.releaseOutputBuffer(lastIndex, 0);
+                                }
                             }
                             else {
                                 videoDecoder.releaseOutputBuffer(lastIndex, true);
@@ -462,73 +454,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         rendererThread.start();
     }
 
-    private void startSpinnerThread(final int i) {
-        spinnerThreads[i] = new Thread() {
-            @Override
-            public void run() {
-                // This thread exists to keep the CPU at a higher DVFS state on devices
-                // where the governor scales clock speed sporadically, causing dropped frames.
-                //
-                // Run until we notice our thread has been removed from the spinner threads
-                // array. Even if we don't notice immediately, we'll notice soon enough.
-                // This will also ensure we terminate even if someone has restarted spinning
-                // before we realized we should stop.
-                while (this == spinnerThreads[i]) {
-                    try {
-                        Thread.sleep(0, 1);
-                    } catch (InterruptedException e) {
-                        break;
-                    }
-                }
-            }
-        };
-        spinnerThreads[i].setName("Spinner-"+i);
-        spinnerThreads[i].setPriority(Thread.MIN_PRIORITY);
-        spinnerThreads[i].start();
-    }
-
-    private void startSpinnerThreads() {
-        LimeLog.info("Using "+spinnerThreads.length+" spinner threads");
-        for (int i = 0; i < spinnerThreads.length; i++) {
-            if (spinnerThreads[i] != null) {
-                continue;
-            }
-
-            startSpinnerThread(i);
-        }
-    }
-
-    private Thread[] signalSpinnerStop() {
-        // Capture current running threads
-        Thread[] runningThreads = Arrays.copyOf(spinnerThreads, spinnerThreads.length);
-
-        // Clear the spinner threads to signal their termination
-        for (int i = 0; i < spinnerThreads.length; i++) {
-            spinnerThreads[i] = null;
-        }
-
-        // Interrupt the threads
-        for (int i = 0; i < runningThreads.length; i++) {
-            if (runningThreads[i] != null) {
-                runningThreads[i].interrupt();
-            }
-        }
-
-        return runningThreads;
-    }
-
-    private void stopSpinnerThreads() {
-        // Signal and wait for the threads to stop
-        Thread[] runningThreads = signalSpinnerStop();
-        for (int i = 0; i < runningThreads.length; i++) {
-            if (runningThreads[i] != null) {
-                try {
-                    runningThreads[i].join();
-                } catch (InterruptedException ignored) { }
-            }
-        }
-    }
-
     private int dequeueInputBuffer() {
         int index = -1;
         long startTime;
@@ -570,7 +495,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     @Override
     public void start() {
         startRendererThread();
-        startSpinnerThreads();
     }
 
     // !!! May be called even if setup()/start() fails !!!
@@ -593,9 +517,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         try {
             rendererThread.join();
         } catch (InterruptedException ignored) { }
-
-        // Halt the spinner threads
-        stopSpinnerThreads();
     }
 
     @Override

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

@@ -71,8 +71,8 @@ public class MediaCodecHelper {
 		blacklistedDecoderPrefixes = new LinkedList<>();
 
 		// Blacklist software decoders that don't support H264 high profile,
-		// but exclude the official AOSP emulator from this restriction.
-		if (!Build.HARDWARE.equals("ranchu") || !Build.BRAND.equals("google")) {
+		// but exclude the official AOSP and CrOS emulator from this restriction.
+		if (!Build.HARDWARE.equals("ranchu") && !Build.HARDWARE.equals("cheets")) {
 			blacklistedDecoderPrefixes.add("omx.google");
 			blacklistedDecoderPrefixes.add("AVCDecoder");
 		}
@@ -131,8 +131,8 @@ public class MediaCodecHelper {
 		}
 
 		// Sony ATVs have broken MediaTek codecs (decoder hangs after rendering the first frame).
-		// I know the Fire TV 2 works, so I'll just whitelist Amazon devices which seem
-		// to actually be tested. Ugh...
+		// I know the Fire TV 2 and 3 works, so I'll just whitelist Amazon devices which seem
+		// to actually be tested.
 		if (Build.MANUFACTURER.equalsIgnoreCase("Amazon")) {
 			whitelistedHevcDecoders.add("omx.mtk");
 			whitelistedHevcDecoders.add("omx.amlogic");
@@ -160,12 +160,16 @@ public class MediaCodecHelper {
 
 		// We see a bunch of crashes on MediaTek Android TVs running
 		// at 49 FPS (PAL 50 Hz - 1). Blacklist this frame rate for
-		// these devices and hope they fix it in Oreo.
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+		// these devices and hope they fix it in Pie.
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
 			blacklisted49FpsDecoderPrefixes.add("omx.mtk");
 		}
 	}
 
+	private static boolean isPowerVR(String glRenderer) {
+		return glRenderer.toLowerCase().contains("powervr");
+	}
+
 	private static String getAdrenoVersionString(String glRenderer) {
 		glRenderer = glRenderer.toLowerCase().trim();
 
@@ -259,6 +263,18 @@ public class MediaCodecHelper {
 			else {
 				blacklistedDecoderPrefixes.add("OMX.qcom.video.decoder.hevc");
 			}
+
+			// Older MediaTek SoCs have issues with HEVC rendering but the newer chips with
+			// PowerVR GPUs have good HEVC support.
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && isPowerVR(glRenderer)) {
+				LimeLog.info("Added omx.mtk to HEVC decoders based on PowerVR GPU");
+				whitelistedHevcDecoders.add("omx.mtk");
+
+				// This SoC (MT8176 in GPD XD+) supports AVC RFI too, but the maxNumReferenceFrames setting
+				// required to make it work adds a huge amount of latency.
+				LimeLog.info("Added omx.mtk to RFI list for HEVC");
+				refFrameInvalidationHevcPrefixes.add("omx.mtk");
+			}
 		}
 
 		initialized = true;

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

@@ -1,13 +1,14 @@
 package com.limelight.computers;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.io.ByteArrayInputStream;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
-import java.util.UUID;
 
-import com.limelight.LimeLog;
 import com.limelight.nvstream.http.ComputerDetails;
 
 import android.content.ContentValues;
@@ -17,15 +18,15 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 
 public class ComputerDatabaseManager {
-    private static final String COMPUTER_DB_NAME = "computers.db";
+    private static final String COMPUTER_DB_NAME = "computers2.db";
     private static final String COMPUTER_TABLE_NAME = "Computers";
-    private static final String COMPUTER_NAME_COLUMN_NAME = "ComputerName";
     private static final String COMPUTER_UUID_COLUMN_NAME = "UUID";
-    private static final String LOCAL_IP_COLUMN_NAME = "LocalIp";
-    private static final String REMOTE_IP_COLUMN_NAME = "RemoteIp";
-    private static final String MAC_COLUMN_NAME = "Mac";
-
-    private static final String ADDRESS_PREFIX = "ADDRESS_PREFIX__";
+    private static final String COMPUTER_NAME_COLUMN_NAME = "ComputerName";
+    private static final String LOCAL_ADDRESS_COLUMN_NAME = "LocalAddress";
+    private static final String REMOTE_ADDRESS_COLUMN_NAME = "RemoteAddress";
+    private static final String MANUAL_ADDRESS_COLUMN_NAME = "ManualAddress";
+    private static final String MAC_ADDRESS_COLUMN_NAME = "MacAddress";
+    private static final String SERVER_CERT_COLUMN_NAME = "ServerCert";
 
     private SQLiteDatabase computerDb;
 
@@ -38,20 +39,35 @@ public class ComputerDatabaseManager {
             c.deleteDatabase(COMPUTER_DB_NAME);
             computerDb = c.openOrCreateDatabase(COMPUTER_DB_NAME, 0, null);
         }
-        initializeDb();
+        initializeDb(c);
     }
 
     public void close() {
         computerDb.close();
     }
 
-    private void initializeDb() {
+    private void initializeDb(Context c) {
+        // Add cert column to the table if not present
+        try {
+            computerDb.execSQL(String.format((Locale)null,
+                    "ALTER TABLE %s ADD COLUMN %s TEXT",
+                    COMPUTER_TABLE_NAME, SERVER_CERT_COLUMN_NAME));
+        } catch (SQLiteException e) {}
+
+
         // Create tables if they aren't already there
-        computerDb.execSQL(String.format((Locale)null, "CREATE TABLE IF NOT EXISTS %s(%s TEXT PRIMARY KEY," +
-                " %s TEXT NOT NULL, %s TEXT NOT NULL, %s TEXT NOT NULL, %s TEXT NOT NULL)",
+        computerDb.execSQL(String.format((Locale)null,
+                "CREATE TABLE IF NOT EXISTS %s(%s TEXT PRIMARY KEY, %s TEXT NOT NULL, %s TEXT, %s TEXT, %s TEXT, %s TEXT, %s TEXT)",
                 COMPUTER_TABLE_NAME,
-                COMPUTER_NAME_COLUMN_NAME, COMPUTER_UUID_COLUMN_NAME, LOCAL_IP_COLUMN_NAME,
-                REMOTE_IP_COLUMN_NAME, MAC_COLUMN_NAME));
+                COMPUTER_UUID_COLUMN_NAME, COMPUTER_NAME_COLUMN_NAME,
+                LOCAL_ADDRESS_COLUMN_NAME, REMOTE_ADDRESS_COLUMN_NAME, MANUAL_ADDRESS_COLUMN_NAME,
+                MAC_ADDRESS_COLUMN_NAME, SERVER_CERT_COLUMN_NAME));
+
+        // Move all computers from the old DB (if any) to the new one
+        List<ComputerDetails> oldComputers = LegacyDatabaseReader.migrateAllComputers(c);
+        for (ComputerDetails computer : oldComputers) {
+            updateComputer(computer);
+        }
     }
 
     public void deleteComputer(String name) {
@@ -60,64 +76,49 @@ public class ComputerDatabaseManager {
 
     public boolean updateComputer(ComputerDetails details) {
         ContentValues values = new ContentValues();
+        values.put(COMPUTER_UUID_COLUMN_NAME, details.uuid);
         values.put(COMPUTER_NAME_COLUMN_NAME, details.name);
-        values.put(COMPUTER_UUID_COLUMN_NAME, details.uuid.toString());
-        values.put(LOCAL_IP_COLUMN_NAME, ADDRESS_PREFIX+details.localAddress);
-        values.put(REMOTE_IP_COLUMN_NAME, ADDRESS_PREFIX+details.remoteAddress);
-        values.put(MAC_COLUMN_NAME, details.macAddress);
+        values.put(LOCAL_ADDRESS_COLUMN_NAME, details.localAddress);
+        values.put(REMOTE_ADDRESS_COLUMN_NAME, details.remoteAddress);
+        values.put(MANUAL_ADDRESS_COLUMN_NAME, details.manualAddress);
+        values.put(MAC_ADDRESS_COLUMN_NAME, details.macAddress);
+        try {
+            if (details.serverCert != null) {
+                values.put(SERVER_CERT_COLUMN_NAME, details.serverCert.getEncoded());
+            }
+            else {
+                values.put(SERVER_CERT_COLUMN_NAME, (byte[])null);
+            }
+        } catch (CertificateEncodingException e) {
+            values.put(SERVER_CERT_COLUMN_NAME, (byte[])null);
+            e.printStackTrace();
+        }
         return -1 != computerDb.insertWithOnConflict(COMPUTER_TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
     }
 
     private ComputerDetails getComputerFromCursor(Cursor c) {
         ComputerDetails details = new ComputerDetails();
 
-        details.name = c.getString(0);
-
-        String uuidStr = c.getString(1);
-        try {
-            details.uuid = UUID.fromString(uuidStr);
-        } catch (IllegalArgumentException e) {
-            // We'll delete this entry
-            LimeLog.severe("DB: Corrupted UUID for "+details.name);
-        }
-
-        // An earlier schema defined addresses as byte blobs. We'll
-        // gracefully migrate those to strings so we can store DNS names
-        // too. To disambiguate, we'll need to prefix them with a string
-        // greater than the allowable IP address length.
-        try {
-            details.localAddress = InetAddress.getByAddress(c.getBlob(2)).getHostAddress();
-            LimeLog.warning("DB: Legacy local address for "+details.name);
-        } catch (UnknownHostException e) {
-            // This is probably a hostname/address with the prefix string
-            String stringData = c.getString(2);
-            if (stringData.startsWith(ADDRESS_PREFIX)) {
-                details.localAddress = c.getString(2).substring(ADDRESS_PREFIX.length());
-            }
-            else {
-                LimeLog.severe("DB: Corrupted local address for "+details.name);
-            }
-        }
+        details.uuid = c.getString(0);
+        details.name = c.getString(1);
+        details.localAddress = c.getString(2);
+        details.remoteAddress = c.getString(3);
+        details.manualAddress = c.getString(4);
+        details.macAddress = c.getString(5);
 
         try {
-            details.remoteAddress = InetAddress.getByAddress(c.getBlob(3)).getHostAddress();
-            LimeLog.warning("DB: Legacy remote address for "+details.name);
-        } catch (UnknownHostException e) {
-            // This is probably a hostname/address with the prefix string
-            String stringData = c.getString(3);
-            if (stringData.startsWith(ADDRESS_PREFIX)) {
-                details.remoteAddress = c.getString(3).substring(ADDRESS_PREFIX.length());
-            }
-            else {
-                LimeLog.severe("DB: Corrupted local address for "+details.name);
-            }
-        }
+            byte[] derCertData = c.getBlob(6);
 
-        details.macAddress = c.getString(4);
+            if (derCertData != null) {
+                details.serverCert = (X509Certificate) CertificateFactory.getInstance("X.509")
+                        .generateCertificate(new ByteArrayInputStream(derCertData));
+            }
+        } catch (CertificateException e) {
+            e.printStackTrace();
+        }
 
         // This signifies we don't have dynamic state (like pair state)
         details.state = ComputerDetails.State.UNKNOWN;
-        details.reachability = ComputerDetails.Reachability.UNKNOWN;
 
         return details;
     }
@@ -128,13 +129,11 @@ public class ComputerDatabaseManager {
         while (c.moveToNext()) {
             ComputerDetails details = getComputerFromCursor(c);
 
-            // If a field is corrupt or missing, skip the database entry
-            if (details.uuid == null || details.localAddress == null || details.remoteAddress == null ||
-                    details.macAddress == null) {
+            // If a critical field is corrupt or missing, skip the database entry
+            if (details.uuid == null) {
                 continue;
             }
 
-
             computerList.add(details);
         }
 
@@ -143,8 +142,8 @@ public class ComputerDatabaseManager {
         return computerList;
     }
 
-    public ComputerDetails getComputerByName(String name) {
-        Cursor c = computerDb.query(COMPUTER_TABLE_NAME, null, COMPUTER_NAME_COLUMN_NAME+"=?", new String[]{name}, null, null, null);
+    public ComputerDetails getComputerByUUID(String uuid) {
+        Cursor c = computerDb.query(COMPUTER_TABLE_NAME, null, COMPUTER_UUID_COLUMN_NAME+"=?", new String[]{ uuid }, null, null, null);
         if (!c.moveToFirst()) {
             // No matching computer
             c.close();
@@ -154,9 +153,8 @@ public class ComputerDatabaseManager {
         ComputerDetails details = getComputerFromCursor(c);
         c.close();
 
-        // If a field is corrupt or missing, delete the database entry
-        if (details.uuid == null || details.localAddress == null || details.remoteAddress == null ||
-                details.macAddress == null) {
+        // If a critical field is corrupt or missing, delete the database entry
+        if (details.uuid == null) {
             deleteComputer(details.name);
             return null;
         }

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

@@ -3,21 +3,21 @@ package com.limelight.computers;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringReader;
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
-import java.net.UnknownHostException;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.limelight.LimeLog;
 import com.limelight.binding.PlatformBinding;
 import com.limelight.discovery.DiscoveryService;
+import com.limelight.nvstream.NvConnection;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
+import com.limelight.nvstream.http.PairingManager;
 import com.limelight.nvstream.mdns.MdnsComputer;
 import com.limelight.nvstream.mdns.MdnsDiscoveryListener;
 import com.limelight.utils.CacheHelper;
@@ -95,7 +95,6 @@ public class ComputerManagerService extends Service {
                 }
 
                 details.state = ComputerDetails.State.OFFLINE;
-                details.reachability = ComputerDetails.Reachability.OFFLINE;
             }
         } catch (InterruptedException e) {
             releaseLocalDatabaseReference();
@@ -106,17 +105,27 @@ public class ComputerManagerService extends Service {
 
         // If it's online, update our persistent state
         if (details.state == ComputerDetails.State.ONLINE) {
-            if (!newPc) {
-                // Check if it's in the database because it could have been
-                // removed after this was issued
-                if (dbManager.getComputerByName(details.name) == null) {
-                    // It's gone
-                    releaseLocalDatabaseReference();
-                    return false;
-                }
+            ComputerDetails existingComputer = dbManager.getComputerByUUID(details.uuid);
+
+            // Check if it's in the database because it could have been
+            // removed after this was issued
+            if (!newPc && existingComputer == null) {
+                // It's gone
+                releaseLocalDatabaseReference();
+                return false;
             }
 
-            dbManager.updateComputer(details);
+            // If we already have an entry for this computer in the DB, we must
+            // combine the existing data with this new data (which may be partially available
+            // due to detecting the PC via mDNS) without the saved external address. If we
+            // write to the DB without doing this first, we can overwrite our existing data.
+            if (existingComputer != null) {
+                existingComputer.update(details);
+                dbManager.updateComputer(existingComputer);
+            }
+            else {
+                dbManager.updateComputer(details);
+            }
         }
 
         // Don't call the listener if this is a failed lookup of a new PC
@@ -156,7 +165,7 @@ public class ComputerManagerService extends Service {
                 }
             }
         };
-        t.setName("Polling thread for " + tuple.computer.localAddress);
+        t.setName("Polling thread for " + tuple.computer.name);
         return t;
     }
 
@@ -177,7 +186,6 @@ public class ComputerManagerService extends Service {
                     if (System.currentTimeMillis() - tuple.lastSuccessfulPollMs > POLL_DATA_TTL_MS) {
                         LimeLog.info("Timing out polled state for "+tuple.computer.name);
                         tuple.computer.state = ComputerDetails.State.UNKNOWN;
-                        tuple.computer.reachability = ComputerDetails.Reachability.UNKNOWN;
                     }
 
                     // Report this computer initially
@@ -233,7 +241,7 @@ public class ComputerManagerService extends Service {
             return idManager.getUniqueId();
         }
 
-        public ComputerDetails getComputer(UUID uuid) {
+        public ComputerDetails getComputer(String uuid) {
             synchronized (pollingTuples) {
                 for (PollingTuple tuple : pollingTuples) {
                     if (uuid.equals(tuple.computer.uuid)) {
@@ -245,7 +253,7 @@ public class ComputerManagerService extends Service {
             return null;
         }
 
-        public void invalidateStateForComputer(UUID uuid) {
+        public void invalidateStateForComputer(String uuid) {
             synchronized (pollingTuples) {
                 for (PollingTuple tuple : pollingTuples) {
                     if (uuid.equals(tuple.computer.uuid)) {
@@ -253,7 +261,6 @@ public class ComputerManagerService extends Service {
                         // from wiping this change out
                         synchronized (tuple.networkLock) {
                             tuple.computer.state = ComputerDetails.State.UNKNOWN;
-                            tuple.computer.reachability = ComputerDetails.Reachability.UNKNOWN;
                         }
                     }
                 }
@@ -307,22 +314,13 @@ public class ComputerManagerService extends Service {
         };
     }
 
-    private void addTuple(ComputerDetails details, boolean manuallyAdded) {
+    private void addTuple(ComputerDetails details) {
         synchronized (pollingTuples) {
             for (PollingTuple tuple : pollingTuples) {
                 // Check if this is the same computer
                 if (tuple.computer.uuid.equals(details.uuid)) {
-                    if (manuallyAdded) {
-                        // Update details anyway in case this machine has been re-added by IP
-                        // after not being reachable by our existing information
-                        tuple.computer.localAddress = details.localAddress;
-                        tuple.computer.remoteAddress = details.remoteAddress;
-                    }
-                    else {
-                        // This indicates that mDNS discovered this address, so we
-                        // should only apply the local address.
-                        tuple.computer.localAddress = details.localAddress;
-                    }
+                    // Update the saved computer with potentially new details
+                    tuple.computer.update(details);
 
                     // Start a polling thread if polling is active
                     if (pollingActive && tuple.thread == null) {
@@ -350,12 +348,40 @@ public class ComputerManagerService extends Service {
     public boolean addComputerBlocking(String addr, boolean manuallyAdded) {
         // Setup a placeholder
         ComputerDetails fakeDetails = new ComputerDetails();
-        fakeDetails.localAddress = addr;
-        fakeDetails.remoteAddress = addr;
+
+        if (manuallyAdded) {
+            // Add PC UI
+            fakeDetails.manualAddress = addr;
+        }
+        else {
+            // mDNS
+            fakeDetails.localAddress = addr;
+
+            // Since we're on the same network, we can use STUN to find
+            // our WAN address, which is also very likely the WAN address
+            // of the PC. We can use this later to connect remotely.
+            fakeDetails.remoteAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
+        }
 
         // Block while we try to fill the details
         try {
-            runPoll(fakeDetails, true, 0);
+            // We cannot use runPoll() here because it will attempt to persist the state of the machine
+            // in the database, which would be bad because we don't have our pinned cert loaded yet.
+            if (pollComputer(fakeDetails)) {
+                // See if we have record of this PC to pull its pinned cert
+                synchronized (pollingTuples) {
+                    for (PollingTuple tuple : pollingTuples) {
+                        if (tuple.computer.uuid.equals(fakeDetails.uuid)) {
+                            fakeDetails.serverCert = tuple.computer.serverCert;
+                            break;
+                        }
+                    }
+                }
+
+                // Poll again, possibly with the pinned cert, to get accurate pairing information.
+                // This will insert the host into the database too.
+                runPoll(fakeDetails, true, 0);
+            }
         } catch (InterruptedException e) {
             return false;
         }
@@ -365,7 +391,7 @@ public class ComputerManagerService extends Service {
             LimeLog.info("New PC ("+fakeDetails.name+") is UUID "+fakeDetails.uuid);
 
             // Start a polling thread for this machine
-            addTuple(fakeDetails, manuallyAdded);
+            addTuple(fakeDetails);
             return true;
         }
         else {
@@ -425,21 +451,29 @@ public class ComputerManagerService extends Service {
         }
 
         try {
-            NvHTTP http = new NvHTTP(address, idManager.getUniqueId(),
-                    null, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
+            NvHTTP http = new NvHTTP(address, idManager.getUniqueId(), details.serverCert,
+                    PlatformBinding.getCryptoProvider(ComputerManagerService.this));
 
             ComputerDetails newDetails = http.getComputerDetails();
 
             // Check if this is the PC we expected
-            if (details.uuid != null && newDetails.uuid != null &&
-                    !details.uuid.equals(newDetails.uuid)) {
+            if (newDetails.uuid == null) {
+                LimeLog.severe("Polling returned no UUID!");
+                return null;
+            }
+            // details.uuid can be null on initial PC add
+            else if (details.uuid != null && !details.uuid.equals(newDetails.uuid)) {
                 // We got the wrong PC!
                 LimeLog.info("Polling returned the wrong PC!");
                 return null;
             }
 
+            // Set the new active address
+            newDetails.activeAddress = address;
+
             return newDetails;
-        } catch (Exception e) {
+        } catch (XmlPullParserException | IOException e) {
+            e.printStackTrace();
             return null;
         }
     }
@@ -447,6 +481,11 @@ public class ComputerManagerService extends Service {
     // Just try to establish a TCP connection to speculatively detect a running
     // GFE server
     private boolean fastPollIp(String address) {
+        if (address == null) {
+            // Don't bother if our address is null
+            return false;
+        }
+
         Socket s = new Socket();
         try {
             s.connect(new InetSocketAddress(address, NvHTTP.HTTPS_PORT), FAST_POLL_TIMEOUT);
@@ -475,12 +514,14 @@ public class ComputerManagerService extends Service {
         t.start();
     }
 
-    private ComputerDetails.Reachability fastPollPc(final String localAddress, final String remoteAddress) throws InterruptedException {
+    private String fastPollPc(final String localAddress, final String remoteAddress, final String manualAddress) throws InterruptedException {
         final boolean[] remoteInfo = new boolean[2];
         final boolean[] localInfo = new boolean[2];
+        final boolean[] manualInfo = new boolean[2];
 
         startFastPollThread(localAddress, localInfo);
         startFastPollThread(remoteAddress, remoteInfo);
+        startFastPollThread(manualAddress, manualInfo);
 
         // Check local first
         synchronized (localInfo) {
@@ -489,174 +530,78 @@ public class ComputerManagerService extends Service {
             }
 
             if (localInfo[1]) {
-                return ComputerDetails.Reachability.LOCAL;
+                return localAddress;
             }
         }
 
-        // Now remote
+        // Now manual
+        synchronized (manualInfo) {
+            while (!manualInfo[0]) {
+                manualInfo.wait(500);
+            }
+
+            if (manualInfo[1]) {
+                return manualAddress;
+            }
+        }
+
+        // And finally, remote
         synchronized (remoteInfo) {
             while (!remoteInfo[0]) {
                 remoteInfo.wait(500);
             }
 
             if (remoteInfo[1]) {
-                return ComputerDetails.Reachability.REMOTE;
+                return remoteAddress;
             }
         }
 
-        return ComputerDetails.Reachability.OFFLINE;
-    }
-
-    private static boolean isAddressLikelyLocal(String str) {
-        try {
-            // This will tend to be wrong for IPv6 but falling back to
-            // remote will be fine in that case. For IPv4, it should be
-            // pretty accurate due to NAT prevalence.
-            InetAddress addr = InetAddress.getByName(str);
-            return addr.isSiteLocalAddress() || addr.isLinkLocalAddress();
-        } catch (UnknownHostException e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    private ReachabilityTuple pollForReachability(ComputerDetails details) throws InterruptedException {
-        ComputerDetails polledDetails;
-        ComputerDetails.Reachability reachability;
-
-        if (details.localAddress.equals(details.remoteAddress)) {
-            reachability = isAddressLikelyLocal(details.localAddress) ?
-                    ComputerDetails.Reachability.LOCAL : ComputerDetails.Reachability.REMOTE;
-        }
-        else {
-            // Do a TCP-level connection to the HTTP server to see if it's listening
-            LimeLog.info("Starting fast poll for "+details.name+" ("+details.localAddress +", "+details.remoteAddress +")");
-            reachability = fastPollPc(details.localAddress, details.remoteAddress);
-            LimeLog.info("Fast poll for "+details.name+" returned "+reachability.toString());
-
-            // If no connection could be established to either IP address, there's nothing we can do
-            if (reachability == ComputerDetails.Reachability.OFFLINE) {
-                return null;
-            }
-        }
-
-        boolean localFirst = (reachability == ComputerDetails.Reachability.LOCAL);
-
-        if (localFirst) {
-            polledDetails = tryPollIp(details, details.localAddress);
-        }
-        else {
-            polledDetails = tryPollIp(details, details.remoteAddress);
-        }
-
-        String reachableAddr = null;
-        if (polledDetails == null && !details.localAddress.equals(details.remoteAddress)) {
-            // Failed, so let's try the fallback
-            if (!localFirst) {
-                polledDetails = tryPollIp(details, details.localAddress);
-            }
-            else {
-                polledDetails = tryPollIp(details, details.remoteAddress);
-            }
-
-            if (polledDetails != null) {
-                // The fallback poll worked
-                reachableAddr = !localFirst ? details.localAddress : details.remoteAddress;
-            }
-        }
-        else if (polledDetails != null) {
-            reachableAddr = localFirst ? details.localAddress : details.remoteAddress;
-        }
-
-        if (reachableAddr == null) {
-            return null;
-        }
-
-        // If both addresses are the same, guess whether we're local based on
-        // IP address heuristics.
-        if (reachableAddr.equals(polledDetails.localAddress) &&
-                reachableAddr.equals(polledDetails.remoteAddress)) {
-            polledDetails.reachability = isAddressLikelyLocal(reachableAddr) ?
-                    ComputerDetails.Reachability.LOCAL : ComputerDetails.Reachability.REMOTE;
-        }
-        else if (polledDetails.remoteAddress.equals(reachableAddr)) {
-            polledDetails.reachability = ComputerDetails.Reachability.REMOTE;
-        }
-        else if (polledDetails.localAddress.equals(reachableAddr)) {
-            polledDetails.reachability = ComputerDetails.Reachability.LOCAL;
-        }
-        else {
-            polledDetails.reachability = ComputerDetails.Reachability.UNKNOWN;
-        }
-
-        return new ReachabilityTuple(polledDetails, reachableAddr);
+        return null;
     }
 
     private boolean pollComputer(ComputerDetails details) throws InterruptedException {
-        ReachabilityTuple initialReachTuple = pollForReachability(details);
-        if (initialReachTuple == null) {
+        ComputerDetails polledDetails;
+
+        // Do a TCP-level connection to the HTTP server to see if it's listening.
+        // Do not write this address to details.activeAddress because:
+        // a) it's only a candidate and may be wrong (multiple PCs behind a single router)
+        // b) if it's null, it will be unexpectedly nulling the activeAddress of a possibly online PC
+        LimeLog.info("Starting fast poll for "+details.name+" ("+details.localAddress +", "+details.remoteAddress +", "+details.manualAddress +")");
+        String candidateAddress = fastPollPc(details.localAddress, details.remoteAddress, details.manualAddress);
+        LimeLog.info("Fast poll for "+details.name+" returned candidate address: "+candidateAddress);
+
+        // If no connection could be established to either IP address, there's nothing we can do
+        if (candidateAddress == null) {
             return false;
         }
 
-        if (initialReachTuple.computer.reachability == ComputerDetails.Reachability.UNKNOWN) {
-            // Neither IP address reported in the serverinfo response was the one we used.
-            // Poll again to see if we can contact this machine on either of its reported addresses.
-            ReachabilityTuple confirmationReachTuple = pollForReachability(initialReachTuple.computer);
-            if (confirmationReachTuple == null) {
-                // Neither of those seem to work, so we'll hold onto the address that did work
-                initialReachTuple.computer.localAddress = initialReachTuple.reachableAddress;
-                initialReachTuple.computer.reachability = ComputerDetails.Reachability.LOCAL;
-            }
-            else {
-                // We got it on one of the returned addresses; replace the original reach tuple
-                // with the new one
-                initialReachTuple = confirmationReachTuple;
+        // Try using the active address from fast-poll
+        polledDetails = tryPollIp(details, candidateAddress);
+        if (polledDetails == null) {
+            // If that failed, try all unique addresses except what we've
+            // already tried
+            HashSet<String> uniqueAddresses = new HashSet<>();
+            uniqueAddresses.add(details.localAddress);
+            uniqueAddresses.add(details.remoteAddress);
+            uniqueAddresses.add(details.manualAddress);
+            for (String addr : uniqueAddresses) {
+                if (addr == null || addr.equals(candidateAddress)) {
+                    continue;
+                }
+                polledDetails = tryPollIp(details, addr);
+                if (polledDetails != null) {
+                    break;
+                }
             }
         }
 
-        // Save some details about the old state of the PC that we may wish
-        // to restore later.
-        String savedMacAddress = details.macAddress;
-        String savedLocalAddress = details.localAddress;
-        String savedRemoteAddress = details.remoteAddress;
-
-        // If we got here, it's reachable
-        details.update(initialReachTuple.computer);
-
-        // If the new MAC address is empty, restore the old one (workaround for GFE bug)
-        if (details.macAddress.equals("00:00:00:00:00:00") && savedMacAddress != null) {
-            LimeLog.info("MAC address was empty; using existing value: "+savedMacAddress);
-            details.macAddress = savedMacAddress;
+        if (polledDetails != null) {
+            details.update(polledDetails);
+            return true;
         }
-
-        // We never want to lose IP addresses by polling server info. If we get a poll back
-        // where localAddress == remoteAddress but savedLocalAddress != savedRemoteAddress,
-        // then we've lost an address in the polling and we should restore the one that's missing.
-        if (details.localAddress.equals(details.remoteAddress) &&
-                !savedLocalAddress.equals(savedRemoteAddress)) {
-            if (details.localAddress.equals(savedLocalAddress)) {
-                // Local addresses are identical, so put the old remote address back
-                details.remoteAddress = savedRemoteAddress;
-            }
-            else if (details.remoteAddress.equals(savedRemoteAddress)) {
-                // Remote addresses are identical, so put the old local address back
-                details.localAddress = savedLocalAddress;
-            }
-            else {
-                // Neither IP address match. Let's restore the remote address to be safe.
-                details.remoteAddress = savedRemoteAddress;
-            }
-
-            // Now update the reachability so the correct address is used
-            if (details.localAddress.equals(initialReachTuple.reachableAddress)) {
-                details.reachability = ComputerDetails.Reachability.LOCAL;
-            }
-            else {
-                details.reachability = ComputerDetails.Reachability.REMOTE;
-            }
+        else {
+            return false;
         }
-
-        return true;
     }
 
     @Override
@@ -679,7 +624,7 @@ public class ComputerManagerService extends Service {
 
         for (ComputerDetails computer : dbManager.getAllComputers()) {
             // Add tuples for each computer
-            addTuple(computer, true);
+            addTuple(computer);
         }
 
         releaseLocalDatabaseReference();
@@ -757,8 +702,9 @@ public class ComputerManagerService extends Service {
                 public void run() {
                     int emptyAppListResponses = 0;
                     do {
-                        // Can't poll if it's not online
-                        if (computer.state != ComputerDetails.State.ONLINE) {
+                        // Can't poll if it's not online or paired
+                        if (computer.state != ComputerDetails.State.ONLINE ||
+                                computer.pairState != PairingManager.PairState.PAIRED) {
                             if (listener != null) {
                                 listener.notifyComputerUpdated(computer);
                             }
@@ -774,7 +720,7 @@ public class ComputerManagerService extends Service {
 
                         try {
                             NvHTTP http = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer), idManager.getUniqueId(),
-                                    null, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
+                                    computer.serverCert, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
 
                             String appList;
                             if (tuple != null) {
@@ -798,12 +744,12 @@ public class ComputerManagerService extends Service {
                                 // in a row, we'll go ahead and believe it.
                                 emptyAppListResponses++;
                             }
-                            if (appList != null && !appList.isEmpty() &&
+                            if (!appList.isEmpty() &&
                                     (!list.isEmpty() || emptyAppListResponses >= EMPTY_LIST_THRESHOLD)) {
                                 // Open the cache file
                                 OutputStream cacheOut = null;
                                 try {
-                                    cacheOut = CacheHelper.openCacheFileForOutput(getCacheDir(), "applist", computer.uuid.toString());
+                                    cacheOut = CacheHelper.openCacheFileForOutput(getCacheDir(), "applist", computer.uuid);
                                     CacheHelper.writeStringToOutputStream(cacheOut, appList);
                                 } catch (IOException e) {
                                     e.printStackTrace();
@@ -830,7 +776,7 @@ public class ComputerManagerService extends Service {
                                     listener.notifyComputerUpdated(computer);
                                 }
                             }
-                            else if (appList == null || appList.isEmpty()) {
+                            else if (appList.isEmpty()) {
                                 LimeLog.warning("Null app list received from "+computer.uuid);
                             }
                         } catch (IOException e) {
@@ -841,7 +787,7 @@ public class ComputerManagerService extends Service {
                     } while (waitPollingDelay());
                 }
             };
-            thread.setName("App list polling thread for " + computer.localAddress);
+            thread.setName("App list polling thread for " + computer.name);
             thread.start();
         }
 

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

@@ -0,0 +1,105 @@
+package com.limelight.computers;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
+
+import com.limelight.LimeLog;
+import com.limelight.nvstream.http.ComputerDetails;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.LinkedList;
+import java.util.List;
+
+public class LegacyDatabaseReader {
+    private static final String COMPUTER_DB_NAME = "computers.db";
+    private static final String COMPUTER_TABLE_NAME = "Computers";
+
+    private static final String ADDRESS_PREFIX = "ADDRESS_PREFIX__";
+
+    private static ComputerDetails getComputerFromCursor(Cursor c) {
+        ComputerDetails details = new ComputerDetails();
+
+        details.name = c.getString(0);
+        details.uuid = c.getString(1);
+
+        // An earlier schema defined addresses as byte blobs. We'll
+        // gracefully migrate those to strings so we can store DNS names
+        // too. To disambiguate, we'll need to prefix them with a string
+        // greater than the allowable IP address length.
+        try {
+            details.localAddress = InetAddress.getByAddress(c.getBlob(2)).getHostAddress();
+            LimeLog.warning("DB: Legacy local address for " + details.name);
+        } catch (UnknownHostException e) {
+            // This is probably a hostname/address with the prefix string
+            String stringData = c.getString(2);
+            if (stringData.startsWith(ADDRESS_PREFIX)) {
+                details.localAddress = c.getString(2).substring(ADDRESS_PREFIX.length());
+            } else {
+                LimeLog.severe("DB: Corrupted local address for " + details.name);
+            }
+        }
+
+        try {
+            details.remoteAddress = InetAddress.getByAddress(c.getBlob(3)).getHostAddress();
+            LimeLog.warning("DB: Legacy remote address for " + details.name);
+        } catch (UnknownHostException e) {
+            // This is probably a hostname/address with the prefix string
+            String stringData = c.getString(3);
+            if (stringData.startsWith(ADDRESS_PREFIX)) {
+                details.remoteAddress = c.getString(3).substring(ADDRESS_PREFIX.length());
+            } else {
+                LimeLog.severe("DB: Corrupted remote address for " + details.name);
+            }
+        }
+
+        // On older versions of Moonlight, this is typically where manual addresses got stored,
+        // so let's initialize it just to be safe.
+        details.manualAddress = details.remoteAddress;
+
+        details.macAddress = c.getString(4);
+
+        // This signifies we don't have dynamic state (like pair state)
+        details.state = ComputerDetails.State.UNKNOWN;
+
+        return details;
+    }
+
+    private static List<ComputerDetails> getAllComputers(SQLiteDatabase db) {
+        Cursor c = db.rawQuery("SELECT * FROM " + COMPUTER_TABLE_NAME, null);
+        LinkedList<ComputerDetails> computerList = new LinkedList<>();
+        while (c.moveToNext()) {
+            ComputerDetails details = getComputerFromCursor(c);
+
+            // If a critical field is corrupt or missing, skip the database entry
+            if (details.uuid == null) {
+                continue;
+            }
+
+            computerList.add(details);
+        }
+
+        c.close();
+
+        return computerList;
+    }
+
+    public static List<ComputerDetails> migrateAllComputers(Context c) {
+        SQLiteDatabase computerDb = null;
+        try {
+            // Open the existing database
+            computerDb = SQLiteDatabase.openDatabase(c.getDatabasePath(COMPUTER_DB_NAME).getPath(), null, SQLiteDatabase.OPEN_READONLY);
+            return getAllComputers(computerDb);
+        } catch (SQLiteException e) {
+            return new LinkedList<ComputerDetails>();
+        } finally {
+            // Close and delete the old DB
+            if (computerDb != null) {
+                computerDb.close();
+            }
+            c.deleteDatabase(COMPUTER_DB_NAME);
+        }
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.limelight.grid;
 
 import android.app.Activity;
-import android.graphics.BitmapFactory;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -46,13 +45,10 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         }
         LimeLog.info("Art scaling divisor: " + scalingDivisor);
 
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inSampleSize = (int) scalingDivisor;
-
         this.loader = new CachedAppAssetLoader(computer, scalingDivisor,
                 new NetworkAssetLoader(context, uniqueId),
                 new MemoryAssetLoader(),
-                new DiskAssetLoader(context.getCacheDir()));
+                new DiskAssetLoader(context));
     }
 
     public void cancelQueuedOperations() {

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

@@ -9,6 +9,7 @@ import android.widget.TextView;
 import com.limelight.PcView;
 import com.limelight.R;
 import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.nvstream.http.PairingManager;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -46,7 +47,7 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
             imgView.setAlpha(0.4f);
         }
 
-        if (obj.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
+        if (obj.details.state == ComputerDetails.State.UNKNOWN) {
             prgView.setVisibility(View.VISIBLE);
         }
         else {
@@ -77,6 +78,14 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
             overlayView.setAlpha(0.4f);
             return true;
         }
+        // We must check if the status is exactly online and unpaired
+        // to avoid colliding with the loading spinner when status is unknown
+        else if (obj.details.state == ComputerDetails.State.ONLINE &&
+                obj.details.pairState == PairingManager.PairState.NOT_PAIRED) {
+            overlayView.setImageResource(R.drawable.ic_lock);
+            overlayView.setAlpha(1.0f);
+            return true;
+        }
         return false;
     }
 }

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

@@ -1,7 +1,11 @@
 package com.limelight.grid.assets;
 
+import android.app.ActivityManager;
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.ImageDecoder;
+import android.os.Build;
 
 import com.limelight.LimeLog;
 import com.limelight.utils.CacheHelper;
@@ -19,14 +23,23 @@ public class DiskAssetLoader {
     private static final int STANDARD_ASSET_WIDTH = 300;
     private static final int STANDARD_ASSET_HEIGHT = 400;
 
+    private final boolean isLowRamDevice;
     private final File cacheDir;
 
-    public DiskAssetLoader(File cacheDir) {
-        this.cacheDir = cacheDir;
+    public DiskAssetLoader(Context context) {
+        this.cacheDir = context.getCacheDir();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            this.isLowRamDevice =
+                    ((ActivityManager)context.getSystemService(Context.ACTIVITY_SERVICE)).isLowRamDevice();
+        }
+        else {
+            // Use conservative low RAM behavior on very old devices
+            this.isLowRamDevice = true;
+        }
     }
 
     public boolean checkCacheExists(CachedAppAssetLoader.LoaderTuple tuple) {
-        return CacheHelper.cacheFileExists(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
+        return CacheHelper.cacheFileExists(cacheDir, "boxart", tuple.computer.uuid, tuple.app.getAppId() + ".png");
     }
 
     // https://developer.android.com/topic/performance/graphics/load-bitmap.html
@@ -52,7 +65,7 @@ public class DiskAssetLoader {
     }
 
     public Bitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple, int sampleSize) {
-        File file = CacheHelper.openPath(false, cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
+        File file = CacheHelper.openPath(false, cacheDir, "boxart", tuple.computer.uuid, tuple.app.getAppId() + ".png");
 
         // Don't bother with anything if it doesn't exist
         if (!file.exists()) {
@@ -66,28 +79,55 @@ public class DiskAssetLoader {
             return null;
         }
 
-        // Lookup bounds of the downloaded image
-        BitmapFactory.Options decodeOnlyOptions = new BitmapFactory.Options();
-        decodeOnlyOptions.inJustDecodeBounds = true;
-        BitmapFactory.decodeFile(file.getAbsolutePath(), decodeOnlyOptions);
-        if (decodeOnlyOptions.outWidth <= 0 || decodeOnlyOptions.outHeight <= 0) {
-            // Dimensions set to -1 on error. Return value always null.
-            return null;
+        Bitmap bmp;
+
+        // For OSes prior to P, we have to use the ugly BitmapFactory API
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
+            // Lookup bounds of the downloaded image
+            BitmapFactory.Options decodeOnlyOptions = new BitmapFactory.Options();
+            decodeOnlyOptions.inJustDecodeBounds = true;
+            BitmapFactory.decodeFile(file.getAbsolutePath(), decodeOnlyOptions);
+            if (decodeOnlyOptions.outWidth <= 0 || decodeOnlyOptions.outHeight <= 0) {
+                // Dimensions set to -1 on error. Return value always null.
+                return null;
+            }
+
+            LimeLog.info("Tuple "+tuple+" has cached art of size: "+decodeOnlyOptions.outWidth+"x"+decodeOnlyOptions.outHeight);
+
+            // Load the image scaled to the appropriate size
+            BitmapFactory.Options options = new BitmapFactory.Options();
+            options.inSampleSize = calculateInSampleSize(decodeOnlyOptions,
+                    STANDARD_ASSET_WIDTH / sampleSize,
+                    STANDARD_ASSET_HEIGHT / sampleSize);
+            if (isLowRamDevice) {
+                options.inPreferredConfig = Bitmap.Config.RGB_565;
+                options.inDither = true;
+            }
+            else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                options.inPreferredConfig = Bitmap.Config.HARDWARE;
+            }
+
+            bmp = BitmapFactory.decodeFile(file.getAbsolutePath(), options);
+            if (bmp != null) {
+                LimeLog.info("Tuple "+tuple+" decoded from disk cache with sample size: "+options.inSampleSize);
+            }
         }
-
-        LimeLog.info("Tuple "+tuple+" has cached art of size: "+decodeOnlyOptions.outWidth+"x"+decodeOnlyOptions.outHeight);
-
-        // Load the image scaled to the appropriate size
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inSampleSize = calculateInSampleSize(decodeOnlyOptions,
-                STANDARD_ASSET_WIDTH / sampleSize,
-                STANDARD_ASSET_HEIGHT / sampleSize);
-        options.inPreferredConfig = Bitmap.Config.RGB_565;
-        options.inDither = true;
-        Bitmap bmp = BitmapFactory.decodeFile(file.getAbsolutePath(), options);
-
-        if (bmp != null) {
-            LimeLog.info("Tuple "+tuple+" decoded from disk cache with sample size: "+options.inSampleSize);
+        else {
+            // On P, we can get a bitmap back in one step with ImageDecoder
+            try {
+                bmp = ImageDecoder.decodeBitmap(ImageDecoder.createSource(file), new ImageDecoder.OnHeaderDecodedListener() {
+                    @Override
+                    public void onHeaderDecoded(ImageDecoder imageDecoder, ImageDecoder.ImageInfo imageInfo, ImageDecoder.Source source) {
+                        imageDecoder.setTargetSize(STANDARD_ASSET_WIDTH, STANDARD_ASSET_HEIGHT);
+                        if (isLowRamDevice) {
+                            imageDecoder.setMemorySizePolicy(ImageDecoder.MEMORY_POLICY_LOW_RAM);
+                        }
+                    }
+                });
+            } catch (IOException e) {
+                e.printStackTrace();
+                return null;
+            }
         }
 
         return bmp;
@@ -97,7 +137,7 @@ public class DiskAssetLoader {
         OutputStream out = null;
         boolean success = false;
         try {
-            out = CacheHelper.openCacheFileForOutput(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
+            out = CacheHelper.openCacheFileForOutput(cacheDir, "boxart", tuple.computer.uuid, tuple.app.getAppId() + ".png");
             CacheHelper.writeInputStreamToOutputStream(input, out, MAX_ASSET_SIZE);
             success = true;
         } catch (IOException e) {
@@ -111,7 +151,7 @@ public class DiskAssetLoader {
 
             if (!success) {
                 LimeLog.warning("Unable to populate cache with tuple: "+tuple);
-                CacheHelper.deleteCacheFile(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
+                CacheHelper.deleteCacheFile(cacheDir, "boxart", tuple.computer.uuid, tuple.app.getAppId() + ".png");
             }
         }
     }

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

@@ -16,7 +16,7 @@ public class MemoryAssetLoader {
     };
 
     private static String constructKey(CachedAppAssetLoader.LoaderTuple tuple) {
-        return tuple.computer.uuid.toString()+"-"+tuple.app.getAppId();
+        return tuple.computer.uuid+"-"+tuple.app.getAppId();
     }
 
     public Bitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple) {

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

@@ -22,7 +22,8 @@ public class NetworkAssetLoader {
     public InputStream getBitmapStream(CachedAppAssetLoader.LoaderTuple tuple) {
         InputStream in = null;
         try {
-            NvHTTP http = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(tuple.computer), uniqueId, null, PlatformBinding.getCryptoProvider(context));
+            NvHTTP http = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(tuple.computer), uniqueId,
+                    tuple.computer.serverCert, PlatformBinding.getCryptoProvider(context));
             in = http.getBoxArt(tuple.app);
         } catch (IOException ignored) {}
 

app/src/main/java/com/limelight/preferences/AddComputerManually.java

@@ -24,6 +24,7 @@ import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.view.KeyEvent;
+import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.TextView;
@@ -90,14 +91,20 @@ public class AddComputerManually extends Activity {
     }
 
     private void doAddPc(String host) {
-        String msg;
         boolean wrongSiteLocal = false;
         boolean success;
 
         SpinnerDialog dialog = SpinnerDialog.displayDialog(this, getResources().getString(R.string.title_add_pc),
             getResources().getString(R.string.msg_add_pc), false);
 
-        success = managerBinder.addComputerBlocking(host, true);
+        try {
+            success = managerBinder.addComputerBlocking(host, true);
+        } catch (IllegalArgumentException e) {
+            // This can be thrown from OkHttp if the host fails to canonicalize to a valid name.
+            // https://github.com/square/okhttp/blob/okhttp_27/okhttp/src/main/java/com/squareup/okhttp/HttpUrl.java#L705
+            e.printStackTrace();
+            success = false;
+        }
         if (!success){
             wrongSiteLocal = isWrongSubnetSiteLocalAddress(host);
         }
@@ -196,12 +203,7 @@ public class AddComputerManually extends Activity {
                         (keyEvent != null &&
                                 keyEvent.getAction() == KeyEvent.ACTION_DOWN &&
                                 keyEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    if (hostText.getText().length() == 0) {
-                        Toast.makeText(AddComputerManually.this, getResources().getString(R.string.addpc_enter_ip), Toast.LENGTH_LONG).show();
-                        return true;
-                    }
-
-                    computersToAdd.add(hostText.getText().toString().trim());
+                    return handleDoneEvent();
                 }
                 else if (actionId == EditorInfo.IME_ACTION_PREVIOUS) {
                     // This is how the Fire TV dismisses the keyboard
@@ -214,8 +216,28 @@ public class AddComputerManually extends Activity {
             }
         });
 
+        findViewById(R.id.addPcButton).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                handleDoneEvent();
+            }
+        });
+
         // Bind to the ComputerManager service
         bindService(new Intent(AddComputerManually.this,
                     ComputerManagerService.class), serviceConnection, Service.BIND_AUTO_CREATE);
     }
+
+    // Returns true if the event should be eaten
+    private boolean handleDoneEvent() {
+        String hostAddress = hostText.getText().toString().trim();
+
+        if (hostAddress.length() == 0) {
+            Toast.makeText(AddComputerManually.this, getResources().getString(R.string.addpc_enter_ip), Toast.LENGTH_LONG).show();
+            return true;
+        }
+
+        computersToAdd.add(hostAddress);
+        return false;
+    }
 }

app/src/main/java/com/limelight/preferences/ConfirmDeleteOscPreference.java

@@ -3,7 +3,6 @@ package com.limelight.preferences;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.SharedPreferences;
 import android.os.Build;
 import android.preference.DialogPreference;
 import android.util.AttributeSet;

app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java

@@ -7,7 +7,11 @@ import android.os.Build;
 import android.preference.PreferenceManager;
 
 public class PreferenceConfiguration {
-    static final String RES_FPS_PREF_STRING = "list_resolution_fps";
+    private static final String LEGACY_RES_FPS_PREF_STRING = "list_resolution_fps";
+
+
+    static final String RESOLUTION_PREF_STRING = "list_resolution";
+    static final String FPS_PREF_STRING = "list_fps";
     static final String BITRATE_PREF_STRING = "seekbar_bitrate_kbps";
     private static final String BITRATE_PREF_OLD_STRING = "seekbar_bitrate";
     private static final String STRETCH_PREF_STRING = "checkbox_stretch_video";
@@ -24,24 +28,18 @@ public class PreferenceConfiguration {
     private static final String VIDEO_FORMAT_PREF_STRING = "video_format";
     private static final String ONSCREEN_CONTROLLER_PREF_STRING = "checkbox_show_onscreen_controls";
     private static final String ONLY_L3_R3_PREF_STRING = "checkbox_only_show_L3R3";
-    private static final String BATTERY_SAVER_PREF_STRING = "checkbox_battery_saver";
     private static final String DISABLE_FRAME_DROP_PREF_STRING = "checkbox_disable_frame_drop";
     private static final String ENABLE_HDR_PREF_STRING = "checkbox_enable_hdr";
     private static final String ENABLE_PIP_PREF_STRING = "checkbox_enable_pip";
     private static final String BIND_ALL_USB_STRING = "checkbox_usb_bind_all";
     private static final String MOUSE_EMULATION_STRING = "checkbox_mouse_emulation";
+    private static final String MOUSE_NAV_BUTTONS_STRING = "checkbox_mouse_nav_buttons";
+    static final String UNLOCK_FPS_STRING = "checkbox_unlock_fps";
+    private static final String VIBRATE_OSC_PREF_STRING = "checkbox_vibrate_osc";
+    private static final String VIBRATE_FALLBACK_PREF_STRING = "checkbox_vibrate_fallback";
 
-    private static final int BITRATE_DEFAULT_360_30 = 1000;
-    private static final int BITRATE_DEFAULT_360_60 = 2000;
-    private static final int BITRATE_DEFAULT_720_30 = 5000;
-    private static final int BITRATE_DEFAULT_720_60 = 10000;
-    private static final int BITRATE_DEFAULT_1080_30 = 10000;
-    private static final int BITRATE_DEFAULT_1080_60 = 20000;
-    private static final int BITRATE_DEFAULT_4K_30 = 40000;
-    private static final int BITRATE_DEFAULT_4K_60 = 80000;
-
-    private static final String DEFAULT_RES_FPS = "720p60";
-    private static final int DEFAULT_BITRATE = BITRATE_DEFAULT_720_60;
+    static final String DEFAULT_RESOLUTION = "720p";
+    static final String DEFAULT_FPS = "60";
     private static final boolean DEFAULT_STRETCH = false;
     private static final boolean DEFAULT_SOPS = true;
     private static final boolean DEFAULT_DISABLE_TOASTS = false;
@@ -55,12 +53,15 @@ public class PreferenceConfiguration {
     private static final String DEFAULT_VIDEO_FORMAT = "auto";
     private static final boolean ONSCREEN_CONTROLLER_DEFAULT = false;
     private static final boolean ONLY_L3_R3_DEFAULT = false;
-    private static final boolean DEFAULT_BATTERY_SAVER = false;
     private static final boolean DEFAULT_DISABLE_FRAME_DROP = false;
     private static final boolean DEFAULT_ENABLE_HDR = false;
     private static final boolean DEFAULT_ENABLE_PIP = false;
     private static final boolean DEFAULT_BIND_ALL_USB = false;
     private static final boolean DEFAULT_MOUSE_EMULATION = true;
+    private static final boolean DEFAULT_MOUSE_NAV_BUTTONS = false;
+    private static final boolean DEFAULT_UNLOCK_FPS = false;
+    private static final boolean DEFAULT_VIBRATE_OSC = true;
+    private static final boolean DEFAULT_VIBRATE_FALLBACK = false;
 
     public static final int FORCE_H265_ON = -1;
     public static final int AUTOSELECT_H265 = 0;
@@ -75,41 +76,102 @@ public class PreferenceConfiguration {
     public boolean listMode, smallIconMode, multiController, enable51Surround, usbDriver;
     public boolean onscreenController;
     public boolean onlyL3R3;
-    public boolean batterySaver;
     public boolean disableFrameDrop;
     public boolean enableHdr;
     public boolean enablePip;
     public boolean bindAllUsb;
     public boolean mouseEmulation;
+    public boolean mouseNavButtons;
+    public boolean unlockFps;
+    public boolean vibrateOsc;
+    public boolean vibrateFallbackToDevice;
 
-    public static int getDefaultBitrate(String resFpsString) {
-        if (resFpsString.equals("360p30")) {
-            return BITRATE_DEFAULT_360_30;
+    private static int getHeightFromResolutionString(String resString) {
+        if (resString.equalsIgnoreCase("360p")) {
+            return 360;
         }
-        else if (resFpsString.equals("360p60")) {
-            return BITRATE_DEFAULT_360_60;
+        else if (resString.equalsIgnoreCase("480p")) {
+            return 480;
         }
-        else if (resFpsString.equals("720p30")) {
-            return BITRATE_DEFAULT_720_30;
+        else if (resString.equalsIgnoreCase("720p")) {
+            return 720;
         }
-        else if (resFpsString.equals("720p60")) {
-            return BITRATE_DEFAULT_720_60;
+        else if (resString.equalsIgnoreCase("1080p")) {
+            return 1080;
         }
-        else if (resFpsString.equals("1080p30")) {
-            return BITRATE_DEFAULT_1080_30;
+        else if (resString.equalsIgnoreCase("1440p")) {
+            return 1440;
         }
-        else if (resFpsString.equals("1080p60")) {
-            return BITRATE_DEFAULT_1080_60;
-        }
-        else if (resFpsString.equals("4K30")) {
-            return BITRATE_DEFAULT_4K_30;
-        }
-        else if (resFpsString.equals("4K60")) {
-            return BITRATE_DEFAULT_4K_60;
+        else if (resString.equalsIgnoreCase("4K")) {
+            return 2160;
         }
         else {
-            // Should never get here
-            return DEFAULT_BITRATE;
+            // Should be unreachable
+            return 720;
+        }
+    }
+
+    private static int getWidthFromResolutionString(String resString) {
+        int height = getHeightFromResolutionString(resString);
+        if (height == 480) {
+            // This isn't an exact 16:9 resolution
+            return 854;
+        }
+        else {
+            return (height * 16) / 9;
+        }
+    }
+
+    private static String getResolutionString(int width, int height) {
+        switch (height) {
+            case 360:
+                return "360p";
+            case 480:
+                return "480p";
+            default:
+            case 720:
+                return "720p";
+            case 1080:
+                return "1080p";
+            case 1440:
+                return "1440p";
+            case 2160:
+                return "4K";
+
+        }
+    }
+
+    public static int getDefaultBitrate(String resString, String fpsString) {
+        int width = getWidthFromResolutionString(resString);
+        int height = getHeightFromResolutionString(resString);
+        int fps = Integer.parseInt(fpsString);
+
+        // This table prefers 16:10 resolutions because they are
+        // only slightly more pixels than the 16:9 equivalents, so
+        // we don't want to bump those 16:10 resolutions up to the
+        // next 16:9 slot.
+        //
+        // This logic is shamelessly stolen from Moonlight Qt:
+        // https://github.com/moonlight-stream/moonlight-qt/blob/master/app/settings/streamingpreferences.cpp
+
+        if (width * height <= 640 * 360) {
+            return (int)(1000 * (fps / 30.0));
+        }
+        else if (width * height <= 854 * 480) {
+            return (int)(1500 * (fps / 30.0));
+        }
+        // This covers 1280x720 and 1280x800 too
+        else if (width * height <= 1366 * 768) {
+            return (int)(5000 * (fps / 30.0));
+        }
+        else if (width * height <= 1920 * 1200) {
+            return (int)(10000 * (fps / 30.0));
+        }
+        else if (width * height <= 2560 * 1600) {
+            return (int)(20000 * (fps / 30.0));
+        }
+        else /* if (width * height <= 3840 * 2160) */ {
+            return (int)(40000 * (fps / 30.0));
         }
     }
 
@@ -135,7 +197,9 @@ public class PreferenceConfiguration {
 
     public static int getDefaultBitrate(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        return getDefaultBitrate(prefs.getString(RES_FPS_PREF_STRING, DEFAULT_RES_FPS));
+        return getDefaultBitrate(
+                prefs.getString(RESOLUTION_PREF_STRING, DEFAULT_RESOLUTION),
+                prefs.getString(FPS_PREF_STRING, DEFAULT_FPS));
     }
 
     private static int getVideoFormatValue(Context context) {
@@ -163,9 +227,12 @@ public class PreferenceConfiguration {
         prefs.edit()
                 .remove(BITRATE_PREF_STRING)
                 .remove(BITRATE_PREF_OLD_STRING)
-                .remove(RES_FPS_PREF_STRING)
+                .remove(LEGACY_RES_FPS_PREF_STRING)
+                .remove(RESOLUTION_PREF_STRING)
+                .remove(FPS_PREF_STRING)
                 .remove(VIDEO_FORMAT_PREF_STRING)
                 .remove(ENABLE_HDR_PREF_STRING)
+                .remove(UNLOCK_FPS_STRING)
                 .apply();
     }
 
@@ -173,59 +240,76 @@ public class PreferenceConfiguration {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         PreferenceConfiguration config = new PreferenceConfiguration();
 
+        // Migrate legacy preferences to the new locations
+        String str = prefs.getString(LEGACY_RES_FPS_PREF_STRING, null);
+        if (str != null) {
+            if (str.equals("360p30")) {
+                config.width = 640;
+                config.height = 360;
+                config.fps = 30;
+            }
+            else if (str.equals("360p60")) {
+                config.width = 640;
+                config.height = 360;
+                config.fps = 60;
+            }
+            else if (str.equals("720p30")) {
+                config.width = 1280;
+                config.height = 720;
+                config.fps = 30;
+            }
+            else if (str.equals("720p60")) {
+                config.width = 1280;
+                config.height = 720;
+                config.fps = 60;
+            }
+            else if (str.equals("1080p30")) {
+                config.width = 1920;
+                config.height = 1080;
+                config.fps = 30;
+            }
+            else if (str.equals("1080p60")) {
+                config.width = 1920;
+                config.height = 1080;
+                config.fps = 60;
+            }
+            else if (str.equals("4K30")) {
+                config.width = 3840;
+                config.height = 2160;
+                config.fps = 30;
+            }
+            else if (str.equals("4K60")) {
+                config.width = 3840;
+                config.height = 2160;
+                config.fps = 60;
+            }
+            else {
+                // Should never get here
+                config.width = 1280;
+                config.height = 720;
+                config.fps = 60;
+            }
+
+            prefs.edit()
+                    .remove(LEGACY_RES_FPS_PREF_STRING)
+                    .putString(RESOLUTION_PREF_STRING, getResolutionString(config.width, config.height))
+                    .putString(FPS_PREF_STRING, ""+config.fps)
+                    .apply();
+        }
+        else {
+            // Use the new preference location
+            String resStr = prefs.getString(RESOLUTION_PREF_STRING, PreferenceConfiguration.DEFAULT_RESOLUTION);
+            config.width = PreferenceConfiguration.getWidthFromResolutionString(resStr);
+            config.height = PreferenceConfiguration.getHeightFromResolutionString(resStr);
+            config.fps = Integer.parseInt(prefs.getString(FPS_PREF_STRING, PreferenceConfiguration.DEFAULT_FPS));
+        }
+
+        // This must happen after the preferences migration to ensure the preferences are populated
         config.bitrate = prefs.getInt(BITRATE_PREF_STRING, prefs.getInt(BITRATE_PREF_OLD_STRING, 0) * 1000);
         if (config.bitrate == 0) {
             config.bitrate = getDefaultBitrate(context);
         }
 
-        String str = prefs.getString(RES_FPS_PREF_STRING, DEFAULT_RES_FPS);
-        if (str.equals("360p30")) {
-            config.width = 640;
-            config.height = 360;
-            config.fps = 30;
-        }
-        else if (str.equals("360p60")) {
-            config.width = 640;
-            config.height = 360;
-            config.fps = 60;
-        }
-        else if (str.equals("720p30")) {
-            config.width = 1280;
-            config.height = 720;
-            config.fps = 30;
-        }
-        else if (str.equals("720p60")) {
-            config.width = 1280;
-            config.height = 720;
-            config.fps = 60;
-        }
-        else if (str.equals("1080p30")) {
-            config.width = 1920;
-            config.height = 1080;
-            config.fps = 30;
-        }
-        else if (str.equals("1080p60")) {
-            config.width = 1920;
-            config.height = 1080;
-            config.fps = 60;
-        }
-        else if (str.equals("4K30")) {
-            config.width = 3840;
-            config.height = 2160;
-            config.fps = 30;
-        }
-        else if (str.equals("4K60")) {
-            config.width = 3840;
-            config.height = 2160;
-            config.fps = 60;
-        }
-        else {
-            // Should never get here
-            config.width = 1280;
-            config.height = 720;
-            config.fps = 60;
-        }
-
         config.videoFormat = getVideoFormatValue(context);
 
         config.deadzonePercentage = prefs.getInt(DEADZONE_PREF_STRING, DEFAULT_DEADZONE);
@@ -244,12 +328,15 @@ public class PreferenceConfiguration {
         config.usbDriver = prefs.getBoolean(USB_DRIVER_PREF_SRING, DEFAULT_USB_DRIVER);
         config.onscreenController = prefs.getBoolean(ONSCREEN_CONTROLLER_PREF_STRING, ONSCREEN_CONTROLLER_DEFAULT);
         config.onlyL3R3 = prefs.getBoolean(ONLY_L3_R3_PREF_STRING, ONLY_L3_R3_DEFAULT);
-        config.batterySaver = prefs.getBoolean(BATTERY_SAVER_PREF_STRING, DEFAULT_BATTERY_SAVER);
         config.disableFrameDrop = prefs.getBoolean(DISABLE_FRAME_DROP_PREF_STRING, DEFAULT_DISABLE_FRAME_DROP);
         config.enableHdr = prefs.getBoolean(ENABLE_HDR_PREF_STRING, DEFAULT_ENABLE_HDR);
         config.enablePip = prefs.getBoolean(ENABLE_PIP_PREF_STRING, DEFAULT_ENABLE_PIP);
         config.bindAllUsb = prefs.getBoolean(BIND_ALL_USB_STRING, DEFAULT_BIND_ALL_USB);
         config.mouseEmulation = prefs.getBoolean(MOUSE_EMULATION_STRING, DEFAULT_MOUSE_EMULATION);
+        config.mouseNavButtons = prefs.getBoolean(MOUSE_NAV_BUTTONS_STRING, DEFAULT_MOUSE_NAV_BUTTONS);
+        config.unlockFps = prefs.getBoolean(UNLOCK_FPS_STRING, DEFAULT_UNLOCK_FPS);
+        config.vibrateOsc = prefs.getBoolean(VIBRATE_OSC_PREF_STRING, DEFAULT_VIBRATE_OSC);
+        config.vibrateFallbackToDevice = prefs.getBoolean(VIBRATE_FALLBACK_PREF_STRING, DEFAULT_VIBRATE_FALLBACK);
 
         return config;
     }

app/src/main/java/com/limelight/preferences/StreamSettings.java

@@ -6,6 +6,7 @@ import android.media.MediaCodecInfo;
 import android.os.Build;
 import android.os.Bundle;
 import android.app.Activity;
+import android.os.Handler;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
@@ -24,6 +25,12 @@ import com.limelight.utils.UiHelper;
 public class StreamSettings extends Activity {
     private PreferenceConfiguration previousPrefs;
 
+    void reloadSettings() {
+        getFragmentManager().beginTransaction().replace(
+                R.id.stream_settings, new SettingsFragment()
+        ).commit();
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -33,9 +40,7 @@ public class StreamSettings extends Activity {
         UiHelper.setLocale(this);
 
         setContentView(R.layout.activity_stream_settings);
-        getFragmentManager().beginTransaction().replace(
-                R.id.stream_settings, new SettingsFragment()
-        ).commit();
+        reloadSettings();
 
         UiHelper.notifyNewRootView(this);
     }
@@ -58,12 +63,20 @@ public class StreamSettings extends Activity {
 
     public static class SettingsFragment extends PreferenceFragment {
 
-        private static void removeResolution(ListPreference pref, String prefix) {
+        private void setValue(String preferenceKey, String value) {
+            ListPreference pref = (ListPreference) findPreference(preferenceKey);
+
+            pref.setValue(value);
+        }
+
+        private void removeValue(String preferenceKey, String value, Runnable onMatched) {
             int matchingCount = 0;
 
+            ListPreference pref = (ListPreference) findPreference(preferenceKey);
+
             // Count the number of matching entries we'll be removing
             for (CharSequence seq : pref.getEntryValues()) {
-                if (seq.toString().startsWith(prefix)) {
+                if (seq.toString().equalsIgnoreCase(value)) {
                     matchingCount++;
                 }
             }
@@ -73,8 +86,8 @@ public class StreamSettings extends Activity {
             CharSequence[] entryValues = new CharSequence[pref.getEntryValues().length-matchingCount];
             int outIndex = 0;
             for (int i = 0; i < pref.getEntryValues().length; i++) {
-                if (pref.getEntryValues()[i].toString().startsWith(prefix)) {
-                    // Skip matching prefixes
+                if (pref.getEntryValues()[i].toString().equalsIgnoreCase(value)) {
+                    // Skip matching values
                     continue;
                 }
 
@@ -83,15 +96,34 @@ public class StreamSettings extends Activity {
                 outIndex++;
             }
 
+            if (pref.getValue().equalsIgnoreCase(value)) {
+                onMatched.run();
+            }
+
             // Update the preference with the new list
             pref.setEntries(entries);
             pref.setEntryValues(entryValues);
         }
 
+
+
+        private void resetBitrateToDefault(SharedPreferences prefs, String res, String fps) {
+            if (res == null) {
+                res = prefs.getString(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.DEFAULT_RESOLUTION);
+            }
+            if (fps == null) {
+                fps = prefs.getString(PreferenceConfiguration.FPS_PREF_STRING, PreferenceConfiguration.DEFAULT_FPS);
+            }
+
+            prefs.edit()
+                    .putInt(PreferenceConfiguration.BITRATE_PREF_STRING,
+                            PreferenceConfiguration.getDefaultBitrate(res, fps))
+                    .apply();
+        }
+
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-
             addPreferencesFromResource(R.xml.preferences);
             PreferenceScreen screen = getPreferenceScreen();
 
@@ -110,6 +142,8 @@ public class StreamSettings extends Activity {
                 category.removePreference(findPreference("checkbox_enable_pip"));
             }
 
+            int maxSupportedFps = 0;
+
             // Hide non-supported resolution/FPS combinations
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 Display display = getActivity().getWindowManager().getDefaultDisplay();
@@ -134,9 +168,16 @@ public class StreamSettings extends Activity {
                     if ((width >= 3840 || height >= 2160) && maxSupportedResW < 3840) {
                         maxSupportedResW = 3840;
                     }
+                    else if ((width >= 2560 || height >= 1440) && maxSupportedResW < 2560) {
+                        maxSupportedResW = 2560;
+                    }
                     else if ((width >= 1920 || height >= 1080) && maxSupportedResW < 1920) {
                         maxSupportedResW = 1920;
                     }
+
+                    if (candidate.getRefreshRate() > maxSupportedFps) {
+                        maxSupportedFps = (int)candidate.getRefreshRate();
+                    }
                 }
 
                 // This must be called to do runtime initialization before calling functions that evaluate
@@ -186,20 +227,102 @@ public class StreamSettings extends Activity {
 
                 LimeLog.info("Maximum resolution slot: "+maxSupportedResW);
 
-                ListPreference resPref = (ListPreference) findPreference("list_resolution_fps");
                 if (maxSupportedResW != 0) {
                     if (maxSupportedResW < 3840) {
                         // 4K is unsupported
-                        removeResolution(resPref, "4K");
+                        removeValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "4K", new Runnable() {
+                            @Override
+                            public void run() {
+                                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
+                                setValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "1440p");
+                                resetBitrateToDefault(prefs, null, null);
+                            }
+                        });
+                    }
+                    if (maxSupportedResW < 2560) {
+                        // 1440p is unsupported
+                        removeValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "1440p", new Runnable() {
+                            @Override
+                            public void run() {
+                                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
+                                setValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "1080p");
+                                resetBitrateToDefault(prefs, null, null);
+                            }
+                        });
                     }
                     if (maxSupportedResW < 1920) {
                         // 1080p is unsupported
-                        removeResolution(resPref, "1080p");
+                        removeValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "1080p", new Runnable() {
+                            @Override
+                            public void run() {
+                                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
+                                setValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "720p");
+                                resetBitrateToDefault(prefs, null, null);
+                            }
+                        });
                     }
                     // Never remove 720p
                 }
             }
 
+            if (!PreferenceConfiguration.readPreferences(this.getActivity()).unlockFps) {
+                // We give some extra room in case the FPS is rounded down
+                if (maxSupportedFps < 118) {
+                    removeValue(PreferenceConfiguration.FPS_PREF_STRING, "120", new Runnable() {
+                        @Override
+                        public void run() {
+                            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
+                            setValue(PreferenceConfiguration.FPS_PREF_STRING, "90");
+                            resetBitrateToDefault(prefs, null, null);
+                        }
+                    });
+                }
+                if (maxSupportedFps < 88) {
+                    // 1080p is unsupported
+                    removeValue(PreferenceConfiguration.FPS_PREF_STRING, "90", new Runnable() {
+                        @Override
+                        public void run() {
+                            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
+                            setValue(PreferenceConfiguration.FPS_PREF_STRING, "60");
+                            resetBitrateToDefault(prefs, null, null);
+                        }
+                    });
+                }
+                // Never remove 30 FPS or 60 FPS
+            }
+
+            // Android L introduces the drop duplicate behavior of releaseOutputBuffer()
+            // that the unlock FPS option relies on to not massively increase latency.
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+                LimeLog.info("Excluding unlock FPS toggle based on OS");
+                PreferenceCategory category =
+                        (PreferenceCategory) findPreference("category_basic_settings");
+                category.removePreference(findPreference("checkbox_unlock_fps"));
+            }
+            else {
+                findPreference(PreferenceConfiguration.UNLOCK_FPS_STRING).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                    @Override
+                    public boolean onPreferenceChange(Preference preference, Object newValue) {
+                        // HACK: We need to let the preference change succeed before reinitializing to ensure
+                        // it's reflected in the new layout.
+                        final Handler h = new Handler();
+                        h.postDelayed(new Runnable() {
+                            @Override
+                            public void run() {
+                                // Ensure the activity is still open when this timeout expires
+                                StreamSettings settingsActivity = (StreamSettings)SettingsFragment.this.getActivity();
+                                if (settingsActivity != null) {
+                                    settingsActivity.reloadSettings();
+                                }
+                            }
+                        }, 500);
+
+                        // Allow the original preference change to take place
+                        return true;
+                    }
+                });
+            }
+
             // Remove HDR preference for devices below Nougat
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
                 LimeLog.info("Excluding HDR toggle based on OS");
@@ -213,9 +336,12 @@ public class StreamSettings extends Activity {
 
                 // We must now ensure our display is compatible with HDR10
                 boolean foundHdr10 = false;
-                for (int hdrType : hdrCaps.getSupportedHdrTypes()) {
-                    if (hdrType == Display.HdrCapabilities.HDR_TYPE_HDR10) {
-                        foundHdr10 = true;
+                if (hdrCaps != null) {
+                    // getHdrCapabilities() returns null on Lenovo Lenovo Mirage Solo (vega), Android 8.0
+                    for (int hdrType : hdrCaps.getSupportedHdrTypes()) {
+                        if (hdrType == Display.HdrCapabilities.HDR_TYPE_HDR10) {
+                            foundHdr10 = true;
+                        }
                     }
                 }
 
@@ -229,18 +355,27 @@ public class StreamSettings extends Activity {
 
             // Add a listener to the FPS and resolution preference
             // so the bitrate can be auto-adjusted
-            Preference pref = findPreference(PreferenceConfiguration.RES_FPS_PREF_STRING);
-            pref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            findPreference(PreferenceConfiguration.RESOLUTION_PREF_STRING).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newValue) {
                     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
                     String valueStr = (String) newValue;
 
                     // Write the new bitrate value
-                    prefs.edit()
-                            .putInt(PreferenceConfiguration.BITRATE_PREF_STRING,
-                                    PreferenceConfiguration.getDefaultBitrate(valueStr))
-                            .apply();
+                    resetBitrateToDefault(prefs, valueStr, null);
+
+                    // Allow the original preference change to take place
+                    return true;
+                }
+            });
+            findPreference(PreferenceConfiguration.FPS_PREF_STRING).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                @Override
+                public boolean onPreferenceChange(Preference preference, Object newValue) {
+                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
+                    String valueStr = (String) newValue;
+
+                    // Write the new bitrate value
+                    resetBitrateToDefault(prefs, null, valueStr);
 
                     // Allow the original preference change to take place
                     return true;

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

@@ -3,15 +3,21 @@ package com.limelight.ui;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.KeyEvent;
 import android.view.SurfaceView;
 
 public class StreamView extends SurfaceView {
     private double desiredAspectRatio;
+    private InputCallbacks inputCallbacks;
 
     public void setDesiredAspectRatio(double aspectRatio) {
         this.desiredAspectRatio = aspectRatio;
     }
 
+    public void setInputCallbacks(InputCallbacks callbacks) {
+        this.inputCallbacks = callbacks;
+    }
+
     public StreamView(Context context) {
         super(context);
     }
@@ -52,4 +58,29 @@ public class StreamView extends SurfaceView {
 
         setMeasuredDimension(measuredWidth, measuredHeight);
     }
+
+    @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.
+        if (inputCallbacks != null) {
+            if (event.getAction() == KeyEvent.ACTION_DOWN) {
+                if (inputCallbacks.handleKeyDown(event)) {
+                    return true;
+                }
+            }
+            else if (event.getAction() == KeyEvent.ACTION_UP) {
+                if (inputCallbacks.handleKeyUp(event)) {
+                    return true;
+                }
+            }
+        }
+
+        return super.onKeyPreIme(keyCode, event);
+    }
+
+    public interface InputCallbacks {
+        boolean handleKeyUp(KeyEvent event);
+        boolean handleKeyDown(KeyEvent event);
+    }
 }

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

@@ -13,13 +13,16 @@ import com.limelight.nvstream.http.GfeHttpResponseException;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
 
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.net.UnknownHostException;
+import java.security.cert.CertificateEncodingException;
 
 public class ServerHelper {
     public static String getCurrentAddressFromComputer(ComputerDetails computer) {
-        return computer.reachability == ComputerDetails.Reachability.LOCAL ?
-                computer.localAddress : computer.remoteAddress;
+        return computer.activeAddress;
     }
 
     public static Intent createStartIntent(Activity parent, NvApp app, ComputerDetails computer,
@@ -30,20 +33,30 @@ public class ServerHelper {
         intent.putExtra(Game.EXTRA_APP_ID, app.getAppId());
         intent.putExtra(Game.EXTRA_APP_HDR, app.isHdrSupported());
         intent.putExtra(Game.EXTRA_UNIQUEID, managerBinder.getUniqueId());
-        intent.putExtra(Game.EXTRA_STREAMING_REMOTE,
-                computer.reachability != ComputerDetails.Reachability.LOCAL);
-        intent.putExtra(Game.EXTRA_PC_UUID, computer.uuid.toString());
+        intent.putExtra(Game.EXTRA_PC_UUID, computer.uuid);
         intent.putExtra(Game.EXTRA_PC_NAME, computer.name);
+        try {
+            if (computer.serverCert != null) {
+                intent.putExtra(Game.EXTRA_SERVER_CERT, computer.serverCert.getEncoded());
+            }
+        } catch (CertificateEncodingException e) {
+            e.printStackTrace();
+        }
         return intent;
     }
 
     public static void doStart(Activity parent, NvApp app, ComputerDetails computer,
                                ComputerManagerService.ComputerManagerBinder managerBinder) {
+        if (computer.state == ComputerDetails.State.OFFLINE ||
+                ServerHelper.getCurrentAddressFromComputer(computer) == null) {
+            Toast.makeText(parent, parent.getResources().getString(R.string.pair_pc_offline), Toast.LENGTH_SHORT).show();
+            return;
+        }
         parent.startActivity(createStartIntent(parent, app, computer, managerBinder));
     }
 
     public static void doQuit(final Activity parent,
-                              final String address,
+                              final ComputerDetails computer,
                               final NvApp app,
                               final ComputerManagerService.ComputerManagerBinder managerBinder,
                               final Runnable onComplete) {
@@ -54,8 +67,8 @@ public class ServerHelper {
                 NvHTTP httpConn;
                 String message;
                 try {
-                    httpConn = new NvHTTP(address,
-                            managerBinder.getUniqueId(), null, PlatformBinding.getCryptoProvider(parent));
+                    httpConn = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer),
+                            managerBinder.getUniqueId(), computer.serverCert, PlatformBinding.getCryptoProvider(parent));
                     if (httpConn.quitApp()) {
                         message = parent.getResources().getString(R.string.applist_quit_success) + " " + app.getAppName();
                     } else {
@@ -74,8 +87,9 @@ public class ServerHelper {
                     message = parent.getResources().getString(R.string.error_unknown_host);
                 } catch (FileNotFoundException e) {
                     message = parent.getResources().getString(R.string.error_404);
-                } catch (Exception e) {
+                } catch (IOException | XmlPullParserException e) {
                     message = e.getMessage();
+                    e.printStackTrace();
                 } finally {
                     if (onComplete != null) {
                         onComplete.run();

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

@@ -5,13 +5,15 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
+import android.graphics.Bitmap;
 import android.graphics.drawable.Icon;
 import android.os.Build;
 
 import com.limelight.AppView;
-import com.limelight.AppViewShortcutTrampoline;
+import com.limelight.ShortcutTrampoline;
 import com.limelight.R;
 import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.nvstream.http.NvApp;
 
 import java.util.Collections;
 import java.util.LinkedList;
@@ -80,8 +82,7 @@ public class ShortcutHelper {
 
     public void reportShortcutUsed(String id) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            ShortcutInfo sinfo = getInfoForId(id);
-            if (sinfo != null) {
+            if (getInfoForId(id) != null) {
                 sm.reportShortcutUsed(id);
             }
         }
@@ -89,7 +90,7 @@ public class ShortcutHelper {
 
     public void createAppViewShortcut(String id, String computerName, String computerUuid, boolean forceAdd) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            Intent i = new Intent(context, AppViewShortcutTrampoline.class);
+            Intent i = new Intent(context, ShortcutTrampoline.class);
             i.putExtra(AppView.NAME_EXTRA, computerName);
             i.putExtra(AppView.UUID_EXTRA, computerUuid);
             i.setAction(Intent.ACTION_DEFAULT);
@@ -124,13 +125,45 @@ public class ShortcutHelper {
     }
 
     public void createAppViewShortcut(String id, ComputerDetails details, boolean forceAdd) {
-        createAppViewShortcut(id, details.name, details.uuid.toString(), forceAdd);
+        createAppViewShortcut(id, details.name, details.uuid, forceAdd);
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    public boolean createPinnedGameShortcut(String id, Bitmap iconBits, String computerName, String computerUuid, String appName, String appId) {
+        if (sm.isRequestPinShortcutSupported()) {
+            Icon appIcon;
+            Intent i = new Intent(context, ShortcutTrampoline.class);
+
+            i.putExtra(AppView.NAME_EXTRA, computerName);
+            i.putExtra(AppView.UUID_EXTRA, computerUuid);
+            i.putExtra(ShortcutTrampoline.APP_ID_EXTRA, appId);
+            i.setAction(Intent.ACTION_DEFAULT);
+
+            if (iconBits != null) {
+                appIcon = Icon.createWithAdaptiveBitmap(iconBits);
+            } else {
+                appIcon = Icon.createWithResource(context, R.mipmap.ic_pc_scut);
+            }
+
+            ShortcutInfo sInfo = new ShortcutInfo.Builder(context, id)
+                .setIntent(i)
+                .setShortLabel(appName + " (" + computerName + ")")
+                .setIcon(appIcon)
+                .build();
+
+            return sm.requestPinShortcut(sInfo, null);
+        } else {
+            return false;
+        }
+    }
+
+    public boolean createPinnedGameShortcut(String id, Bitmap iconBits, ComputerDetails cDetails, NvApp app) {
+        return createPinnedGameShortcut(id, iconBits, cDetails.name, cDetails.uuid, app.getAppName(), Integer.valueOf(app.getAppId()).toString());
     }
 
     public void disableShortcut(String id, CharSequence reason) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            ShortcutInfo sinfo = getInfoForId(id);
-            if (sinfo != null) {
+            if (getInfoForId(id) != null) {
                 sm.disableShortcuts(Collections.singletonList(id), reason);
             }
         }

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

@@ -7,9 +7,12 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.os.Build;
 import android.view.View;
+import android.view.WindowManager;
 
 import com.limelight.R;
+import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.preferences.PreferenceConfiguration;
 
 import java.util.Locale;
@@ -57,6 +60,16 @@ public class UiHelper {
             rootView.setPadding(horizontalPaddingPixels, verticalPaddingPixels,
                     horizontalPaddingPixels, verticalPaddingPixels);
         }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            // Allow this non-streaming activity to layout under notches.
+            //
+            // We should NOT do this for the Game activity unless
+            // the user specifically opts in, because it can obscure
+            // parts of the streaming surface.
+            activity.getWindow().getAttributes().layoutInDisplayCutoutMode =
+                    WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+        }
     }
 
     public static void showDecoderCrashDialog(Activity activity) {
@@ -123,4 +136,32 @@ public class UiHelper {
                 .setNegativeButton(parent.getResources().getString(R.string.no), dialogClickListener)
                 .show();
     }
+
+    public static void displayDeletePcConfirmationDialog(Activity parent, ComputerDetails computer, final Runnable onYes, final Runnable onNo) {
+        DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                switch (which){
+                    case DialogInterface.BUTTON_POSITIVE:
+                        if (onYes != null) {
+                            onYes.run();
+                        }
+                        break;
+
+                    case DialogInterface.BUTTON_NEGATIVE:
+                        if (onNo != null) {
+                            onNo.run();
+                        }
+                        break;
+                }
+            }
+        };
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(parent);
+        builder.setMessage(parent.getResources().getString(R.string.delete_pc_msg))
+                .setTitle(computer.name)
+                .setPositiveButton(parent.getResources().getString(R.string.yes), dialogClickListener)
+                .setNegativeButton(parent.getResources().getString(R.string.no), dialogClickListener)
+                .show();
+    }
 }

app/src/main/res/drawable/ic_lock.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="128dp"
+        android:height="128dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"
+        android:fillColor="#FFFFFF"/>
+</vector>

app/src/main/res/layout/activity_add_computer_manually.xml

@@ -22,11 +22,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/manuallyAddPcText"
+        android:layout_toLeftOf="@+id/addPcButton"
+        android:layout_toStartOf="@+id/addPcButton"
         android:layout_marginTop="25dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
         android:ems="10"
         android:singleLine="true"
         android:inputType="textNoSuggestions"
@@ -34,5 +34,15 @@
         
         <requestFocus />
     </EditText>
+
+    <Button
+        android:id="@+id/addPcButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="25dp"
+        android:layout_below="@+id/manuallyAddPcText"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
+        android:text="@android:string/ok"/>
 	
 </RelativeLayout>

app/src/main/res/layout/activity_pc_view.xml

@@ -1,3 +1,4 @@
+<!-- Portrait orientation only -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"

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>
@@ -98,7 +97,6 @@
     <string name="title_checkbox_51_surround">Activar sonido 5.1 surround</string>
     <string name="summary_checkbox_51_surround">Desmarcar si experimentas problemas de audio. Requiere GFE 2.7 o superior.</string>
 
-    <string name="category_gamepad_settings">Configuración de mando</string>
     <string name="title_checkbox_multi_controller">Soporte para múltiples mandos</string>
     <string name="summary_checkbox_multi_controller">Si no está marcado, todos los mandos aparecen como uno solo</string>
     <string name="title_seekbar_deadzone">Ajustar zona muerta del stick analógico</string>

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

@@ -3,6 +3,9 @@
     <!-- Shortcut strings -->
     <string name="scut_deleted_pc">PC supprimé</string>
     <string name="scut_not_paired">PC non appairé</string>
+    <string name="scut_pc_not_found">PC non trouvé</string>
+    <string name="scut_invalid_uuid">Le PC fourni n\'est pas valide</string>
+    <string name="scut_invalid_app_id">L\'application fournie n\'est pas valide</string>
 
     <!-- Help strings -->
     <string name="help_loading_title">Visionneuse d\'aide</string>
@@ -14,6 +17,7 @@
     <string name="pcview_menu_unpair_pc">Désappairer</string>
     <string name="pcview_menu_send_wol">Envoyer la requête Wake-On-LAN</string>
     <string name="pcview_menu_delete_pc">Supprimer PC</string>
+    <string name="pcview_menu_details">Voir les détails</string>
 
     <!-- Pair messages -->
     <string name="pairing">Appariement…</string>
@@ -47,6 +51,12 @@
     <string name="error_404">GFE renvoi une erreur HTTP 404. Assurez-vous que votre PC exécute un GPU pris en charge.
         L\'utilisation d\'un logiciel de bureau à distance peut également provoquer cette erreur. Essayez de redémarrer votre machine ou de réinstaller GFE.
     </string>
+    <string name="title_decoding_error">Le décodeur vidéo s\'est écrasé</string>
+    <string name="message_decoding_error">Moonlight s\'est écrasé en raison d\'une incompatibilité avec le décodeur vidéo de cet appareil. Assurez-vous que GeForce Experience soit mis à jour vers la dernière version sur votre PC. Essayez de régler les paramètres de diffusion si les plantages continuent.</string>
+    <string name="title_decoding_reset">Paramètres vidéo réinitialiser</string>
+    <string name="message_decoding_reset">Le décodeur vidéo de votre appareil continue de planter avec les paramètres de diffusion sélectionnés. Vos paramètres de diffusion ont été réinitialisés par défaut.</string>
+    <string name="error_usb_prohibited">L\'accès USB est interdit par votre appareil. Vérifiez vos paramètres Knox ou MDM.</string>
+    <string name="unable_to_pin_shortcut">Votre lanceur actuel ne permet pas de créer des raccourcis épinglés.</string>
 
     <!-- Start application messages -->
     <string name="conn_establishing_title">Établissement de la connexion</string>
@@ -63,20 +73,23 @@
 
     <!-- General strings -->
     <string name="ip_hint">Adresse IP de GeForce PC</string>
-    <string name="searching_pc">Recherche de PC avec GameStream en cours...\n\n
+    <string name="searching_pc">Recherche de PC avec GameStream en cours…\n\n
         Assurez-vous que GameStream est activé dans les paramètres GeForce Experience SHIELD.</string>
     <string name="yes">Oui</string>
     <string name="no">Non</string>
     <string name="lost_connection">Perte de connexion avec le PC</string>
+    <string name="title_details">Détails</string>
     <string name="help">Aide</string>
+    <string name="delete_pc_msg">Êtes-vous sûr de vouloir supprimer ce PC?</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>
     <string name="applist_menu_quit_and_start">Quitter le jeu actuel et démarrer</string>
     <string name="applist_menu_cancel">Annuler</string>
+    <string name="applist_menu_details">Voir les détails</string>
+    <string name="applist_menu_scut">Créer un raccourci</string>
     <string name="applist_refresh_title">Liste des applications</string>
     <string name="applist_refresh_msg">Actualisation des applications…</string>
     <string name="applist_refresh_error_title">Erreur</string>
@@ -85,6 +98,7 @@
     <string name="applist_quit_success">Fermeture avec succès</string>
     <string name="applist_quit_fail">Échec de la fermeture</string>
     <string name="applist_quit_confirmation">Voulez-vous vraiment quitter l\'application en cours d\'exécution? Toutes les données non enregistrées seront perdues.</string>
+    <string name="applist_details_id">ID app:</string>
 
     <!-- Add computer manually activity -->
     <string name="title_add_pc">Ajouter un PC manuellement</string>
@@ -93,35 +107,53 @@
     <string name="addpc_success">Ajouté avec succès de l\'ordinateur</string>
     <string name="addpc_unknown_host">Impossible de résoudre l\'adresse du PC. Assurez-vous que vous n\'avez pas fait une faute de frappe dans l\'adresse.</string>
     <string name="addpc_enter_ip">Vous devez entrer une adresse IP</string>
+    <string name="addpc_wrong_sitelocal">Cette adresse ne semble pas correcte. Vous devez utiliser l\'adresse IP publique de votre routeur pour la diffusion en continu sur Internet..</string>
 
     <!-- Preferences -->
     <string name="category_basic_settings">Paramètres de base</string>
-    <string name="title_resolution_list">Sélectionner la résolution et les FPS à atteindre</string>
+    <string name="title_resolution_list">Résolution vidéo</string>
     <string name="summary_resolution_list">Le réglage de valeurs trop élevées pour votre appareil peut provoquer un retard ou un plantage</string>
+    <string name="title_fps_list">Fréquence d\'images vidéo</string>
+    <string name="summary_fps_list">Augmenter pour un flux vidéo plus lisse. Diminution pour de meilleures performances sur les périphériques bas de gamme.</string>
     <string name="title_seekbar_bitrate">Sélectionnez le bitrate vidéo à obtenir</string>
     <string name="summary_seekbar_bitrate">Bitrate inférieur pour réduire la saccade. Augmentez le bitrate pour augmenter la qualité de l\'image.</string>
     <string name="suffix_seekbar_bitrate">Kbps</string>
+    <string name="title_unlock_fps">Débloquer tous les taux d\'images possibles</string>
+    <string name="summary_unlock_fps">La diffusion en continu à 90 ou 120 FPS peut réduire la latence sur les périphériques haut de gamme, mais peut provoquer des retards ou des blocages sur les périphériques qui ne peuvent \pas le prendre en charge</string>
     <string name="title_checkbox_stretch_video">Étirez la vidéo en plein écran</string>
     <string name="title_checkbox_disable_warnings">Désactiver les messages d\'avertissement</string>
     <string name="summary_checkbox_disable_warnings">Désactiver les messages d\'avertissement de connexion à l\'écran pendant le streaming</string>
+    <string name="title_checkbox_enable_pip">Activer le mode observateur dans l\'image</string>
+    <string name="summary_checkbox_enable_pip">Permet de visualiser le flux (sans le contrôleur) tout en multitâche</string>
 
     <string name="category_audio_settings">Paramètres audio</string>
     <string name="title_checkbox_51_surround">Activer son surround 5.1</string>
     <string name="summary_checkbox_51_surround">Décochez si vous rencontrez des problèmes audio. Nécessite GFE 2.7 ou supérieur.</string>
 
-    <string name="category_gamepad_settings">Paramètres du gamepad</string>
+    <string name="category_input_settings">Paramètres d\'entrée</string>
     <string name="title_checkbox_multi_controller">Prise en charge de plusieurs contrôleurs</string>
     <string name="summary_checkbox_multi_controller">Lorsqu\'elle n\'est pas cochée, tous les contrôleurs sont regroupés</string>
     <string name="title_seekbar_deadzone">Régler la zone morte du stick analogique</string>
     <string name="suffix_seekbar_deadzone">%</string>
     <string name="title_checkbox_xb1_driver">Pilote de contrôleur Xbox 360/One</string>
     <string name="summary_checkbox_xb1_driver">Active un pilote USB intégré pour les périphériques sans prise en charge du contrôleur Xbox natif.</string>
+    <string name="title_checkbox_usb_bind_all">Ignorer le support du contrôleur Android</string>
+    <string name="summary_checkbox_usb_bind_all">Force le pilote USB de Moonlight à prendre en charge tous les gamepads Xbox pris en charge</string>
+    <string name="title_checkbox_mouse_emulation">Emulation de la souris via le gamepad</string>
+    <string name="summary_checkbox_mouse_emulation">Appuyez longuement sur le bouton Start pour faire basculer la manette de jeu en mode souris.</string>
+    <string name="title_checkbox_mouse_nav_buttons">Activer les boutons de souris arrière et avant</string>
+    <string name="summary_checkbox_mouse_nav_buttons">L\'activation de cette option peut entraîner un clic droit sur certains périphériques.</string>
 
     <string name="category_on_screen_controls_settings">Paramètres des contrôles à l\'écran</string>
     <string name="title_checkbox_show_onscreen_controls">Afficher les commandes à l\'écran</string>
     <string name="summary_checkbox_show_onscreen_controls">Afficher la superposition du contrôleur virtuel sur l\'écran tactile</string>
     <string name="title_only_l3r3">Montre seulement L3 et R3</string>
     <string name="summary_only_l3r3">Cacher tout sauf L3 et R3</string>
+    <string name="title_reset_osc">Effacer la disposition des commandes à l\'écran sauvegardée</string>
+    <string name="summary_reset_osc">Rétablit la taille et la position par défaut de tous les contrôles à l\'écran</string>
+    <string name="dialog_title_reset_osc">Réinitialiser la mise en page</string>
+    <string name="dialog_text_reset_osc">Êtes-vous sûr de vouloir supprimer la disposition des commandes à l\'écran que vous avez sauvegardée?</string>
+    <string name="toast_reset_osc_success">Les contrôles à l\'écran sont réinitialisés</string>
 
     <string name="category_ui_settings">Paramètres de l\'interface utilisateur</string>
     <string name="title_language_list">Langue</string>
@@ -138,6 +170,11 @@
     <string name="summary_checkbox_host_audio">Lire l\'audio de l\'ordinateur et de ce périphérique</string>
 
     <string name="category_advanced_settings">Réglages avancés</string>
+    <string name="title_disable_frame_drop">Désactiver la suppression d\'image</string>
+    <string name="summary_disable_frame_drop">Peut réduire les micro-saccades sur certains appareils, mais peut augmenter la latence</string>
     <string name="title_video_format">Modifier les paramètres H.265</string>
-    <string name="summary_video_format">H.265 réduit les exigences de bande passante vidéo, mais requiert un périphérique très récent.</string>
+    <string name="summary_video_format">H.265 réduit les besoins en bande passante vidéo mais nécessite un périphérique très récent</string>
+    <string name="title_enable_hdr">Activer le HDR (expérimental)</string>
+    <string name="summary_enable_hdr">Diffuser du HDR lorsque le jeu et le processeur graphique du PC le prennent en charge. HDR nécessite un GPU série GTX 1000 ou une version ultérieure.</string>
+    
 </resources>

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>
@@ -110,8 +109,6 @@
     <string name="title_checkbox_stretch_video">Forza video a schermo intero</string>
     <string name="title_checkbox_disable_warnings">Disabilita messaggi di warning</string>
     <string name="summary_checkbox_disable_warnings">Disabilita i messaggi di warning sullo schermo durante lo streaming</string>
-    <string name="title_checkbox_battery_saver">Risparmio batteria</string>
-    <string name="summary_checkbox_battery_saver">Usa meno batteria, ma può aumentare lo stuttering</string>
     <string name="title_checkbox_enable_pip">Abilita modalità spettatore Picture-in-Picture</string>
     <string name="summary_checkbox_enable_pip">Permette di osservare (ma non di controllare) la stream in multitasking</string>
 
@@ -119,7 +116,6 @@
     <string name="title_checkbox_51_surround">Abilita l\'audio 5.1 surround</string>
     <string name="summary_checkbox_51_surround">Se riscontri problemi, disabilitalo. Richiede GFE 2.7 o versioni sucessive.</string>
 
-    <string name="category_gamepad_settings">Impostazioni controller</string>
     <string name="title_checkbox_multi_controller">Supporto a più controller</string>
     <string name="summary_checkbox_multi_controller">Quando disabilitato, tutti i controller appaiono come uno solo</string>
     <string name="title_seekbar_deadzone">Regola i punti morti degli stick analogici</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>
@@ -94,7 +93,6 @@
     <string name="title_checkbox_51_surround">5.1chサラウンド</string>
     <string name="summary_checkbox_51_surround">音声に問題が生じる場合はチェックを外してください。バージョン2.7以降のGFEが必要です</string>
 
-    <string name="category_gamepad_settings">ゲームコントローラ</string>
     <string name="title_checkbox_multi_controller">複数のゲームコントローラ</string>
     <string name="summary_checkbox_multi_controller">チェックを外すと、全てのゲームコントローラが単一の物として認識されます</string>
     <string name="title_seekbar_deadzone">アナログゲームコントローラのデッドゾーン</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>
@@ -109,7 +108,6 @@
     <string name="title_checkbox_51_surround">5.1 서라운드 사운드 활성화</string>
     <string name="summary_checkbox_51_surround">오디오 문제가 발생한다면 체크를 해제하세요. GFE 2.7이나 그 이상 버전이 필요합니다.</string>
 
-    <string name="category_gamepad_settings">게임패드 설정</string>
     <string name="title_checkbox_multi_controller">다중 컨트롤러 지원</string>
     <string name="summary_checkbox_multi_controller">이 옵션을 선택하지 않으면 모든 컨트롤러가 하나로 표시됩니다</string>
     <string name="title_seekbar_deadzone">아날로그 스틱 데드존 설정</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>
@@ -98,7 +97,6 @@
   <string name="title_checkbox_51_surround">Gebruik 5.1 surround sound</string>
   <string name="summary_checkbox_51_surround">Gebruik dit niet als er problemen zijn met de audio. Vereist GFE 2.7 of hoger.</string>
 
-  <string name="category_gamepad_settings">Gamepad Instellingen</string>
   <string name="title_checkbox_multi_controller">Multi-gamepad support</string>
   <string name="summary_checkbox_multi_controller">Wanneer uitgevinkt, alle controllers verschijnen als één.</string>
   <string name="title_seekbar_deadzone">Pas analoge dodezone aan.</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>
@@ -99,7 +98,6 @@
     <string name="title_checkbox_51_surround">Включить объёмный звук 5.1</string>
     <string name="summary_checkbox_51_surround">Отключите, если появляются аудио проблемы. Требуется GFE 2.7 или выше.</string>
 
-    <string name="category_gamepad_settings">Настройки Геймпада</string>
     <string name="title_checkbox_multi_controller">Поддержка нескольких контроллеров</string>
     <string name="summary_checkbox_multi_controller">Когда отключена, все контроллеры определяются как один</string>
     <string name="title_seekbar_deadzone">Регулировать мертвую зону аналогового стика</string>
@@ -142,8 +140,6 @@
     <string name="message_decoding_reset">Видео декодер Вашего устройства давал сбои с выбранными настройками. Настройки трансляции были сброшены до значений по умолчанию.</string>
     <string name="error_usb_prohibited">USB доступ запрещен администратором устройства. Проверьте настройки Knox или MDM.</string>
     <string name="addpc_wrong_sitelocal">Адрес указан неверно. Вы должны ввести публичный IP-адрес Вашего роутера для передачи через интернет.</string>
-    <string name="title_checkbox_battery_saver">Экономия батареи</string>
-    <string name="summary_checkbox_battery_saver">Использует меньше заряда батареи, но может увеличить зависания</string>
     <string name="title_checkbox_enable_pip">Включить просмотр в режиме \"Картинка в картинке\"</string>
     <string name="summary_checkbox_enable_pip">Позволяет просматривать трансляцию (но не управлять ей) во время работы в других приложениях</string>
     <string name="title_checkbox_usb_bind_all">Переопределить поддержку контроллеров Android</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>
@@ -109,7 +108,6 @@
     <string name="title_checkbox_51_surround"> 启用 5.1 环绕音效 </string>
     <string name="summary_checkbox_51_surround"> 如果你的声音听起来有问题请禁用。\n\n需要GeForce Experience 2.7 或更高版本 </string>
 
-    <string name="category_gamepad_settings"> 手柄设置 </string>
     <string name="title_checkbox_multi_controller"> 启用多手柄支持 </string>
     <string name="summary_checkbox_multi_controller"> 如果禁用，所有手柄将会认作一个手柄 </string>
     <string name="title_seekbar_deadzone"> 调整摇杆死区 </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>
@@ -109,7 +108,6 @@
     <string name="title_checkbox_51_surround"> 啟用 5.1 環繞音效 </string>
     <string name="summary_checkbox_51_surround"> 如果你的聲音聽起來有問題請禁用。\n\n需要GeForce Experience 2.7 或更高版本 </string>
 
-    <string name="category_gamepad_settings"> 手柄設置 </string>
     <string name="title_checkbox_multi_controller"> 啟用多手柄支持 </string>
     <string name="summary_checkbox_multi_controller"> 如果禁用，所有手柄將會認作一個手柄 </string>
     <string name="title_seekbar_deadzone"> 調整搖桿死區 </string>

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

@@ -1,24 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="resolution_names">
-        <item>360p 30 FPS</item>
-        <item>360p 60 FPS</item>
-        <item>720p 30 FPS</item>
-        <item>720p 60 FPS</item>
-        <item>1080p 30 FPS</item>
-        <item>1080p 60 FPS</item>
-        <item>4K 30 FPS</item>
-        <item>4K 60 FPS</item>
+        <item>360p</item>
+        <item>480p</item>
+        <item>720p</item>
+        <item>1080p</item>
+        <item>1440p</item>
+        <item>4K</item>
     </string-array>
     <string-array name="resolution_values" translatable="false">
-        <item>360p30</item>
-        <item>360p60</item>
-        <item>720p30</item>
-        <item>720p60</item>
-        <item>1080p30</item>
-        <item>1080p60</item>
-        <item>4K30</item>
-        <item>4K60</item>
+        <item>360p</item>
+        <item>480p</item>
+        <item>720p</item>
+        <item>1080p</item>
+        <item>1440p</item>
+        <item>4K</item>
+    </string-array>
+
+    <string-array name="fps_names">
+        <item>30 FPS</item>
+        <item>60 FPS</item>
+        <item>90 FPS</item>
+        <item>120 FPS</item>
+    </string-array>
+    <string-array name="fps_values" translatable="false">
+        <item>30</item>
+        <item>60</item>
+        <item>90</item>
+        <item>120</item>
     </string-array>
 
     <string-array name="language_names" translatable="false">

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

@@ -6,6 +6,9 @@
     <!-- Shortcut strings -->
     <string name="scut_deleted_pc">PC deleted</string>
     <string name="scut_not_paired">PC not paired</string>
+    <string name="scut_pc_not_found">PC not found</string>
+    <string name="scut_invalid_uuid">Provided PC is not valid</string>
+    <string name="scut_invalid_app_id">Provided App is not valid</string>
 
     <!-- Help strings -->
     <string name="help_loading_title">Help Viewer</string>
@@ -17,6 +20,7 @@
     <string name="pcview_menu_unpair_pc">Unpair</string>
     <string name="pcview_menu_send_wol">Send Wake-On-LAN request</string>
     <string name="pcview_menu_delete_pc">Delete PC</string>
+    <string name="pcview_menu_details">View Details</string>
 
     <!-- Pair messages -->
     <string name="pairing">Pairing…</string>
@@ -55,6 +59,7 @@
     <string name="title_decoding_reset">Video Settings Reset</string>
     <string name="message_decoding_reset">Your device\'s video decoder continues to crash at your selected streaming settings. Your streaming settings have been reset to default.</string>
     <string name="error_usb_prohibited">USB access is prohibited by your device administrator. Check your Knox or MDM settings.</string>
+    <string name="unable_to_pin_shortcut">Your current launcher does not allow for creating pinned shortcuts.</string>
 
     <!-- Start application messages -->
     <string name="conn_establishing_title">Establishing Connection</string>
@@ -76,15 +81,18 @@
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="lost_connection">Lost connection to PC</string>
+    <string name="title_details">Details</string>
     <string name="help">Help</string>
+    <string name="delete_pc_msg">Are you sure you want to delete this PC?</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>
     <string name="applist_menu_quit_and_start">Quit Current Game and Start</string>
     <string name="applist_menu_cancel">Cancel</string>
+    <string name="applist_menu_details">View Details</string>
+    <string name="applist_menu_scut">Create Shortcut</string>
     <string name="applist_refresh_title">App List</string>
     <string name="applist_refresh_msg">Refreshing apps…</string>
     <string name="applist_refresh_error_title">Error</string>
@@ -93,6 +101,7 @@
     <string name="applist_quit_success">Successfully quit</string>
     <string name="applist_quit_fail">Failed to quit</string>
     <string name="applist_quit_confirmation">Are you sure you want to quit the running app? All unsaved data will be lost.</string>
+    <string name="applist_details_id">App ID:</string>
 
     <!-- Add computer manually activity -->
     <string name="title_add_pc">Add PC Manually</string>
@@ -105,16 +114,18 @@
 
     <!-- Preferences -->
     <string name="category_basic_settings">Basic Settings</string>
-    <string name="title_resolution_list">Select resolution and FPS target</string>
-    <string name="summary_resolution_list">Setting values too high for your device may cause lag or crashing</string>
-    <string name="title_seekbar_bitrate">Select target video bitrate</string>
-    <string name="summary_seekbar_bitrate">Lower bitrate to reduce stuttering. Raise bitrate to increase image quality.</string>
+    <string name="title_resolution_list">Video resolution</string>
+    <string name="summary_resolution_list">Increase to improve image clarity. Decrease for better performance on lower end devices and slower networks.</string>
+    <string name="title_fps_list">Video frame rate</string>
+    <string name="summary_fps_list">Increase for a smoother video stream. Decrease for better performance on lower end devices.</string>
+    <string name="title_seekbar_bitrate">Video bitrate</string>
+    <string name="summary_seekbar_bitrate">Increase for better image quality. Decrease to improve performance on slower connections.</string>
     <string name="suffix_seekbar_bitrate">Kbps</string>
+    <string name="title_unlock_fps">Unlock all possible frame rates</string>
+    <string name="summary_unlock_fps">Streaming at 90 or 120 FPS may reduce latency on high-end devices but can cause lag or crashes on devices that can\'t support it</string>
     <string name="title_checkbox_stretch_video">Stretch video to full-screen</string>
     <string name="title_checkbox_disable_warnings">Disable warning messages</string>
     <string name="summary_checkbox_disable_warnings">Disable on-screen connection warning messages while streaming</string>
-    <string name="title_checkbox_battery_saver">Battery saver</string>
-    <string name="summary_checkbox_battery_saver">Uses less battery, but may increase stuttering</string>
     <string name="title_checkbox_enable_pip">Enable Picture-in-Picture observer mode</string>
     <string name="summary_checkbox_enable_pip">Allows the stream to be viewed (but not controlled) while multitasking</string>
 
@@ -122,9 +133,11 @@
     <string name="title_checkbox_51_surround">Enable 5.1 surround sound</string>
     <string name="summary_checkbox_51_surround">Uncheck if you experience audio issues. Requires GFE 2.7 or higher.</string>
 
-    <string name="category_gamepad_settings">Gamepad Settings</string>
-    <string name="title_checkbox_multi_controller">Multiple controller support</string>
-    <string name="summary_checkbox_multi_controller">When unchecked, all controllers appear as one</string>
+    <string name="category_input_settings">Input Settings</string>
+    <string name="title_checkbox_multi_controller">Automatic gamepad presence detection</string>
+    <string name="summary_checkbox_multi_controller">Unchecking this option forces a gamepad to always be present</string>
+    <string name="title_checkbox_vibrate_fallback">Emulate rumble support with vibration</string>
+    <string name="summary_checkbox_vibrate_fallback">Vibrates your device to emulate rumble if your gamepad does not support it</string>
     <string name="title_seekbar_deadzone">Adjust analog stick deadzone</string>
     <string name="suffix_seekbar_deadzone">%</string>
     <string name="title_checkbox_xb1_driver">Xbox 360/One controller driver</string>
@@ -133,10 +146,14 @@
     <string name="summary_checkbox_usb_bind_all">Forces Moonlight\'s USB driver to take over all supported Xbox gamepads</string>
     <string name="title_checkbox_mouse_emulation">Mouse emulation via gamepad</string>
     <string name="summary_checkbox_mouse_emulation">Long pressing the Start button will switch the gamepad into mouse mode</string>
+    <string name="title_checkbox_mouse_nav_buttons">Enable back and forward mouse buttons</string>
+    <string name="summary_checkbox_mouse_nav_buttons">Enabling this option may break right clicking on some buggy devices</string>
 
     <string name="category_on_screen_controls_settings">On-screen Controls Settings</string>
     <string name="title_checkbox_show_onscreen_controls">Show on-screen controls</string>
     <string name="summary_checkbox_show_onscreen_controls">Show virtual controller overlay on touchscreen</string>
+    <string name="title_checkbox_vibrate_osc">Enable vibration</string>
+    <string name="summary_checkbox_vibrate_osc">Vibrates your device to emulate rumble for the on-screen controls</string>
     <string name="title_only_l3r3">Only show L3 and R3</string>
     <string name="summary_only_l3r3">Hide all virtual buttons except L3 and R3</string>
     <string name="title_reset_osc">Clear saved on-screen controls layout</string>

app/src/main/res/xml/preferences.xml

@@ -5,12 +5,19 @@
     <PreferenceCategory android:title="@string/category_basic_settings"
         android:key="category_basic_settings">
         <ListPreference
-            android:key="list_resolution_fps"
+            android:key="list_resolution"
             android:title="@string/title_resolution_list"
             android:summary="@string/summary_resolution_list"
             android:entries="@array/resolution_names"
             android:entryValues="@array/resolution_values"
-            android:defaultValue="720p60" />
+            android:defaultValue="720p" />
+        <ListPreference
+            android:key="list_fps"
+            android:title="@string/title_fps_list"
+            android:summary="@string/summary_fps_list"
+            android:entries="@array/fps_names"
+            android:entryValues="@array/fps_values"
+            android:defaultValue="60" />
         <com.limelight.preferences.SeekBarPreference
             android:key="seekbar_bitrate_kbps"
             android:dialogMessage="@string/summary_seekbar_bitrate"
@@ -21,13 +28,13 @@
             android:text="@string/suffix_seekbar_bitrate"
             android:title="@string/title_seekbar_bitrate" />
         <CheckBoxPreference
-            android:key="checkbox_stretch_video"
-            android:title="@string/title_checkbox_stretch_video"
+            android:key="checkbox_unlock_fps"
+            android:title="@string/title_unlock_fps"
+            android:summary="@string/summary_unlock_fps"
             android:defaultValue="false" />
         <CheckBoxPreference
-            android:key="checkbox_battery_saver"
-            android:title="@string/title_checkbox_battery_saver"
-            android:summary="@string/summary_checkbox_battery_saver"
+            android:key="checkbox_stretch_video"
+            android:title="@string/title_checkbox_stretch_video"
             android:defaultValue="false" />
         <CheckBoxPreference
             android:key="checkbox_enable_pip"
@@ -42,7 +49,7 @@
             android:summary="@string/summary_checkbox_51_surround"
             android:defaultValue="false" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="@string/category_gamepad_settings">
+    <PreferenceCategory android:title="@string/category_input_settings">
         <!--com.limelight.preferences.SeekBarPreference
             android:key="seekbar_deadzone"
             android:defaultValue="15"
@@ -54,6 +61,11 @@
             android:title="@string/title_checkbox_multi_controller"
             android:summary="@string/summary_checkbox_multi_controller"
             android:defaultValue="true" />
+        <CheckBoxPreference
+            android:key="checkbox_mouse_nav_buttons"
+            android:title="@string/title_checkbox_mouse_nav_buttons"
+            android:summary="@string/summary_checkbox_mouse_nav_buttons"
+            android:defaultValue="false" />
         <CheckBoxPreference
             android:key="checkbox_usb_driver"
             android:title="@string/title_checkbox_xb1_driver"
@@ -70,6 +82,11 @@
             android:title="@string/title_checkbox_mouse_emulation"
             android:summary="@string/summary_checkbox_mouse_emulation"
             android:defaultValue="true" />
+        <CheckBoxPreference
+            android:key="checkbox_vibrate_fallback"
+            android:title="@string/title_checkbox_vibrate_fallback"
+            android:summary="@string/summary_checkbox_vibrate_fallback"
+            android:defaultValue="false" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_on_screen_controls_settings"
         android:key="category_onscreen_controls">
@@ -78,6 +95,12 @@
             android:key="checkbox_show_onscreen_controls"
             android:summary="@string/summary_checkbox_show_onscreen_controls"
             android:title="@string/title_checkbox_show_onscreen_controls" />
+        <CheckBoxPreference
+            android:key="checkbox_vibrate_osc"
+            android:dependency="checkbox_show_onscreen_controls"
+            android:title="@string/title_checkbox_vibrate_osc"
+            android:summary="@string/summary_checkbox_vibrate_osc"
+            android:defaultValue="true" />
         <CheckBoxPreference
             android:defaultValue="false"
             android:dependency="checkbox_show_onscreen_controls"

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

@@ -55,7 +55,7 @@ public class EvdevCaptureProvider extends InputCaptureProvider {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 // Launch evdev_reader directly via SU
                 try {
-                    su = Runtime.getRuntime().exec("su -c "+evdevReaderCmd);
+                    su = new ProcessBuilder("su", "-c", evdevReaderCmd).start();
                 } catch (IOException e) {
                     reportDeviceNotRooted();
                     e.printStackTrace();
@@ -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.1.0'
+        classpath 'com.android.tools.build:gradle:3.3.1'
     }
 }
 

decoder-errata.txt

@@ -1,9 +1,9 @@
 This file serves to document some of the decoder errata when using MediaCodec hardware decoders on certain devices.
 
 1. num_ref_frames is set to 16 by NVENC which causes decoders to allocate 16+ buffers. This can cause an error or lag on some devices.
-	- Affected decoders: TI OMAP4, Allwinner A20
+	- Affected decoders: TI OMAP4 crashes, Allwinner A20, MT8176 lags (HEVC not affected)
 	
-2. Some decoders have a huge per-frame latency with the unmodified SPS sent from NVENC. Setting max_dec_frame_buffering fixes this latency issue.
+2. Some H.264 decoders have a huge per-frame latency with the unmodified SPS sent from NVENC. Setting max_dec_frame_buffering=1 fixes this latency issue.
 	- Affected decoders: NVIDIA Tegra 3 and 4, Broadcom VideoCore IV
 
 3. Some decoders strictly require that you pass BUFFER_FLAG_CODEC_CONFIG and crash upon the IDR frame if you don't

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Mar 20 18:12:28 PDT 2018
+#Tue Feb 05 20:54:22 PST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip