Version 9.1

translation update

.github/auto-comment.yml

@@ -0,0 +1,4 @@
+issuesOpened: >
+  If this is a question about Moonlight or you need help troubleshooting a streaming problem, please use the help channels on our [Discord server](https://moonlight-stream.org/discord) instead of GitHub issues. There are many more people available on Discord to help you and answer your questions.<br /><br />
+  This issue tracker should only be used for specific bugs or feature requests.<br /><br />
+  Thank you, and happy streaming!

.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
@@ -30,8 +33,11 @@ Thumbs.db
 #.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
 .gradle
 build/
-app/app.iml
+*.iml
 
 # Compiled JNI libraries folder
 **/jniLibs
 app/.externalNativeBuild/
+
+# NDK stuff
+.cxx/

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "moonlight-common"]
-	path = moonlight-common
-	url = https://github.com/moonlight-stream/moonlight-common.git
+[submodule "app/src/main/jni/moonlight-core/moonlight-common-c"]
+	path = app/src/main/jni/moonlight-core/moonlight-common-c
+	url = https://github.com/moonlight-stream/moonlight-common-c.git

.travis.yml

@@ -0,0 +1,18 @@
+language: android
+dist: trusty
+
+git:
+  depth: 1
+
+android:
+  components:
+    - tools
+    - platform-tools
+    - build-tools-29.0.3
+    - android-29
+
+before_install:
+  - sdkmanager --list
+
+install:
+  - yes | sdkmanager "ndk;20.0.5594570"

README.md

@@ -1,44 +1,44 @@
-#Moonlight
+# Moonlight Android
 
-[Moonlight](http://moonlight-stream.com) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
+[![Travis CI Status](https://travis-ci.org/moonlight-stream/moonlight-android.svg?branch=master)](https://travis-ci.org/moonlight-stream/moonlight-android)
+
+[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
+## Features
 
 * Streams any of your games from your PC to your Android device
 * Full gamepad support for MOGA, Xbox 360, PS3, OUYA, and Shield
 * Automatically finds GameStream-compatible PCs on your network
 
-##Installation
+## Installation
 
 * Download and install Moonlight for Android from
-[Google Play](https://play.google.com/store/apps/details?id=com.limelight), [Amazon App Store](http://www.amazon.com/gp/product/B00JK4MFN2), or directly from the [releases page](https://github.com/moonlight-stream/moonlight-android/releases)
+[Google Play](https://play.google.com/store/apps/details?id=com.limelight), [F-Droid](https://f-droid.org/packages/com.limelight/), [Amazon App Store](http://www.amazon.com/gp/product/B00JK4MFN2), or directly from the [releases page](https://github.com/moonlight-stream/moonlight-android/releases)
 * Download [GeForce Experience](http://www.geforce.com/geforce-experience) and install on your Windows PC
 
-##Requirements
+## Requirements
 
-* [GameStream compatible](http://shield.nvidia.com/play-pc-games/) computer with GTX 600/700 series GPU
+* [GameStream compatible](http://shield.nvidia.com/play-pc-games/) computer with an NVIDIA GeForce GTX 600 series or higher desktop or mobile GPU (GT-series and AMD GPUs not supported)
 * Android device running 4.1 (Jelly Bean) or higher
 * High-end wireless router (802.11n dual-band recommended)
 
-##Usage
+## Usage
 
 * Turn on GameStream in the GFE settings
 * If you are connecting from outside the same network, turn on internet
   streaming
 * When on the same network as your PC, open Moonlight and tap on your PC in the list
-* Accept the pairing confirmation on your PC
+* Accept the pairing confirmation on your PC and add the PIN if needed
 * Tap your PC again to view the list of apps to stream
 * Play games!
 
-##Contribute
+## Contribute
 
 This project is being actively developed at [XDA Developers](http://forum.xda-developers.com/showthread.php?t=2505510)
 
@@ -46,13 +46,13 @@ This project is being actively developed at [XDA Developers](http://forum.xda-de
 2. Write code
 3. Send Pull Requests
 
-##Building
+## Building
 * Install Android Studio and the Android NDK
 * Run ‘git submodule update --init --recursive’ from within moonlight-android/
 * In moonlight-android/, create a file called ‘local.properties’. Add an ‘ndk.dir=’ property to the local.properties file and set it equal to your NDK directory.
 * Build the APK using Android Studio
 
-##Authors
+## Authors
 
 * [Cameron Gutman](https://github.com/cgutman)  
 * [Diego Waxemberg](https://github.com/dwaxemberg)  

app/build.gradle

@@ -1,48 +1,108 @@
-import com.android.builder.model.ProductFlavor
-import org.apache.tools.ant.taskdefs.condition.Os
-
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.0'
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 29
 
-        versionName "5.1"
-        versionCode = 128
+        versionName "9.1"
+        versionCode = 220
     }
 
+    flavorDimensions "root"
+
     productFlavors {
         root {
             // Android O has native mouse capture, so don't show the rooted
             // version to devices running O on the Play Store.
             maxSdkVersion 25
 
-            applicationId "com.limelight.root"
-            ndk {
-                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
+            externalNativeBuild {
+                ndkBuild {
+                    arguments "PRODUCT_FLAVOR=root"
+                }
             }
+
+            applicationId "com.limelight.root"
+            dimension "root"
         }
 
         nonRoot {
-            applicationId "com.limelight"
-            ndk {
-                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
+            externalNativeBuild {
+                ndkBuild {
+                    arguments "PRODUCT_FLAVOR=nonRoot"
+                }
             }
+
+            applicationId "com.limelight"
+            dimension "root"
         }
     }
 
     lintOptions {
         disable 'MissingTranslation'
+        lintConfig file("lint.xml")
+    }
+
+    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 {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt')
+            // To whomever is releasing/using an APK in release mode with
+            // Moonlight's official application ID, please stop. I see every
+            // single one of your crashes in my Play Console and it makes
+            // Moonlight's reliability look worse and makes it more difficult
+            // to distinguish real crashes from your crashy VR app. Seriously,
+            // 44 of the *same* native crash in 72 hours and a few each of
+            // several other crashes.
+            //
+            // This is technically not your fault. I would have hoped Google
+            // would validate the signature of the APK before attributing
+            // the crash to it. I asked their Play Store support about this
+            // and they said they don't and don't have plans to, so that sucks.
+            //
+            // In any case, it's bad form to release an APK using someone
+            // else's application ID. There is no legitimate reason, that
+            // anyone would need to comment out the following line, except me
+            // when I release an official signed Moonlight build. If you feel
+            // like doing so would solve something, I can tell you it will not.
+            // You can't upgrade an app while retaining data without having the
+            // same signature as the official version. Nor can you post it on
+            // the Play Store, since that application ID is already taken.
+            // Reputable APK hosting websites similarly validate the signature
+            // is consistent with the Play Store and won't allow an APK that
+            // isn't signed the same as the original.
+            //
+            // I wish any and all people using Moonlight as the basis of other
+            // cool projects the best of luck with their efforts. All I ask
+            // is to please change the applicationId before you publish.
+            //
+            // TL;DR: Leave the following line alone!
+            applicationIdSuffix ".unofficial"
+
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
@@ -54,10 +114,10 @@ android {
 }
 
 dependencies {
-    compile 'org.bouncycastle:bcprov-jdk15on:1.52'
-    compile 'org.bouncycastle:bcpkix-jdk15on:1.52'
-    compile files('libs/jcodec-0.1.9-patched.jar')
-
-    debugCompile project(path:':moonlight-common', configuration:'debug')
-    releaseCompile project(path:':moonlight-common', configuration:'release')
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.64'
+    implementation 'org.bouncycastle:bcpkix-jdk15on:1.64'
+    implementation 'org.jcodec:jcodec:0.2.3'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.10'
+    implementation 'com.squareup.okio:okio:1.17.5'
+    implementation 'org.jmdns:jmdns:3.5.5'
 }

app/lint.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="InvalidPackage">
+        <ignore path="**/bcpkix-jdk15on-*.jar"/>
+    </issue>
+</lint>

app/proguard-rules.pro

@@ -0,0 +1,28 @@
+# 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
+-dontwarn org.slf4j.**

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_label" translatable="false">Moonlight (Debug)</string>
+    <string name="app_label_root" translatable="false">Moonlight (Root Debug)</string>
+
+</resources>

app/src/main/AndroidManifest.xml

@@ -4,9 +4,12 @@
 
     <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" />
+    <uses-permission android:name="com.android.providers.tv.permission.READ_EPG_DATA"/>
+    <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA"/>
 
     <uses-feature
         android:name="android.hardware.touchscreen"
@@ -24,14 +27,28 @@
         android:name="android.software.leanback"
         android:required="false" />
 
+    <!-- Disable legacy input emulation on ChromeOS -->
+    <uses-feature
+        android:name="android.hardware.type.pc"
+        android:required="false"/>
+
     <application
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_rules"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:isGame="true"
         android:banner="@drawable/atv_banner"
-        android:icon="@drawable/ic_launcher"
+        android:appCategory="game"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher"
+        android:installLocation="auto"
         android:theme="@style/AppTheme">
-
+        <provider
+            android:name=".PosterContentProvider"
+            android:authorities="poster.${applicationId}"
+            android:enabled="true"
+            android:exported="true">
+        </provider>
         <!-- Samsung multi-window support -->
         <uses-library
             android:name="com.sec.android.app.multiwindow"
@@ -59,8 +76,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
@@ -86,17 +104,22 @@
         <activity
             android:name=".preferences.AddComputerManually"
             android:resizeableActivity="true"
+            android:windowSoftInputMode="stateVisible"
             android:label="Add Computer Manually">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.limelight.PcView" />
         </activity>
+        <!-- This will fall back to sensorLandscape at runtime on Android 4.2 and below -->
         <activity
             android:name=".Game"
             android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
-            android:screenOrientation="sensorLandscape"
+            android:screenOrientation="userLandscape"
             android:noHistory="true"
+            android:supportsPictureInPicture="true"
             android:resizeableActivity="true"
+            android:launchMode="singleTask"
+            android:excludeFromRecents="true"
             android:theme="@style/StreamTheme">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"

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

@@ -1,9 +1,8 @@
 package com.limelight;
 
+import java.io.IOException;
 import java.io.StringReader;
 import java.util.List;
-import java.util.Locale;
-import java.util.UUID;
 
 import com.limelight.computers.ComputerManagerListener;
 import com.limelight.computers.ComputerManagerService;
@@ -28,6 +27,9 @@ import android.content.ComponentName;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.res.Configuration;
+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;
@@ -38,10 +40,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;
@@ -58,10 +63,13 @@ 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";
+    public final static String NEW_PAIR_EXTRA = "NewPair";
 
     private ComputerManagerService.ComputerManagerBinder managerBinder;
     private final ServiceConnection serviceConnection = new ServiceConnection() {
@@ -76,27 +84,32 @@ 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;
                     }
 
+                    // Add a launcher shortcut for this PC (forced, since this is user interaction)
+                    shortcutHelper.createAppViewShortcut(computer, true, getIntent().getBooleanExtra(NEW_PAIR_EXTRA, false));
+                    shortcutHelper.reportComputerShortcutUsed(computer);
+
                     try {
                         appGridAdapter = new AppGridAdapter(AppView.this,
-                                PreferenceConfiguration.readPreferences(AppView.this).listMode,
-                                PreferenceConfiguration.readPreferences(AppView.this).smallIconMode,
-                                computer, managerBinder.getUniqueId());
+                                PreferenceConfiguration.readPreferences(AppView.this),
+                                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
@@ -134,6 +147,27 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         }
     };
 
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+
+        // If appGridAdapter is initialized, let it know about the configuration change.
+        // If not, it will pick it up when it initializes.
+        if (appGridAdapter != null) {
+            // Update the app grid adapter to create grid items with the correct layout
+            appGridAdapter.updateLayoutWithPreferences(this, PreferenceConfiguration.readPreferences(this));
+
+            try {
+                // Reinflate the app grid itself to pick up the layout change
+                getFragmentManager().beginTransaction()
+                        .replace(R.id.appFragmentContainer, new AdapterFragment())
+                        .commitAllowingStateLoss();
+            } catch (IllegalStateException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     private void startComputerUpdates() {
         // Don't start polling if we're not bound or in the foreground
         if (managerBinder == null || !inForeground) {
@@ -149,7 +183,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;
                 }
 
@@ -173,7 +207,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.disableComputerShortcut(details,
                                     getResources().getString(R.string.scut_not_paired));
 
                             // Display a toast to the user and quit the activity
@@ -209,7 +243,9 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                         blockingLoadSpinner.dismiss();
                         blockingLoadSpinner = null;
                     }
-                } catch (Exception ignored) {}
+                } catch (XmlPullParserException | IOException e) {
+                    e.printStackTrace();
+                }
             }
         });
 
@@ -237,6 +273,10 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        // Assume we're in the foreground when created to avoid a race
+        // between binding to CMS and onResume()
+        inForeground = true;
+
         shortcutHelper = new ShortcutHelper(this);
 
         UiHelper.setLocale(this);
@@ -249,14 +289,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 = (TextView) findViewById(R.id.appListText);
-        setTitle(labelText);
-        label.setText(labelText);
-
-        // Add a launcher shortcut for this PC (forced, since this is user interaction)
-        shortcutHelper.createAppViewShortcut(uuidString, computerName, uuidString, true);
-        shortcutHelper.reportShortcutUsed(uuidString);
+        TextView label = findViewById(R.id.appListText);
+        setTitle(computerName);
+        label.setText(computerName);
 
         // Bind to the computer manager service
         bindService(new Intent(this, ComputerManagerService.class), serviceConnection,
@@ -270,7 +305,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();
@@ -302,6 +337,9 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
     protected void onResume() {
         super.onResume();
 
+        // Display a decoder crash notification if we've returned after a crash
+        UiHelper.showDecoderCrashDialog(this);
+
         inForeground = true;
         startComputerUpdates();
     }
@@ -326,10 +364,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
@@ -341,7 +394,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
@@ -362,8 +415,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() {
@@ -381,6 +433,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(computer, app.app, appBits)) {
+                    Toast.makeText(AppView.this, getResources().getString(R.string.unable_to_pin_shortcut), Toast.LENGTH_LONG).show();
+                }
+                return true;
+
             default:
                 return super.onContextItemSelected(item);
         }
@@ -452,6 +517,12 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                     if (!foundExistingApp) {
                         // This app must be new
                         appGridAdapter.addApp(new AppObject(app));
+
+                        // We could have a leftover shortcut from last time this PC was paired
+                        // or if this app was removed then added again. Enable those shortcuts
+                        // again if present.
+                        shortcutHelper.enableAppShortcut(computer, app);
+
                         updated = true;
                     }
                 }
@@ -472,6 +543,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 
                     // This app was removed in the latest app list
                     if (!foundExistingApp) {
+                        shortcutHelper.disableAppShortcut(computer, existingApp.app, "App removed from PC");
                         appGridAdapter.removeApp(existingApp);
                         updated = true;
 
@@ -515,6 +587,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                 }
             }
         });
+        UiHelper.applyStatusBarPadding(listView);
         registerForContextMenu(listView);
         listView.requestFocus();
     }

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

@@ -1,164 +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 (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), 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/HelpActivity.java

@@ -51,14 +51,8 @@ public class HelpActivity extends Activity {
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                if (url.toUpperCase().startsWith("https://github.com/moonlight-stream/moonlight-docs/wiki/".toUpperCase()) ||
-                        url.toUpperCase().startsWith("http://github.com/moonlight-stream/moonlight-docs/wiki/".toUpperCase())) {
-                    // Allow navigation to Moonlight docs
-                    return false;
-                }
-                else {
-                    return true;
-                }
+                return !(url.toUpperCase().startsWith("https://github.com/moonlight-stream/moonlight-docs/wiki/".toUpperCase()) ||
+                        url.toUpperCase().startsWith("http://github.com/moonlight-stream/moonlight-docs/wiki/".toUpperCase()));
             }
         });
 

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

@@ -0,0 +1,25 @@
+package com.limelight;
+
+import java.io.IOException;
+import java.util.logging.FileHandler;
+import java.util.logging.Logger;
+
+public class LimeLog {
+    private static final Logger LOGGER = Logger.getLogger(LimeLog.class.getName());
+
+    public static void info(String msg) {
+        LOGGER.info(msg);
+    }
+    
+    public static void warning(String msg) {
+        LOGGER.warning(msg);
+    }
+    
+    public static void severe(String msg) {
+        LOGGER.severe(msg);
+    }
+    
+    public static void setFileHandler(String fileName) throws IOException {
+        LOGGER.addHandler(new FileHandler(fileName));
+    }
+}

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

@@ -2,15 +2,14 @@ package com.limelight;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.Locale;
 
 import com.limelight.binding.PlatformBinding;
 import com.limelight.binding.crypto.AndroidCryptoProvider;
 import com.limelight.computers.ComputerManagerListener;
 import com.limelight.computers.ComputerManagerService;
 import com.limelight.grid.PcGridAdapter;
+import com.limelight.grid.assets.DiskAssetLoader;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
@@ -18,6 +17,7 @@ import com.limelight.nvstream.http.PairingManager;
 import com.limelight.nvstream.http.PairingManager.PairState;
 import com.limelight.nvstream.wol.WakeOnLanSender;
 import com.limelight.preferences.AddComputerManually;
+import com.limelight.preferences.GlPreferences;
 import com.limelight.preferences.PreferenceConfiguration;
 import com.limelight.preferences.StreamSettings;
 import com.limelight.ui.AdapterFragment;
@@ -29,11 +29,14 @@ 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;
 import android.content.ServiceConnection;
 import android.content.res.Configuration;
+import android.opengl.GLSurfaceView;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
@@ -51,12 +54,17 @@ 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;
+
 public class PcView extends Activity implements AdapterFragmentCallbacks {
     private RelativeLayout noPcFoundLayout;
     private PcGridAdapter pcGridAdapter;
     private ShortcutHelper shortcutHelper;
     private ComputerManagerService.ComputerManagerBinder managerBinder;
-    private boolean freezeUpdates, runningPolling, inForeground;
+    private boolean freezeUpdates, runningPolling, inForeground, completeOnCreateCalled;
     private final ServiceConnection serviceConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName className, IBinder binder) {
             final ComputerManagerService.ComputerManagerBinder localBinder =
@@ -86,11 +94,19 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         }
     };
 
+    @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
 
-        // Reinitialize views just in case orientation changed
-        initializeViews();
+        // Only reinitialize views if completeOnCreate() was called
+        // before this callback. If it was not, completeOnCreate() will
+        // handle initializing views with the config change accounted for.
+        // This is not prone to races because both callbacks are invoked
+        // in the main thread.
+        if (completeOnCreateCalled) {
+            // Reinitialize views just in case orientation changed
+            initializeViews();
+        }
     }
 
     private final static int APP_LIST_ID = 1;
@@ -100,6 +116,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);
@@ -109,10 +126,13 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         // Set default preferences if we've never been run
         PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
 
+        // Set the correct layout for the PC grid
+        pcGridAdapter.updateLayoutWithPreferences(this, PreferenceConfiguration.readPreferences(this));
+
         // Setup the list view
-        ImageButton settingsButton = (ImageButton) findViewById(R.id.settingsButton);
-        ImageButton addComputerButton = (ImageButton) findViewById(R.id.manuallyAddPc);
-        ImageButton helpButton = (ImageButton) findViewById(R.id.helpButton);
+        ImageButton settingsButton = findViewById(R.id.settingsButton);
+        ImageButton addComputerButton = findViewById(R.id.manuallyAddPc);
+        ImageButton helpButton = findViewById(R.id.helpButton);
 
         settingsButton.setOnClickListener(new OnClickListener() {
             @Override
@@ -138,7 +158,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
             .replace(R.id.pcFragmentContainer, new AdapterFragment())
             .commitAllowingStateLoss();
 
-        noPcFoundLayout = (RelativeLayout) findViewById(R.id.no_pc_found_layout);
+        noPcFoundLayout = findViewById(R.id.no_pc_found_layout);
         if (pcGridAdapter.getCount() == 0) {
             noPcFoundLayout.setVisibility(View.VISIBLE);
         }
@@ -152,6 +172,52 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        // Assume we're in the foreground when created to avoid a race
+        // between binding to CMS and onResume()
+        inForeground = true;
+
+        // Create a GLSurfaceView to fetch GLRenderer unless we have
+        // a cached result already.
+        final GlPreferences glPrefs = GlPreferences.readPreferences(this);
+        if (!glPrefs.savedFingerprint.equals(Build.FINGERPRINT) || glPrefs.glRenderer.isEmpty()) {
+            GLSurfaceView surfaceView = new GLSurfaceView(this);
+            surfaceView.setRenderer(new GLSurfaceView.Renderer() {
+                @Override
+                public void onSurfaceCreated(GL10 gl10, EGLConfig eglConfig) {
+                    // Save the GLRenderer string so we don't need to do this next time
+                    glPrefs.glRenderer = gl10.glGetString(GL10.GL_RENDERER);
+                    glPrefs.savedFingerprint = Build.FINGERPRINT;
+                    glPrefs.writePreferences();
+
+                    LimeLog.info("Fetched GL Renderer: " + glPrefs.glRenderer);
+
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            completeOnCreate();
+                        }
+                    });
+                }
+
+                @Override
+                public void onSurfaceChanged(GL10 gl10, int i, int i1) {
+                }
+
+                @Override
+                public void onDrawFrame(GL10 gl10) {
+                }
+            });
+            setContentView(surfaceView);
+        }
+        else {
+            LimeLog.info("Cached GL Renderer: " + glPrefs.glRenderer);
+            completeOnCreate();
+        }
+    }
+
+    private void completeOnCreate() {
+        completeOnCreateCalled = true;
+
         shortcutHelper = new ShortcutHelper(this);
 
         UiHelper.setLocale(this);
@@ -160,9 +226,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         bindService(new Intent(PcView.this, ComputerManagerService.class), serviceConnection,
                 Service.BIND_AUTO_CREATE);
 
-        pcGridAdapter = new PcGridAdapter(this,
-                PreferenceConfiguration.readPreferences(this).listMode,
-                PreferenceConfiguration.readPreferences(this).smallIconMode);
+        pcGridAdapter = new PcGridAdapter(this, PreferenceConfiguration.readPreferences(this));
 
         initializeViews();
     }
@@ -220,6 +284,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     protected void onResume() {
         super.onResume();
 
+        // Display a decoder crash notification if we've returned after a crash
+        UiHelper.showDecoderCrashDialog(this);
+
         inForeground = true;
         startComputerUpdates();
     }
@@ -250,8 +317,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));
         }
@@ -271,6 +338,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
@@ -282,7 +350,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;
         }
@@ -306,23 +375,11 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                     // Stop updates and wait while pairing
                     stopComputerUpdates(true);
 
-                    InetAddress addr;
-                    if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
-                        addr = computer.localIp;
-                    }
-                    else if (computer.reachability == ComputerDetails.Reachability.REMOTE) {
-                        addr = computer.remoteIp;
-                    }
-                    else {
-                        LimeLog.warning("Unknown reachability - using local IP");
-                        addr = computer.localIp;
-                    }
-
-                    httpConn = new NvHTTP(addr,
+                    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;
@@ -334,21 +391,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);
@@ -362,7 +424,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();
                 }
@@ -380,7 +442,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
                         if (toastSuccess) {
                             // Open the app list after a successful pairing attempt
-                            doAppList(computer);
+                            doAppList(computer, true);
                         }
                         else {
                             // Start polling again if we're still in the foreground
@@ -403,7 +465,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() {
@@ -427,7 +488,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;
         }
@@ -443,21 +505,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 NvHTTP httpConn;
                 String message;
                 try {
-                    InetAddress addr;
-                    if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
-                        addr = computer.localIp;
-                    }
-                    else if (computer.reachability == ComputerDetails.Reachability.REMOTE) {
-                        addr = computer.remoteIp;
-                    }
-                    else {
-                        LimeLog.warning("Unknown reachability - using local IP");
-                        addr = computer.localIp;
-                    }
-
-                    httpConn = new NvHTTP(addr,
+                    httpConn = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer),
                             managerBinder.getUniqueId(),
-                            PlatformBinding.getDeviceName(),
+                            computer.serverCert,
                             PlatformBinding.getCryptoProvider(PcView.this));
                     if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
                         httpConn.unpair();
@@ -475,8 +525,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;
@@ -490,8 +541,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         }).start();
     }
 
-    private void doAppList(ComputerDetails computer) {
-        if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
+    private void doAppList(ComputerDetails computer, boolean newlyPaired) {
+        if (computer.state == ComputerDetails.State.OFFLINE) {
             Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
             return;
         }
@@ -502,7 +553,8 @@ 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);
+        i.putExtra(AppView.NEW_PAIR_EXTRA, newlyPaired);
         startActivity(i);
     }
 
@@ -524,16 +576,24 @@ 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;
+                        }
+                        removeComputer(computer.details);
+                    }
+                }, null);
                 return true;
 
             case APP_LIST_ID:
-                doAppList(computer.details);
+                doAppList(computer.details, false);
                 return true;
 
             case RESUME_ID:
@@ -542,7 +602,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                     return true;
                 }
 
-                ServerHelper.doStart(this, new NvApp("app", computer.details.runningGameId), computer.details, managerBinder);
+                ServerHelper.doStart(this, new NvApp("app", computer.details.runningGameId, false), computer.details, managerBinder);
                 return true;
 
             case QUIT_ID:
@@ -555,25 +615,32 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 UiHelper.displayQuitConfirmationDialog(this, new Runnable() {
                     @Override
                     public void run() {
-                        ServerHelper.doQuit(PcView.this,
-                                ServerHelper.getCurrentAddressFromComputer(computer.details),
-                                new NvApp("app", 0), managerBinder, null);
+                        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);
         }
     }
     
     private void removeComputer(ComputerDetails details) {
+        managerBinder.removeComputer(details);
+
+        new DiskAssetLoader(this).deleteAssetsForComputer(details.uuid);
+
         for (int i = 0; i < pcGridAdapter.getCount(); i++) {
             ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
 
             if (details.equals(computer.details)) {
                 // Disable or delete shortcuts referencing this PC
-                shortcutHelper.disableShortcut(details.uuid.toString(),
+                shortcutHelper.disableComputerShortcut(details,
                         getResources().getString(R.string.scut_deleted_pc));
 
                 pcGridAdapter.removeComputer(computer);
@@ -604,7 +671,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.createAppViewShortcutForOnlineHost(details);
         }
 
         if (existingEntry != null) {
@@ -638,18 +705,19 @@ 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) {
                     // Pair an unpaired machine by default
                     doPair(computer.details);
                 } else {
-                    doAppList(computer.details);
+                    doAppList(computer.details, false);
                 }
             }
         });
+        UiHelper.applyStatusBarPadding(listView);
         registerForContextMenu(listView);
     }
 

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

@@ -0,0 +1,107 @@
+package com.limelight;
+
+import android.content.ContentProvider;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+
+import com.limelight.grid.assets.DiskAssetLoader;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.List;
+
+public class PosterContentProvider extends ContentProvider {
+
+
+    public static final String AUTHORITY = "poster." + BuildConfig.APPLICATION_ID;
+    public static final String PNG_MIME_TYPE = "image/png";
+    public static final int APP_ID_PATH_INDEX = 2;
+    public static final int COMPUTER_UUID_PATH_INDEX = 1;
+    private DiskAssetLoader mDiskAssetLoader;
+
+    private static final UriMatcher sUriMatcher;
+    private static final String BOXART_PATH = "boxart";
+    private static final int BOXART_URI_ID = 1;
+
+    static {
+        sUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+        sUriMatcher.addURI(AUTHORITY, BOXART_PATH, BOXART_URI_ID);
+    }
+
+    @Override
+    public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
+        int match = sUriMatcher.match(uri);
+        if (match == BOXART_URI_ID) {
+            return openBoxArtFile(uri, mode);
+        }
+        return openBoxArtFile(uri, mode);
+
+    }
+
+    public ParcelFileDescriptor openBoxArtFile(Uri uri, String mode) throws FileNotFoundException {
+        if (!"r".equals(mode)) {
+            throw new UnsupportedOperationException("This provider is only for read mode");
+        }
+
+        List<String> segments = uri.getPathSegments();
+        if (segments.size() != 3) {
+            throw new FileNotFoundException();
+        }
+        String appId = segments.get(APP_ID_PATH_INDEX);
+        String uuid = segments.get(COMPUTER_UUID_PATH_INDEX);
+        File file = mDiskAssetLoader.getFile(uuid, Integer.parseInt(appId));
+        if (file.exists()) {
+            return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
+        }
+        throw new FileNotFoundException();
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        throw new UnsupportedOperationException("This provider is only for read mode");
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        return PNG_MIME_TYPE;
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        throw new UnsupportedOperationException("This provider is only for read mode");
+    }
+
+    @Override
+    public boolean onCreate() {
+        mDiskAssetLoader = new DiskAssetLoader(getContext());
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection,
+                        String[] selectionArgs, String sortOrder) {
+        throw new UnsupportedOperationException("This provider doesn't support query");
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection,
+                      String[] selectionArgs) {
+        throw new UnsupportedOperationException("This provider is support read only");
+    }
+
+
+    public static Uri createBoxArtUri(String uuid, String appId) {
+        return new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(AUTHORITY)
+                .appendPath(BOXART_PATH)
+                .appendPath(uuid)
+                .appendPath(appId)
+                .build();
+    }
+
+}

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

@@ -0,0 +1,277 @@
+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 NvApp app;
+    private ArrayList<Intent> intentStack = new ArrayList<>();
+
+    private ComputerDetails computer;
+    private SpinnerDialog blockingLoadSpinner;
+
+    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 (app != null) {
+                                                if (details.runningGameId == 0 || details.runningGameId == app.getAppId()) {
+                                                    intentStack.add(ServerHelper.createStartIntent(ShortcutTrampoline.this, app, 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, app, 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(null, 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(String uuidString, String appIdString) {
+        // 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);
+
+        String appIdString = getIntent().getStringExtra(Game.EXTRA_APP_ID);
+        uuidString = getIntent().getStringExtra(AppView.UUID_EXTRA);
+
+        if (validateInput(uuidString, appIdString)) {
+            if (appIdString != null && !appIdString.isEmpty()) {
+                app = new NvApp(getIntent().getStringExtra(Game.EXTRA_APP_NAME),
+                        Integer.parseInt(appIdString),
+                        getIntent().getBooleanExtra(Game.EXTRA_APP_HDR, false));
+            }
+
+            // 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/audio/AndroidAudioRenderer.java

@@ -1,8 +1,10 @@
 package com.limelight.binding.audio;
 
+import android.media.AudioAttributes;
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioTrack;
+import android.os.Build;
 
 import com.limelight.LimeLog;
 import com.limelight.nvstream.av.audio.AudioRenderer;
@@ -12,90 +14,206 @@ public class AndroidAudioRenderer implements AudioRenderer {
 
     private AudioTrack track;
 
+    private AudioTrack createAudioTrack(int channelConfig, int sampleRate, int bufferSize, boolean lowLatency) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            return new AudioTrack(AudioManager.STREAM_MUSIC,
+                    sampleRate,
+                    channelConfig,
+                    AudioFormat.ENCODING_PCM_16BIT,
+                    bufferSize,
+                    AudioTrack.MODE_STREAM);
+        }
+        else {
+            AudioAttributes.Builder attributesBuilder = new AudioAttributes.Builder()
+                    .setUsage(AudioAttributes.USAGE_GAME);
+            AudioFormat format = new AudioFormat.Builder()
+                    .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+                    .setSampleRate(sampleRate)
+                    .setChannelMask(channelConfig)
+                    .build();
+
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+                // Use FLAG_LOW_LATENCY on L through N
+                if (lowLatency) {
+                    attributesBuilder.setFlags(AudioAttributes.FLAG_LOW_LATENCY);
+                }
+            }
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                AudioTrack.Builder trackBuilder = new AudioTrack.Builder()
+                        .setAudioFormat(format)
+                        .setAudioAttributes(attributesBuilder.build())
+                        .setTransferMode(AudioTrack.MODE_STREAM)
+                        .setBufferSizeInBytes(bufferSize);
+
+                // Use PERFORMANCE_MODE_LOW_LATENCY on O and later
+                if (lowLatency) {
+                    trackBuilder.setPerformanceMode(AudioTrack.PERFORMANCE_MODE_LOW_LATENCY);
+                }
+
+                return trackBuilder.build();
+            }
+            else {
+                return new AudioTrack(attributesBuilder.build(),
+                        format,
+                        bufferSize,
+                        AudioTrack.MODE_STREAM,
+                        AudioManager.AUDIO_SESSION_ID_GENERATE);
+            }
+        }
+    }
+
     @Override
-    public int setup(int audioConfiguration) {
+    public int setup(MoonBridge.AudioConfiguration audioConfiguration, int sampleRate, int samplesPerFrame) {
         int channelConfig;
-        int bufferSize;
         int bytesPerFrame;
 
-        switch (audioConfiguration)
+        switch (audioConfiguration.channelCount)
         {
-            case MoonBridge.AUDIO_CONFIGURATION_STEREO:
+            case 2:
                 channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
-                bytesPerFrame = 2 * 240 * 2;
                 break;
-            case MoonBridge.AUDIO_CONFIGURATION_51_SURROUND:
+            case 4:
+                channelConfig = AudioFormat.CHANNEL_OUT_QUAD;
+                break;
+            case 6:
                 channelConfig = AudioFormat.CHANNEL_OUT_5POINT1;
-                bytesPerFrame = 6 * 240 * 2;
+                break;
+            case 8:
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    // AudioFormat.CHANNEL_OUT_7POINT1_SURROUND isn't available until Android 6.0,
+                    // yet the CHANNEL_OUT_SIDE_LEFT and CHANNEL_OUT_SIDE_RIGHT constants were added
+                    // in 5.0, so just hardcode the constant so we can work on Lollipop.
+                    channelConfig = 0x000018fc; // AudioFormat.CHANNEL_OUT_7POINT1_SURROUND
+                }
+                else {
+                    // On KitKat and lower, creation of the AudioTrack will fail if we specify
+                    // CHANNEL_OUT_SIDE_LEFT or CHANNEL_OUT_SIDE_RIGHT. That leaves us with
+                    // the old CHANNEL_OUT_7POINT1 which uses left-of-center and right-of-center
+                    // speakers instead of side-left and side-right. This non-standard layout
+                    // is probably not what the user wants, but we don't really have a choice.
+                    channelConfig = AudioFormat.CHANNEL_OUT_7POINT1;
+                }
                 break;
             default:
                 LimeLog.severe("Decoder returned unhandled channel count");
                 return -1;
         }
 
+        LimeLog.info("Audio channel config: "+String.format("0x%X", channelConfig));
+
+        bytesPerFrame = audioConfiguration.channelCount * samplesPerFrame * 2;
+
         // We're not supposed to request less than the minimum
         // buffer size for our buffer, but it appears that we can
         // do this on many devices and it lowers audio latency.
         // We'll try the small buffer size first and if it fails,
         // use the recommended larger buffer size.
-        try {
-            // Buffer two frames of audio if possible
-            bufferSize = bytesPerFrame * 2;
 
-            track = new AudioTrack(AudioManager.STREAM_MUSIC,
-                    48000,
-                    channelConfig,
-                    AudioFormat.ENCODING_PCM_16BIT,
-                    bufferSize,
-                    AudioTrack.MODE_STREAM);
-            track.play();
-        } catch (Exception e) {
-            // Try to release the AudioTrack if we got far enough
-            try {
-                if (track != null) {
-                    track.release();
-                }
-            } catch (Exception ignored) {}
+        for (int i = 0; i < 4; i++) {
+            boolean lowLatency;
+            int bufferSize;
 
-            // Now try the larger buffer size
-            bufferSize = Math.max(AudioTrack.getMinBufferSize(48000,
+            // We will try:
+            // 1) Small buffer, low latency mode
+            // 2) Large buffer, low latency mode
+            // 3) Small buffer, standard mode
+            // 4) Large buffer, standard mode
+
+            switch (i) {
+                case 0:
+                case 1:
+                    lowLatency = true;
+                    break;
+                case 2:
+                case 3:
+                    lowLatency = false;
+                    break;
+                default:
+                    // Unreachable
+                    throw new IllegalStateException();
+            }
+
+            switch (i) {
+                case 0:
+                case 2:
+                    bufferSize = bytesPerFrame * 2;
+                    break;
+
+                case 1:
+                case 3:
+                    // Try the larger buffer size
+                    bufferSize = Math.max(AudioTrack.getMinBufferSize(sampleRate,
                             channelConfig,
                             AudioFormat.ENCODING_PCM_16BIT),
-                    bytesPerFrame * 2);
+                            bytesPerFrame * 2);
 
-            // Round to next frame
-            bufferSize = (((bufferSize + (bytesPerFrame - 1)) / bytesPerFrame) * bytesPerFrame);
+                    // Round to next frame
+                    bufferSize = (((bufferSize + (bytesPerFrame - 1)) / bytesPerFrame) * bytesPerFrame);
+                    break;
+                default:
+                    // Unreachable
+                    throw new IllegalStateException();
+            }
 
-            track = new AudioTrack(AudioManager.STREAM_MUSIC,
-                    48000,
-                    channelConfig,
-                    AudioFormat.ENCODING_PCM_16BIT,
-                    bufferSize,
-                    AudioTrack.MODE_STREAM);
-            track.play();
+            // Skip low latency options if hardware sample rate doesn't match the content
+            if (AudioTrack.getNativeOutputSampleRate(AudioManager.STREAM_MUSIC) != sampleRate && lowLatency) {
+                continue;
+            }
+
+            try {
+                track = createAudioTrack(channelConfig, sampleRate, bufferSize, lowLatency);
+                track.play();
+
+                // Successfully created working AudioTrack. We're done here.
+                LimeLog.info("Audio track configuration: "+bufferSize+" "+lowLatency);
+                break;
+            } catch (Exception e) {
+                // Try to release the AudioTrack if we got far enough
+                e.printStackTrace();
+                try {
+                    if (track != null) {
+                        track.release();
+                        track = null;
+                    }
+                } catch (Exception ignored) {}
+            }
+        }
+
+        if (track == null) {
+            // Couldn't create any audio track for playback
+            return -2;
         }
 
-        LimeLog.info("Audio track buffer size: "+bufferSize);
         return 0;
     }
 
     @Override
-    public void playDecodedAudio(byte[] audioData) {
-        track.write(audioData, 0, audioData.length);
+    public void playDecodedAudio(short[] audioData) {
+        // Only queue up to 40 ms of pending audio data in addition to what AudioTrack is buffering for us.
+        if (MoonBridge.getPendingAudioDuration() < 40) {
+            // This will block until the write is completed. That can cause a backlog
+            // of pending audio data, so we do the above check to be able to bound
+            // latency at 40 ms in that situation.
+            track.write(audioData, 0, audioData.length);
+        }
+        else {
+            LimeLog.info("Too much pending audio data: " + MoonBridge.getPendingAudioDuration() +" ms");
+        }
     }
 
     @Override
     public void start() {}
 
     @Override
-    public void stop() {
-        // Immediately drop all pending data
-        track.pause();
-        track.flush();
-    }
+    public void stop() {}
 
     @Override
     public void cleanup() {
+        // Immediately drop all pending data
+        track.pause();
+        track.flush();
+
         track.release();
     }
 }

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

@@ -12,9 +12,8 @@ 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.Security;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
@@ -54,10 +53,7 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
 
     private static final Object globalCryptoLock = new Object();
 
-    static {
-        // Install the Bouncy Castle provider
-        Security.addProvider(new BouncyCastleProvider());
-    }
+    private static final Provider bcProvider = new BouncyCastleProvider();
 
     public AndroidCryptoProvider(Context c) {
         String dataPath = c.getFilesDir().getAbsolutePath();
@@ -96,10 +92,10 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
         }
 
         try {
-            CertificateFactory certFactory = CertificateFactory.getInstance("X.509", "BC");
+            CertificateFactory certFactory = CertificateFactory.getInstance("X.509", bcProvider);
             cert = (X509Certificate) certFactory.generateCertificate(new ByteArrayInputStream(certBytes));
             pemCertBytes = certBytes;
-            KeyFactory keyFactory = KeyFactory.getInstance("RSA", "BC");
+            KeyFactory keyFactory = KeyFactory.getInstance("RSA", bcProvider);
             key = (RSAPrivateKey) keyFactory.generatePrivate(new PKCS8EncodedKeySpec(keyBytes));
         } catch (CertificateException e) {
             // May happen if the cert is corrupt
@@ -113,10 +109,6 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
             // May happen if the key is corrupt
             LimeLog.warning("Corrupted key");
             return false;
-        } catch (NoSuchProviderException e) {
-            // Should never happen
-            e.printStackTrace();
-            return false;
         }
 
         return true;
@@ -129,17 +121,13 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
 
         KeyPair keyPair;
         try {
-            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA", "BC");
+            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA", bcProvider);
             keyPairGenerator.initialize(2048);
             keyPair = keyPairGenerator.generateKeyPair();
         } catch (NoSuchAlgorithmException e1) {
             // Should never happen
             e1.printStackTrace();
             return false;
-        } catch (NoSuchProviderException e) {
-            // Should never happen
-            e.printStackTrace();
-            return false;
         }
 
         Date now = new Date();
@@ -160,13 +148,13 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
             SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded()));
 
         try {
-            ContentSigner sigGen = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BouncyCastleProvider.PROVIDER_NAME).build(keyPair.getPrivate());
-            cert = new JcaX509CertificateConverter().setProvider(BouncyCastleProvider.PROVIDER_NAME).getCertificate(certBuilder.build(sigGen));
+            ContentSigner sigGen = new JcaContentSignerBuilder("SHA256withRSA").setProvider(bcProvider).build(keyPair.getPrivate());
+            cert = new JcaX509CertificateConverter().setProvider(bcProvider).getCertificate(certBuilder.build(sigGen));
             key = (RSAPrivateKey) keyPair.getPrivate();
         } 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

@@ -1,8 +1,15 @@
 package com.limelight.binding.input;
 
+import android.app.Activity;
 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;
@@ -11,13 +18,17 @@ 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;
 import com.limelight.nvstream.input.ControllerPacket;
 import com.limelight.nvstream.input.MouseButtonPacket;
+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;
 
@@ -41,24 +52,26 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     private final SparseArray<UsbDeviceContext> usbDeviceContexts = new SparseArray<>();
 
     private final NvConnection conn;
-    private final Context activityContext;
+    private final Activity activityContext;
     private final double stickDeadzone;
     private final InputDeviceContext defaultContext = new InputDeviceContext();
     private final GameGestures gestures;
+    private final Vibrator deviceVibrator;
     private boolean hasGameController;
 
-    private final boolean multiControllerEnabled;
-    private short currentControllers;
+    private final PreferenceConfiguration prefConfig;
+    private short currentControllers, initialControllers;
 
-    public ControllerHandler(Context activityContext, NvConnection conn, GameGestures gestures, boolean multiControllerEnabled, int deadzonePercentage) {
+    public ControllerHandler(Activity activityContext, NvConnection conn, GameGestures gestures, PreferenceConfiguration prefConfig) {
         this.activityContext = activityContext;
         this.conn = conn;
         this.gestures = gestures;
-        this.multiControllerEnabled = multiControllerEnabled;
+        this.prefConfig = prefConfig;
+        this.deviceVibrator = (Vibrator) activityContext.getSystemService(Context.VIBRATOR_SERVICE);
 
-        // HACK: For now we're hardcoding a 10% deadzone. Some deadzone
+        // HACK: For now we're hardcoding a 7% deadzone. Some deadzone
         // is required for controller batching support to work.
-        deadzonePercentage = 10;
+        int deadzonePercentage = 7;
 
         int[] ids = InputDevice.getDeviceIds();
         for (int id : ids) {
@@ -96,6 +109,19 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         defaultContext.rightTriggerAxis = MotionEvent.AXIS_GAS;
         defaultContext.controllerNumber = (short) 0;
         defaultContext.assignedControllerNumber = true;
+        defaultContext.external = false;
+
+        // Some devices (GPD XD) have a back button which sends input events
+        // with device ID == 0. This hits the default context which would normally
+        // consume these. Instead, let's ignore them since that's probably the
+        // most likely case.
+        defaultContext.ignoreBack = true;
+
+        // Get the initially attached set of gamepads. As each gamepad receives
+        // its initial InputEvent, we will move these from this set onto the
+        // currentControllers set which will allow them to properly unplug
+        // if they are removed.
+        initialControllers = getAttachedControllerMask(activityContext);
     }
 
     private static InputDevice.MotionRange getMotionRangeForJoystickAxis(InputDevice dev, int axis) {
@@ -122,6 +148,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         if (context != null) {
             LimeLog.info("Removed controller: "+context.name+" ("+deviceId+")");
             releaseControllerNumber(context);
+            context.destroy();
             inputDeviceContexts.remove(deviceId);
         }
     }
@@ -133,8 +160,95 @@ 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);
+            deviceContext.destroy();
+        }
+
+        for (int i = 0; i < usbDeviceContexts.size(); i++) {
+            UsbDeviceContext deviceContext = usbDeviceContexts.valueAt(i);
+            deviceContext.destroy();
+        }
+
+        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;
+
+        // Count all input devices that are gamepads
+        InputManager im = (InputManager) context.getSystemService(Context.INPUT_SERVICE);
+        for (int id : im.getInputDeviceIds()) {
+            InputDevice dev = im.getInputDevice(id);
+            if (dev == null) {
+                continue;
+            }
+
+            if (hasJoystickAxes(dev)) {
+                LimeLog.info("Counting InputDevice: "+dev.getName());
+                mask |= 1 << count++;
+            }
+        }
+
+        // Count all USB devices that match our drivers
+        if (PreferenceConfiguration.readPreferences(context).usbDriver) {
+            UsbManager usbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
+            for (UsbDevice dev : usbManager.getDeviceList().values()) {
+                // We explicitly check not to claim devices that appear as InputDevices
+                // otherwise we will double count them.
+                if (UsbDriverService.shouldClaimDevice(dev, false) &&
+                        !UsbDriverService.isRecognizedInputDevice(dev)) {
+                    LimeLog.info("Counting UsbDevice: "+dev.getDeviceName());
+                    mask |= 1 << count++;
+                }
+            }
+        }
+
+        if (PreferenceConfiguration.readPreferences(context).onscreenController) {
+            LimeLog.info("Counting OSC gamepad");
+            mask |= 1;
+        }
+
+        LimeLog.info("Enumerated "+count+" gamepads");
+        return mask;
+    }
+
     private void releaseControllerNumber(GenericControllerContext context) {
-        // If this device sent data as a gamepad, zero the values before removing
+        // If we reserved a controller number, remove that reservation
+        if (context.reservedControllerNumber) {
+            LimeLog.info("Controller number "+context.controllerNumber+" is now available");
+            currentControllers &= ~(1 << context.controllerNumber);
+        }
+
+        // If this device sent data as a gamepad, zero the values before removing.
+        // We must do this after clearing the currentControllers entry so this
+        // causes the device to be removed on the server PC.
         if (context.assignedControllerNumber) {
             conn.sendControllerInput(context.controllerNumber, getActiveControllerMask(),
                     (short) 0,
@@ -142,12 +256,6 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                     (short) 0, (short) 0,
                     (short) 0, (short) 0);
         }
-
-        // If we reserved a controller number, remove that reservation
-        if (context.reservedControllerNumber) {
-            LimeLog.info("Controller number "+context.controllerNumber+" is now available");
-            currentControllers &= ~(1 << context.controllerNumber);
-        }
     }
 
     // Called before sending input but after we've determined that this
@@ -161,13 +269,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             InputDeviceContext devContext = (InputDeviceContext) context;
 
             LimeLog.info(devContext.name+" ("+context.id+") needs a controller number assigned");
-            if (devContext.name != null &&
-                    (devContext.name.contains("gpio-keys") || // This is the back button on Shield portable consoles
-                            devContext.name.contains("joy_key"))) { // These are the gamepad buttons on the Archos Gamepad 2
+            if (!devContext.external) {
                 LimeLog.info("Built-in buttons hardcoded as controller 0");
                 context.controllerNumber = 0;
             }
-            else if (multiControllerEnabled && devContext.hasJoystickAxes) {
+            else if (prefConfig.multiController && devContext.hasJoystickAxes) {
                 context.controllerNumber = 0;
 
                 LimeLog.info("Reserving the next available controller number");
@@ -175,6 +281,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                     if ((currentControllers & (1 << i)) == 0) {
                         // Found an unused controller value
                         currentControllers |= (1 << i);
+
+                        // Take this value out of the initial gamepad set
+                        initialControllers &= ~(1 << i);
+
                         context.controllerNumber = i;
                         context.reservedControllerNumber = true;
                         break;
@@ -187,7 +297,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             }
         }
         else {
-            if (multiControllerEnabled) {
+            if (prefConfig.multiController) {
                 context.controllerNumber = 0;
 
                 LimeLog.info("Reserving the next available controller number");
@@ -195,6 +305,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                     if ((currentControllers & (1 << i)) == 0) {
                         // Found an unused controller value
                         currentControllers |= (1 << i);
+
+                        // Take this value out of the initial gamepad set
+                        initialControllers &= ~(1 << i);
+
                         context.controllerNumber = i;
                         context.reservedControllerNumber = true;
                         break;
@@ -211,10 +325,12 @@ 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.external = true;
 
         context.leftStickDeadzoneRadius = (float) stickDeadzone;
         context.rightStickDeadzoneRadius = (float) stickDeadzone;
@@ -223,15 +339,125 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         return context;
     }
 
+    private static boolean isExternal(InputDevice dev) {
+        // The ASUS Tinker Board inaccurately reports Bluetooth gamepads as internal,
+        // causing shouldIgnoreBack() to believe it should pass through back as a
+        // navigation event for any attached gamepads.
+        if (Build.MODEL.equals("Tinker Board")) {
+            return true;
+        }
+
+        String deviceName = dev.getName();
+        if (deviceName.contains("gpio") || // This is the back button on Shield portable consoles
+                deviceName.contains("joy_key") || // These are the gamepad buttons on the Archos Gamepad 2
+                deviceName.contains("keypad") || // These are gamepad buttons on the XPERIA Play
+                deviceName.equalsIgnoreCase("NVIDIA Corporation NVIDIA Controller v01.01") || // Gamepad on Shield Portable
+                deviceName.equalsIgnoreCase("NVIDIA Corporation NVIDIA Controller v01.02")) // Gamepad on Shield Portable (?)
+        {
+            LimeLog.info(dev.getName()+" is internal by hardcoded mapping");
+            return false;
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            // Landroid/view/InputDevice;->isExternal()Z is officially public on Android Q
+            return dev.isExternal();
+        }
+        else {
+            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 (!hasJoystickAxes(dev) && 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.
+                if (currentDev.hasKeys(KeyEvent.KEYCODE_BUTTON_SELECT)[0]) {
+                    foundInternalSelect = true;
+                }
+
+                // We don't check KEYCODE_BUTTON_A here, since the Shield Android TV has a
+                // virtual mouse device that claims to have KEYCODE_BUTTON_A. Instead, we rely
+                // on the SOURCE_GAMEPAD flag to be set on gamepad devices.
+                if (hasGamepadButtons(currentDev)) {
+                    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;
+        }
+        else {
+            // For external devices, we want to pass through the back button if the device
+            // has no gamepad axes or gamepad buttons.
+            return !hasJoystickAxes(dev) && !hasGamepadButtons(dev);
+        }
+    }
+
     private InputDeviceContext createInputDeviceContextForDevice(InputDevice dev) {
         InputDeviceContext context = new InputDeviceContext();
         String devName = dev.getName();
 
         LimeLog.info("Creating controller context for device: "+devName);
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+            LimeLog.info("Vendor ID: "+dev.getVendorId());
+            LimeLog.info("Product ID: "+dev.getProductId());
+        }
         LimeLog.info(dev.toString());
 
         context.name = devName;
         context.id = dev.getId();
+        context.external = isExternal(dev);
+
+        if (dev.getVibrator().hasVibrator()) {
+            context.vibrator = dev.getVibrator();
+        }
 
         context.leftStickXAxis = MotionEvent.AXIS_X;
         context.leftStickYAxis = MotionEvent.AXIS_Y;
@@ -270,25 +496,45 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             InputDevice.MotionRange rxRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RX);
             InputDevice.MotionRange ryRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RY);
             if (rxRange != null && ryRange != null && devName != null) {
-                if (devName.contains("Xbox") || devName.contains("XBox") || devName.contains("X-Box")) {
-                    // Xbox controllers use RX and RY for right stick
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+                    if (dev.getVendorId() == 0x054c) { // Sony
+                        if (dev.hasKeys(KeyEvent.KEYCODE_BUTTON_C)[0]) {
+                            LimeLog.info("Detected non-standard DualShock 4 mapping");
+                            context.isNonStandardDualShock4 = true;
+                        }
+                        else {
+                            LimeLog.info("Detected DualShock 4 (Linux standard mapping)");
+                            context.usesLinuxGamepadStandardFaceButtons = true;
+                        }
+                    }
+                }
+                else if (!devName.contains("Xbox") && !devName.contains("XBox") && !devName.contains("X-Box")) {
+                    LimeLog.info("Assuming non-standard DualShock 4 mapping on < 4.4");
+                    context.isNonStandardDualShock4 = true;
+                }
+
+                if (context.isNonStandardDualShock4) {
+                    // The old DS4 driver uses RX and RY for triggers
+                    context.leftTriggerAxis = MotionEvent.AXIS_RX;
+                    context.rightTriggerAxis = MotionEvent.AXIS_RY;
+                }
+                else {
+                    // If it's not a non-standard DS4 controller, it's probably an Xbox controller or
+                    // other sane controller that uses RX and RY for right stick and Z and RZ for triggers.
                     context.rightStickXAxis = MotionEvent.AXIS_RX;
                     context.rightStickYAxis = MotionEvent.AXIS_RY;
 
-                    // Xbox controllers use Z and RZ for triggers
-                    context.leftTriggerAxis = MotionEvent.AXIS_Z;
-                    context.rightTriggerAxis = MotionEvent.AXIS_RZ;
-                    context.triggersIdleNegative = true;
-                    context.isXboxController = true;
+                    // While it's likely that Z and RZ are triggers, we may have digital trigger buttons
+                    // instead. We must check that we actually have Z and RZ axes before assigning them.
+                    if (getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Z) != null &&
+                            getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RZ) != null) {
+                        context.leftTriggerAxis = MotionEvent.AXIS_Z;
+                        context.rightTriggerAxis = MotionEvent.AXIS_RZ;
+                    }
                 }
-                else {
-                    // DS4 controller uses RX and RY for triggers
-                    context.leftTriggerAxis = MotionEvent.AXIS_RX;
-                    context.rightTriggerAxis = MotionEvent.AXIS_RY;
-                    context.triggersIdleNegative = true;
 
-                    context.isDualShock4 = true;
-                }
+                // Triggers always idle negative on axes that are centered at zero
+                context.triggersIdleNegative = true;
             }
         }
 
@@ -355,6 +601,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
@@ -374,28 +622,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.contains("Fire TV Remote") || devName.contains("Nexus 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
-            else if (devName.equals("sec_touchscreen") || devName.equals("sec_touchkey")) {
-                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
@@ -405,7 +640,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             // required fixup is ignoring the select button.
             else if (devName.equals("Xbox Wireless Controller")) {
                 if (gasRange == null) {
-                    context.isXboxBtController = true;
+                    context.isNonStandardXboxBtController = true;
                 }
             }
         }
@@ -464,8 +699,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     }
 
     private short getActiveControllerMask() {
-        if (multiControllerEnabled) {
-            return currentControllers;
+        if (prefConfig.multiController) {
+            return (short)(currentControllers | initialControllers | (prefConfig.onscreenController ? 1 : 0));
         }
         else {
             // Only Player 1 is active with multi-controller disabled
@@ -551,6 +786,16 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                     conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
                 }
             }
+            if ((changedMask & ControllerPacket.UP_FLAG) != 0) {
+                if ((inputMap & ControllerPacket.UP_FLAG) != 0) {
+                    conn.sendMouseScroll((byte) 1);
+                }
+            }
+            if ((changedMask & ControllerPacket.DOWN_FLAG) != 0) {
+                if ((inputMap & ControllerPacket.DOWN_FLAG) != 0) {
+                    conn.sendMouseScroll((byte) -1);
+                }
+            }
 
             conn.sendControllerInput(controllerNumber, getActiveControllerMask(),
                     (short)0, (byte)0, (byte)0, (short)0, (short)0, (short)0, (short)0);
@@ -574,7 +819,21 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             }
         }
 
-        if (context.isDualShock4) {
+        if (context.usesLinuxGamepadStandardFaceButtons) {
+            // Android's Generic.kl swaps BTN_NORTH and BTN_WEST
+            switch (event.getScanCode()) {
+                case 304:
+                    return KeyEvent.KEYCODE_BUTTON_A;
+                case 305:
+                    return KeyEvent.KEYCODE_BUTTON_B;
+                case 307:
+                    return KeyEvent.KEYCODE_BUTTON_Y;
+                case 308:
+                    return KeyEvent.KEYCODE_BUTTON_X;
+            }
+        }
+
+        if (context.isNonStandardDualShock4) {
             switch (event.getScanCode()) {
                 case 304:
                     return KeyEvent.KEYCODE_BUTTON_X;
@@ -619,7 +878,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                     return KeyEvent.KEYCODE_BUTTON_START;
             }
         }
-        else if (context.isXboxBtController) {
+        else if (context.isNonStandardXboxBtController) {
             switch (event.getScanCode()) {
                 case 306:
                     return KeyEvent.KEYCODE_BUTTON_X;
@@ -649,18 +908,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             }
         }
 
-        if (context.hatXAxis != -1 && context.hatYAxis != -1) {
-            switch (event.getKeyCode()) {
-            // These are duplicate dpad events for hat input
-            case KeyEvent.KEYCODE_DPAD_LEFT:
-            case KeyEvent.KEYCODE_DPAD_RIGHT:
-            case KeyEvent.KEYCODE_DPAD_CENTER:
-            case KeyEvent.KEYCODE_DPAD_UP:
-            case KeyEvent.KEYCODE_DPAD_DOWN:
-                return 0;
-            }
-        }
-        else if (context.hatXAxis == -1 &&
+        if (context.hatXAxis == -1 &&
                  context.hatYAxis == -1 &&
                  /* FIXME: There's no good way to know for sure if xpad is bound
                     to this device, so we won't use the name to validate if these
@@ -762,16 +1010,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;
                 }
             }
@@ -791,17 +1039,21 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             context.inputMap &= ~(ControllerPacket.LEFT_FLAG | ControllerPacket.RIGHT_FLAG);
             if (hatX < -0.5) {
                 context.inputMap |= ControllerPacket.LEFT_FLAG;
+                context.hatXAxisUsed = true;
             }
             else if (hatX > 0.5) {
                 context.inputMap |= ControllerPacket.RIGHT_FLAG;
+                context.hatXAxisUsed = true;
             }
 
             context.inputMap &= ~(ControllerPacket.UP_FLAG | ControllerPacket.DOWN_FLAG);
             if (hatY < -0.5) {
                 context.inputMap |= ControllerPacket.UP_FLAG;
+                context.hatYAxisUsed = true;
             }
             else if (hatY > 0.5) {
                 context.inputMap |= ControllerPacket.DOWN_FLAG;
+                context.hatYAxisUsed = true;
             }
         }
 
@@ -884,6 +1136,94 @@ 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 80% of the big motor and 33% of the small motor, then capping to 255.
+        // 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 = Math.min(255, (int)((lowFreqMotorMSB * 0.80) + (highFreqMotorMSB * 0.33)));
+
+        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;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            AudioAttributes audioAttributes = new AudioAttributes.Builder()
+                    .setUsage(AudioAttributes.USAGE_GAME)
+                    .build();
+            vibrator.vibrate(new long[]{0, onTime, offTime}, 0, audioAttributes);
+        }
+        else {
+            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) {
@@ -917,7 +1257,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             // Make sure it's real by checking that the key is actually down before taking
             // any action.
             if ((context.inputMap & ControllerPacket.PLAY_FLAG) != 0 &&
-                SystemClock.uptimeMillis() - context.startDownTime > ControllerHandler.START_DOWN_TIME_MOUSE_MODE_MS) {
+                    SystemClock.uptimeMillis() - context.startDownTime > ControllerHandler.START_DOWN_TIME_MOUSE_MODE_MS &&
+                    prefConfig.mouseEmulation) {
                 toggleMouseEmulation(context);
             }
             context.inputMap &= ~ControllerPacket.PLAY_FLAG;
@@ -927,15 +1268,31 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             context.inputMap &= ~ControllerPacket.BACK_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_LEFT:
+            if (context.hatXAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap &= ~ControllerPacket.LEFT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_RIGHT:
+            if (context.hatXAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap &= ~ControllerPacket.RIGHT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_UP:
+            if (context.hatYAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap &= ~ControllerPacket.UP_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_DOWN:
+            if (context.hatYAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap &= ~ControllerPacket.DOWN_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_B:
@@ -966,9 +1323,17 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             context.inputMap &= ~ControllerPacket.RS_CLK_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_L2:
+            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.rightTriggerAxisUsed) {
+                // Suppress this digital event if an analog trigger is active
+                return true;
+            }
             context.rightTrigger = 0;
             break;
         default:
@@ -1011,6 +1376,12 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         }
 
         sendControllerInputPacket(context);
+
+        if (context.pendingExit && context.inputMap == 0) {
+            // All buttons from the quit combo are lifted. Finish the activity now.
+            activityContext.finish();
+        }
+
         return true;
     }
 
@@ -1041,15 +1412,31 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             context.inputMap |= ControllerPacket.BACK_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_LEFT:
+            if (context.hatXAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap |= ControllerPacket.LEFT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_RIGHT:
+            if (context.hatXAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap |= ControllerPacket.RIGHT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_UP:
+            if (context.hatYAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap |= ControllerPacket.UP_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_DOWN:
+            if (context.hatYAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap |= ControllerPacket.DOWN_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_B:
@@ -1078,18 +1465,33 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             context.inputMap |= ControllerPacket.RS_CLK_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_L2:
+            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.rightTriggerAxisUsed) {
+                // Suppress this digital event if an analog trigger is active
+                return true;
+            }
             context.rightTrigger = (byte)0xFF;
             break;
         default:
             return false;
         }
 
+        // Start+Back+LB+RB is the quit combo
+        if (context.inputMap == (ControllerPacket.BACK_FLAG | ControllerPacket.PLAY_FLAG |
+                                 ControllerPacket.LB_FLAG | ControllerPacket.RB_FLAG)) {
+            // Wait for the combo to lift and then finish the activity
+            context.pendingExit = true;
+        }
+
         // Start+LB acts like select for controllers with one button
-        if ((context.inputMap & ControllerPacket.PLAY_FLAG) != 0 &&
-            ((context.inputMap & ControllerPacket.LB_FLAG) != 0 ||
+        if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG) ||
+            (context.inputMap == ControllerPacket.PLAY_FLAG &&
               SystemClock.uptimeMillis() - context.lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
         {
             context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG);
@@ -1099,10 +1501,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         }
 
         // We detect select+start or start+RB as the special button combo
-        if (((context.inputMap & ControllerPacket.RB_FLAG) != 0 ||
-             (SystemClock.uptimeMillis() - context.lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS) ||
-             (context.inputMap & ControllerPacket.BACK_FLAG) != 0) &&
-            (context.inputMap & ControllerPacket.PLAY_FLAG) != 0)
+        if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.BACK_FLAG) ||
+            context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG) ||
+                (context.inputMap == ControllerPacket.PLAY_FLAG &&
+                        SystemClock.uptimeMillis() - context.lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
         {
             context.inputMap &= ~(ControllerPacket.BACK_FLAG | ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG);
             context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
@@ -1110,7 +1512,6 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             context.emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
         }
 
-
         // We don't need to send repeat key down events, but the platform
         // sends us events that claim to be repeats but they're from different
         // devices, so we just send them all and deal with some duplicates.
@@ -1118,12 +1519,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;
         }
@@ -1158,23 +1577,25 @@ 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);
+            context.destroy();
+            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 {
         public int id;
+        public boolean external;
 
         public float leftStickDeadzoneRadius;
         public float rightStickDeadzoneRadius;
@@ -1195,10 +1616,18 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         public boolean mouseEmulationActive;
         public Timer mouseEmulationTimer;
         public short mouseEmulationLastInputMap;
+
+        public void destroy() {
+            if (mouseEmulationTimer != null) {
+                mouseEmulationTimer.cancel();
+                mouseEmulationTimer = null;
+            }
+        }
     }
 
     class InputDeviceContext extends GenericControllerContext {
         public String name;
+        public Vibrator vibrator;
 
         public int leftStickXAxis = -1;
         public int leftStickYAxis = -1;
@@ -1209,19 +1638,21 @@ 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;
+        public boolean hatXAxisUsed, hatYAxisUsed;
 
-        public boolean isDualShock4;
-        public boolean isXboxController;
-        public boolean isXboxBtController;
+        public boolean isNonStandardDualShock4;
+        public boolean usesLinuxGamepadStandardFaceButtons;
+        public boolean isNonStandardXboxBtController;
         public boolean isServal;
         public boolean backIsStart;
         public boolean modeIsSelect;
         public boolean ignoreBack;
         public boolean hasJoystickAxes;
+        public boolean pendingExit;
 
         public int emulatingButtonFlags = 0;
 
@@ -1234,7 +1665,25 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         public long lastRbUpTime = 0;
 
         public long startDownTime = 0;
+
+        @Override
+        public void destroy() {
+            super.destroy();
+
+            if (vibrator != null) {
+                vibrator.cancel();
+            }
+        }
     }
 
-    class UsbDeviceContext extends GenericControllerContext {}
+    class UsbDeviceContext extends GenericControllerContext {
+        public AbstractController device;
+
+        @Override
+        public void destroy() {
+            super.destroy();
+
+            // Nothing for now
+        }
+    }
 }

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

@@ -2,249 +2,296 @@ package com.limelight.binding.input;
 
 import android.view.KeyEvent;
 
-import com.limelight.nvstream.NvConnection;
-
 /**
  * Class to translate a Android key code into the codes GFE is expecting
  * @author Diego Waxemberg
  * @author Cameron Gutman
  */
 public class KeyboardTranslator {
-	
-	/**
-	 * GFE's prefix for every key code
-	 */
-	private static final short KEY_PREFIX = (short) 0x80;
-	
-	public static final int VK_0 = 48;
-	public static final int VK_9 = 57;
-	public static final int VK_A = 65;
-	public static final int VK_Z = 90;
-	public static final int VK_ALT = 18;
-	public static final int VK_NUMPAD0 = 96;
+    
+    /**
+     * GFE's prefix for every key code
+     */
+    private static final short KEY_PREFIX = (short) 0x80;
+    
+    public static final int VK_0 = 48;
+    public static final int VK_9 = 57;
+    public static final int VK_A = 65;
+    public static final int VK_Z = 90;
+    public static final int VK_NUMPAD0 = 96;
     public static final int VK_BACK_SLASH = 92;
     public static final int VK_CAPS_LOCK = 20;
-	public static final int VK_CLEAR = 12;
-	public static final int VK_COMMA = 44;
-	public static final int VK_CONTROL = 17;
-	public static final int VK_BACK_SPACE = 8;
-	public static final int VK_EQUALS = 61;
-	public static final int VK_ESCAPE = 27;
-	public static final int VK_F1 = 112;
-	public static final int VK_PERIOD = 46;
-	public static final int VK_INSERT = 155;
-	public static final int VK_OPEN_BRACKET = 91;
-	public static final int VK_WINDOWS = 524;
-	public static final int VK_MINUS = 45;
-	public static final int VK_END = 35;
-	public static final int VK_HOME = 36;
-	public static final int VK_NUM_LOCK = 144;
-	public static final int VK_PAGE_UP = 33;
-	public static final int VK_PAGE_DOWN = 34;
-	public static final int VK_PLUS = 521;
-	public static final int VK_CLOSE_BRACKET = 93;
-	public static final int VK_SCROLL_LOCK = 145;
-	public static final int VK_SEMICOLON = 59;
-	public static final int VK_SHIFT = 16;
-	public static final int VK_SLASH = 47;
-	public static final int VK_SPACE = 32;
-	public static final int VK_PRINTSCREEN = 154;
-	public static final int VK_TAB = 9;
-	public static final int VK_LEFT = 37;
-	public static final int VK_RIGHT = 39;
-	public static final int VK_UP = 38;
-	public static final int VK_DOWN = 40;
-	public static final int VK_BACK_QUOTE = 192;
-	public static final int VK_QUOTE = 222;
-	public static final int VK_PAUSE = 19;
-	
-	/**
-	 * Translates the given keycode and returns the GFE keycode
-	 * @param keycode the code to be translated
-	 * @return a GFE keycode for the given keycode
-	 */
-	public static short translate(int keycode) {
-		int translated;
-		
-		/* There seems to be no clean mapping between Android key codes
-		 * and what Nvidia sends over the wire. If someone finds one,
-		 * I'll happily delete this code :)
-		 */
-		if (keycode >= KeyEvent.KEYCODE_0 &&
-			keycode <= KeyEvent.KEYCODE_9) {
-			translated = (keycode - KeyEvent.KEYCODE_0) + VK_0;
-		}
-		else if (keycode >= KeyEvent.KEYCODE_A &&
-				 keycode <= KeyEvent.KEYCODE_Z) {
-			translated = (keycode - KeyEvent.KEYCODE_A) + VK_A;
-		}
-		else if (keycode >= KeyEvent.KEYCODE_NUMPAD_0 &&
-				 keycode <= KeyEvent.KEYCODE_NUMPAD_9) {
-			translated = (keycode - KeyEvent.KEYCODE_NUMPAD_0) + VK_NUMPAD0;
-		}
-		else if (keycode >= KeyEvent.KEYCODE_F1 &&
-				 keycode <= KeyEvent.KEYCODE_F12) {
-			translated = (keycode - KeyEvent.KEYCODE_F1) + VK_F1;
-		}
-		else {
-			switch (keycode) {
-			case KeyEvent.KEYCODE_ALT_LEFT:
-			case KeyEvent.KEYCODE_ALT_RIGHT:
-				translated = VK_ALT;
-				break;
-				
-			case KeyEvent.KEYCODE_BACKSLASH:
-				translated = 0xdc;
-				break;
-				
-			case KeyEvent.KEYCODE_CAPS_LOCK:
-				translated = VK_CAPS_LOCK;
-				break;
-				
-			case KeyEvent.KEYCODE_CLEAR:
-				translated = VK_CLEAR;
-				break;
-				
-			case KeyEvent.KEYCODE_COMMA:
-				translated = 0xbc;
-				break;
-				
-			case KeyEvent.KEYCODE_CTRL_LEFT:
-			case KeyEvent.KEYCODE_CTRL_RIGHT:
-				translated = VK_CONTROL;
-				break;
-				
-			case KeyEvent.KEYCODE_DEL:
-				translated = VK_BACK_SPACE;
-				break;
-				
-			case KeyEvent.KEYCODE_ENTER:
-				translated = 0x0d;
-				break;
-				
-			case KeyEvent.KEYCODE_EQUALS:
-				translated = 0xbb;
-				break;
-				
-			case KeyEvent.KEYCODE_ESCAPE:
-				translated = VK_ESCAPE;
-				break;
-				
-			case KeyEvent.KEYCODE_FORWARD_DEL:
-				// Nvidia maps period to delete
-				translated = VK_PERIOD;
-				break;
-				
-			case KeyEvent.KEYCODE_INSERT:
-				translated = -1;
-				break;
-				
-			case KeyEvent.KEYCODE_LEFT_BRACKET:
-				translated = 0xdb;
-				break;
-				
-			case KeyEvent.KEYCODE_META_LEFT:
-			case KeyEvent.KEYCODE_META_RIGHT:
-				translated = VK_WINDOWS;
-				break;
-				
-			case KeyEvent.KEYCODE_MINUS:
-				translated = 0xbd;
-				break;
-				
-			case KeyEvent.KEYCODE_MOVE_END:
-				translated = VK_END;
-				break;
-				
-			case KeyEvent.KEYCODE_MOVE_HOME:
-				translated = VK_HOME;
-				break;
-				
-			case KeyEvent.KEYCODE_NUM_LOCK:
-				translated = VK_NUM_LOCK;
-				break;
-				
-			case KeyEvent.KEYCODE_PAGE_DOWN:
-				translated = VK_PAGE_DOWN;
-				break;
-				
-			case KeyEvent.KEYCODE_PAGE_UP:
-				translated = VK_PAGE_UP;
-				break;
-				
-			case KeyEvent.KEYCODE_PERIOD:
-				translated = 0xbe;
-				break;
-				
-			case KeyEvent.KEYCODE_RIGHT_BRACKET:
-				translated = 0xdd;
-				break;
-				
-			case KeyEvent.KEYCODE_SCROLL_LOCK:
-				translated = VK_SCROLL_LOCK;
-				break;
-				
-			case KeyEvent.KEYCODE_SEMICOLON:
-				translated = 0xba;
-				break;
-				
-			case KeyEvent.KEYCODE_SHIFT_LEFT:
-			case KeyEvent.KEYCODE_SHIFT_RIGHT:
-				translated = VK_SHIFT;
-				break;
-				
-			case KeyEvent.KEYCODE_SLASH:
-				translated = 0xbf;
-				break;
-				
-			case KeyEvent.KEYCODE_SPACE:
-				translated = VK_SPACE;
-				break;
-				
-			case KeyEvent.KEYCODE_SYSRQ:
-				// Android defines this as SysRq/PrntScrn
-				translated = VK_PRINTSCREEN;
-				break;
-				
-			case KeyEvent.KEYCODE_TAB:
-				translated = VK_TAB;
-				break;
-				
-			case KeyEvent.KEYCODE_DPAD_LEFT:
-				translated = VK_LEFT;
-				break;
-				
-			case KeyEvent.KEYCODE_DPAD_RIGHT:
-				translated = VK_RIGHT;
-				break;
-				
-			case KeyEvent.KEYCODE_DPAD_UP:
-				translated = VK_UP;
-				break;
-				
-			case KeyEvent.KEYCODE_DPAD_DOWN:
-				translated = VK_DOWN;
-				break;
-				
-			case KeyEvent.KEYCODE_GRAVE:
-				translated = VK_BACK_QUOTE;
-				break;
-				
-			case KeyEvent.KEYCODE_APOSTROPHE:
-				translated = 0xde;
-				break;
-				
-			case KeyEvent.KEYCODE_BREAK:
-				translated = VK_PAUSE;
-				break;
-				
-			default:
-				System.out.println("No key for "+keycode);
-				return 0;
-			}
-		}
-		
-		return (short) ((KEY_PREFIX << 8) | translated);
-	}
+    public static final int VK_CLEAR = 12;
+    public static final int VK_COMMA = 44;
+    public static final int VK_BACK_SPACE = 8;
+    public static final int VK_EQUALS = 61;
+    public static final int VK_ESCAPE = 27;
+    public static final int VK_F1 = 112;
+    public static final int VK_END = 35;
+    public static final int VK_HOME = 36;
+    public static final int VK_NUM_LOCK = 144;
+    public static final int VK_PAGE_UP = 33;
+    public static final int VK_PAGE_DOWN = 34;
+    public static final int VK_PLUS = 521;
+    public static final int VK_CLOSE_BRACKET = 93;
+    public static final int VK_SCROLL_LOCK = 145;
+    public static final int VK_SEMICOLON = 59;
+    public static final int VK_SLASH = 47;
+    public static final int VK_SPACE = 32;
+    public static final int VK_PRINTSCREEN = 154;
+    public static final int VK_TAB = 9;
+    public static final int VK_LEFT = 37;
+    public static final int VK_RIGHT = 39;
+    public static final int VK_UP = 38;
+    public static final int VK_DOWN = 40;
+    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
+     * @return a GFE keycode for the given keycode
+     */
+    public static short translate(int keycode) {
+        int translated;
+        
+        // This is a poor man's mapping between Android key codes
+        // and Windows VK_* codes. For all defined VK_ codes, see:
+        // https://msdn.microsoft.com/en-us/library/windows/desktop/dd375731(v=vs.85).aspx
+        if (keycode >= KeyEvent.KEYCODE_0 &&
+            keycode <= KeyEvent.KEYCODE_9) {
+            translated = (keycode - KeyEvent.KEYCODE_0) + VK_0;
+        }
+        else if (keycode >= KeyEvent.KEYCODE_A &&
+                 keycode <= KeyEvent.KEYCODE_Z) {
+            translated = (keycode - KeyEvent.KEYCODE_A) + VK_A;
+        }
+        else if (keycode >= KeyEvent.KEYCODE_NUMPAD_0 &&
+                 keycode <= KeyEvent.KEYCODE_NUMPAD_9) {
+            translated = (keycode - KeyEvent.KEYCODE_NUMPAD_0) + VK_NUMPAD0;
+        }
+        else if (keycode >= KeyEvent.KEYCODE_F1 &&
+                 keycode <= KeyEvent.KEYCODE_F12) {
+            translated = (keycode - KeyEvent.KEYCODE_F1) + VK_F1;
+        }
+        else {
+            switch (keycode) {
+            case KeyEvent.KEYCODE_ALT_LEFT:
+                translated = 0xA4;
+                break;
+
+            case KeyEvent.KEYCODE_ALT_RIGHT:
+                translated = 0xA5;
+                break;
+                
+            case KeyEvent.KEYCODE_BACKSLASH:
+                translated = 0xdc;
+                break;
+                
+            case KeyEvent.KEYCODE_CAPS_LOCK:
+                translated = VK_CAPS_LOCK;
+                break;
+                
+            case KeyEvent.KEYCODE_CLEAR:
+                translated = VK_CLEAR;
+                break;
+                
+            case KeyEvent.KEYCODE_COMMA:
+                translated = 0xbc;
+                break;
+                
+            case KeyEvent.KEYCODE_CTRL_LEFT:
+                translated = 0xA2;
+                break;
+
+            case KeyEvent.KEYCODE_CTRL_RIGHT:
+                translated = 0xA3;
+                break;
+                
+            case KeyEvent.KEYCODE_DEL:
+                translated = VK_BACK_SPACE;
+                break;
+                
+            case KeyEvent.KEYCODE_ENTER:
+                translated = 0x0d;
+                break;
+
+            case KeyEvent.KEYCODE_PLUS:
+            case KeyEvent.KEYCODE_EQUALS:
+                translated = 0xbb;
+                break;
+                
+            case KeyEvent.KEYCODE_ESCAPE:
+                translated = VK_ESCAPE;
+                break;
+                
+            case KeyEvent.KEYCODE_FORWARD_DEL:
+                translated = 0x2e;
+                break;
+                
+            case KeyEvent.KEYCODE_INSERT:
+                translated = 0x2d;
+                break;
+                
+            case KeyEvent.KEYCODE_LEFT_BRACKET:
+                translated = 0xdb;
+                break;
+
+            case KeyEvent.KEYCODE_META_LEFT:
+                translated = 0x5b;
+                break;
+
+            case KeyEvent.KEYCODE_META_RIGHT:
+                translated = 0x5c;
+                break;
+
+            case KeyEvent.KEYCODE_MINUS:
+                translated = 0xbd;
+                break;
+                
+            case KeyEvent.KEYCODE_MOVE_END:
+                translated = VK_END;
+                break;
+                
+            case KeyEvent.KEYCODE_MOVE_HOME:
+                translated = VK_HOME;
+                break;
+                
+            case KeyEvent.KEYCODE_NUM_LOCK:
+                translated = VK_NUM_LOCK;
+                break;
+                
+            case KeyEvent.KEYCODE_PAGE_DOWN:
+                translated = VK_PAGE_DOWN;
+                break;
+                
+            case KeyEvent.KEYCODE_PAGE_UP:
+                translated = VK_PAGE_UP;
+                break;
+                
+            case KeyEvent.KEYCODE_PERIOD:
+                translated = 0xbe;
+                break;
+                
+            case KeyEvent.KEYCODE_RIGHT_BRACKET:
+                translated = 0xdd;
+                break;
+                
+            case KeyEvent.KEYCODE_SCROLL_LOCK:
+                translated = VK_SCROLL_LOCK;
+                break;
+                
+            case KeyEvent.KEYCODE_SEMICOLON:
+                translated = 0xba;
+                break;
+                
+            case KeyEvent.KEYCODE_SHIFT_LEFT:
+                translated = 0xA0;
+                break;
+
+            case KeyEvent.KEYCODE_SHIFT_RIGHT:
+                translated = 0xA1;
+                break;
+                
+            case KeyEvent.KEYCODE_SLASH:
+                translated = 0xbf;
+                break;
+                
+            case KeyEvent.KEYCODE_SPACE:
+                translated = VK_SPACE;
+                break;
+                
+            case KeyEvent.KEYCODE_SYSRQ:
+                // Android defines this as SysRq/PrntScrn
+                translated = VK_PRINTSCREEN;
+                break;
+                
+            case KeyEvent.KEYCODE_TAB:
+                translated = VK_TAB;
+                break;
+                
+            case KeyEvent.KEYCODE_DPAD_LEFT:
+                translated = VK_LEFT;
+                break;
+                
+            case KeyEvent.KEYCODE_DPAD_RIGHT:
+                translated = VK_RIGHT;
+                break;
+                
+            case KeyEvent.KEYCODE_DPAD_UP:
+                translated = VK_UP;
+                break;
+                
+            case KeyEvent.KEYCODE_DPAD_DOWN:
+                translated = VK_DOWN;
+                break;
+                
+            case KeyEvent.KEYCODE_GRAVE:
+                translated = VK_BACK_QUOTE;
+                break;
+                
+            case KeyEvent.KEYCODE_APOSTROPHE:
+                translated = 0xde;
+                break;
+                
+            case KeyEvent.KEYCODE_BREAK:
+                translated = VK_PAUSE;
+                break;
+
+            case KeyEvent.KEYCODE_NUMPAD_DIVIDE:
+                translated = 0x6F;
+                break;
+
+            case KeyEvent.KEYCODE_NUMPAD_MULTIPLY:
+                translated = 0x6A;
+                break;
+
+            case KeyEvent.KEYCODE_NUMPAD_SUBTRACT:
+                translated = 0x6D;
+                break;
+
+            case KeyEvent.KEYCODE_NUMPAD_ADD:
+                translated = 0x6B;
+                break;
+
+            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;
+            }
+        }
+        
+        return (short) ((KEY_PREFIX << 8) | translated);
+    }
 
 }

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/capture/InputCaptureManager.java

@@ -3,8 +3,9 @@ package com.limelight.binding.input.capture;
 import android.app.Activity;
 
 import com.limelight.LimeLog;
+import com.limelight.LimelightBuildProps;
 import com.limelight.R;
-import com.limelight.binding.input.evdev.EvdevCaptureProvider;
+import com.limelight.binding.input.evdev.EvdevCaptureProviderShim;
 import com.limelight.binding.input.evdev.EvdevListener;
 
 public class InputCaptureManager {
@@ -13,13 +14,15 @@ public class InputCaptureManager {
             LimeLog.info("Using Android O+ native mouse capture");
             return new AndroidNativePointerCaptureProvider(activity.findViewById(R.id.surfaceView));
         }
-        else if (ShieldCaptureProvider.isCaptureProviderSupported()) {
+        // LineageOS implemented broken NVIDIA capture extensions, so avoid using them on root builds.
+        // See https://github.com/LineageOS/android_frameworks_base/commit/d304f478a023430f4712dbdc3ee69d9ad02cebd3
+        else if (!LimelightBuildProps.ROOT_BUILD && ShieldCaptureProvider.isCaptureProviderSupported()) {
             LimeLog.info("Using NVIDIA mouse capture extension");
             return new ShieldCaptureProvider(activity);
         }
-        else if (EvdevCaptureProvider.isCaptureProviderSupported()) {
+        else if (EvdevCaptureProviderShim.isCaptureProviderSupported()) {
             LimeLog.info("Using Evdev mouse capture");
-            return new EvdevCaptureProvider(activity, rootListener);
+            return EvdevCaptureProviderShim.createEvdevCaptureProvider(activity, rootListener);
         }
         else if (AndroidPointerIconCaptureProvider.isCaptureProviderSupported()) {
             // Android N's native capture can't capture over system UI elements

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

@@ -30,6 +30,18 @@ public abstract class AbstractXboxController extends AbstractController {
     private Thread createInputThread() {
         return new Thread() {
             public void run() {
+                try {
+                    // Delay for a moment before reporting the new gamepad and
+                    // accepting new input. This allows time for the old InputDevice
+                    // to go away before we reclaim its spot. If the old device is still
+                    // around when we call notifyDeviceAdded(), we won't be able to claim
+                    // the controller number used by the original InputDevice.
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {}
+
+                // Report that we're added _before_ reporting input
+                notifyDeviceAdded();
+
                 while (!isInterrupted() && !stopped) {
                     byte[] buffer = new byte[64];
 
@@ -114,9 +126,6 @@ public abstract class AbstractXboxController extends AbstractController {
             return false;
         }
 
-        // Report that we're added _before_ starting the input thread
-        notifyDeviceAdded();
-
         // Start listening for controller input
         inputThread = createInputThread();
         inputThread.start();
@@ -131,6 +140,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

@@ -11,10 +11,14 @@ import android.hardware.usb.UsbDeviceConnection;
 import android.hardware.usb.UsbManager;
 import android.os.Binder;
 import android.os.Build;
+import android.os.Handler;
 import android.os.IBinder;
 import android.view.InputDevice;
+import android.widget.Toast;
 
 import com.limelight.LimeLog;
+import com.limelight.R;
+import com.limelight.preferences.PreferenceConfiguration;
 
 import java.util.ArrayList;
 
@@ -24,6 +28,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {
             "com.limelight.USB_PERMISSION";
 
     private UsbManager usbManager;
+    private PreferenceConfiguration prefConfig;
 
     private final UsbEventReceiver receiver = new UsbEventReceiver();
     private final UsbDriverBinder binder = new UsbDriverBinder();
@@ -42,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);
         }
     }
 
@@ -72,10 +72,22 @@ public class UsbDriverService extends Service implements UsbDriverListener {
 
             // Initial attachment broadcast
             if (action.equals(UsbManager.ACTION_USB_DEVICE_ATTACHED)) {
-                UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+                final UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
 
-                // Continue the state machine
-                handleUsbDeviceState(device);
+                // shouldClaimDevice() looks at the kernel's enumerated input
+                // devices to make its decision about whether to prompt to take
+                // control of the device. The kernel bringing up the input stack
+                // may race with this callback and cause us to prompt when the
+                // kernel is capable of running the device. Let's post a delayed
+                // message to process this state change to allow the kernel
+                // some time to bring up the stack.
+                new Handler().postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        // Continue the state machine
+                        handleUsbDeviceState(device);
+                    }
+                }, 1000);
             }
             // Subsequent permission dialog completion intent
             else if (action.equals(ACTION_USB_PERMISSION)) {
@@ -96,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);
                 }
             }
         }
@@ -104,11 +116,21 @@ public class UsbDriverService extends Service implements UsbDriverListener {
 
     private void handleUsbDeviceState(UsbDevice device) {
         // Are we able to operate it?
-        if (shouldClaimDevice(device)) {
+        if (shouldClaimDevice(device, prefConfig.bindAllUsb)) {
             // Do we have permission yet?
             if (!usbManager.hasPermission(device)) {
                 // Let's ask for permission
-                usbManager.requestPermission(device, PendingIntent.getBroadcast(UsbDriverService.this, 0, new Intent(ACTION_USB_PERMISSION), 0));
+                try {
+                    // This function is not documented as throwing any exceptions (denying access
+                    // is indicated by calling the PendingIntent with a false result). However,
+                    // Samsung Knox has some policies which block this request, but rather than
+                    // just returning a false result or returning 0 enumerated devices,
+                    // they throw an undocumented SecurityException from this call, crashing
+                    // the whole app. :(
+                    usbManager.requestPermission(device, PendingIntent.getBroadcast(UsbDriverService.this, 0, new Intent(ACTION_USB_PERMISSION), 0));
+                } catch (SecurityException e) {
+                    Toast.makeText(this, this.getText(R.string.error_usb_prohibited), Toast.LENGTH_LONG).show();
+                }
                 return;
             }
 
@@ -144,13 +166,17 @@ public class UsbDriverService extends Service implements UsbDriverListener {
         }
     }
 
-    private boolean isRecognizedInputDevice(UsbDevice device) {
+    public static boolean isRecognizedInputDevice(UsbDevice device) {
         // On KitKat and later, we can determine if this VID and PID combo
         // matches an existing input device and defer to the built-in controller
         // support in that case. Prior to KitKat, we'll always return true to be safe.
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             for (int id : InputDevice.getDeviceIds()) {
                 InputDevice inputDev = InputDevice.getDevice(id);
+                if (inputDev == null) {
+                    // Device was removed while looping
+                    continue;
+                }
 
                 if (inputDev.getVendorId() == device.getVendorId() &&
                         inputDev.getProductId() == device.getProductId()) {
@@ -165,16 +191,39 @@ public class UsbDriverService extends Service implements UsbDriverListener {
         }
     }
 
-    private boolean shouldClaimDevice(UsbDevice device) {
-        // We always bind to XB1 controllers but only bind to XB360 controllers
-        // if we know the kernel isn't already driving this device.
-        return XboxOneController.canClaimDevice(device) ||
-                (!isRecognizedInputDevice(device) && Xbox360Controller.canClaimDevice(device));
+    public static boolean kernelSupportsXboxOne() {
+        String kernelVersion = System.getProperty("os.version");
+        LimeLog.info("Kernel Version: "+kernelVersion);
+
+        if (kernelVersion == null) {
+            // We'll assume this is some newer version of Android
+            // that doesn't let you read the kernel version this way.
+            return true;
+        }
+        else if (kernelVersion.startsWith("2.") || kernelVersion.startsWith("3.")) {
+            // These are old kernels that definitely don't support Xbox One controllers properly
+            return false;
+        }
+        else if (kernelVersion.startsWith("4.4.") || kernelVersion.startsWith("4.9.")) {
+            // These aren't guaranteed to have backported kernel patches for proper Xbox One
+            // support (though some devices will).
+            return false;
+        }
+        else {
+            // The next AOSP common kernel is 4.14 which has working Xbox One controller support
+            return true;
+        }
+    }
+
+    public static boolean shouldClaimDevice(UsbDevice device, boolean claimAllAvailable) {
+        return ((!kernelSupportsXboxOne() || !isRecognizedInputDevice(device) || claimAllAvailable) && XboxOneController.canClaimDevice(device)) ||
+                ((!isRecognizedInputDevice(device) || claimAllAvailable) && Xbox360Controller.canClaimDevice(device));
     }
 
     @Override
     public void onCreate() {
         this.usbManager = (UsbManager) getSystemService(Context.USB_SERVICE);
+        this.prefConfig = PreferenceConfiguration.readPreferences(this);
 
         // Register for USB attach broadcasts and permission completions
         IntentFilter filter = new IntentFilter();
@@ -184,7 +233,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {
 
         // Enumerate existing devices
         for (UsbDevice dev : usbManager.getDeviceList().values()) {
-            if (shouldClaimDevice(dev)) {
+            if (shouldClaimDevice(dev, prefConfig.bindAllUsb)) {
                 // Start the process of claiming this device
                 handleUsbDeviceState(dev);
             }

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

@@ -14,21 +14,27 @@ 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
+            0x056e, // Elecom
+            0x06a3, // Saitek
             0x0738, // Mad Catz
+            0x07ff, // Mad Catz
             0x0e6f, // Unknown
+            0x0f0d, // Hori
+            0x1038, // SteelSeries
+            0x11c9, // Nacon
             0x12ab, // Unknown
             0x1430, // RedOctane
             0x146b, // BigBen
-            0x1bad, // Harmonix
-            0x0f0d, // Hori
-            0x1689, // Razer Onza
-            0x24c6, // PowerA
             0x1532, // Razer Sabertooth
             0x15e4, // Numark
             0x162e, // Joytech
+            0x1689, // Razer Onza
+            0x1bad, // Harmonix
+            0x24c6, // PowerA
     };
 
     public static boolean canClaimDevice(UsbDevice device) {
@@ -133,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 {
 
@@ -19,11 +20,35 @@ public class XboxOneController extends AbstractXboxController {
             0x0738, // Mad Catz
             0x0e6f, // Unknown
             0x0f0d, // Hori
+            0x1532, // Razer Wildcat
             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);
@@ -110,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/EvdevCaptureProviderShim.java

@@ -0,0 +1,24 @@
+package com.limelight.binding.input.evdev;
+
+
+import android.app.Activity;
+
+import com.limelight.LimelightBuildProps;
+import com.limelight.binding.input.capture.InputCaptureProvider;
+
+public class EvdevCaptureProviderShim {
+    public static boolean isCaptureProviderSupported() {
+        return LimelightBuildProps.ROOT_BUILD;
+    }
+
+    // We need to construct our capture provider using reflection because it isn't included in non-root builds
+    public static InputCaptureProvider createEvdevCaptureProvider(Activity activity, EvdevListener listener) {
+        try {
+            Class providerClass = Class.forName("com.limelight.binding.input.evdev.EvdevCaptureProvider");
+            return (InputCaptureProvider) providerClass.getConstructors()[0].newInstance(activity, listener);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+}

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

@@ -1,12 +1,14 @@
 package com.limelight.binding.input.evdev;
 
 public interface EvdevListener {
-    public static final int BUTTON_LEFT = 1;
-    public static final int BUTTON_MIDDLE = 2;
-    public static final int BUTTON_RIGHT = 3;
+    int BUTTON_LEFT = 1;
+    int BUTTON_MIDDLE = 2;
+    int BUTTON_RIGHT = 3;
+    int BUTTON_X1 = 4;
+    int BUTTON_X2 = 5;
 
-    public void mouseMove(int deltaX, int deltaY);
-    public void mouseButtonEvent(int buttonId, boolean down);
-    public void mouseScroll(byte amount);
-    public void keyboardEvent(boolean buttonDown, short keyCode);
+    void mouseMove(int deltaX, int deltaY);
+    void mouseButtonEvent(int buttonId, boolean down);
+    void mouseScroll(byte amount);
+    void keyboardEvent(boolean buttonDown, short keyCode);
 }

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

@@ -164,8 +164,8 @@ public class AnalogStick extends VirtualControllerElement {
         }
     }
 
-    public AnalogStick(VirtualController controller, Context context) {
-        super(controller, context);
+    public AnalogStick(VirtualController controller, Context context, int elementId) {
+        super(controller, context, elementId);
         // reset stick position
         position_stick_x = getWidth() / 2;
         position_stick_y = getHeight() / 2;
@@ -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);
 
@@ -293,12 +293,12 @@ public class AnalogStick extends VirtualControllerElement {
         movement_radius = getMovementRadius(relative_x, relative_y);
         movement_angle = getAngle(relative_x, relative_y);
 
-        // chop radius if out of outer circle and already pressed
+        // pass touch event to parent if out of outer circle
+        if (movement_radius > radius_complete && !isPressed())
+            return false;
+
+        // chop radius if out of outer circle or near the edge
         if (movement_radius > (radius_complete - radius_analog_stick)) {
-            // not pressed already, so ignore event from outer circle
-            if (!isPressed()) {
-                return false;
-            }
             movement_radius = radius_complete - radius_analog_stick;
         }
 
@@ -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/DigitalButton.java

@@ -8,6 +8,7 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.view.MotionEvent;
 
@@ -60,6 +61,7 @@ public class DigitalButton extends VirtualControllerElement {
     private TimerLongClickTimerTask longClickTimerTask = null;
 
     private final Paint paint = new Paint();
+    private final RectF rect = new RectF();
 
     private int layer;
     private DigitalButton movingButton = null;
@@ -120,8 +122,8 @@ public class DigitalButton extends VirtualControllerElement {
         }
     }
 
-    public DigitalButton(VirtualController controller, int layer, Context context) {
-        super(controller, context);
+    public DigitalButton(VirtualController controller, int elementId, int layer, Context context) {
+        super(controller, context, elementId);
         this.layer = layer;
     }
 
@@ -144,14 +146,18 @@ public class DigitalButton extends VirtualControllerElement {
         // set transparent background
         canvas.drawColor(Color.TRANSPARENT);
 
-        paint.setTextSize(getPercent(getWidth(), 30));
+        paint.setTextSize(getPercent(getWidth(), 25));
         paint.setTextAlign(Paint.Align.CENTER);
         paint.setStrokeWidth(getDefaultStrokeWidth());
 
         paint.setColor(isPressed() ? pressedColor : getDefaultColor());
         paint.setStyle(Paint.Style.STROKE);
-        canvas.drawRect(paint.getStrokeWidth(), paint.getStrokeWidth(),
-                getWidth() - paint.getStrokeWidth(), getHeight() - paint.getStrokeWidth(), paint);
+
+        rect.left = rect.top = paint.getStrokeWidth();
+        rect.right = getWidth() - rect.left;
+        rect.bottom = getHeight() - rect.top;
+
+        canvas.drawOval(rect, paint);
 
         if (icon != -1) {
             Drawable d = getResources().getDrawable(icon);

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

@@ -27,7 +27,7 @@ public class DigitalPad extends VirtualControllerElement {
     private final Paint paint = new Paint();
 
     public DigitalPad(VirtualController controller, Context context) {
-        super(controller, context);
+        super(controller, context, EID_DPAD);
     }
 
     public void addDigitalPadListener(DigitalPadListener listener) {

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

@@ -10,7 +10,7 @@ import com.limelight.nvstream.input.ControllerPacket;
 
 public class LeftAnalogStick extends AnalogStick {
     public LeftAnalogStick(final VirtualController controller, final Context context) {
-        super(controller, context);
+        super(controller, context, EID_LS);
 
         addAnalogStickListener(new AnalogStick.AnalogStickListener() {
             @Override

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

@@ -8,7 +8,7 @@ import android.content.Context;
 
 public class LeftTrigger extends DigitalButton {
     public LeftTrigger(final VirtualController controller, final int layer, final Context context) {
-        super(controller, layer, context);
+        super(controller, EID_LT, layer, context);
         addDigitalButtonListener(new DigitalButton.DigitalButtonListener() {
             @Override
             public void onClick() {

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

@@ -10,7 +10,7 @@ import com.limelight.nvstream.input.ControllerPacket;
 
 public class RightAnalogStick extends AnalogStick {
     public RightAnalogStick(final VirtualController controller, final Context context) {
-        super(controller, context);
+        super(controller, context, EID_RS);
 
         addAnalogStickListener(new AnalogStick.AnalogStickListener() {
             @Override

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

@@ -8,7 +8,7 @@ import android.content.Context;
 
 public class RightTrigger extends DigitalButton {
     public RightTrigger(final VirtualController controller, final int layer, final Context context) {
-        super(controller, layer, context);
+        super(controller, EID_RT, layer, context);
         addDigitalButtonListener(new DigitalButton.DigitalButtonListener() {
             @Override
             public void onClick() {

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 {
@@ -31,27 +34,29 @@ public class VirtualController {
 
     public enum ControllerMode {
         Active,
-        Configuration
+        MoveButtons,
+        ResizeButtons
     }
 
     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();
 
-    private RelativeLayout.LayoutParams layoutParamsButtonConfigure = null;
     private Button buttonConfigure = null;
 
     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,18 +65,24 @@ public class VirtualController {
         frame_layout.addView(relative_layout);
 
         buttonConfigure = new Button(context);
+        buttonConfigure.setAlpha(0.25f);
+        buttonConfigure.setFocusable(false);
         buttonConfigure.setBackgroundResource(R.drawable.ic_settings);
         buttonConfigure.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 String message;
 
-                if (currentMode == ControllerMode.Configuration) {
-                    currentMode = ControllerMode.Active;
-                    message = "Exiting configuration mode";
+                if (currentMode == ControllerMode.Active){
+                    currentMode = ControllerMode.MoveButtons;
+                    message = "Entering configuration mode (Move buttons)";
+                } else if (currentMode == ControllerMode.MoveButtons) {
+                    currentMode = ControllerMode.ResizeButtons;
+                    message = "Entering configuration mode (Resize buttons)";
                 } else {
-                    currentMode = ControllerMode.Configuration;
-                    message = "Entering configuration mode";
+                    currentMode = ControllerMode.Active;
+                    VirtualControllerConfigurationLoader.saveProfile(VirtualController.this, context);
+                    message = "Exiting configuration mode";
                 }
 
                 Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
@@ -83,6 +94,28 @@ 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() {
@@ -92,6 +125,13 @@ public class VirtualController {
         elements.clear();
     }
 
+    public void setOpacity(int opacity) {
+        for (VirtualControllerElement element : elements) {
+            element.setOpacity(opacity);
+        }
+    }
+
+
     public void addElement(VirtualControllerElement element, int x, int y, int width, int height) {
         elements.add(element);
         RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(width, height);
@@ -116,11 +156,19 @@ public class VirtualController {
 
         DisplayMetrics screen = context.getResources().getDisplayMetrics();
 
-        int buttonSize = (int)(screen.heightPixels*0.05f);
-        layoutParamsButtonConfigure = new RelativeLayout.LayoutParams(buttonSize, buttonSize);
-        relative_layout.addView(buttonConfigure, layoutParamsButtonConfigure);
+        int buttonSize = (int)(screen.heightPixels*0.06f);
+        RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(buttonSize, buttonSize);
+        params.addRule(RelativeLayout.ALIGN_PARENT_LEFT, RelativeLayout.TRUE);
+        params.addRule(RelativeLayout.ALIGN_PARENT_TOP, RelativeLayout.TRUE);
+        params.leftMargin = 15;
+        params.topMargin = 15;
+        relative_layout.addView(buttonConfigure, params);
 
+        // Start with the default layout
         VirtualControllerConfigurationLoader.createDefaultLayout(this, context);
+
+        // Apply user preferences onto the default layout
+        VirtualControllerConfigurationLoader.loadFromPreferences(this, context);
     }
 
     public ControllerMode getControllerMode() {
@@ -131,32 +179,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/VirtualControllerConfigurationLoader.java

@@ -4,13 +4,19 @@
 
 package com.limelight.binding.input.virtual_controller;
 
+import android.app.Activity;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.util.DisplayMetrics;
 
 import com.limelight.nvstream.input.ControllerPacket;
+import com.limelight.preferences.PreferenceConfiguration;
+
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public class VirtualControllerConfigurationLoader {
-    private static final String PROFILE_PATH = "profiles";
+    public static final String OSC_PREFERENCE = "OSC";
 
     private static int getPercent(
             int percent,
@@ -18,6 +24,11 @@ public class VirtualControllerConfigurationLoader {
         return (int) (((float) total / (float) 100) * (float) percent);
     }
 
+    // The default controls are specified using a grid of 128*72 cells at 16:9
+    private static int screenScale(int units, int height) {
+        return (int) (((float) height / (float) 72) * (float) units);
+    }
+
     private static DigitalPad createDigitalPad(
             final VirtualController controller,
             final Context context) {
@@ -58,6 +69,7 @@ public class VirtualControllerConfigurationLoader {
     }
 
     private static DigitalButton createDigitalButton(
+            final int elementId,
             final int keyShort,
             final int keyLong,
             final int layer,
@@ -65,7 +77,7 @@ public class VirtualControllerConfigurationLoader {
             final int icon,
             final VirtualController controller,
             final Context context) {
-        DigitalButton button = new DigitalButton(controller, layer, context);
+        DigitalButton button = new DigitalButton(controller, elementId, layer, context);
         button.setText(text);
         button.setIcon(icon);
 
@@ -138,148 +150,217 @@ public class VirtualControllerConfigurationLoader {
         return new RightAnalogStick(controller, context);
     }
 
-    private static final int BUTTON_BASE_X = 65;
-    private static final int BUTTON_BASE_Y = 5;
-    private static final int BUTTON_WIDTH = getPercent(30, 33);
-    private static final int BUTTON_HEIGHT = getPercent(40, 33);
+
+    private static final int TRIGGER_L_BASE_X = 1;
+    private static final int TRIGGER_R_BASE_X = 92;
+    private static final int TRIGGER_DISTANCE = 23;
+    private static final int TRIGGER_BASE_Y = 31;
+    private static final int TRIGGER_WIDTH = 12;
+    private static final int TRIGGER_HEIGHT = 9;
+
+    // Face buttons are defined based on the Y button (button number 9)
+    private static final int BUTTON_BASE_X = 106;
+    private static final int BUTTON_BASE_Y = 1;
+    private static final int BUTTON_SIZE = 10;
+
+    private static final int DPAD_BASE_X = 4;
+    private static final int DPAD_BASE_Y = 41;
+    private static final int DPAD_SIZE = 30;
+
+    private static final int ANALOG_L_BASE_X = 4;
+    private static final int ANALOG_L_BASE_Y = 1;
+    private static final int ANALOG_R_BASE_X = 96;
+    private static final int ANALOG_R_BASE_Y = 42;
+    private static final int ANALOG_SIZE = 28;
+
+    private static final int L3_R3_BASE_Y = 60;
+
+    private static final int START_X = 83;
+    private static final int BACK_X = 34;
+    private static final int START_BACK_Y = 64;
+    private static final int START_BACK_WIDTH = 12;
+    private static final int START_BACK_HEIGHT = 7;
 
     public static void createDefaultLayout(final VirtualController controller, final Context context) {
 
         DisplayMetrics screen = context.getResources().getDisplayMetrics();
+        PreferenceConfiguration config = PreferenceConfiguration.readPreferences(context);
+
+        // Displace controls on the right by this amount of pixels to account for different aspect ratios
+        int rightDisplacement = screen.widthPixels - screen.heightPixels * 16 / 9;
+
+        int height = screen.heightPixels;
 
         // NOTE: Some of these getPercent() expressions seem like they can be combined
         // into a single call. Due to floating point rounding, this isn't actually possible.
 
-        controller.addElement(createDigitalPad(controller, context),
-                getPercent(5, screen.widthPixels),
-                getPercent(BUTTON_BASE_Y, screen.heightPixels),
-                getPercent(30, screen.widthPixels),
-                getPercent(40, screen.heightPixels)
-        );
+        if (!config.onlyL3R3)
+        {
+            controller.addElement(createDigitalPad(controller, context),
+                    screenScale(DPAD_BASE_X, height),
+                    screenScale(DPAD_BASE_Y, height),
+                    screenScale(DPAD_SIZE, height),
+                    screenScale(DPAD_SIZE, height)
+            );
 
-        controller.addElement(createDigitalButton(
-                ControllerPacket.A_FLAG, 0, 1, "A", -1, controller, context),
-                getPercent(BUTTON_BASE_X, screen.widthPixels)+getPercent(BUTTON_WIDTH, screen.widthPixels),
-                getPercent(BUTTON_BASE_Y, screen.heightPixels)+2*getPercent(BUTTON_HEIGHT, screen.heightPixels),
-                getPercent(BUTTON_WIDTH, screen.widthPixels),
-                getPercent(BUTTON_HEIGHT, screen.heightPixels)
-        );
+            controller.addElement(createDigitalButton(
+                    VirtualControllerElement.EID_A,
+                    ControllerPacket.A_FLAG, 0, 1, "A", -1, controller, context),
+                    screenScale(BUTTON_BASE_X, height) + rightDisplacement,
+                    screenScale(BUTTON_BASE_Y + 2 * BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height)
+            );
 
-        controller.addElement(createDigitalButton(
-                ControllerPacket.B_FLAG, 0, 1, "B", -1, controller, context),
-                getPercent(BUTTON_BASE_X, screen.widthPixels)+2*getPercent(BUTTON_WIDTH, screen.widthPixels),
-                getPercent(BUTTON_BASE_Y, screen.heightPixels)+getPercent(BUTTON_HEIGHT, screen.heightPixels),
-                getPercent(BUTTON_WIDTH, screen.widthPixels),
-                getPercent(BUTTON_HEIGHT, screen.heightPixels)
-        );
+            controller.addElement(createDigitalButton(
+                    VirtualControllerElement.EID_B,
+                    ControllerPacket.B_FLAG, 0, 1, "B", -1, controller, context),
+                    screenScale(BUTTON_BASE_X + BUTTON_SIZE, height) + rightDisplacement,
+                    screenScale(BUTTON_BASE_Y + BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height)
+            );
 
-        controller.addElement(createDigitalButton(
-                ControllerPacket.X_FLAG, 0, 1, "X", -1, controller, context),
-                getPercent(BUTTON_BASE_X, screen.widthPixels),
-                getPercent(BUTTON_BASE_Y, screen.heightPixels)+getPercent(BUTTON_HEIGHT, screen.heightPixels),
-                getPercent(BUTTON_WIDTH, screen.widthPixels),
-                getPercent(BUTTON_HEIGHT, screen.heightPixels)
-        );
+            controller.addElement(createDigitalButton(
+                    VirtualControllerElement.EID_X,
+                    ControllerPacket.X_FLAG, 0, 1, "X", -1, controller, context),
+                    screenScale(BUTTON_BASE_X - BUTTON_SIZE, height) + rightDisplacement,
+                    screenScale(BUTTON_BASE_Y + BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height)
+            );
 
-        controller.addElement(createDigitalButton(
-                ControllerPacket.Y_FLAG, 0, 1, "Y", -1, controller, context),
-                getPercent(BUTTON_BASE_X, screen.widthPixels)+getPercent(BUTTON_WIDTH, screen.widthPixels),
-                getPercent(BUTTON_BASE_Y, screen.heightPixels),
-                getPercent(BUTTON_WIDTH, screen.widthPixels),
-                getPercent(BUTTON_HEIGHT, screen.heightPixels)
-        );
+            controller.addElement(createDigitalButton(
+                    VirtualControllerElement.EID_Y,
+                    ControllerPacket.Y_FLAG, 0, 1, "Y", -1, controller, context),
+                    screenScale(BUTTON_BASE_X, height) + rightDisplacement,
+                    screenScale(BUTTON_BASE_Y, height),
+                    screenScale(BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height)
+            );
 
-        controller.addElement(createLeftTrigger(
-                        0, "LT", -1, controller, context),
-                getPercent(BUTTON_BASE_X, screen.widthPixels),
-                getPercent(BUTTON_BASE_Y, screen.heightPixels),
-                getPercent(BUTTON_WIDTH, screen.widthPixels),
-                getPercent(BUTTON_HEIGHT, screen.heightPixels)
-        );
+            controller.addElement(createLeftTrigger(
+                    1, "LT", -1, controller, context),
+                    screenScale(TRIGGER_L_BASE_X, height),
+                    screenScale(TRIGGER_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
+            );
 
-        controller.addElement(createRightTrigger(
-                0, "RT", -1, controller, context),
-                getPercent(BUTTON_BASE_X, screen.widthPixels)+2*getPercent(BUTTON_WIDTH, screen.widthPixels),
-                getPercent(BUTTON_BASE_Y, screen.heightPixels),
-                getPercent(BUTTON_WIDTH, screen.widthPixels),
-                getPercent(BUTTON_HEIGHT, screen.heightPixels)
-        );
+            controller.addElement(createRightTrigger(
+                    1, "RT", -1, controller, context),
+                    screenScale(TRIGGER_R_BASE_X + TRIGGER_DISTANCE, height) + rightDisplacement,
+                    screenScale(TRIGGER_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
+            );
 
-        controller.addElement(createDigitalButton(
-                ControllerPacket.LB_FLAG, 0, 1, "LB", -1, controller, context),
-                getPercent(BUTTON_BASE_X, screen.widthPixels),
-                getPercent(BUTTON_BASE_Y, screen.heightPixels)+2*getPercent(BUTTON_HEIGHT, screen.heightPixels),
-                getPercent(BUTTON_WIDTH, screen.widthPixels),
-                getPercent(BUTTON_HEIGHT, screen.heightPixels)
-        );
+            controller.addElement(createDigitalButton(
+                    VirtualControllerElement.EID_LB,
+                    ControllerPacket.LB_FLAG, 0, 1, "LB", -1, controller, context),
+                    screenScale(TRIGGER_L_BASE_X + TRIGGER_DISTANCE, height),
+                    screenScale(TRIGGER_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
+            );
 
-        controller.addElement(createDigitalButton(
-                ControllerPacket.RB_FLAG, 0, 1, "RB", -1, controller, context),
-                getPercent(BUTTON_BASE_X, screen.widthPixels)+2*getPercent(BUTTON_WIDTH, screen.widthPixels),
-                getPercent(BUTTON_BASE_Y, screen.heightPixels)+2*getPercent(BUTTON_HEIGHT, screen.heightPixels),
-                getPercent(BUTTON_WIDTH, screen.widthPixels),
-                getPercent(BUTTON_HEIGHT, screen.heightPixels)
-        );
+            controller.addElement(createDigitalButton(
+                    VirtualControllerElement.EID_RB,
+                    ControllerPacket.RB_FLAG, 0, 1, "RB", -1, controller, context),
+                    screenScale(TRIGGER_R_BASE_X, height) + rightDisplacement,
+                    screenScale(TRIGGER_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
+            );
 
-        controller.addElement(createLeftStick(controller, context),
-                getPercent(5, screen.widthPixels),
-                getPercent(50, screen.heightPixels),
-                getPercent(40, screen.widthPixels),
-                getPercent(50, screen.heightPixels)
-        );
+            controller.addElement(createLeftStick(controller, context),
+                    screenScale(ANALOG_L_BASE_X, height),
+                    screenScale(ANALOG_L_BASE_Y, height),
+                    screenScale(ANALOG_SIZE, height),
+                    screenScale(ANALOG_SIZE, height)
+            );
 
-        controller.addElement(createRightStick(controller, context),
-                getPercent(55, screen.widthPixels),
-                getPercent(50, screen.heightPixels),
-                getPercent(40, screen.widthPixels),
-                getPercent(50, screen.heightPixels)
-        );
+            controller.addElement(createRightStick(controller, context),
+                    screenScale(ANALOG_R_BASE_X, height) + rightDisplacement,
+                    screenScale(ANALOG_R_BASE_Y, height),
+                    screenScale(ANALOG_SIZE, height),
+                    screenScale(ANALOG_SIZE, height)
+            );
 
-        controller.addElement(createDigitalButton(
-                ControllerPacket.BACK_FLAG, 0, 2, "BACK", -1, controller, context),
-                getPercent(40, screen.widthPixels),
-                getPercent(90, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
-        );
+            controller.addElement(createDigitalButton(
+                    VirtualControllerElement.EID_BACK,
+                    ControllerPacket.BACK_FLAG, 0, 2, "BACK", -1, controller, context),
+                    screenScale(BACK_X, height),
+                    screenScale(START_BACK_Y, height),
+                    screenScale(START_BACK_WIDTH, height),
+                    screenScale(START_BACK_HEIGHT, height)
+            );
 
-        controller.addElement(createDigitalButton(
-                ControllerPacket.PLAY_FLAG, 0, 3, "START", -1, controller, context),
-                getPercent(40, screen.widthPixels)+getPercent(10, screen.widthPixels),
-                getPercent(90, screen.heightPixels),
-                getPercent(10, screen.widthPixels),
-                getPercent(10, screen.heightPixels)
-        );
+            controller.addElement(createDigitalButton(
+                    VirtualControllerElement.EID_START,
+                    ControllerPacket.PLAY_FLAG, 0, 3, "START", -1, controller, context),
+                    screenScale(START_X, height) + rightDisplacement,
+                    screenScale(START_BACK_Y, height),
+                    screenScale(START_BACK_WIDTH, height),
+                    screenScale(START_BACK_HEIGHT, height)
+            );
+        }
+        else {
+            controller.addElement(createDigitalButton(
+                    VirtualControllerElement.EID_LSB,
+                    ControllerPacket.LS_CLK_FLAG, 0, 1, "L3", -1, controller, context),
+                    screenScale(TRIGGER_L_BASE_X, height),
+                    screenScale(L3_R3_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
+            );
+
+            controller.addElement(createDigitalButton(
+                    VirtualControllerElement.EID_RSB,
+                    ControllerPacket.RS_CLK_FLAG, 0, 1, "R3", -1, controller, context),
+                    screenScale(TRIGGER_R_BASE_X + TRIGGER_DISTANCE, height) + rightDisplacement,
+                    screenScale(L3_R3_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
+            );
+        }
+
+        controller.setOpacity(config.oscOpacity);
     }
 
-    /*
-    NOT IMPLEMENTED YET,
-    this should later be used to store and load a profile for the virtual controller
-    public static void saveProfile(final String name,
-                                   final VirtualController controller,
+    public static void saveProfile(final VirtualController controller,
                                    final Context context) {
+        SharedPreferences.Editor prefEditor = context.getSharedPreferences(OSC_PREFERENCE, Activity.MODE_PRIVATE).edit();
 
-        SharedPreferences preferences = context.getSharedPreferences(PROFILE_PATH + "/" +
-                name, Activity.MODE_PRIVATE);
-
-        JSONArray elementConfigurations = new JSONArray();
         for (VirtualControllerElement element : controller.getElements()) {
-            JSONObject elementConfiguration = new JSONObject();
+            String prefKey = ""+element.elementId;
             try {
-                elementConfiguration.put("TYPE", element.getClass().getName());
-                elementConfiguration.put("CONFIGURATION", element.getConfiguration());
-                elementConfigurations.put(elementConfiguration);
-            } catch (Exception e) {
+                prefEditor.putString(prefKey, element.getConfiguration().toString());
+            } catch (JSONException e) {
                 e.printStackTrace();
             }
         }
 
-        SharedPreferences.Editor editor= preferences.edit();
-        editor.putString("ELEMENTS", elementConfigurations.toString());
+        prefEditor.apply();
     }
 
-	public static void loadFromPreferences(final VirtualController controller) {
+    public static void loadFromPreferences(final VirtualController controller, final Context context) {
+        SharedPreferences pref = context.getSharedPreferences(OSC_PREFERENCE, Activity.MODE_PRIVATE);
 
-	}
-	*/
-}
+        for (VirtualControllerElement element : controller.getElements()) {
+            String prefKey = ""+element.elementId;
+
+            String jsonConfig = pref.getString(prefKey, null);
+            if (jsonConfig != null) {
+                try {
+                    element.loadConfiguration(new JSONObject(jsonConfig));
+                } catch (JSONException e) {
+                    e.printStackTrace();
+
+                    // Remove the corrupt element from the preferences
+                    pref.edit().remove(prefKey).apply();
+                }
+            }
+        }
+    }
+}

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

@@ -14,16 +14,37 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.widget.RelativeLayout;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 public abstract class VirtualControllerElement extends View {
     protected static boolean _PRINT_DEBUG_INFORMATION = false;
 
+    public static final int EID_DPAD = 1;
+    public static final int EID_LT = 2;
+    public static final int EID_RT = 3;
+    public static final int EID_LB = 4;
+    public static final int EID_RB = 5;
+    public static final int EID_A = 6;
+    public static final int EID_B = 7;
+    public static final int EID_X = 8;
+    public static final int EID_Y = 9;
+    public static final int EID_BACK = 10;
+    public static final int EID_START = 11;
+    public static final int EID_LS = 12;
+    public static final int EID_RS = 13;
+    public static final int EID_LSB = 14;
+    public static final int EID_RSB = 15;
+
     protected VirtualController virtualController;
+    protected final int elementId;
 
     private final Paint paint = new Paint();
 
     private int normalColor = 0xF0888888;
     protected int pressedColor = 0xF00000FF;
-    private int configNormalColor = 0xF0FF0000;
+    private int configMoveColor = 0xF0FF0000;
+    private int configResizeColor = 0xF0FF00FF;
     private int configSelectedColor = 0xF000FF00;
 
     protected int startSize_x;
@@ -40,10 +61,11 @@ public abstract class VirtualControllerElement extends View {
 
     private Mode currentMode = Mode.Normal;
 
-    protected VirtualControllerElement(VirtualController controller, Context context) {
+    protected VirtualControllerElement(VirtualController controller, Context context, int elementId) {
         super(context);
 
         this.virtualController = controller;
+        this.elementId = elementId;
     }
 
     protected void moveElement(int pressed_x, int pressed_y, int x, int y) {
@@ -91,34 +113,34 @@ public abstract class VirtualControllerElement extends View {
 
     /*
     protected void actionShowNormalColorChooser() {
-		AmbilWarnaDialog colorDialog = new AmbilWarnaDialog(getContext(), normalColor, true, new AmbilWarnaDialog.OnAmbilWarnaListener() {
-			@Override
-			public void onCancel(AmbilWarnaDialog dialog)
-			{}
+        AmbilWarnaDialog colorDialog = new AmbilWarnaDialog(getContext(), normalColor, true, new AmbilWarnaDialog.OnAmbilWarnaListener() {
+            @Override
+            public void onCancel(AmbilWarnaDialog dialog)
+            {}
 
-			@Override
-			public void onOk(AmbilWarnaDialog dialog, int color) {
-				normalColor = color;
-				invalidate();
-			}
-		});
-		colorDialog.show();
-	}
+            @Override
+            public void onOk(AmbilWarnaDialog dialog, int color) {
+                normalColor = color;
+                invalidate();
+            }
+        });
+        colorDialog.show();
+    }
 
-	protected void actionShowPressedColorChooser() {
-		AmbilWarnaDialog colorDialog = new AmbilWarnaDialog(getContext(), normalColor, true, new AmbilWarnaDialog.OnAmbilWarnaListener() {
-			@Override
-			public void onCancel(AmbilWarnaDialog dialog) {
-			}
+    protected void actionShowPressedColorChooser() {
+        AmbilWarnaDialog colorDialog = new AmbilWarnaDialog(getContext(), normalColor, true, new AmbilWarnaDialog.OnAmbilWarnaListener() {
+            @Override
+            public void onCancel(AmbilWarnaDialog dialog) {
+            }
 
-			@Override
-			public void onOk(AmbilWarnaDialog dialog, int color) {
-				pressedColor = color;
-				invalidate();
-			}
-		});
-		colorDialog.show();
-	}
+            @Override
+            public void onOk(AmbilWarnaDialog dialog, int color) {
+                pressedColor = color;
+                invalidate();
+            }
+        });
+        colorDialog.show();
+    }
     */
 
     protected void actionEnableMove() {
@@ -135,8 +157,12 @@ public abstract class VirtualControllerElement extends View {
     }
 
     protected int getDefaultColor() {
-        return (virtualController.getControllerMode() == VirtualController.ControllerMode.Configuration) ?
-                configNormalColor : normalColor;
+        if (virtualController.getControllerMode() == VirtualController.ControllerMode.MoveButtons)
+            return configMoveColor;
+        else if (virtualController.getControllerMode() == VirtualController.ControllerMode.ResizeButtons)
+            return configResizeColor;
+        else
+            return normalColor;
     }
 
     protected int getDefaultStrokeWidth() {
@@ -145,58 +171,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
@@ -213,7 +235,10 @@ public abstract class VirtualControllerElement extends View {
                 startSize_x = getWidth();
                 startSize_y = getHeight();
 
-                actionEnableMove();
+                if (virtualController.getControllerMode() == VirtualController.ControllerMode.MoveButtons)
+                    actionEnableMove();
+                else if (virtualController.getControllerMode() == VirtualController.ControllerMode.ResizeButtons)
+                    actionEnableResize();
 
                 return true;
             }
@@ -270,6 +295,15 @@ public abstract class VirtualControllerElement extends View {
         invalidate();
     }
 
+
+    public void setOpacity(int opacity) {
+        int hexOpacity = opacity * 255 / 100;
+        this.normalColor = (hexOpacity << 24) | (normalColor & 0x00FFFFFF);
+        this.pressedColor = (hexOpacity << 24) | (pressedColor & 0x00FFFFFF);
+
+        invalidate();
+    }
+
     protected final float getPercent(float value, float percent) {
         return value / 100 * percent;
     }
@@ -278,13 +312,28 @@ public abstract class VirtualControllerElement extends View {
         return getWidth() > getHeight() ? getHeight() : getWidth();
     }
 
-    /**
-     public JSONObject getConfiguration () {
-     JSONObject configuration = new JSONObject();
-     return  configuration;
-     }
 
-     public  void loadConfiguration (JSONObject configuration) {
-     }
-     */
+    public JSONObject getConfiguration() throws JSONException {
+        JSONObject configuration = new JSONObject();
+
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
+
+        configuration.put("LEFT", layoutParams.leftMargin);
+        configuration.put("TOP", layoutParams.topMargin);
+        configuration.put("WIDTH", layoutParams.width);
+        configuration.put("HEIGHT", layoutParams.height);
+
+        return configuration;
+    }
+
+    public void loadConfiguration(JSONObject configuration) throws JSONException {
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
+
+        layoutParams.leftMargin = configuration.getInt("LEFT");
+        layoutParams.topMargin = configuration.getInt("TOP");
+        layoutParams.width = configuration.getInt("WIDTH");
+        layoutParams.height = configuration.getInt("HEIGHT");
+
+        requestLayout();
+    }
 }

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

@@ -0,0 +1,5 @@
+package com.limelight.binding.video;
+
+public interface CrashListener {
+    void notifyCrash(Exception e);
+}

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

@@ -0,0 +1,5 @@
+package com.limelight.binding.video;
+
+public interface PerfOverlayListener {
+    void onPerfUpdate(final String text);
+}

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

@@ -0,0 +1,70 @@
+package com.limelight.binding.video;
+
+class VideoStats {
+
+    long decoderTimeMs;
+    long totalTimeMs;
+    int totalFrames;
+    int totalFramesReceived;
+    int totalFramesRendered;
+    int frameLossEvents;
+    int framesLost;
+    long measurementStartTimestamp;
+
+    void add(VideoStats other) {
+        this.decoderTimeMs += other.decoderTimeMs;
+        this.totalTimeMs += other.totalTimeMs;
+        this.totalFrames += other.totalFrames;
+        this.totalFramesReceived += other.totalFramesReceived;
+        this.totalFramesRendered += other.totalFramesRendered;
+        this.frameLossEvents += other.frameLossEvents;
+        this.framesLost += other.framesLost;
+
+        if (this.measurementStartTimestamp == 0) {
+            this.measurementStartTimestamp = other.measurementStartTimestamp;
+        }
+
+        assert other.measurementStartTimestamp <= this.measurementStartTimestamp;
+    }
+
+    void copy(VideoStats other) {
+        this.decoderTimeMs = other.decoderTimeMs;
+        this.totalTimeMs = other.totalTimeMs;
+        this.totalFrames = other.totalFrames;
+        this.totalFramesReceived = other.totalFramesReceived;
+        this.totalFramesRendered = other.totalFramesRendered;
+        this.frameLossEvents = other.frameLossEvents;
+        this.framesLost = other.framesLost;
+        this.measurementStartTimestamp = other.measurementStartTimestamp;
+    }
+
+    void clear() {
+        this.decoderTimeMs = 0;
+        this.totalTimeMs = 0;
+        this.totalFrames = 0;
+        this.totalFramesReceived = 0;
+        this.totalFramesRendered = 0;
+        this.frameLossEvents = 0;
+        this.framesLost = 0;
+        this.measurementStartTimestamp = 0;
+    }
+
+    VideoStatsFps getFps() {
+        float elapsed = (System.currentTimeMillis() - this.measurementStartTimestamp) / (float) 1000;
+
+        VideoStatsFps fps = new VideoStatsFps();
+        if (elapsed > 0) {
+            fps.totalFps = this.totalFrames / elapsed;
+            fps.receivedFps = this.totalFramesReceived / elapsed;
+            fps.renderedFps = this.totalFramesRendered / elapsed;
+        }
+        return fps;
+    }
+}
+
+class VideoStatsFps {
+
+    float totalFps;
+    float receivedFps;
+    float renderedFps;
+}

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,13 +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 = "computers3.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 COMPUTER_NAME_COLUMN_NAME = "ComputerName";
+    private static final String ADDRESSES_COLUMN_NAME = "Addresses";
+    private static final String MAC_ADDRESS_COLUMN_NAME = "MacAddress";
+    private static final String SERVER_CERT_COLUMN_NAME = "ServerCert";
+
+    private static final char ADDRESS_DELIMITER = ';';
 
     private SQLiteDatabase computerDb;
 
@@ -36,80 +39,107 @@ 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) {
         // 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)",
-                COMPUTER_TABLE_NAME,
-                COMPUTER_NAME_COLUMN_NAME, COMPUTER_UUID_COLUMN_NAME, LOCAL_IP_COLUMN_NAME,
-                REMOTE_IP_COLUMN_NAME, MAC_COLUMN_NAME));
+        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, %s TEXT)",
+                COMPUTER_TABLE_NAME, COMPUTER_UUID_COLUMN_NAME, COMPUTER_NAME_COLUMN_NAME,
+                ADDRESSES_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);
+        }
+        oldComputers = LegacyDatabaseReader2.migrateAllComputers(c);
+        for (ComputerDetails computer : oldComputers) {
+            updateComputer(computer);
+        }
     }
 
-    public void deleteComputer(String name) {
-        computerDb.delete(COMPUTER_TABLE_NAME, COMPUTER_NAME_COLUMN_NAME+"=?", new String[]{name});
+    public void deleteComputer(ComputerDetails details) {
+        computerDb.delete(COMPUTER_TABLE_NAME, COMPUTER_UUID_COLUMN_NAME+"=?", new String[]{details.uuid});
     }
 
     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, details.localIp.getAddress());
-        values.put(REMOTE_IP_COLUMN_NAME, details.remoteIp.getAddress());
-        values.put(MAC_COLUMN_NAME, details.macAddress);
+
+        StringBuilder addresses = new StringBuilder();
+        addresses.append(details.localAddress != null ? details.localAddress : "");
+        addresses.append(ADDRESS_DELIMITER).append(details.remoteAddress != null ? details.remoteAddress : "");
+        addresses.append(ADDRESS_DELIMITER).append(details.manualAddress != null ? details.manualAddress : "");
+        addresses.append(ADDRESS_DELIMITER).append(details.ipv6Address != null ? details.ipv6Address : "");
+
+        values.put(ADDRESSES_COLUMN_NAME, addresses.toString());
+        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 static String readNonEmptyString(String input) {
+        if (input.isEmpty()) {
+            return null;
+        }
+
+        return input;
+    }
+
+    private ComputerDetails getComputerFromCursor(Cursor c) {
+        ComputerDetails details = new ComputerDetails();
+
+        details.uuid = c.getString(0);
+        details.name = c.getString(1);
+
+        String[] addresses = c.getString(2).split(""+ADDRESS_DELIMITER, -1);
+
+        details.localAddress = readNonEmptyString(addresses[0]);
+        details.remoteAddress = readNonEmptyString(addresses[1]);
+        details.manualAddress = readNonEmptyString(addresses[2]);
+        details.ipv6Address = readNonEmptyString(addresses[3]);
+
+        details.macAddress = c.getString(3);
+
+        try {
+            byte[] derCertData = c.getBlob(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;
+
+        return details;
+    }
+
     public List<ComputerDetails> getAllComputers() {
         Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME, null);
         LinkedList<ComputerDetails> computerList = new LinkedList<>();
         while (c.moveToNext()) {
-            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);
-            }
-
-            try {
-                details.localIp = InetAddress.getByAddress(c.getBlob(2));
-            } catch (UnknownHostException e) {
-                // We'll delete this entry
-                LimeLog.severe("DB: Corrupted local IP for "+details.name);
-            }
-
-            try {
-                details.remoteIp = InetAddress.getByAddress(c.getBlob(3));
-            } catch (UnknownHostException e) {
-                // We'll delete this entry
-                LimeLog.severe("DB: Corrupted remote IP for "+details.name);
-            }
-
-            details.macAddress = c.getString(4);
-
-            // This signifies we don't have dynamic state (like pair state)
-            details.state = ComputerDetails.State.UNKNOWN;
-            details.reachability = ComputerDetails.Reachability.UNKNOWN;
-
-            // If a field is corrupt or missing, skip the database entry
-            if (details.uuid == null || details.localIp == null || details.remoteIp == null ||
-                    details.macAddress == null) {
-                continue;
-            }
-
-
-            computerList.add(details);
+            computerList.add(getComputerFromCursor(c));
         }
 
         c.close();
@@ -117,53 +147,17 @@ 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);
-        ComputerDetails details = new ComputerDetails();
+    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();
             return null;
         }
 
-        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);
-        }
-
-        try {
-            details.localIp = InetAddress.getByAddress(c.getBlob(2));
-        } catch (UnknownHostException e) {
-            // We'll delete this entry
-            LimeLog.severe("DB: Corrupted local IP for "+details.name);
-        }
-
-        try {
-            details.remoteIp = InetAddress.getByAddress(c.getBlob(3));
-        } catch (UnknownHostException e) {
-            // We'll delete this entry
-            LimeLog.severe("DB: Corrupted remote IP for "+details.name);
-        }
-
-        details.macAddress = c.getString(4);
-
+        ComputerDetails details = getComputerFromCursor(c);
         c.close();
 
-        details.state = ComputerDetails.State.UNKNOWN;
-        details.reachability = ComputerDetails.Reachability.UNKNOWN;
-
-        // If a field is corrupt or missing, delete the database entry
-        if (details.uuid == null || details.localIp == null || details.remoteIp == null ||
-                details.macAddress == null) {
-            deleteComputer(details.name);
-            return null;
-        }
-
         return details;
     }
 }

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

@@ -3,5 +3,5 @@ package com.limelight.computers;
 import com.limelight.nvstream.http.ComputerDetails;
 
 public interface ComputerManagerListener {
-    public void notifyComputerUpdated(ComputerDetails details);
+    void notifyComputerUpdated(ComputerDetails details);
 }

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

@@ -3,29 +3,40 @@ package com.limelight.computers;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringReader;
-import java.net.InetAddress;
+import java.net.Inet4Address;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 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;
+import com.limelight.utils.NetHelper;
+import com.limelight.utils.ServerHelper;
 
 import android.app.Service;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
 import android.os.Binder;
+import android.os.Build;
 import android.os.IBinder;
 
 import org.xmlpull.v1.XmlPullParserException;
@@ -35,7 +46,7 @@ public class ComputerManagerService extends Service {
     private static final int APPLIST_POLLING_PERIOD_MS = 30000;
     private static final int APPLIST_FAILED_POLLING_RETRY_MS = 2000;
     private static final int MDNS_QUERY_PERIOD_MS = 1000;
-    private static final int FAST_POLL_TIMEOUT = 500;
+    private static final int FAST_POLL_TIMEOUT = 1000;
     private static final int OFFLINE_POLL_TRIES = 5;
     private static final int INITIAL_POLL_TRIES = 2;
     private static final int EMPTY_LIST_THRESHOLD = 3;
@@ -51,6 +62,7 @@ public class ComputerManagerService extends Service {
     private ComputerManagerListener listener = null;
     private final AtomicInteger activePolls = new AtomicInteger(0);
     private boolean pollingActive = false;
+    private final Lock defaultNetworkLock = new ReentrantLock();
 
     private DiscoveryService.DiscoveryBinder discoveryBinder;
     private final ServiceConnection discoveryServiceConnection = new ServiceConnection() {
@@ -93,7 +105,6 @@ public class ComputerManagerService extends Service {
                 }
 
                 details.state = ComputerDetails.State.OFFLINE;
-                details.reachability = ComputerDetails.Reachability.OFFLINE;
             }
         } catch (InterruptedException e) {
             releaseLocalDatabaseReference();
@@ -104,17 +115,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
@@ -132,7 +153,7 @@ public class ComputerManagerService extends Service {
             public void run() {
 
                 int offlineCount = 0;
-                while (!isInterrupted() && pollingActive) {
+                while (!isInterrupted() && pollingActive && tuple.thread == this) {
                     try {
                         // Only allow one request to the machine at a time
                         synchronized (tuple.networkLock) {
@@ -154,7 +175,7 @@ public class ComputerManagerService extends Service {
                 }
             }
         };
-        t.setName("Polling thread for " + tuple.computer.localIp.getHostAddress());
+        t.setName("Polling thread for " + tuple.computer.name);
         return t;
     }
 
@@ -175,7 +196,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
@@ -210,12 +230,12 @@ public class ComputerManagerService extends Service {
             }
         }
 
-        public boolean addComputerBlocking(InetAddress addr) {
-            return ComputerManagerService.this.addComputerBlocking(addr);
+        public boolean addComputerBlocking(ComputerDetails fakeDetails) {
+            return ComputerManagerService.this.addComputerBlocking(fakeDetails);
         }
 
-        public void removeComputer(String name) {
-            ComputerManagerService.this.removeComputer(name);
+        public void removeComputer(ComputerDetails computer) {
+            ComputerManagerService.this.removeComputer(computer);
         }
 
         public void stopPolling() {
@@ -231,7 +251,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)) {
@@ -243,7 +263,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)) {
@@ -251,7 +271,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;
                         }
                     }
                 }
@@ -284,12 +303,91 @@ public class ComputerManagerService extends Service {
         return false;
     }
 
+    private void populateExternalAddress(ComputerDetails details) {
+        boolean boundToNetwork = false;
+        boolean activeNetworkIsVpn = NetHelper.isActiveNetworkVpn(this);
+        ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        // Check if we're currently connected to a VPN which may send our
+        // STUN request from an unexpected interface
+        if (activeNetworkIsVpn) {
+            // Acquire the default network lock since we could be changing global process state
+            defaultNetworkLock.lock();
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                // On Lollipop or later, we can bind our process to the underlying interface
+                // to ensure our STUN request goes out on that interface or not at all (which is
+                // preferable to getting a VPN endpoint address back).
+                Network[] networks = connMgr.getAllNetworks();
+                for (Network net : networks) {
+                    NetworkCapabilities netCaps = connMgr.getNetworkCapabilities(net);
+                    if (netCaps != null) {
+                        if (!netCaps.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) &&
+                                !netCaps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
+                            // This network looks like an underlying multicast-capable transport,
+                            // so let's guess that it's probably where our mDNS response came from.
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                                if (connMgr.bindProcessToNetwork(net)) {
+                                    boundToNetwork = true;
+                                    break;
+                                }
+                            }
+                            else if (ConnectivityManager.setProcessDefaultNetwork(net)) {
+                                boundToNetwork = true;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // Perform the STUN request if we're not on a VPN or if we bound to a network
+        if (!activeNetworkIsVpn || boundToNetwork) {
+            details.remoteAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
+        }
+
+        // Unbind from the network
+        if (boundToNetwork) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                connMgr.bindProcessToNetwork(null);
+            }
+            else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                ConnectivityManager.setProcessDefaultNetwork(null);
+            }
+        }
+
+        // Unlock the network state
+        if (activeNetworkIsVpn) {
+            defaultNetworkLock.unlock();
+        }
+    }
+
     private MdnsDiscoveryListener createDiscoveryListener() {
         return new MdnsDiscoveryListener() {
             @Override
             public void notifyComputerAdded(MdnsComputer computer) {
+                ComputerDetails details = new ComputerDetails();
+
+                // Populate the computer template with mDNS info
+                if (computer.getLocalAddress() != null) {
+                    details.localAddress = computer.getLocalAddress().getHostAddress();
+
+                    // 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.
+                    if (computer.getLocalAddress() instanceof Inet4Address) {
+                        populateExternalAddress(details);
+                    }
+                }
+                if (computer.getIpv6Address() != null) {
+                    details.ipv6Address = computer.getIpv6Address().getHostAddress();
+                }
+
                 // Kick off a serverinfo poll on this machine
-                addComputerBlocking(computer.getAddress());
+                if (!addComputerBlocking(details)) {
+                    LimeLog.warning("Auto-discovered PC failed to respond: "+details);
+                }
             }
 
             @Override
@@ -310,10 +408,8 @@ public class ComputerManagerService extends Service {
             for (PollingTuple tuple : pollingTuples) {
                 // Check if this is the same computer
                 if (tuple.computer.uuid.equals(details.uuid)) {
-                    // Update details anyway in case this machine has been re-added by IP
-                    // after not being reachable by our existing information
-                    tuple.computer.localIp = details.localIp;
-                    tuple.computer.remoteIp = details.remoteIp;
+                    // 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) {
@@ -338,15 +434,26 @@ public class ComputerManagerService extends Service {
         }
     }
 
-    public boolean addComputerBlocking(InetAddress addr) {
-        // Setup a placeholder
-        ComputerDetails fakeDetails = new ComputerDetails();
-        fakeDetails.localIp = addr;
-        fakeDetails.remoteIp = addr;
-
+    public boolean addComputerBlocking(ComputerDetails fakeDetails) {
         // 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;
         }
@@ -364,21 +471,22 @@ public class ComputerManagerService extends Service {
         }
     }
 
-    public void removeComputer(String name) {
+    public void removeComputer(ComputerDetails computer) {
         if (!getLocalDatabaseReference()) {
             return;
         }
 
         // Remove it from the database
-        dbManager.deleteComputer(name);
+        dbManager.deleteComputer(computer);
 
         synchronized (pollingTuples) {
             // Remove the computer from the computer list
             for (PollingTuple tuple : pollingTuples) {
-                if (tuple.computer.name.equals(name)) {
+                if (tuple.computer.uuid.equals(computer.uuid)) {
                     if (tuple.thread != null) {
                         // Interrupt the thread on this entry
                         tuple.thread.interrupt();
+                        tuple.thread = null;
                     }
                     pollingTuples.remove(tuple);
                     break;
@@ -404,38 +512,51 @@ public class ComputerManagerService extends Service {
         }
     }
 
-    private ComputerDetails tryPollIp(ComputerDetails details, InetAddress ipAddr) {
+    private ComputerDetails tryPollIp(ComputerDetails details, String address) {
         // Fast poll this address first to determine if we can connect at the TCP layer
-        if (!fastPollIp(ipAddr)) {
+        if (!fastPollIp(address)) {
             return null;
         }
 
         try {
-            NvHTTP http = new NvHTTP(ipAddr, 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;
         }
     }
 
     // Just try to establish a TCP connection to speculatively detect a running
     // GFE server
-    private boolean fastPollIp(InetAddress addr) {
+    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(addr, NvHTTP.HTTPS_PORT), FAST_POLL_TIMEOUT);
+            s.connect(new InetSocketAddress(address, NvHTTP.HTTPS_PORT), FAST_POLL_TIMEOUT);
             s.close();
             return true;
         } catch (IOException e) {
@@ -443,11 +564,11 @@ public class ComputerManagerService extends Service {
         }
     }
 
-    private void startFastPollThread(final InetAddress addr, final boolean[] info) {
+    private void startFastPollThread(final String address, final boolean[] info) {
         Thread t = new Thread() {
             @Override
             public void run() {
-                boolean pollRes = fastPollIp(addr);
+                boolean pollRes = fastPollIp(address);
 
                 synchronized (info) {
                     info[0] = true; // Done
@@ -457,16 +578,20 @@ public class ComputerManagerService extends Service {
                 }
             }
         };
-        t.setName("Fast Poll - "+addr.getHostAddress());
+        t.setName("Fast Poll - "+address);
         t.start();
     }
 
-    private ComputerDetails.Reachability fastPollPc(final InetAddress local, final InetAddress remote) throws InterruptedException {
+    private String fastPollPc(final String localAddress, final String remoteAddress, final String manualAddress, final String ipv6Address) throws InterruptedException {
         final boolean[] remoteInfo = new boolean[2];
         final boolean[] localInfo = new boolean[2];
+        final boolean[] manualInfo = new boolean[2];
+        final boolean[] ipv6Info = new boolean[2];
 
-        startFastPollThread(local, localInfo);
-        startFastPollThread(remote, remoteInfo);
+        startFastPollThread(localAddress, localInfo);
+        startFastPollThread(remoteAddress, remoteInfo);
+        startFastPollThread(manualAddress, manualInfo);
+        startFastPollThread(ipv6Address, ipv6Info);
 
         // Check local first
         synchronized (localInfo) {
@@ -475,125 +600,90 @@ 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;
+            }
+        }
+
+        // Now remote IPv4
         synchronized (remoteInfo) {
             while (!remoteInfo[0]) {
                 remoteInfo.wait(500);
             }
 
             if (remoteInfo[1]) {
-                return ComputerDetails.Reachability.REMOTE;
+                return remoteAddress;
             }
         }
 
-        return ComputerDetails.Reachability.OFFLINE;
-    }
+        // Now global IPv6
+        synchronized (ipv6Info) {
+            while (!ipv6Info[0]) {
+                ipv6Info.wait(500);
+            }
 
-    private ReachabilityTuple pollForReachability(ComputerDetails details) throws InterruptedException {
-        ComputerDetails polledDetails;
-        ComputerDetails.Reachability reachability;
-
-        // If the local address is routable across the Internet,
-        // always consider this PC remote to be conservative
-        if (details.localIp.equals(details.remoteIp)) {
-            reachability = 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.localIp+", "+details.remoteIp+")");
-            reachability = fastPollPc(details.localIp, details.remoteIp);
-            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;
+            if (ipv6Info[1]) {
+                return ipv6Address;
             }
         }
 
-        boolean localFirst = (reachability == ComputerDetails.Reachability.LOCAL);
-
-        if (localFirst) {
-            polledDetails = tryPollIp(details, details.localIp);
-        }
-        else {
-            polledDetails = tryPollIp(details, details.remoteIp);
-        }
-
-        InetAddress reachableAddr = null;
-        if (polledDetails == null && !details.localIp.equals(details.remoteIp)) {
-            // Failed, so let's try the fallback
-            if (!localFirst) {
-                polledDetails = tryPollIp(details, details.localIp);
-            }
-            else {
-                polledDetails = tryPollIp(details, details.remoteIp);
-            }
-
-            if (polledDetails != null) {
-                // The fallback poll worked
-                reachableAddr = !localFirst ? details.localIp : details.remoteIp;
-            }
-        }
-        else if (polledDetails != null) {
-            reachableAddr = localFirst ? details.localIp : details.remoteIp;
-        }
-
-        if (reachableAddr == null) {
-            return null;
-        }
-
-        if (polledDetails.remoteIp.equals(reachableAddr)) {
-            polledDetails.reachability = ComputerDetails.Reachability.REMOTE;
-        }
-        else if (polledDetails.localIp.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+", "+details.ipv6Address+")");
+        String candidateAddress = fastPollPc(details.localAddress, details.remoteAddress, details.manualAddress, details.ipv6Address);
+        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.localIp = 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.manualAddress);
+            uniqueAddresses.add(details.remoteAddress);
+            uniqueAddresses.add(details.ipv6Address);
+            for (String addr : uniqueAddresses) {
+                if (addr == null || addr.equals(candidateAddress)) {
+                    continue;
+                }
+                polledDetails = tryPollIp(details, addr);
+                if (polledDetails != null) {
+                    break;
+                }
             }
         }
 
-        // Save the old MAC address
-        String savedMacAddress = details.macAddress;
-
-        // 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;
+        }
+        else {
+            return false;
         }
-
-        return true;
     }
 
     @Override
@@ -694,10 +784,9 @@ public class ComputerManagerService extends Service {
                 public void run() {
                     int emptyAppListResponses = 0;
                     do {
-                        InetAddress selectedAddr;
-
-                        // 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);
                             }
@@ -709,19 +798,12 @@ public class ComputerManagerService extends Service {
                             continue;
                         }
 
-                        if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
-                            selectedAddr = computer.localIp;
-                        }
-                        else {
-                            selectedAddr = computer.remoteIp;
-                        }
-
-                        NvHTTP http = new NvHTTP(selectedAddr, idManager.getUniqueId(),
-                                null, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
-
                         PollingTuple tuple = getPollingTuple(computer);
 
                         try {
+                            NvHTTP http = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer), idManager.getUniqueId(),
+                                    computer.serverCert, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
+
                             String appList;
                             if (tuple != null) {
                                 // If we're polling this machine too, grab the network lock
@@ -744,12 +826,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();
@@ -776,7 +858,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) {
@@ -787,6 +869,7 @@ public class ComputerManagerService extends Service {
                     } while (waitPollingDelay());
                 }
             };
+            thread.setName("App list polling thread for " + computer.name);
             thread.start();
         }
 
@@ -816,10 +899,10 @@ class PollingTuple {
 }
 
 class ReachabilityTuple {
-    public final InetAddress reachableAddress;
+    public final String reachableAddress;
     public final ComputerDetails computer;
 
-    public ReachabilityTuple(ComputerDetails computer, InetAddress reachableAddress) {
+    public ReachabilityTuple(ComputerDetails computer, String reachableAddress) {
         this.computer = computer;
         this.reachableAddress = reachableAddress;
     }

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/computers/LegacyDatabaseReader2.java

@@ -0,0 +1,86 @@
+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.nvstream.http.ComputerDetails;
+
+import java.io.ByteArrayInputStream;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.LinkedList;
+import java.util.List;
+
+public class LegacyDatabaseReader2 {
+    private static final String COMPUTER_DB_NAME = "computers2.db";
+    private static final String COMPUTER_TABLE_NAME = "Computers";
+
+    private static ComputerDetails getComputerFromCursor(Cursor c) {
+        ComputerDetails details = new ComputerDetails();
+
+        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);
+
+        // This column wasn't always present in the old schema
+        if (c.getColumnCount() >= 7) {
+            try {
+                byte[] derCertData = c.getBlob(6);
+
+                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;
+
+        return details;
+    }
+
+    public static List<ComputerDetails> getAllComputers(SQLiteDatabase computerDb) {
+        Cursor c = computerDb.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,6 +1,6 @@
 package com.limelight.grid;
 
-import android.app.Activity;
+import android.content.Context;
 import android.graphics.BitmapFactory;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
@@ -14,6 +14,7 @@ import com.limelight.grid.assets.DiskAssetLoader;
 import com.limelight.grid.assets.MemoryAssetLoader;
 import com.limelight.grid.assets.NetworkAssetLoader;
 import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.preferences.PreferenceConfiguration;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -24,15 +25,37 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
     private static final int SMALL_WIDTH_DP = 100;
     private static final int LARGE_WIDTH_DP = 150;
 
-    private final CachedAppAssetLoader loader;
+    private final ComputerDetails computer;
+    private final String uniqueId;
 
-    public AppGridAdapter(Activity activity, boolean listMode, boolean small, ComputerDetails computer, String uniqueId) {
-        super(activity, listMode ? R.layout.simple_row : (small ? R.layout.app_grid_item_small : R.layout.app_grid_item));
+    private CachedAppAssetLoader loader;
 
-        int dpi = activity.getResources().getDisplayMetrics().densityDpi;
+    public AppGridAdapter(Context context, PreferenceConfiguration prefs, ComputerDetails computer, String uniqueId) {
+        super(context, getLayoutIdForPreferences(prefs));
+
+        this.computer = computer;
+        this.uniqueId = uniqueId;
+
+        updateLayoutWithPreferences(context, prefs);
+    }
+
+    private static int getLayoutIdForPreferences(PreferenceConfiguration prefs) {
+        if (prefs.listMode) {
+            return R.layout.simple_row;
+        }
+        else if (prefs.smallIconMode) {
+            return R.layout.app_grid_item_small;
+        }
+        else {
+            return R.layout.app_grid_item;
+        }
+    }
+
+    public void updateLayoutWithPreferences(Context context, PreferenceConfiguration prefs) {
+        int dpi = context.getResources().getDisplayMetrics().densityDpi;
         int dp;
 
-        if (small) {
+        if (prefs.smallIconMode) {
             dp = SMALL_WIDTH_DP;
         }
         else {
@@ -46,13 +69,19 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         }
         LimeLog.info("Art scaling divisor: " + scalingDivisor);
 
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inSampleSize = (int) scalingDivisor;
+        if (loader != null) {
+            // Cancel operations on the old loader
+            cancelQueuedOperations();
+        }
 
         this.loader = new CachedAppAssetLoader(computer, scalingDivisor,
                 new NetworkAssetLoader(context, uniqueId),
                 new MemoryAssetLoader(),
-                new DiskAssetLoader(context.getCacheDir()));
+                new DiskAssetLoader(context),
+                BitmapFactory.decodeResource(context.getResources(), R.drawable.no_app_image));
+
+        // This will trigger the view to reload with the new layout
+        setLayoutId(getLayoutIdForPreferences(prefs));
     }
 
     public void cancelQueuedOperations() {

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

@@ -10,22 +10,32 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.limelight.R;
+import com.limelight.preferences.PreferenceConfiguration;
 
 import java.util.ArrayList;
 
 public abstract class GenericGridAdapter<T> extends BaseAdapter {
     protected final Context context;
-    protected final int layoutId;
-    protected final ArrayList<T> itemList = new ArrayList<>();
-    protected final LayoutInflater inflater;
+    private int layoutId;
+    final ArrayList<T> itemList = new ArrayList<>();
+    private final LayoutInflater inflater;
 
-    public GenericGridAdapter(Context context, int layoutId) {
+    GenericGridAdapter(Context context, int layoutId) {
         this.context = context;
         this.layoutId = layoutId;
 
         this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     }
 
+    void setLayoutId(int layoutId) {
+        if (layoutId != this.layoutId) {
+            this.layoutId = layoutId;
+
+            // Force the view to be redrawn with the new layout
+            notifyDataSetInvalidated();
+        }
+    }
+
     public void clear() {
         itemList.clear();
     }
@@ -55,10 +65,10 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
             convertView = inflater.inflate(layoutId, viewGroup, false);
         }
 
-        ImageView imgView = (ImageView) convertView.findViewById(R.id.grid_image);
-        ImageView overlayView = (ImageView) convertView.findViewById(R.id.grid_overlay);
-        TextView txtView = (TextView) convertView.findViewById(R.id.grid_text);
-        ProgressBar prgView = (ProgressBar) convertView.findViewById(R.id.grid_spinner);
+        ImageView imgView = convertView.findViewById(R.id.grid_image);
+        ImageView overlayView = convertView.findViewById(R.id.grid_overlay);
+        TextView txtView = convertView.findViewById(R.id.grid_text);
+        ProgressBar prgView = convertView.findViewById(R.id.grid_spinner);
 
         if (imgView != null) {
             if (!populateImageView(imgView, prgView, itemList.get(i))) {

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

@@ -9,14 +9,33 @@ 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 com.limelight.preferences.PreferenceConfiguration;
 
 import java.util.Collections;
 import java.util.Comparator;
 
 public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
 
-    public PcGridAdapter(Context context, boolean listMode, boolean small) {
-        super(context, listMode ? R.layout.simple_row : (small ? R.layout.pc_grid_item_small : R.layout.pc_grid_item));
+    public PcGridAdapter(Context context, PreferenceConfiguration prefs) {
+        super(context, getLayoutIdForPreferences(prefs));
+    }
+
+    private static int getLayoutIdForPreferences(PreferenceConfiguration prefs) {
+        if (prefs.listMode) {
+            return R.layout.simple_row;
+        }
+        else if (prefs.smallIconMode) {
+            return R.layout.pc_grid_item_small;
+        }
+        else {
+            return R.layout.pc_grid_item;
+        }
+    }
+
+    public void updateLayoutWithPreferences(Context context, PreferenceConfiguration prefs) {
+        // This will trigger the view to reload with the new layout
+        setLayoutId(getLayoutIdForPreferences(prefs));
     }
 
     public void addComputer(PcView.ComputerObject computer) {
@@ -46,7 +65,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 +96,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/CachedAppAssetLoader.java

@@ -52,15 +52,17 @@ public class CachedAppAssetLoader {
     private final MemoryAssetLoader memoryLoader;
     private final DiskAssetLoader diskLoader;
     private final Bitmap placeholderBitmap;
+    private final Bitmap noAppImageBitmap;
 
     public CachedAppAssetLoader(ComputerDetails computer, double scalingDivider,
                                 NetworkAssetLoader networkLoader, MemoryAssetLoader memoryLoader,
-                                DiskAssetLoader diskLoader) {
+                                DiskAssetLoader diskLoader, Bitmap noAppImageBitmap) {
         this.computer = computer;
         this.scalingDivider = scalingDivider;
         this.networkLoader = networkLoader;
         this.memoryLoader = memoryLoader;
         this.diskLoader = diskLoader;
+        this.noAppImageBitmap = noAppImageBitmap;
         this.placeholderBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
     }
 
@@ -188,9 +190,10 @@ public class CachedAppAssetLoader {
                     prgView.setVisibility(View.VISIBLE);
                 }
 
-                // Set off another loader task on the network executor
+                // Set off another loader task on the network executor. This time our AsyncDrawable
+                // will use the app image placeholder bitmap, rather than an empty bitmap.
                 LoaderTask task = new LoaderTask(imageView, prgView, false);
-                AsyncDrawable asyncDrawable = new AsyncDrawable(imageView.getResources(), placeholderBitmap, task);
+                AsyncDrawable asyncDrawable = new AsyncDrawable(imageView.getResources(), noAppImageBitmap, task);
                 imageView.setVisibility(View.VISIBLE);
                 imageView.setImageDrawable(asyncDrawable);
                 task.executeOnExecutor(networkExecutor, tuple);

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;
@@ -13,55 +17,141 @@ import java.io.OutputStream;
 
 public class DiskAssetLoader {
     // 5 MB
-    private final long MAX_ASSET_SIZE = 5 * 1024 * 1024;
+    private static final long MAX_ASSET_SIZE = 5 * 1024 * 1024;
 
+    // Standard box art is 300x400
+    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
+    public static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
+        // Raw height and width of image
+        final int height = options.outHeight;
+        final int width = options.outWidth;
+        int inSampleSize = 1;
+
+        if (height > reqHeight || width > reqWidth) {
+
+            final int halfHeight = height / 2;
+            final int halfWidth = width / 2;
+
+            // Calculates the largest inSampleSize value that is a power of 2 and keeps both
+            // height and width larger than the requested height and width.
+            while ((halfHeight / inSampleSize) >= reqHeight && (halfWidth / inSampleSize) >= reqWidth) {
+                inSampleSize *= 2;
+            }
+        }
+
+        return inSampleSize;
     }
 
     public Bitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple, int sampleSize) {
-        InputStream in = null;
-        Bitmap bmp = null;
-        try {
-            // Make sure the cached asset doesn't exceed the maximum size
-            if (CacheHelper.getFileSize(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png") > MAX_ASSET_SIZE) {
-                LimeLog.warning("Removing cached tuple exceeding size threshold: "+tuple);
-                CacheHelper.deleteCacheFile(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
+        File file = getFile(tuple.computer.uuid, tuple.app.getAppId());
+
+        // Don't bother with anything if it doesn't exist
+        if (!file.exists()) {
+            return null;
+        }
+
+        // Make sure the cached asset doesn't exceed the maximum size
+        if (file.length() > MAX_ASSET_SIZE) {
+            LimeLog.warning("Removing cached tuple exceeding size threshold: "+tuple);
+            file.delete();
+            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;
             }
 
-            in = CacheHelper.openCacheFileForInput(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
+            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 = sampleSize;
-            options.inPreferredConfig = Bitmap.Config.RGB_565;
-            bmp = BitmapFactory.decodeStream(in, null, options);
-        } catch (IOException ignored) {
-        } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException ignored) {}
+            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);
+            }
+        }
+        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;
             }
         }
 
-        if (bmp != null) {
-            LimeLog.info("Disk cache hit for tuple: "+tuple);
-        }
-
         return bmp;
     }
 
+    public File getFile(String computerUuid, int appId) {
+        return CacheHelper.openPath(false, cacheDir, "boxart", computerUuid, appId + ".png");
+    }
+
+    public void deleteAssetsForComputer(String computerUuid) {
+        File dir = CacheHelper.openPath(false, cacheDir, "boxart", computerUuid);
+        File[] files = dir.listFiles();
+        if (files != null) {
+            for (File f : files) {
+                f.delete();
+            }
+        }
+    }
+
     public void populateCacheWithStream(CachedAppAssetLoader.LoaderTuple tuple, InputStream input) {
         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) {
@@ -75,7 +165,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

@@ -4,12 +4,11 @@ import android.content.Context;
 
 import com.limelight.LimeLog;
 import com.limelight.binding.PlatformBinding;
-import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvHTTP;
+import com.limelight.utils.ServerHelper;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.InetAddress;
 
 public class NetworkAssetLoader {
     private final Context context;
@@ -21,10 +20,10 @@ public class NetworkAssetLoader {
     }
 
     public InputStream getBitmapStream(CachedAppAssetLoader.LoaderTuple tuple) {
-        NvHTTP http = new NvHTTP(getCurrentAddress(tuple.computer), uniqueId, null, PlatformBinding.getCryptoProvider(context));
-
         InputStream in = null;
         try {
+            NvHTTP http = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(tuple.computer), uniqueId,
+                    tuple.computer.serverCert, PlatformBinding.getCryptoProvider(context));
             in = http.getBoxArt(tuple.app);
         } catch (IOException ignored) {}
 
@@ -37,13 +36,4 @@ public class NetworkAssetLoader {
 
         return in;
     }
-
-    private static InetAddress getCurrentAddress(ComputerDetails computer) {
-        if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
-            return computer.localIp;
-        }
-        else {
-            return computer.remoteIp;
-        }
-    }
 }

app/src/main/java/com/limelight/nvstream/ConnectionContext.java

@@ -0,0 +1,23 @@
+package com.limelight.nvstream;
+
+import java.security.cert.X509Certificate;
+
+import javax.crypto.SecretKey;
+
+public class ConnectionContext {
+    public String serverAddress;
+    public X509Certificate serverCert;
+    public StreamConfiguration streamConfig;
+    public NvConnectionListener connListener;
+    public SecretKey riKey;
+    public int riKeyId;
+    
+    // This is the version quad from the appversion tag of /serverinfo
+    public String serverAppVersion;
+    public String serverGfeVersion;
+    
+    public int negotiatedWidth, negotiatedHeight;
+    public boolean negotiatedHdr;
+
+    public int videoCapabilities;
+}

app/src/main/java/com/limelight/nvstream/NvConnection.java

@@ -0,0 +1,343 @@
+package com.limelight.nvstream;
+
+import android.app.ActivityManager;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import java.util.concurrent.Semaphore;
+
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+
+import org.xmlpull.v1.XmlPullParserException;
+
+import com.limelight.LimeLog;
+import com.limelight.nvstream.av.audio.AudioRenderer;
+import com.limelight.nvstream.av.video.VideoDecoderRenderer;
+import com.limelight.nvstream.http.GfeHttpResponseException;
+import com.limelight.nvstream.http.LimelightCryptoProvider;
+import com.limelight.nvstream.http.NvApp;
+import com.limelight.nvstream.http.NvHTTP;
+import com.limelight.nvstream.http.PairingManager;
+import com.limelight.nvstream.input.MouseButtonPacket;
+import com.limelight.nvstream.jni.MoonBridge;
+
+public class NvConnection {
+    // Context parameters
+    private String host;
+    private LimelightCryptoProvider cryptoProvider;
+    private String uniqueId;
+    private ConnectionContext context;
+    private static Semaphore connectionAllowed = new Semaphore(1);
+    private final boolean isMonkey;
+    
+    public NvConnection(String host, String uniqueId, StreamConfiguration config, LimelightCryptoProvider cryptoProvider, X509Certificate serverCert)
+    {       
+        this.host = host;
+        this.cryptoProvider = cryptoProvider;
+        this.uniqueId = uniqueId;
+
+        this.context = new ConnectionContext();
+        this.context.streamConfig = config;
+        this.context.serverCert = serverCert;
+        try {
+            // This is unique per connection
+            this.context.riKey = generateRiAesKey();
+        } catch (NoSuchAlgorithmException e) {
+            // Should never happen
+            e.printStackTrace();
+        }
+        
+        this.context.riKeyId = generateRiKeyId();
+        this.isMonkey = ActivityManager.isUserAMonkey();
+    }
+    
+    private static SecretKey generateRiAesKey() throws NoSuchAlgorithmException {
+        KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+        
+        // RI keys are 128 bits
+        keyGen.init(128);
+        
+        return keyGen.generateKey();
+    }
+    
+    private static int generateRiKeyId() {
+        return new SecureRandom().nextInt();
+    }
+
+    public void stop() {
+        // Interrupt any pending connection. This is thread-safe.
+        MoonBridge.interruptConnection();
+
+        // Moonlight-core is not thread-safe with respect to connection start and stop, so
+        // we must not invoke that functionality in parallel.
+        synchronized (MoonBridge.class) {
+            MoonBridge.stopConnection();
+            MoonBridge.cleanupBridge();
+        }
+
+        // Now a pending connection can be processed
+        connectionAllowed.release();
+    }
+    
+    private boolean startApp() throws XmlPullParserException, IOException
+    {
+        NvHTTP h = new NvHTTP(context.serverAddress, uniqueId, context.serverCert, cryptoProvider);
+
+        String serverInfo = h.getServerInfo();
+        
+        context.serverAppVersion = h.getServerVersion(serverInfo);
+        if (context.serverAppVersion == null) {
+            context.connListener.displayMessage("Server version malformed");
+            return false;
+        }
+
+        // May be missing for older servers
+        context.serverGfeVersion = h.getGfeVersion(serverInfo);
+                
+        if (h.getPairState(serverInfo) != PairingManager.PairState.PAIRED) {
+            context.connListener.displayMessage("Device not paired with computer");
+            return false;
+        }
+
+        context.negotiatedHdr = context.streamConfig.getEnableHdr();
+        if ((h.getServerCodecModeSupport(serverInfo) & 0x200) == 0 && context.negotiatedHdr) {
+            context.connListener.displayTransientMessage("Your GPU does not support streaming HDR. The stream will be SDR.");
+            context.negotiatedHdr = false;
+        }
+        
+        //
+        // Decide on negotiated stream parameters now
+        //
+        
+        // Check for a supported stream resolution
+        if (context.streamConfig.getHeight() >= 2160 && !h.supports4K(serverInfo)) {
+            // Client wants 4K but the server can't do it
+            context.connListener.displayTransientMessage("You must update GeForce Experience to stream in 4K. The stream will be 1080p.");
+            
+            // Lower resolution to 1080p
+            context.negotiatedWidth = 1920;
+            context.negotiatedHeight = 1080;
+        }
+        else {
+            // Take what the client wanted
+            context.negotiatedWidth = context.streamConfig.getWidth();
+            context.negotiatedHeight = context.streamConfig.getHeight();
+        }
+        
+        //
+        // Video stream format will be decided during the RTSP handshake
+        //
+        
+        NvApp app = context.streamConfig.getApp();
+        
+        // If the client did not provide an exact app ID, do a lookup with the applist
+        if (!context.streamConfig.getApp().isInitialized()) {
+            LimeLog.info("Using deprecated app lookup method - Please specify an app ID in your StreamConfiguration instead");
+            app = h.getAppByName(context.streamConfig.getApp().getAppName());
+            if (app == null) {
+                context.connListener.displayMessage("The app " + context.streamConfig.getApp().getAppName() + " is not in GFE app list");
+                return false;
+            }
+        }
+        
+        // If there's a game running, resume it
+        if (h.getCurrentGame(serverInfo) != 0) {
+            try {
+                if (h.getCurrentGame(serverInfo) == app.getAppId()) {
+                    if (!h.resumeApp(context)) {
+                        context.connListener.displayMessage("Failed to resume existing session");
+                        return false;
+                    }
+                } else {
+                    return quitAndLaunch(h, context);
+                }
+            } catch (GfeHttpResponseException e) {
+                if (e.getErrorCode() == 470) {
+                    // This is the error you get when you try to resume a session that's not yours.
+                    // Because this is fairly common, we'll display a more detailed message.
+                    context.connListener.displayMessage("This session wasn't started by this device," +
+                            " so it cannot be resumed. End streaming on the original " +
+                            "device or the PC itself and try again. (Error code: "+e.getErrorCode()+")");
+                    return false;
+                }
+                else if (e.getErrorCode() == 525) {
+                    context.connListener.displayMessage("The application is minimized. Resume it on the PC manually or " +
+                            "quit the session and start streaming again.");
+                    return false;
+                } else {
+                    throw e;
+                }
+            }
+            
+            LimeLog.info("Resumed existing game session");
+            return true;
+        }
+        else {
+            return launchNotRunningApp(h, context);
+        }
+    }
+
+    protected boolean quitAndLaunch(NvHTTP h, ConnectionContext context) throws IOException,
+            XmlPullParserException {
+        try {
+            if (!h.quitApp()) {
+                context.connListener.displayMessage("Failed to quit previous session! You must quit it manually");
+                return false;
+            } 
+        } catch (GfeHttpResponseException e) {
+            if (e.getErrorCode() == 599) {
+                context.connListener.displayMessage("This session wasn't started by this device," +
+                        " so it cannot be quit. End streaming on the original " +
+                        "device or the PC itself. (Error code: "+e.getErrorCode()+")");
+                return false;
+            }
+            else {
+                throw e;
+            }
+        }
+
+        return launchNotRunningApp(h, context);
+    }
+    
+    private boolean launchNotRunningApp(NvHTTP h, ConnectionContext context)
+            throws IOException, XmlPullParserException {
+        // Launch the app since it's not running
+        if (!h.launchApp(context, context.streamConfig.getApp().getAppId(), context.negotiatedHdr)) {
+            context.connListener.displayMessage("Failed to launch application");
+            return false;
+        }
+        
+        LimeLog.info("Launched new game session");
+        
+        return true;
+    }
+
+    public void start(final AudioRenderer audioRenderer, final VideoDecoderRenderer videoDecoderRenderer, final NvConnectionListener connectionListener)
+    {
+        new Thread(new Runnable() {
+            public void run() {
+                context.connListener = connectionListener;
+                context.videoCapabilities = videoDecoderRenderer.getCapabilities();
+
+                String appName = context.streamConfig.getApp().getAppName();
+
+                context.serverAddress = host;
+                context.connListener.stageStarting(appName);
+
+                try {
+                    if (!startApp()) {
+                        context.connListener.stageFailed(appName, 0);
+                        return;
+                    }
+                    context.connListener.stageComplete(appName);
+                } catch (XmlPullParserException | IOException e) {
+                    e.printStackTrace();
+                    context.connListener.displayMessage(e.getMessage());
+                    context.connListener.stageFailed(appName, 0);
+                    return;
+                }
+
+                ByteBuffer ib = ByteBuffer.allocate(16);
+                ib.putInt(context.riKeyId);
+
+                // Acquire the connection semaphore to ensure we only have one
+                // connection going at once.
+                try {
+                    connectionAllowed.acquire();
+                } catch (InterruptedException e) {
+                    context.connListener.displayMessage(e.getMessage());
+                    context.connListener.stageFailed(appName, 0);
+                    return;
+                }
+
+                // Moonlight-core is not thread-safe with respect to connection start and stop, so
+                // we must not invoke that functionality in parallel.
+                synchronized (MoonBridge.class) {
+                    MoonBridge.setupBridge(videoDecoderRenderer, audioRenderer, connectionListener);
+                    int ret = MoonBridge.startConnection(context.serverAddress,
+                            context.serverAppVersion, context.serverGfeVersion,
+                            context.negotiatedWidth, context.negotiatedHeight,
+                            context.streamConfig.getRefreshRate(), context.streamConfig.getBitrate(),
+                            context.streamConfig.getMaxPacketSize(),
+                            context.streamConfig.getRemote(), context.streamConfig.getAudioConfiguration().toInt(),
+                            context.streamConfig.getHevcSupported(),
+                            context.negotiatedHdr,
+                            context.streamConfig.getHevcBitratePercentageMultiplier(),
+                            context.streamConfig.getClientRefreshRateX100(),
+                            context.riKey.getEncoded(), ib.array(),
+                            context.videoCapabilities);
+                    if (ret != 0) {
+                        // LiStartConnection() failed, so the caller is not expected
+                        // to stop the connection themselves. We need to release their
+                        // semaphore count for them.
+                        connectionAllowed.release();
+                    }
+                }
+            }
+        }).start();
+    }
+    
+    public void sendMouseMove(final short deltaX, final short deltaY)
+    {
+        if (!isMonkey) {
+            MoonBridge.sendMouseMove(deltaX, deltaY);
+        }
+    }
+    
+    public void sendMouseButtonDown(final byte mouseButton)
+    {
+        if (!isMonkey) {
+            MoonBridge.sendMouseButton(MouseButtonPacket.PRESS_EVENT, mouseButton);
+        }
+    }
+    
+    public void sendMouseButtonUp(final byte mouseButton)
+    {
+        if (!isMonkey) {
+            MoonBridge.sendMouseButton(MouseButtonPacket.RELEASE_EVENT, mouseButton);
+        }
+    }
+    
+    public void sendControllerInput(final short controllerNumber,
+            final short activeGamepadMask, final short buttonFlags,
+            final byte leftTrigger, final byte rightTrigger,
+            final short leftStickX, final short leftStickY,
+            final short rightStickX, final short rightStickY)
+    {
+        if (!isMonkey) {
+            MoonBridge.sendMultiControllerInput(controllerNumber, activeGamepadMask, buttonFlags,
+                    leftTrigger, rightTrigger, leftStickX, leftStickY, rightStickX, rightStickY);
+        }
+    }
+    
+    public void sendControllerInput(final short buttonFlags,
+            final byte leftTrigger, final byte rightTrigger,
+            final short leftStickX, final short leftStickY,
+            final short rightStickX, final short rightStickY)
+    {
+        if (!isMonkey) {
+            MoonBridge.sendControllerInput(buttonFlags, leftTrigger, rightTrigger, leftStickX,
+                    leftStickY, rightStickX, rightStickY);
+        }
+    }
+    
+    public void sendKeyboardInput(final short keyMap, final byte keyDirection, final byte modifier) {
+        if (!isMonkey) {
+            MoonBridge.sendKeyboardInput(keyMap, keyDirection, modifier);
+        }
+    }
+    
+    public void sendMouseScroll(final byte scrollClicks) {
+        if (!isMonkey) {
+            MoonBridge.sendMouseScroll(scrollClicks);
+        }
+    }
+
+    public static String findExternalAddressForMdns(String stunHostname, int stunPort) {
+        return MoonBridge.findExternalAddressIP4(stunHostname, stunPort);
+    }
+}

app/src/main/java/com/limelight/nvstream/NvConnectionListener.java

@@ -0,0 +1,16 @@
+package com.limelight.nvstream;
+
+public interface NvConnectionListener {
+    void stageStarting(String stage);
+    void stageComplete(String stage);
+    void stageFailed(String stage, int errorCode);
+    
+    void connectionStarted();
+    void connectionTerminated(int errorCode);
+    void connectionStatusUpdate(int connectionStatus);
+    
+    void displayMessage(String message);
+    void displayTransientMessage(String message);
+
+    void rumble(short controllerNumber, short lowFreqMotor, short highFreqMotor);
+}

app/src/main/java/com/limelight/nvstream/StreamConfiguration.java

@@ -0,0 +1,214 @@
+package com.limelight.nvstream;
+
+import com.limelight.nvstream.http.NvApp;
+import com.limelight.nvstream.jni.MoonBridge;
+
+public class StreamConfiguration {
+    public static final int INVALID_APP_ID = 0;
+
+    public static final int STREAM_CFG_LOCAL = 0;
+    public static final int STREAM_CFG_REMOTE = 1;
+    public static final int STREAM_CFG_AUTO = 2;
+    
+    private NvApp app;
+    private int width, height;
+    private int refreshRate;
+    private int launchRefreshRate;
+    private int clientRefreshRateX100;
+    private int bitrate;
+    private boolean sops;
+    private boolean enableAdaptiveResolution;
+    private boolean playLocalAudio;
+    private int maxPacketSize;
+    private int remote;
+    private MoonBridge.AudioConfiguration audioConfiguration;
+    private boolean supportsHevc;
+    private int hevcBitratePercentageMultiplier;
+    private boolean enableHdr;
+    private int attachedGamepadMask;
+
+    public static class Builder {
+        private StreamConfiguration config = new StreamConfiguration();
+        
+        public StreamConfiguration.Builder setApp(NvApp app) {
+            config.app = app;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder setRemoteConfiguration(int remote) {
+            config.remote = remote;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder setResolution(int width, int height) {
+            config.width = width;
+            config.height = height;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder setRefreshRate(int refreshRate) {
+            config.refreshRate = refreshRate;
+            return this;
+        }
+
+        public StreamConfiguration.Builder setLaunchRefreshRate(int refreshRate) {
+            config.launchRefreshRate = refreshRate;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder setBitrate(int bitrate) {
+            config.bitrate = bitrate;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder setEnableSops(boolean enable) {
+            config.sops = enable;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder enableAdaptiveResolution(boolean enable) {
+            config.enableAdaptiveResolution = enable;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder enableLocalAudioPlayback(boolean enable) {
+            config.playLocalAudio = enable;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder setMaxPacketSize(int maxPacketSize) {
+            config.maxPacketSize = maxPacketSize;
+            return this;
+        }
+
+        public StreamConfiguration.Builder setHevcBitratePercentageMultiplier(int multiplier) {
+            config.hevcBitratePercentageMultiplier = multiplier;
+            return this;
+        }
+
+        public StreamConfiguration.Builder setEnableHdr(boolean enableHdr) {
+            config.enableHdr = enableHdr;
+            return this;
+        }
+
+        public StreamConfiguration.Builder setAttachedGamepadMask(int attachedGamepadMask) {
+            config.attachedGamepadMask = attachedGamepadMask;
+            return this;
+        }
+
+        public StreamConfiguration.Builder setAttachedGamepadMaskByCount(int gamepadCount) {
+            config.attachedGamepadMask = 0;
+            for (int i = 0; i < 4; i++) {
+                if (gamepadCount > i) {
+                    config.attachedGamepadMask |= 1 << i;
+                }
+            }
+            return this;
+        }
+
+        public StreamConfiguration.Builder setClientRefreshRateX100(int refreshRateX100) {
+            config.clientRefreshRateX100 = refreshRateX100;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder setAudioConfiguration(MoonBridge.AudioConfiguration audioConfig) {
+            config.audioConfiguration = audioConfig;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder setHevcSupported(boolean supportsHevc) {
+            config.supportsHevc = supportsHevc;
+            return this;
+        }
+        
+        public StreamConfiguration build() {
+            return config;
+        }
+    }
+    
+    private StreamConfiguration() {
+        // Set default attributes
+        this.app = new NvApp("Steam");
+        this.width = 1280;
+        this.height = 720;
+        this.refreshRate = 60;
+        this.launchRefreshRate = 60;
+        this.bitrate = 10000;
+        this.maxPacketSize = 1024;
+        this.remote = STREAM_CFG_AUTO;
+        this.sops = true;
+        this.enableAdaptiveResolution = false;
+        this.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_STEREO;
+        this.supportsHevc = false;
+        this.enableHdr = false;
+        this.attachedGamepadMask = 0;
+    }
+    
+    public int getWidth() {
+        return width;
+    }
+    
+    public int getHeight() {
+        return height;
+    }
+    
+    public int getRefreshRate() {
+        return refreshRate;
+    }
+
+    public int getLaunchRefreshRate() {
+        return launchRefreshRate;
+    }
+    
+    public int getBitrate() {
+        return bitrate;
+    }
+    
+    public int getMaxPacketSize() {
+        return maxPacketSize;
+    }
+
+    public NvApp getApp() {
+        return app;
+    }
+    
+    public boolean getSops() {
+        return sops;
+    }
+    
+    public boolean getAdaptiveResolutionEnabled() {
+        return enableAdaptiveResolution;
+    }
+    
+    public boolean getPlayLocalAudio() {
+        return playLocalAudio;
+    }
+    
+    public int getRemote() {
+        return remote;
+    }
+
+    public MoonBridge.AudioConfiguration getAudioConfiguration() {
+        return audioConfiguration;
+    }
+    
+    public boolean getHevcSupported() {
+        return supportsHevc;
+    }
+
+    public int getHevcBitratePercentageMultiplier() {
+        return hevcBitratePercentageMultiplier;
+    }
+
+    public boolean getEnableHdr() {
+        return enableHdr;
+    }
+
+    public int getAttachedGamepadMask() {
+        return attachedGamepadMask;
+    }
+
+    public int getClientRefreshRateX100() {
+        return clientRefreshRateX100;
+    }
+}

app/src/main/java/com/limelight/nvstream/av/ByteBufferDescriptor.java

@@ -0,0 +1,57 @@
+package com.limelight.nvstream.av;
+
+public class ByteBufferDescriptor {
+    public byte[] data;
+    public int offset;
+    public int length;
+    
+    public ByteBufferDescriptor nextDescriptor;
+    
+    public ByteBufferDescriptor(byte[] data, int offset, int length)
+    {
+        this.data = data;
+        this.offset = offset;
+        this.length = length;
+    }
+    
+    public ByteBufferDescriptor(ByteBufferDescriptor desc)
+    {
+        this.data = desc.data;
+        this.offset = desc.offset;
+        this.length = desc.length;
+    }
+    
+    public void reinitialize(byte[] data, int offset, int length)
+    {
+        this.data = data;
+        this.offset = offset;
+        this.length = length;
+        this.nextDescriptor = null;
+    }
+    
+    public void print()
+    {
+        print(offset, length);
+    }
+    
+    public void print(int length)
+    {
+        print(this.offset, length);
+    }
+    
+    public void print(int offset, int length)
+    {
+        for (int i = offset; i < offset+length;) {
+            if (i + 8 <= offset+length) {
+                System.out.printf("%x: %02x %02x %02x %02x %02x %02x %02x %02x\n", i,
+                        data[i], data[i+1], data[i+2], data[i+3], data[i+4], data[i+5], data[i+6], data[i+7]);
+                i += 8;
+            }
+            else {
+                System.out.printf("%x: %02x \n", i, data[i]);
+                i++;
+            }
+        }
+        System.out.println();
+    }
+}

app/src/main/java/com/limelight/nvstream/av/audio/AudioRenderer.java

@@ -0,0 +1,15 @@
+package com.limelight.nvstream.av.audio;
+
+import com.limelight.nvstream.jni.MoonBridge;
+
+public interface AudioRenderer {
+    int setup(MoonBridge.AudioConfiguration audioConfiguration, int sampleRate, int samplesPerFrame);
+
+    void start();
+
+    void stop();
+    
+    void playDecodedAudio(short[] audioData);
+    
+    void cleanup();
+}

app/src/main/java/com/limelight/nvstream/av/video/VideoDecoderRenderer.java

@@ -0,0 +1,18 @@
+package com.limelight.nvstream.av.video;
+
+public abstract class VideoDecoderRenderer {
+    public abstract int setup(int format, int width, int height, int redrawRate);
+
+    public abstract void start();
+
+    public abstract void stop();
+
+    // This is called once for each frame-start NALU. This means it will be called several times
+    // for an IDR frame which contains several parameter sets and the I-frame data.
+    public abstract int submitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength, int decodeUnitType,
+                                         int frameNumber, long receiveTimeMs);
+    
+    public abstract void cleanup();
+
+    public abstract int getCapabilities();
+}

app/src/main/java/com/limelight/nvstream/http/ComputerDetails.java

@@ -0,0 +1,85 @@
+package com.limelight.nvstream.http;
+
+import java.security.cert.X509Certificate;
+
+
+public class ComputerDetails {
+    public enum State {
+        ONLINE, OFFLINE, UNKNOWN
+    }
+
+    // Persistent attributes
+    public String uuid;
+    public String name;
+    public String localAddress;
+    public String remoteAddress;
+    public String manualAddress;
+    public String ipv6Address;
+    public String macAddress;
+    public X509Certificate serverCert;
+
+    // Transient attributes
+    public State state;
+    public String activeAddress;
+    public PairingManager.PairState pairState;
+    public int runningGameId;
+    public String rawAppList;
+
+    public ComputerDetails() {
+        // Use defaults
+        state = State.UNKNOWN;
+    }
+
+    public ComputerDetails(ComputerDetails details) {
+        // Copy details from the other computer
+        update(details);
+    }
+
+    public void update(ComputerDetails details) {
+        this.state = details.state;
+        this.name = details.name;
+        this.uuid = details.uuid;
+        if (details.activeAddress != null) {
+            this.activeAddress = details.activeAddress;
+        }
+        // We can get IPv4 loopback addresses with GS IPv6 Forwarder
+        if (details.localAddress != null && !details.localAddress.startsWith("127.")) {
+            this.localAddress = details.localAddress;
+        }
+        if (details.remoteAddress != null) {
+            this.remoteAddress = details.remoteAddress;
+        }
+        if (details.manualAddress != null) {
+            this.manualAddress = details.manualAddress;
+        }
+        if (details.ipv6Address != null) {
+            this.ipv6Address = details.ipv6Address;
+        }
+        if (details.macAddress != null && !details.macAddress.equals("00:00:00:00:00:00")) {
+            this.macAddress = details.macAddress;
+        }
+        if (details.serverCert != null) {
+            this.serverCert = details.serverCert;
+        }
+        this.pairState = details.pairState;
+        this.runningGameId = details.runningGameId;
+        this.rawAppList = details.rawAppList;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder str = new StringBuilder();
+        str.append("State: ").append(state).append("\n");
+        str.append("Active Address: ").append(activeAddress).append("\n");
+        str.append("Name: ").append(name).append("\n");
+        str.append("UUID: ").append(uuid).append("\n");
+        str.append("Local Address: ").append(localAddress).append("\n");
+        str.append("Remote Address: ").append(remoteAddress).append("\n");
+        str.append("IPv6 Address: ").append(ipv6Address).append("\n");
+        str.append("Manual Address: ").append(manualAddress).append("\n");
+        str.append("MAC Address: ").append(macAddress).append("\n");
+        str.append("Pair State: ").append(pairState).append("\n");
+        str.append("Running Game ID: ").append(runningGameId).append("\n");
+        return str.toString();
+    }
+}

app/src/main/java/com/limelight/nvstream/http/GfeHttpResponseException.java

@@ -0,0 +1,28 @@
+package com.limelight.nvstream.http;
+
+import java.io.IOException;
+
+public class GfeHttpResponseException extends IOException {
+    private static final long serialVersionUID = 1543508830807804222L;
+    
+    private int errorCode;
+    private String errorMsg;
+    
+    public GfeHttpResponseException(int errorCode, String errorMsg) {
+        this.errorCode = errorCode;
+        this.errorMsg = errorMsg;
+    }
+    
+    public int getErrorCode() {
+        return errorCode;
+    }
+    
+    public String getErrorMessage() {
+        return errorMsg;
+    }
+    
+    @Override
+    public String getMessage() {
+        return "GeForce Experience returned error: "+errorMsg+" (Error code: "+errorCode+")";
+    }
+}

app/src/main/java/com/limelight/nvstream/http/LimelightCryptoProvider.java

@@ -0,0 +1,11 @@
+package com.limelight.nvstream.http;
+
+import java.security.cert.X509Certificate;
+import java.security.interfaces.RSAPrivateKey;
+
+public interface LimelightCryptoProvider {
+    X509Certificate getClientCertificate();
+    RSAPrivateKey getClientPrivateKey();
+    byte[] getPemEncodedClientCertificate();
+    String encodeBase64String(byte[] data);
+}

app/src/main/java/com/limelight/nvstream/http/NvApp.java

@@ -0,0 +1,61 @@
+package com.limelight.nvstream.http;
+
+import com.limelight.LimeLog;
+
+public class NvApp {
+    private String appName = "";
+    private int appId;
+    private boolean initialized;
+    private boolean hdrSupported;
+    
+    public NvApp() {}
+    
+    public NvApp(String appName) {
+        this.appName = appName;
+    }
+    
+    public NvApp(String appName, int appId, boolean hdrSupported) {
+        this.appName = appName;
+        this.appId = appId;
+        this.hdrSupported = hdrSupported;
+        this.initialized = true;
+    }
+    
+    public void setAppName(String appName) {
+        this.appName = appName;
+    }
+    
+    public void setAppId(String appId) {
+        try {
+            this.appId = Integer.parseInt(appId);
+            this.initialized = true;
+        } catch (NumberFormatException e) {
+            LimeLog.warning("Malformed app ID: "+appId);
+        }
+    }
+    
+    public void setAppId(int appId) {
+        this.appId = appId;
+        this.initialized = true;
+    }
+
+    public void setHdrSupported(boolean hdrSupported) {
+        this.hdrSupported = hdrSupported;
+    }
+    
+    public String getAppName() {
+        return this.appName;
+    }
+    
+    public int getAppId() {
+        return this.appId;
+    }
+
+    public boolean isHdrSupported() {
+        return this.hdrSupported;
+    }
+    
+    public boolean isInitialized() {
+        return this.initialized;
+    }
+}

app/src/main/java/com/limelight/nvstream/http/NvHTTP.java

@@ -0,0 +1,691 @@
+package com.limelight.nvstream.http;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.net.MalformedURLException;
+import java.net.Socket;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import java.security.Principal;
+import java.security.PrivateKey;
+import java.security.SecureRandom;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Stack;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509KeyManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
+
+import com.limelight.BuildConfig;
+import com.limelight.LimeLog;
+import com.limelight.nvstream.ConnectionContext;
+import com.limelight.nvstream.http.PairingManager.PairState;
+
+import okhttp3.ConnectionPool;
+import okhttp3.Handshake;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+
+public class NvHTTP {
+    private String uniqueId;
+    private PairingManager pm;
+
+    public static final int HTTPS_PORT = 47984;
+    public static final int HTTP_PORT = 47989;
+    public static final int CONNECTION_TIMEOUT = 3000;
+    public static final int READ_TIMEOUT = 5000;
+
+    // Print URL and content to logcat on debug builds
+    private static boolean verbose = BuildConfig.DEBUG;
+
+    public String baseUrlHttps;
+    public String baseUrlHttp;
+    
+    private OkHttpClient httpClient;
+    private OkHttpClient httpClientWithReadTimeout;
+        
+    private X509TrustManager trustManager;
+    private X509KeyManager keyManager;
+    private X509Certificate serverCert;
+
+    void setServerCert(X509Certificate serverCert) {
+        this.serverCert = serverCert;
+
+        trustManager = new X509TrustManager() {
+            public X509Certificate[] getAcceptedIssuers() {
+                return new X509Certificate[0];
+            }
+            public void checkClientTrusted(X509Certificate[] certs, String authType) {
+                throw new IllegalStateException("Should never be called");
+            }
+            public void checkServerTrusted(X509Certificate[] certs, String authType) throws CertificateException {
+                // Check the server certificate if we've paired to this host
+                if (!certs[0].equals(NvHTTP.this.serverCert)) {
+                    throw new CertificateException("Certificate mismatch");
+                }
+            }
+        };
+    }
+
+    private void initializeHttpState(final X509Certificate serverCert, final LimelightCryptoProvider cryptoProvider) {
+        // Set up TrustManager
+        setServerCert(serverCert);
+
+        keyManager = new X509KeyManager() {
+            public String chooseClientAlias(String[] keyTypes,
+                    Principal[] issuers, Socket socket) { return "Limelight-RSA"; }
+            public String chooseServerAlias(String keyType, Principal[] issuers,
+                    Socket socket) { return null; }
+            public X509Certificate[] getCertificateChain(String alias) {
+                return new X509Certificate[] {cryptoProvider.getClientCertificate()};
+            }
+            public String[] getClientAliases(String keyType, Principal[] issuers) { return null; }
+            public PrivateKey getPrivateKey(String alias) {
+                return cryptoProvider.getClientPrivateKey();
+            }
+            public String[] getServerAliases(String keyType, Principal[] issuers) { return null; }
+        };
+
+        // Ignore differences between given hostname and certificate hostname
+        HostnameVerifier hv = new HostnameVerifier() {
+            public boolean verify(String hostname, SSLSession session) { return true; }
+        };
+
+        httpClient = new OkHttpClient.Builder()
+                .connectionPool(new ConnectionPool(0, 1, TimeUnit.MILLISECONDS))
+                .hostnameVerifier(hv)
+                .readTimeout(0, TimeUnit.MILLISECONDS)
+                .connectTimeout(CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
+                .build();
+        
+        httpClientWithReadTimeout = httpClient.newBuilder()
+                .readTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS)
+                .build();
+    }
+    
+    public NvHTTP(String address, String uniqueId, X509Certificate serverCert, LimelightCryptoProvider cryptoProvider) throws IOException {
+        // Use the same UID for all Moonlight clients so we can quit games
+        // started by other Moonlight clients.
+        this.uniqueId = "0123456789ABCDEF";
+
+        initializeHttpState(serverCert, cryptoProvider);
+
+        try {
+            // The URI constructor takes care of escaping IPv6 literals
+            this.baseUrlHttps = new URI("https", null, address, HTTPS_PORT, null, null, null).toString();
+            this.baseUrlHttp = new URI("http", null, address, HTTP_PORT, null, null, null).toString();
+        } catch (URISyntaxException e) {
+            // Encapsulate URISyntaxException into IOException for callers to handle more easily
+            throw new IOException(e);
+        }
+
+        this.pm = new PairingManager(this, cryptoProvider);
+    }
+    
+    String buildUniqueIdUuidString() {
+        return "uniqueid="+uniqueId+"&uuid="+UUID.randomUUID();
+    }
+    
+    static String getXmlString(Reader r, String tagname) throws XmlPullParserException, IOException {
+        XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
+        factory.setNamespaceAware(true);
+        XmlPullParser xpp = factory.newPullParser();
+
+        xpp.setInput(r);
+        int eventType = xpp.getEventType();
+        Stack<String> currentTag = new Stack<String>();
+        
+        while (eventType != XmlPullParser.END_DOCUMENT) {
+            switch (eventType) {
+            case (XmlPullParser.START_TAG):
+                if (xpp.getName().equals("root")) {
+                    verifyResponseStatus(xpp);
+                }
+                currentTag.push(xpp.getName());
+                break;
+            case (XmlPullParser.END_TAG):
+                currentTag.pop();
+                break;
+            case (XmlPullParser.TEXT):
+                if (currentTag.peek().equals(tagname)) {
+                    return xpp.getText().trim();
+                }
+                break;
+            }
+            eventType = xpp.next();
+        }
+
+        return null;
+    }
+
+    static String getXmlString(String str, String tagname) throws XmlPullParserException, IOException {
+        return getXmlString(new StringReader(str), tagname);
+    }
+    
+    private static void verifyResponseStatus(XmlPullParser xpp) throws GfeHttpResponseException {
+        int statusCode = Integer.parseInt(xpp.getAttributeValue(XmlPullParser.NO_NAMESPACE, "status_code"));
+        if (statusCode != 200) {
+            throw new GfeHttpResponseException(statusCode, xpp.getAttributeValue(XmlPullParser.NO_NAMESPACE, "status_message"));
+        }
+    }
+    
+    public String getServerInfo() throws IOException, XmlPullParserException {
+        String resp;
+        
+        //
+        // TODO: Shield Hub uses HTTP for this and is able to get an accurate PairStatus with HTTP.
+        // For some reason, we always see PairStatus is 0 over HTTP and only 1 over HTTPS. It looks
+        // like there are extra request headers required to make this stuff work over HTTP.
+        //
+
+        // When we have a pinned cert, use HTTPS to fetch serverinfo and fall back on cert mismatch
+        if (serverCert != null) {
+            try {
+                try {
+                    resp = openHttpConnectionToString(baseUrlHttps + "/serverinfo?"+buildUniqueIdUuidString(), true);
+                } catch (SSLHandshakeException e) {
+                    // Detect if we failed due to a server cert mismatch
+                    if (e.getCause() instanceof CertificateException) {
+                        // Jump to the GfeHttpResponseException exception handler to retry
+                        // over HTTP which will allow us to pair again to update the cert
+                        throw new GfeHttpResponseException(401, "Server certificate mismatch");
+                    }
+                    else {
+                        throw e;
+                    }
+                }
+
+                // This will throw an exception if the request came back with a failure status.
+                // We want this because it will throw us into the HTTP case if the client is unpaired.
+                getServerVersion(resp);
+            }
+            catch (GfeHttpResponseException e) {
+                if (e.getErrorCode() == 401) {
+                    // Cert validation error - fall back to HTTP
+                    return openHttpConnectionToString(baseUrlHttp + "/serverinfo", true);
+                }
+
+                // If it's not a cert validation error, throw it
+                throw e;
+            }
+
+            return resp;
+        }
+        else {
+            // No pinned cert, so use HTTP
+            return openHttpConnectionToString(baseUrlHttp + "/serverinfo", true);
+        }
+    }
+    
+    public ComputerDetails getComputerDetails() throws IOException, XmlPullParserException {
+        ComputerDetails details = new ComputerDetails();
+        String serverInfo = getServerInfo();
+        
+        details.name = getXmlString(serverInfo, "hostname");
+        if (details.name == null || details.name.isEmpty()) {
+            details.name = "UNKNOWN";
+        }
+
+        details.uuid = getXmlString(serverInfo, "uniqueid");
+        details.macAddress = getXmlString(serverInfo, "mac");
+        details.localAddress = getXmlString(serverInfo, "LocalIP");
+
+        // This may be null, but that's okay
+        details.remoteAddress = getXmlString(serverInfo, "ExternalIP");
+
+        // This has some extra logic to always report unpaired if the pinned cert isn't there
+        details.pairState = getPairState(serverInfo);
+        
+        try {
+            details.runningGameId = getCurrentGame(serverInfo);
+        } catch (NumberFormatException e) {
+            details.runningGameId = 0;
+        }
+        
+        // We could reach it so it's online
+        details.state = ComputerDetails.State.ONLINE;
+        
+        return details;
+    }
+
+    // This hack is Android-specific but we do it on all platforms
+    // because it doesn't really matter
+    private OkHttpClient performAndroidTlsHack(OkHttpClient client) {
+        // Doing this each time we create a socket is required
+        // to avoid the SSLv3 fallback that causes connection failures
+        try {
+            SSLContext sc = SSLContext.getInstance("TLS");
+            sc.init(new KeyManager[] { keyManager }, new TrustManager[] { trustManager }, new SecureRandom());
+            return client.newBuilder().sslSocketFactory(sc.getSocketFactory(), trustManager).build();
+        } catch (NoSuchAlgorithmException | KeyManagementException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public X509Certificate getCertificateIfTrusted() {
+        try {
+            Response resp = httpClient.newCall(new Request.Builder().url(baseUrlHttps).get().build()).execute();
+            Handshake handshake = resp.handshake();
+            if (handshake != null) {
+                return (X509Certificate)handshake.peerCertificates().get(0);
+            }
+        } catch (IOException ignored) {}
+
+        return null;
+    }
+
+    // Read timeout should be enabled for any HTTP query that requires no outside action
+    // on the GFE server. Examples of queries that DO require outside action are launch, resume, and quit.
+    // The initial pair query does require outside action (user entering a PIN) but subsequent pairing
+    // queries do not.
+    private ResponseBody openHttpConnection(String url, boolean enableReadTimeout) throws IOException {
+        Request request = new Request.Builder().url(url).get().build();
+        Response response;
+
+        if (serverCert == null && !url.startsWith(baseUrlHttp)) {
+            throw new IllegalStateException("Attempted HTTPS fetch without pinned cert");
+        }
+
+        if (enableReadTimeout) {
+            response = performAndroidTlsHack(httpClientWithReadTimeout).newCall(request).execute();
+        }
+        else {
+            response = performAndroidTlsHack(httpClient).newCall(request).execute();
+        }
+
+        ResponseBody body = response.body();
+        
+        if (response.isSuccessful()) {
+            return body;
+        }
+        
+        // Unsuccessful, so close the response body
+        if (body != null) {
+            body.close();
+        }
+        
+        if (response.code() == 404) {
+            throw new FileNotFoundException(url);
+        }
+        else {
+            throw new IOException("HTTP request failed: "+response.code());
+        }
+    }
+    
+    String openHttpConnectionToString(String url, boolean enableReadTimeout) throws IOException {
+        try {
+            if (verbose) {
+                LimeLog.info("Requesting URL: "+url);
+            }
+
+            ResponseBody resp = openHttpConnection(url, enableReadTimeout);
+            String respString = resp.string();
+            resp.close();
+
+            if (verbose) {
+                LimeLog.info(url+" -> "+respString);
+            }
+
+            return respString;
+        } catch (IOException e) {
+            if (verbose) {
+                e.printStackTrace();
+            }
+            
+            throw e;
+        }
+    }
+
+    public String getServerVersion(String serverInfo) throws XmlPullParserException, IOException {
+        return getXmlString(serverInfo, "appversion");
+    }
+
+    public PairingManager.PairState getPairState() throws IOException, XmlPullParserException {
+        return getPairState(getServerInfo());
+    }
+
+    public PairingManager.PairState getPairState(String serverInfo) throws IOException, XmlPullParserException {
+        // If we don't have a server cert, we can't be paired even if the host thinks we are
+        if (serverCert == null) {
+            return PairState.NOT_PAIRED;
+        }
+
+        if (!NvHTTP.getXmlString(serverInfo, "PairStatus").equals("1")) {
+            return PairState.NOT_PAIRED;
+        }
+
+        return PairState.PAIRED;
+    }
+    
+    public long getMaxLumaPixelsH264(String serverInfo) throws XmlPullParserException, IOException {
+        String str = getXmlString(serverInfo, "MaxLumaPixelsH264");
+        if (str != null) {
+            try {
+                return Long.parseLong(str);
+            } catch (NumberFormatException e) {
+                return 0;
+            }
+        } else {
+            return 0;
+        }
+    }
+    
+    public long getMaxLumaPixelsHEVC(String serverInfo) throws XmlPullParserException, IOException {
+        String str = getXmlString(serverInfo, "MaxLumaPixelsHEVC");
+        if (str != null) {
+            try {
+                return Long.parseLong(str);
+            } catch (NumberFormatException e) {
+                return 0;
+            }
+        } else {
+            return 0;
+        }
+    }
+
+    // Possible meaning of bits
+    // Bit 0: H.264 Baseline
+    // Bit 1: H.264 High
+    // ----
+    // Bit 8: HEVC Main
+    // Bit 9: HEVC Main10
+    // Bit 10: HEVC Main10 4:4:4
+    // Bit 11: ???
+    public long getServerCodecModeSupport(String serverInfo) throws XmlPullParserException, IOException {
+        String str = getXmlString(serverInfo, "ServerCodecModeSupport");
+        if (str != null) {
+            try {
+                return Long.parseLong(str);
+            } catch (NumberFormatException e) {
+                return 0;
+            }
+        } else {
+            return 0;
+        }
+    }
+    
+    public String getGpuType(String serverInfo) throws XmlPullParserException, IOException {
+        return getXmlString(serverInfo, "gputype");
+    }
+
+    public String getGfeVersion(String serverInfo) throws XmlPullParserException, IOException {
+        return getXmlString(serverInfo, "GfeVersion");
+    }
+    
+    public boolean supports4K(String serverInfo) throws XmlPullParserException, IOException {
+        // Only allow 4K on GFE 3.x
+        String gfeVersionStr = getXmlString(serverInfo, "GfeVersion");
+        if (gfeVersionStr == null || gfeVersionStr.startsWith("2.")) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public int getCurrentGame(String serverInfo) throws IOException, XmlPullParserException {
+        // GFE 2.8 started keeping currentgame set to the last game played. As a result, it no longer
+        // has the semantics that its name would indicate. To contain the effects of this change as much
+        // as possible, we'll force the current game to zero if the server isn't in a streaming session.
+        String serverState = getXmlString(serverInfo, "state");
+        if (serverState != null && serverState.endsWith("_SERVER_BUSY")) {
+            String game = getXmlString(serverInfo, "currentgame");
+            return Integer.parseInt(game);
+        }
+        else {
+            return 0;
+        }
+    }
+
+    public NvApp getAppById(int appId) throws IOException, XmlPullParserException {
+        LinkedList<NvApp> appList = getAppList();
+        for (NvApp appFromList : appList) {
+            if (appFromList.getAppId() == appId) {
+                return appFromList;
+            }
+        }
+        return null;
+    }
+    
+    /* NOTE: Only use this function if you know what you're doing.
+     * It's totally valid to have two apps named the same thing,
+     * or even nothing at all! Look apps up by ID if at all possible
+     * using the above function */
+    public NvApp getAppByName(String appName) throws IOException, XmlPullParserException {
+        LinkedList<NvApp> appList = getAppList();
+        for (NvApp appFromList : appList) {
+            if (appFromList.getAppName().equalsIgnoreCase(appName)) {
+                return appFromList;
+            }
+        }
+        return null;
+    }
+
+    public PairingManager getPairingManager() {
+        return pm;
+    }
+    
+    public static LinkedList<NvApp> getAppListByReader(Reader r) throws XmlPullParserException, IOException {
+        XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
+        factory.setNamespaceAware(true);
+        XmlPullParser xpp = factory.newPullParser();
+
+        xpp.setInput(r);
+        int eventType = xpp.getEventType();
+        LinkedList<NvApp> appList = new LinkedList<NvApp>();
+        Stack<String> currentTag = new Stack<String>();
+        boolean rootTerminated = false;
+
+        while (eventType != XmlPullParser.END_DOCUMENT) {
+            switch (eventType) {
+            case (XmlPullParser.START_TAG):
+                if (xpp.getName().equals("root")) {
+                    verifyResponseStatus(xpp);
+                }
+                currentTag.push(xpp.getName());
+                if (xpp.getName().equals("App")) {
+                    appList.addLast(new NvApp());
+                }
+                break;
+            case (XmlPullParser.END_TAG):
+                currentTag.pop();
+                if (xpp.getName().equals("root")) {
+                    rootTerminated = true;
+                }
+                break;
+            case (XmlPullParser.TEXT):
+                NvApp app = appList.getLast();
+                if (currentTag.peek().equals("AppTitle")) {
+                    app.setAppName(xpp.getText().trim());
+                } else if (currentTag.peek().equals("ID")) {
+                    app.setAppId(xpp.getText().trim());
+                } else if (currentTag.peek().equals("IsHdrSupported")) {
+                    app.setHdrSupported(xpp.getText().trim().equals("1"));
+                }
+                break;
+            }
+            eventType = xpp.next();
+        }
+        
+        // Throw a malformed XML exception if we've not seen the root tag ended
+        if (!rootTerminated) {
+            throw new XmlPullParserException("Malformed XML: Root tag was not terminated");
+        }
+        
+        // Ensure that all apps in the list are initialized
+        ListIterator<NvApp> i = appList.listIterator();
+        while (i.hasNext()) {
+            NvApp app = i.next();
+            
+            // Remove uninitialized apps
+            if (!app.isInitialized()) {
+                LimeLog.warning("GFE returned incomplete app: "+app.getAppId()+" "+app.getAppName());
+                i.remove();
+            }
+        }
+        
+        return appList;
+    }
+    
+    public String getAppListRaw() throws MalformedURLException, IOException {
+        return openHttpConnectionToString(baseUrlHttps + "/applist?"+buildUniqueIdUuidString(), true);
+    }
+    
+    public LinkedList<NvApp> getAppList() throws GfeHttpResponseException, IOException, XmlPullParserException {
+        if (verbose) {
+            // Use the raw function so the app list is printed
+            return getAppListByReader(new StringReader(getAppListRaw()));
+        }
+        else {
+            ResponseBody resp = openHttpConnection(baseUrlHttps + "/applist?" + buildUniqueIdUuidString(), true);
+            LinkedList<NvApp> appList = getAppListByReader(new InputStreamReader(resp.byteStream()));
+            resp.close();
+            return appList;
+        }
+    }
+    
+    public void unpair() throws IOException {
+        openHttpConnectionToString(baseUrlHttp + "/unpair?"+buildUniqueIdUuidString(), true);
+    }
+    
+    public InputStream getBoxArt(NvApp app) throws IOException {
+        ResponseBody resp = openHttpConnection(baseUrlHttps + "/appasset?"+ buildUniqueIdUuidString() +
+                "&appid=" + app.getAppId() + "&AssetType=2&AssetIdx=0", true);
+        return resp.byteStream();
+    }
+    
+    public int getServerMajorVersion(String serverInfo) throws XmlPullParserException, IOException {
+        int[] appVersionQuad = getServerAppVersionQuad(serverInfo);
+        if (appVersionQuad != null) {
+            return appVersionQuad[0];
+        }
+        else {
+            return 0;
+        }
+    }
+    
+    public int[] getServerAppVersionQuad(String serverInfo) throws XmlPullParserException, IOException {
+        try {
+            String serverVersion = getServerVersion(serverInfo);
+            if (serverVersion == null) {
+                LimeLog.warning("Missing server version field");
+                return null;
+            }
+            String[] serverVersionSplit = serverVersion.split("\\.");
+            if (serverVersionSplit.length != 4) {
+                LimeLog.warning("Malformed server version field");
+                return null;
+            }
+            int[] ret = new int[serverVersionSplit.length];
+            for (int i = 0; i < ret.length; i++) {
+                ret[i] = Integer.parseInt(serverVersionSplit[i]);
+            }
+            return ret;
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    final private static char[] hexArray = "0123456789ABCDEF".toCharArray();
+    private static String bytesToHex(byte[] bytes) {
+        char[] hexChars = new char[bytes.length * 2];
+        for ( int j = 0; j < bytes.length; j++ ) {
+            int v = bytes[j] & 0xFF;
+            hexChars[j * 2] = hexArray[v >>> 4];
+            hexChars[j * 2 + 1] = hexArray[v & 0x0F];
+        }
+        return new String(hexChars);
+    }
+    
+    public boolean launchApp(ConnectionContext context, int appId, boolean enableHdr) throws IOException, XmlPullParserException {
+        // Using an unsupported resolution (not 720p, 1080p, or 4K) causes
+        // GFE to force SOPS to 720p60. This is fine for < 720p resolutions like
+        // 360p or 480p, but it is not ideal for 1440p and other resolutions.
+        // When we detect an unsupported resolution, disable SOPS unless it's under 720p.
+        // FIXME: Detect support resolutions using the serverinfo response, not a hardcoded list
+        boolean enableSops = context.streamConfig.getSops();
+        if (context.negotiatedWidth * context.negotiatedHeight > 1280 * 720 &&
+                context.negotiatedWidth * context.negotiatedHeight != 1920 * 1080 &&
+                context.negotiatedWidth * context.negotiatedHeight != 3840 * 2160) {
+            LimeLog.info("Disabling SOPS due to non-standard resolution: "+context.negotiatedWidth+"x"+context.negotiatedHeight);
+            enableSops = false;
+        }
+
+        // Using SOPS with FPS values over 60 causes GFE to fall back
+        // to 720p60. On previous GFE versions, we could avoid this by
+        // forcing the FPS value to 60 when launching the stream, but
+        // now on GFE 3.20.3 that seems to trigger some sort of
+        // frame rate limiter that locks the game to 60 FPS.
+        if (context.streamConfig.getLaunchRefreshRate() > 60) {
+            LimeLog.info("Disabling SOPS due to high frame rate: "+context.streamConfig.getLaunchRefreshRate());
+            enableSops = false;
+        }
+
+        String xmlStr = openHttpConnectionToString(baseUrlHttps +
+            "/launch?" + buildUniqueIdUuidString() +
+            "&appid=" + appId +
+            "&mode=" + context.negotiatedWidth + "x" + context.negotiatedHeight + "x" + context.streamConfig.getLaunchRefreshRate() +
+            "&additionalStates=1&sops=" + (enableSops ? 1 : 0) +
+            "&rikey="+bytesToHex(context.riKey.getEncoded()) +
+            "&rikeyid="+context.riKeyId +
+            (!enableHdr ? "" : "&hdrMode=1&clientHdrCapVersion=0&clientHdrCapSupportedFlagsInUint32=0&clientHdrCapMetaDataId=NV_STATIC_METADATA_TYPE_1&clientHdrCapDisplayData=0x0x0x0x0x0x0x0x0x0x0") +
+            "&localAudioPlayMode=" + (context.streamConfig.getPlayLocalAudio() ? 1 : 0) +
+            "&surroundAudioInfo=" + context.streamConfig.getAudioConfiguration().getSurroundAudioInfo() +
+            (context.streamConfig.getAttachedGamepadMask() != 0 ? "&remoteControllersBitmap=" + context.streamConfig.getAttachedGamepadMask() : "") +
+            (context.streamConfig.getAttachedGamepadMask() != 0 ? "&gcmap=" + context.streamConfig.getAttachedGamepadMask() : ""),
+            false);
+        String gameSession = getXmlString(xmlStr, "gamesession");
+        return gameSession != null && !gameSession.equals("0");
+    }
+    
+    public boolean resumeApp(ConnectionContext context) throws IOException, XmlPullParserException {
+        String xmlStr = openHttpConnectionToString(baseUrlHttps + "/resume?" + buildUniqueIdUuidString() +
+                "&rikey="+bytesToHex(context.riKey.getEncoded()) +
+                "&rikeyid="+context.riKeyId +
+                "&surroundAudioInfo=" + context.streamConfig.getAudioConfiguration().getSurroundAudioInfo(),
+                false);
+        String resume = getXmlString(xmlStr, "resume");
+        return Integer.parseInt(resume) != 0;
+    }
+    
+    public boolean quitApp() throws IOException, XmlPullParserException {
+        String xmlStr = openHttpConnectionToString(baseUrlHttps + "/cancel?" + buildUniqueIdUuidString(), false);
+        String cancel = getXmlString(xmlStr, "cancel");
+        if (Integer.parseInt(cancel) == 0) {
+            return false;
+        }
+
+        // Newer GFE versions will just return success even if quitting fails
+        // if we're not the original requestor.
+        if (getCurrentGame(getServerInfo()) != 0) {
+            // Generate a synthetic GfeResponseException letting the caller know
+            // that they can't kill someone else's stream.
+            throw new GfeHttpResponseException(599, "");
+        }
+
+        return true;
+    }
+}

app/src/main/java/com/limelight/nvstream/http/PairingManager.java

@@ -0,0 +1,341 @@
+package com.limelight.nvstream.http;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+
+import org.xmlpull.v1.XmlPullParserException;
+
+import com.limelight.LimeLog;
+
+import java.security.cert.Certificate;
+import java.io.*;
+import java.security.*;
+import java.security.cert.*;
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.Random;
+
+public class PairingManager {
+
+    private NvHTTP http;
+    
+    private PrivateKey pk;
+    private X509Certificate cert;
+    private SecretKey aesKey;
+    private byte[] pemCertBytes;
+
+    private X509Certificate serverCert;
+    
+    public enum PairState {
+        NOT_PAIRED,
+        PAIRED,
+        PIN_WRONG,
+        FAILED,
+        ALREADY_IN_PROGRESS
+    }
+    
+    public PairingManager(NvHTTP http, LimelightCryptoProvider cryptoProvider) {
+        this.http = http;
+        this.cert = cryptoProvider.getClientCertificate();
+        this.pemCertBytes = cryptoProvider.getPemEncodedClientCertificate();
+        this.pk = cryptoProvider.getClientPrivateKey();
+    }
+    
+    final private static char[] hexArray = "0123456789ABCDEF".toCharArray();
+    private static String bytesToHex(byte[] bytes) {
+        char[] hexChars = new char[bytes.length * 2];
+        for ( int j = 0; j < bytes.length; j++ ) {
+            int v = bytes[j] & 0xFF;
+            hexChars[j * 2] = hexArray[v >>> 4];
+            hexChars[j * 2 + 1] = hexArray[v & 0x0F];
+        }
+        return new String(hexChars);
+    }
+    
+    private static byte[] hexToBytes(String s) {
+        int len = s.length();
+        byte[] data = new byte[len / 2];
+        for (int i = 0; i < len; i += 2) {
+            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
+                                 + Character.digit(s.charAt(i+1), 16));
+        }
+        return data;
+    }
+    
+    private X509Certificate extractPlainCert(String text) throws XmlPullParserException, IOException
+    {
+        String certText = NvHTTP.getXmlString(text, "plaincert");
+        if (certText != null) {
+            byte[] certBytes = hexToBytes(certText);
+
+            try {
+                CertificateFactory cf = CertificateFactory.getInstance("X.509");
+                return (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(certBytes));
+            } catch (CertificateException e) {
+                e.printStackTrace();
+                return null;
+            }
+        }
+        else {
+            return null;
+        }
+    }
+    
+    private byte[] generateRandomBytes(int length)
+    {
+        byte[] rand = new byte[length];
+        new SecureRandom().nextBytes(rand);
+        return rand;
+    }
+    
+    private static byte[] saltPin(byte[] salt, String pin) throws UnsupportedEncodingException {
+        byte[] saltedPin = new byte[salt.length + pin.length()];
+        System.arraycopy(salt, 0, saltedPin, 0, salt.length);
+        System.arraycopy(pin.getBytes("UTF-8"), 0, saltedPin, salt.length, pin.length());
+        return saltedPin;
+    }
+    
+    private static boolean verifySignature(byte[] data, byte[] signature, Certificate cert) {
+        try {
+            Signature sig = Signature.getInstance("SHA256withRSA");
+            sig.initVerify(cert.getPublicKey());
+            sig.update(data);
+            return sig.verify(signature);
+        } catch (NoSuchAlgorithmException | SignatureException | InvalidKeyException e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+    
+    private static byte[] signData(byte[] data, PrivateKey key) {
+        try {
+            Signature sig = Signature.getInstance("SHA256withRSA");
+            sig.initSign(key);
+            sig.update(data);
+            byte[] signature = new byte[256];
+            sig.sign(signature, 0, signature.length);
+            return signature;
+        } catch (NoSuchAlgorithmException | SignatureException | InvalidKeyException e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+    
+    private static byte[] decryptAes(byte[] encryptedData, SecretKey secretKey) {
+        try {
+            Cipher cipher = Cipher.getInstance("AES/ECB/NoPadding");
+        
+            int blockRoundedSize = ((encryptedData.length + 15) / 16) * 16;
+            byte[] blockRoundedEncrypted = Arrays.copyOf(encryptedData, blockRoundedSize);
+            byte[] fullDecrypted = new byte[blockRoundedSize];
+
+            cipher.init(Cipher.DECRYPT_MODE, secretKey);
+            cipher.doFinal(blockRoundedEncrypted, 0,
+                    blockRoundedSize, fullDecrypted);
+            return fullDecrypted;
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+    
+    private static byte[] encryptAes(byte[] data, SecretKey secretKey) {
+        try {
+            Cipher cipher = Cipher.getInstance("AES/ECB/NoPadding");
+        
+            int blockRoundedSize = ((data.length + 15) / 16) * 16;
+            byte[] blockRoundedData = Arrays.copyOf(data, blockRoundedSize);
+
+            cipher.init(Cipher.ENCRYPT_MODE, secretKey);
+            return cipher.doFinal(blockRoundedData);
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+    
+    private static SecretKey generateAesKey(PairingHashAlgorithm hashAlgo, byte[] keyData) {
+        byte[] aesTruncated = Arrays.copyOf(hashAlgo.hashData(keyData), 16);
+        return new SecretKeySpec(aesTruncated, "AES");
+    }
+    
+    private static byte[] concatBytes(byte[] a, byte[] b) {
+        byte[] c = new byte[a.length + b.length];
+        System.arraycopy(a, 0, c, 0, a.length);
+        System.arraycopy(b, 0, c, a.length, b.length);
+        return c;
+    }
+    
+    public static String generatePinString() {
+        Random r = new Random();
+        return String.format((Locale)null, "%d%d%d%d",
+                r.nextInt(10), r.nextInt(10),
+                r.nextInt(10), r.nextInt(10));
+    }
+
+    public X509Certificate getPairedCert() {
+        return serverCert;
+    }
+    
+    public PairState pair(String serverInfo, String pin) throws IOException, XmlPullParserException {
+        PairingHashAlgorithm hashAlgo;
+
+        int serverMajorVersion = http.getServerMajorVersion(serverInfo);
+        LimeLog.info("Pairing with server generation: "+serverMajorVersion);
+        if (serverMajorVersion >= 7) {
+            // Gen 7+ uses SHA-256 hashing
+            hashAlgo = new Sha256PairingHash();
+        }
+        else {
+            // Prior to Gen 7, SHA-1 is used
+            hashAlgo = new Sha1PairingHash();
+        }
+        
+        // Generate a salt for hashing the PIN
+        byte[] salt = generateRandomBytes(16);
+
+        // Combine the salt and pin, then create an AES key from them
+        byte[] saltAndPin = saltPin(salt, pin);
+        aesKey = generateAesKey(hashAlgo, saltAndPin);
+        
+        // Send the salt and get the server cert. This doesn't have a read timeout
+        // because the user must enter the PIN before the server responds
+        String getCert = http.openHttpConnectionToString(http.baseUrlHttp +
+                "/pair?"+http.buildUniqueIdUuidString()+"&devicename=roth&updateState=1&phrase=getservercert&salt="+
+                bytesToHex(salt)+"&clientcert="+bytesToHex(pemCertBytes),
+                false);
+        if (!NvHTTP.getXmlString(getCert, "paired").equals("1")) {
+            return PairState.FAILED;
+        }
+
+        // Save this cert for retrieval later
+        serverCert = extractPlainCert(getCert);
+        if (serverCert == null) {
+            // Attempting to pair while another device is pairing will cause GFE
+            // to give an empty cert in the response.
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
+            return PairState.ALREADY_IN_PROGRESS;
+        }
+
+        // Require this cert for TLS to this host
+        http.setServerCert(serverCert);
+        
+        // Generate a random challenge and encrypt it with our AES key
+        byte[] randomChallenge = generateRandomBytes(16);
+        byte[] encryptedChallenge = encryptAes(randomChallenge, aesKey);
+        
+        // Send the encrypted challenge to the server
+        String challengeResp = http.openHttpConnectionToString(http.baseUrlHttp + 
+                "/pair?"+http.buildUniqueIdUuidString()+"&devicename=roth&updateState=1&clientchallenge="+bytesToHex(encryptedChallenge),
+                true);
+        if (!NvHTTP.getXmlString(challengeResp, "paired").equals("1")) {
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
+            return PairState.FAILED;
+        }
+        
+        // Decode the server's response and subsequent challenge
+        byte[] encServerChallengeResponse = hexToBytes(NvHTTP.getXmlString(challengeResp, "challengeresponse"));
+        byte[] decServerChallengeResponse = decryptAes(encServerChallengeResponse, aesKey);
+        
+        byte[] serverResponse = Arrays.copyOfRange(decServerChallengeResponse, 0, hashAlgo.getHashLength());
+        byte[] serverChallenge = Arrays.copyOfRange(decServerChallengeResponse, hashAlgo.getHashLength(), hashAlgo.getHashLength() + 16);
+        
+        // Using another 16 bytes secret, compute a challenge response hash using the secret, our cert sig, and the challenge
+        byte[] clientSecret = generateRandomBytes(16);
+        byte[] challengeRespHash = hashAlgo.hashData(concatBytes(concatBytes(serverChallenge, cert.getSignature()), clientSecret));
+        byte[] challengeRespEncrypted = encryptAes(challengeRespHash, aesKey);
+        String secretResp = http.openHttpConnectionToString(http.baseUrlHttp +
+                "/pair?"+http.buildUniqueIdUuidString()+"&devicename=roth&updateState=1&serverchallengeresp="+bytesToHex(challengeRespEncrypted),
+                true);
+        if (!NvHTTP.getXmlString(secretResp, "paired").equals("1")) {
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
+            return PairState.FAILED;
+        }
+        
+        // Get the server's signed secret
+        byte[] serverSecretResp = hexToBytes(NvHTTP.getXmlString(secretResp, "pairingsecret"));
+        byte[] serverSecret = Arrays.copyOfRange(serverSecretResp, 0, 16);
+        byte[] serverSignature = Arrays.copyOfRange(serverSecretResp, 16, 272);
+
+        // Ensure the authenticity of the data
+        if (!verifySignature(serverSecret, serverSignature, serverCert)) {
+            // Cancel the pairing process
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
+            
+            // Looks like a MITM
+            return PairState.FAILED;
+        }
+        
+        // Ensure the server challenge matched what we expected (aka the PIN was correct)
+        byte[] serverChallengeRespHash = hashAlgo.hashData(concatBytes(concatBytes(randomChallenge, serverCert.getSignature()), serverSecret));
+        if (!Arrays.equals(serverChallengeRespHash, serverResponse)) {
+            // Cancel the pairing process
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
+            
+            // Probably got the wrong PIN
+            return PairState.PIN_WRONG;
+        }
+        
+        // Send the server our signed secret
+        byte[] clientPairingSecret = concatBytes(clientSecret, signData(clientSecret, pk));
+        String clientSecretResp = http.openHttpConnectionToString(http.baseUrlHttp + 
+                "/pair?"+http.buildUniqueIdUuidString()+"&devicename=roth&updateState=1&clientpairingsecret="+bytesToHex(clientPairingSecret),
+                true);
+        if (!NvHTTP.getXmlString(clientSecretResp, "paired").equals("1")) {
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
+            return PairState.FAILED;
+        }
+        
+        // Do the initial challenge (seems neccessary for us to show as paired)
+        String pairChallenge = http.openHttpConnectionToString(http.baseUrlHttps +
+                "/pair?"+http.buildUniqueIdUuidString()+"&devicename=roth&updateState=1&phrase=pairchallenge", true);
+        if (!NvHTTP.getXmlString(pairChallenge, "paired").equals("1")) {
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
+            return PairState.FAILED;
+        }
+
+        return PairState.PAIRED;
+    }
+    
+    private interface PairingHashAlgorithm {
+        int getHashLength();
+        byte[] hashData(byte[] data);
+    }
+    
+    private static class Sha1PairingHash implements PairingHashAlgorithm {
+        public int getHashLength() {
+            return 20;
+        }
+        
+        public byte[] hashData(byte[] data) {
+            try {
+                MessageDigest md = MessageDigest.getInstance("SHA-1");
+                return md.digest(data);
+            }
+            catch (NoSuchAlgorithmException e) {
+                // Shouldn't ever happen
+                e.printStackTrace();
+                return null;
+            }
+        }
+    }
+    
+    private static class Sha256PairingHash implements PairingHashAlgorithm {
+        public int getHashLength() {
+            return 32;
+        }
+        
+        public byte[] hashData(byte[] data) {
+            try {
+                MessageDigest md = MessageDigest.getInstance("SHA-256");
+                return md.digest(data);
+            }
+            catch (NoSuchAlgorithmException e) {
+                // Shouldn't ever happen
+                e.printStackTrace();
+                return null;
+            }
+        }
+    }
+}

app/src/main/java/com/limelight/nvstream/input/ControllerPacket.java

@@ -0,0 +1,19 @@
+package com.limelight.nvstream.input;
+
+public class ControllerPacket {
+    public static final short A_FLAG = 0x1000;
+    public static final short B_FLAG = 0x2000;
+    public static final short X_FLAG = 0x4000;
+    public static final short Y_FLAG = (short)0x8000;
+    public static final short UP_FLAG = 0x0001;
+    public static final short DOWN_FLAG = 0x0002;
+    public static final short LEFT_FLAG = 0x0004;
+    public static final short RIGHT_FLAG = 0x0008;
+    public static final short LB_FLAG = 0x0100;
+    public static final short RB_FLAG = 0x0200;
+    public static final short PLAY_FLAG = 0x0010;
+    public static final short BACK_FLAG = 0x0020;
+    public static final short LS_CLK_FLAG = 0x0040;
+    public static final short RS_CLK_FLAG = 0x0080;
+    public static final short SPECIAL_BUTTON_FLAG = 0x0400;
+}

app/src/main/java/com/limelight/nvstream/input/KeyboardPacket.java

@@ -0,0 +1,10 @@
+package com.limelight.nvstream.input;
+
+public class KeyboardPacket {
+    public static final byte KEY_DOWN = 0x03;
+    public static final byte KEY_UP = 0x04;
+
+    public static final byte MODIFIER_SHIFT = 0x01;
+    public static final byte MODIFIER_CTRL = 0x02;
+    public static final byte MODIFIER_ALT = 0x04;
+}

app/src/main/java/com/limelight/nvstream/input/MouseButtonPacket.java

@@ -0,0 +1,12 @@
+package com.limelight.nvstream.input;
+
+public class MouseButtonPacket {
+    public static final byte PRESS_EVENT = 0x07;
+    public static final byte RELEASE_EVENT = 0x08;
+    
+    public static final byte BUTTON_LEFT = 0x01;
+    public static final byte BUTTON_MIDDLE = 0x02;
+    public static final byte BUTTON_RIGHT = 0x03;
+    public static final byte BUTTON_X1 = 0x04;
+    public static final byte BUTTON_X2 = 0x05;
+}

app/src/main/java/com/limelight/nvstream/jni/MoonBridge.java

@@ -0,0 +1,268 @@
+package com.limelight.nvstream.jni;
+
+import com.limelight.nvstream.NvConnectionListener;
+import com.limelight.nvstream.av.audio.AudioRenderer;
+import com.limelight.nvstream.av.video.VideoDecoderRenderer;
+
+public class MoonBridge {
+    /* See documentation in Limelight.h for information about these functions and constants */
+
+    public static final AudioConfiguration AUDIO_CONFIGURATION_STEREO = new AudioConfiguration(2, 0x3);
+    public static final AudioConfiguration AUDIO_CONFIGURATION_51_SURROUND = new AudioConfiguration(6, 0x3F);
+    public static final AudioConfiguration AUDIO_CONFIGURATION_71_SURROUND = new AudioConfiguration(8, 0x63F);
+
+    public static final int VIDEO_FORMAT_H264 = 0x0001;
+    public static final int VIDEO_FORMAT_H265 = 0x0100;
+    public static final int VIDEO_FORMAT_H265_MAIN10 = 0x0200;
+
+    public static final int VIDEO_FORMAT_MASK_H264 = 0x00FF;
+    public static final int VIDEO_FORMAT_MASK_H265 = 0xFF00;
+
+    public static final int BUFFER_TYPE_PICDATA = 0;
+    public static final int BUFFER_TYPE_SPS = 1;
+    public static final int BUFFER_TYPE_PPS = 2;
+    public static final int BUFFER_TYPE_VPS = 3;
+
+    public static final int CAPABILITY_DIRECT_SUBMIT = 1;
+    public static final int CAPABILITY_REFERENCE_FRAME_INVALIDATION_AVC = 2;
+    public static final int CAPABILITY_REFERENCE_FRAME_INVALIDATION_HEVC = 4;
+
+    public static final int DR_OK = 0;
+    public static final int DR_NEED_IDR = -1;
+
+    public static final int CONN_STATUS_OKAY = 0;
+    public static final int CONN_STATUS_POOR = 1;
+
+    private static AudioRenderer audioRenderer;
+    private static VideoDecoderRenderer videoRenderer;
+    private static NvConnectionListener connectionListener;
+
+    static {
+        System.loadLibrary("moonlight-core");
+        init();
+    }
+
+    public static int CAPABILITY_SLICES_PER_FRAME(byte slices) {
+        return slices << 24;
+    }
+
+    public static class AudioConfiguration {
+        public final int channelCount;
+        public final int channelMask;
+
+        public AudioConfiguration(int channelCount, int channelMask) {
+            this.channelCount = channelCount;
+            this.channelMask = channelMask;
+        }
+
+        // Creates an AudioConfiguration from the integer value returned by moonlight-common-c
+        // See CHANNEL_COUNT_FROM_AUDIO_CONFIGURATION() and CHANNEL_MASK_FROM_AUDIO_CONFIGURATION()
+        // in Limelight.h
+        private AudioConfiguration(int audioConfiguration) {
+            // Check the magic byte before decoding to make sure we got something that's actually
+            // a MAKE_AUDIO_CONFIGURATION()-based value and not something else like an older version
+            // hardcoded AUDIO_CONFIGURATION value from an earlier version of moonlight-common-c.
+            if ((audioConfiguration & 0xFF) != 0xCA) {
+                throw new IllegalArgumentException("Audio configuration has invalid magic byte!");
+            }
+
+            this.channelCount = (audioConfiguration >> 8) & 0xFF;
+            this.channelMask = (audioConfiguration >> 16) & 0xFFFF;
+        }
+
+        // See SURROUNDAUDIOINFO_FROM_AUDIO_CONFIGURATION() in Limelight.h
+        public int getSurroundAudioInfo() {
+            return channelMask << 16 | channelCount;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj instanceof AudioConfiguration) {
+                AudioConfiguration that = (AudioConfiguration)obj;
+                return this.toInt() == that.toInt();
+            }
+
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return toInt();
+        }
+
+        // Returns the integer value expected by moonlight-common-c
+        // See MAKE_AUDIO_CONFIGURATION() in Limelight.h
+        public int toInt() {
+            return ((channelMask) << 16) | (channelCount << 8) | 0xCA;
+        }
+    }
+
+    public static int bridgeDrSetup(int videoFormat, int width, int height, int redrawRate) {
+        if (videoRenderer != null) {
+            return videoRenderer.setup(videoFormat, width, height, redrawRate);
+        }
+        else {
+            return -1;
+        }
+    }
+
+    public static void bridgeDrStart() {
+        if (videoRenderer != null) {
+            videoRenderer.start();
+        }
+    }
+
+    public static void bridgeDrStop() {
+        if (videoRenderer != null) {
+            videoRenderer.stop();
+        }
+    }
+
+    public static void bridgeDrCleanup() {
+        if (videoRenderer != null) {
+            videoRenderer.cleanup();
+        }
+    }
+
+    public static int bridgeDrSubmitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength,
+                                               int decodeUnitType,
+                                               int frameNumber, long receiveTimeMs) {
+        if (videoRenderer != null) {
+            return videoRenderer.submitDecodeUnit(decodeUnitData, decodeUnitLength,
+                    decodeUnitType, frameNumber, receiveTimeMs);
+        }
+        else {
+            return DR_OK;
+        }
+    }
+
+    public static int bridgeArInit(int audioConfiguration, int sampleRate, int samplesPerFrame) {
+        if (audioRenderer != null) {
+            return audioRenderer.setup(new AudioConfiguration(audioConfiguration), sampleRate, samplesPerFrame);
+        }
+        else {
+            return -1;
+        }
+    }
+
+    public static void bridgeArStart() {
+        if (audioRenderer != null) {
+            audioRenderer.start();
+        }
+    }
+
+    public static void bridgeArStop() {
+        if (audioRenderer != null) {
+            audioRenderer.stop();
+        }
+    }
+
+    public static void bridgeArCleanup() {
+        if (audioRenderer != null) {
+            audioRenderer.cleanup();
+        }
+    }
+
+    public static void bridgeArPlaySample(short[] pcmData) {
+        if (audioRenderer != null) {
+            audioRenderer.playDecodedAudio(pcmData);
+        }
+    }
+
+    public static void bridgeClStageStarting(int stage) {
+        if (connectionListener != null) {
+            connectionListener.stageStarting(getStageName(stage));
+        }
+    }
+
+    public static void bridgeClStageComplete(int stage) {
+        if (connectionListener != null) {
+            connectionListener.stageComplete(getStageName(stage));
+        }
+    }
+
+    public static void bridgeClStageFailed(int stage, int errorCode) {
+        if (connectionListener != null) {
+            connectionListener.stageFailed(getStageName(stage), errorCode);
+        }
+    }
+
+    public static void bridgeClConnectionStarted() {
+        if (connectionListener != null) {
+            connectionListener.connectionStarted();
+        }
+    }
+
+    public static void bridgeClConnectionTerminated(int errorCode) {
+        if (connectionListener != null) {
+            connectionListener.connectionTerminated(errorCode);
+        }
+    }
+
+    public static void bridgeClRumble(short controllerNumber, short lowFreqMotor, short highFreqMotor) {
+        if (connectionListener != null) {
+            connectionListener.rumble(controllerNumber, lowFreqMotor, highFreqMotor);
+        }
+    }
+
+    public static void bridgeClConnectionStatusUpdate(int connectionStatus) {
+        if (connectionListener != null) {
+            connectionListener.connectionStatusUpdate(connectionStatus);
+        }
+    }
+
+    public static void setupBridge(VideoDecoderRenderer videoRenderer, AudioRenderer audioRenderer, NvConnectionListener connectionListener) {
+        MoonBridge.videoRenderer = videoRenderer;
+        MoonBridge.audioRenderer = audioRenderer;
+        MoonBridge.connectionListener = connectionListener;
+    }
+
+    public static void cleanupBridge() {
+        MoonBridge.videoRenderer = null;
+        MoonBridge.audioRenderer = null;
+        MoonBridge.connectionListener = null;
+    }
+
+    public static native int startConnection(String address, String appVersion, String gfeVersion,
+                                              int width, int height, int fps,
+                                              int bitrate, int packetSize, int streamingRemotely,
+                                              int audioConfiguration, boolean supportsHevc,
+                                              boolean enableHdr,
+                                              int hevcBitratePercentageMultiplier,
+                                              int clientRefreshRateX100,
+                                              byte[] riAesKey, byte[] riAesIv,
+                                              int videoCapabilities);
+
+    public static native void stopConnection();
+
+    public static native void interruptConnection();
+
+    public static native void sendMouseMove(short deltaX, short deltaY);
+
+    public static native void sendMouseButton(byte buttonEvent, byte mouseButton);
+
+    public static native void sendMultiControllerInput(short controllerNumber,
+                                    short activeGamepadMask, short buttonFlags,
+                                    byte leftTrigger, byte rightTrigger,
+                                    short leftStickX, short leftStickY,
+                                    short rightStickX, short rightStickY);
+
+    public static native void sendControllerInput(short buttonFlags,
+                                    byte leftTrigger, byte rightTrigger,
+                                    short leftStickX, short leftStickY,
+                                    short rightStickX, short rightStickY);
+
+    public static native void sendKeyboardInput(short keyMap, byte keyDirection, byte modifier);
+
+    public static native void sendMouseScroll(byte scrollClicks);
+
+    public static native String getStageName(int stage);
+
+    public static native String findExternalAddressIP4(String stunHostName, int stunPort);
+
+    public static native int getPendingAudioDuration();
+
+    public static native int getPendingVideoFrames();
+
+    public static native void init();
+}

app/src/main/java/com/limelight/nvstream/mdns/MdnsComputer.java

@@ -0,0 +1,65 @@
+package com.limelight.nvstream.mdns;
+
+import java.net.Inet6Address;
+import java.net.InetAddress;
+
+public class MdnsComputer {
+    private InetAddress localAddr;
+    private Inet6Address v6Addr;
+    private String name;
+
+    public MdnsComputer(String name, InetAddress localAddress, Inet6Address v6Addr) {
+        this.name = name;
+        this.localAddr = localAddress;
+        this.v6Addr = v6Addr;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public InetAddress getLocalAddress() {
+        return localAddr;
+    }
+
+    public Inet6Address getIpv6Address() {
+        return v6Addr;
+    }
+
+    @Override
+    public int hashCode() {
+        return name.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o instanceof MdnsComputer) {
+            MdnsComputer other = (MdnsComputer)o;
+
+            if (!other.name.equals(name)) {
+                return false;
+            }
+
+            if ((other.localAddr != null && localAddr == null) ||
+                    (other.localAddr == null && localAddr != null) ||
+                    (other.localAddr != null && !other.localAddr.equals(localAddr))) {
+                return false;
+            }
+
+            if ((other.v6Addr != null && v6Addr == null) ||
+                    (other.v6Addr == null && v6Addr != null) ||
+                    (other.v6Addr != null && !other.v6Addr.equals(v6Addr))) {
+                return false;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return "["+name+" - "+localAddr+" - "+v6Addr+"]";
+    }
+}

app/src/main/java/com/limelight/nvstream/mdns/MdnsDiscoveryAgent.java

@@ -0,0 +1,408 @@
+package com.limelight.nvstream.mdns;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+
+import javax.jmdns.JmmDNS;
+import javax.jmdns.NetworkTopologyDiscovery;
+import javax.jmdns.ServiceEvent;
+import javax.jmdns.ServiceInfo;
+import javax.jmdns.ServiceListener;
+import javax.jmdns.impl.NetworkTopologyDiscoveryImpl;
+
+import com.limelight.LimeLog;
+
+public class MdnsDiscoveryAgent implements ServiceListener {
+    public static final String SERVICE_TYPE = "_nvstream._tcp.local.";
+    
+    private MdnsDiscoveryListener listener;
+    private Thread discoveryThread;
+    private HashMap<InetAddress, MdnsComputer> computers = new HashMap<InetAddress, MdnsComputer>();
+    private HashSet<String> pendingResolution = new HashSet<String>();
+    
+    // The resolver factory's instance member has a static lifetime which
+    // means our ref count and listener must be static also.
+    private static int resolverRefCount = 0;
+    private static HashSet<ServiceListener> listeners = new HashSet<ServiceListener>();
+    private static ServiceListener nvstreamListener = new ServiceListener() {
+        @Override
+        public void serviceAdded(ServiceEvent event) {
+            HashSet<ServiceListener> localListeners;
+            
+            // Copy the listener set into a new set so we can invoke
+            // the callbacks without holding the listeners monitor the
+            // whole time.
+            synchronized (listeners) {
+                localListeners = new HashSet<ServiceListener>(listeners);
+            }
+            
+            for (ServiceListener listener : localListeners) {
+                listener.serviceAdded(event);
+            }
+        }
+
+        @Override
+        public void serviceRemoved(ServiceEvent event) {
+            HashSet<ServiceListener> localListeners;
+            
+            // Copy the listener set into a new set so we can invoke
+            // the callbacks without holding the listeners monitor the
+            // whole time.
+            synchronized (listeners) {
+                localListeners = new HashSet<ServiceListener>(listeners);
+            }
+            
+            for (ServiceListener listener : localListeners) {
+                listener.serviceRemoved(event);
+            }
+        }
+
+        @Override
+        public void serviceResolved(ServiceEvent event) {
+            HashSet<ServiceListener> localListeners;
+            
+            // Copy the listener set into a new set so we can invoke
+            // the callbacks without holding the listeners monitor the
+            // whole time.
+            synchronized (listeners) {
+                localListeners = new HashSet<ServiceListener>(listeners);
+            }
+            
+            for (ServiceListener listener : localListeners) {
+                listener.serviceResolved(event);
+            }
+        }
+    };
+
+    public static class MyNetworkTopologyDiscovery extends NetworkTopologyDiscoveryImpl {
+        @Override
+        public boolean useInetAddress(NetworkInterface networkInterface, InetAddress interfaceAddress) {
+            // This is an copy of jmDNS's implementation, except we omit the multicast check, since
+            // it seems at least some devices lie about interfaces not supporting multicast when they really do.
+            try {
+                if (!networkInterface.isUp()) {
+                    return false;
+                }
+
+                /*
+                if (!networkInterface.supportsMulticast()) {
+                    return false;
+                }
+                */
+
+                if (networkInterface.isLoopback()) {
+                    return false;
+                }
+
+                return true;
+            } catch (Exception exception) {
+                return false;
+            }
+        }
+    };
+
+    static {
+        // Override jmDNS's default topology discovery class with ours
+        NetworkTopologyDiscovery.Factory.setClassDelegate(new NetworkTopologyDiscovery.Factory.ClassDelegate() {
+            @Override
+            public NetworkTopologyDiscovery newNetworkTopologyDiscovery() {
+                return new MyNetworkTopologyDiscovery();
+            }
+        });
+    }
+
+    private static JmmDNS referenceResolver() {
+        synchronized (MdnsDiscoveryAgent.class) {
+            JmmDNS instance = JmmDNS.Factory.getInstance();
+            if (++resolverRefCount == 1) {
+                // This will cause the listener to be invoked for known hosts immediately.
+                // JmDNS only supports one listener per service, so we have to do this here
+                // with a static listener.
+                instance.addServiceListener(SERVICE_TYPE, nvstreamListener);
+            }
+            return instance;
+        }
+    }
+
+    private static void dereferenceResolver() {
+        synchronized (MdnsDiscoveryAgent.class) {
+            if (--resolverRefCount == 0) {
+                try {
+                    JmmDNS.Factory.close();
+                } catch (IOException e) {}
+            }
+        }
+    }
+
+    public MdnsDiscoveryAgent(MdnsDiscoveryListener listener) {
+        this.listener = listener;
+    }
+
+    private void handleResolvedServiceInfo(ServiceInfo info) {
+        synchronized (pendingResolution) {
+            pendingResolution.remove(info.getName());
+        }
+
+        try {
+            handleServiceInfo(info);
+        } catch (UnsupportedEncodingException e) {
+            // Invalid DNS response
+            LimeLog.info("mDNS: Invalid response for machine: "+info.getName());
+            return;
+        }
+    }
+
+    private Inet6Address getLocalAddress(Inet6Address[] addresses) {
+        for (Inet6Address addr : addresses) {
+            if (addr.isLinkLocalAddress() || addr.isSiteLocalAddress()) {
+                return addr;
+            }
+            // fc00::/7 - ULAs
+            else if ((addr.getAddress()[0] & 0xfe) == 0xfc) {
+                return addr;
+            }
+        }
+
+        return null;
+    }
+
+    private Inet6Address getLinkLocalAddress(Inet6Address[] addresses) {
+        for (Inet6Address addr : addresses) {
+            if (addr.isLinkLocalAddress()) {
+                LimeLog.info("Found link-local address: "+addr.getHostAddress());
+                return addr;
+            }
+        }
+
+        return null;
+    }
+
+    private Inet6Address getBestIpv6Address(Inet6Address[] addresses) {
+        // First try to find a link local address, so we can match the interface identifier
+        // with a global address (this will work for SLAAC but not DHCPv6).
+        Inet6Address linkLocalAddr = getLinkLocalAddress(addresses);
+
+        // We will try once to match a SLAAC interface suffix, then
+        // pick the first matching address
+        for (int tries = 0; tries < 2; tries++) {
+            // We assume the addresses are already sorted in descending order
+            // of preference from Bonjour.
+            for (Inet6Address addr : addresses) {
+                if (addr.isLinkLocalAddress() || addr.isSiteLocalAddress() || addr.isLoopbackAddress()) {
+                    // Link-local, site-local, and loopback aren't global
+                    LimeLog.info("Ignoring non-global address: "+addr.getHostAddress());
+                    continue;
+                }
+
+                byte[] addrBytes = addr.getAddress();
+
+                // 2002::/16
+                if (addrBytes[0] == 0x20 && addrBytes[1] == 0x02) {
+                    // 6to4 has horrible performance
+                    LimeLog.info("Ignoring 6to4 address: "+addr.getHostAddress());
+                    continue;
+                }
+                // 2001::/32
+                else if (addrBytes[0] == 0x20 && addrBytes[1] == 0x01 && addrBytes[2] == 0x00 && addrBytes[3] == 0x00) {
+                    // Teredo also has horrible performance
+                    LimeLog.info("Ignoring Teredo address: "+addr.getHostAddress());
+                    continue;
+                }
+                // fc00::/7
+                else if ((addrBytes[0] & 0xfe) == 0xfc) {
+                    // ULAs aren't global
+                    LimeLog.info("Ignoring ULA: "+addr.getHostAddress());
+                    continue;
+                }
+
+                // Compare the final 64-bit interface identifier and skip the address
+                // if it doesn't match our link-local address.
+                if (linkLocalAddr != null && tries == 0) {
+                    boolean matched = true;
+
+                    for (int i = 8; i < 16; i++) {
+                        if (linkLocalAddr.getAddress()[i] != addr.getAddress()[i]) {
+                            matched = false;
+                            break;
+                        }
+                    }
+
+                    if (!matched) {
+                        LimeLog.info("Ignoring non-matching global address: "+addr.getHostAddress());
+                        continue;
+                    }
+                }
+
+                return addr;
+            }
+        }
+
+        return null;
+    }
+
+    private void handleServiceInfo(ServiceInfo info) throws UnsupportedEncodingException {
+        Inet4Address v4Addrs[] = info.getInet4Addresses();
+        Inet6Address v6Addrs[] = info.getInet6Addresses();
+
+        LimeLog.info("mDNS: "+info.getName()+" has "+v4Addrs.length+" IPv4 addresses");
+        LimeLog.info("mDNS: "+info.getName()+" has "+v6Addrs.length+" IPv6 addresses");
+
+        Inet6Address v6GlobalAddr = getBestIpv6Address(v6Addrs);
+
+        // Add a computer object for each IPv4 address reported by the PC
+        for (Inet4Address v4Addr : v4Addrs) {
+            synchronized (computers) {
+                MdnsComputer computer = new MdnsComputer(info.getName(), v4Addr, v6GlobalAddr);
+                if (computers.put(computer.getLocalAddress(), computer) == null) {
+                    // This was a new entry
+                    listener.notifyComputerAdded(computer);
+                }
+            }
+        }
+
+        // If there were no IPv4 addresses, use IPv6 for registration
+        if (v4Addrs.length == 0) {
+            Inet6Address v6LocalAddr = getLocalAddress(v6Addrs);
+
+            if (v6LocalAddr != null || v6GlobalAddr != null) {
+                MdnsComputer computer = new MdnsComputer(info.getName(), v6LocalAddr, v6GlobalAddr);
+                if (computers.put(v6LocalAddr != null ?
+                        computer.getLocalAddress() : computer.getIpv6Address(), computer) == null) {
+                    // This was a new entry
+                    listener.notifyComputerAdded(computer);
+                }
+            }
+        }
+    }
+    
+    public void startDiscovery(final int discoveryIntervalMs) {
+        // Kill any existing discovery before starting a new one
+        stopDiscovery();
+        
+        // Add our listener to the set
+        synchronized (listeners) {
+            listeners.add(MdnsDiscoveryAgent.this);
+        }
+        
+        discoveryThread = new Thread() {
+            @Override
+            public void run() {
+                // This may result in listener callbacks so we must register
+                // our listener first.
+                JmmDNS resolver = referenceResolver();
+                
+                try {
+                    while (!Thread.interrupted()) {
+                        // Start an mDNS request
+                        resolver.requestServiceInfo(SERVICE_TYPE, null, discoveryIntervalMs);
+                        
+                        // Run service resolution again for pending machines
+                        ArrayList<String> pendingNames;
+                        synchronized (pendingResolution) {
+                            pendingNames = new ArrayList<String>(pendingResolution);
+                        }
+                        for (String name : pendingNames) {
+                            LimeLog.info("mDNS: Retrying service resolution for machine: "+name);
+                            ServiceInfo[] infos = resolver.getServiceInfos(SERVICE_TYPE, name, 500);
+                            if (infos != null && infos.length != 0) {
+                                LimeLog.info("mDNS: Resolved (retry) with "+infos.length+" service entries");
+                                for (ServiceInfo svcinfo : infos) {
+                                    handleResolvedServiceInfo(svcinfo);
+                                }
+                            }
+                        }
+                        
+                        // Wait for the next polling interval
+                        try {
+                            Thread.sleep(discoveryIntervalMs);
+                        } catch (InterruptedException e) {
+                            break;
+                        }
+                    }
+                }
+                finally {
+                    // Dereference the resolver
+                    dereferenceResolver();
+                }
+            }
+        };
+        discoveryThread.setName("mDNS Discovery Thread");
+        discoveryThread.start();
+    }
+    
+    public void stopDiscovery() {
+        // Remove our listener from the set
+        synchronized (listeners) {
+            listeners.remove(MdnsDiscoveryAgent.this);
+        }
+        
+        // If there's already a running thread, interrupt it
+        if (discoveryThread != null) {
+            discoveryThread.interrupt();
+            discoveryThread = null;
+        }
+    }
+    
+    public List<MdnsComputer> getComputerSet() {
+        synchronized (computers) {
+            return new ArrayList<MdnsComputer>(computers.values());
+        }
+    }
+
+    @Override
+    public void serviceAdded(ServiceEvent event) {
+        LimeLog.info("mDNS: Machine appeared: "+event.getInfo().getName());
+
+        ServiceInfo info = event.getDNS().getServiceInfo(SERVICE_TYPE, event.getInfo().getName(), 500);
+        if (info == null) {
+            // This machine is pending resolution
+            synchronized (pendingResolution) {
+                pendingResolution.add(event.getInfo().getName());
+            }
+            return;
+        }
+        
+        LimeLog.info("mDNS: Resolved (blocking)");
+        handleResolvedServiceInfo(info);
+    }
+
+    @Override
+    public void serviceRemoved(ServiceEvent event) {
+        LimeLog.info("mDNS: Machine disappeared: "+event.getInfo().getName());
+
+        Inet4Address v4Addrs[] = event.getInfo().getInet4Addresses();
+        for (Inet4Address addr : v4Addrs) {
+            synchronized (computers) {
+                MdnsComputer computer = computers.remove(addr);
+                if (computer != null) {
+                    listener.notifyComputerRemoved(computer);
+                    break;
+                }
+            }
+        }
+
+        Inet6Address v6Addrs[] = event.getInfo().getInet6Addresses();
+        for (Inet6Address addr : v6Addrs) {
+            synchronized (computers) {
+                MdnsComputer computer = computers.remove(addr);
+                if (computer != null) {
+                    listener.notifyComputerRemoved(computer);
+                    break;
+                }
+            }
+        }
+    }
+
+    @Override
+    public void serviceResolved(ServiceEvent event) {
+        // We handle this synchronously
+    }
+}

app/src/main/java/com/limelight/nvstream/mdns/MdnsDiscoveryListener.java

@@ -0,0 +1,7 @@
+package com.limelight.nvstream.mdns;
+
+public interface MdnsDiscoveryListener {
+    void notifyComputerAdded(MdnsComputer computer);
+    void notifyComputerRemoved(MdnsComputer computer);
+    void notifyDiscoveryFailure(Exception e);
+}

app/src/main/java/com/limelight/nvstream/wol/WakeOnLanSender.java

@@ -0,0 +1,99 @@
+package com.limelight.nvstream.wol;
+
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.util.Scanner;
+
+import com.limelight.LimeLog;
+import com.limelight.nvstream.http.ComputerDetails;
+
+public class WakeOnLanSender {
+    private static final int[] PORTS_TO_TRY = new int[] {
+        7, 9, // Standard WOL ports
+        47998, 47999, 48000, 48002, 48010 // Ports opened by GFE
+    };
+    
+    public static void sendWolPacket(ComputerDetails computer) throws IOException {
+        DatagramSocket sock = new DatagramSocket(0);
+        byte[] payload = createWolPayload(computer);
+        IOException lastException = null;
+        boolean sentWolPacket = false;
+
+        try {
+            // Try all resolved remote and local addresses and IPv4 broadcast address.
+            // The broadcast address is required to avoid stale ARP cache entries
+            // making the sleeping machine unreachable.
+            for (String unresolvedAddress : new String[] {
+                    computer.localAddress, computer.remoteAddress, computer.manualAddress, computer.ipv6Address, "255.255.255.255"
+            }) {
+                if (unresolvedAddress == null) {
+                    continue;
+                }
+
+                try {
+                    for (InetAddress resolvedAddress : InetAddress.getAllByName(unresolvedAddress)) {
+                        // Try all the ports for each resolved address
+                        for (int port : PORTS_TO_TRY) {
+                            DatagramPacket dp = new DatagramPacket(payload, payload.length);
+                            dp.setAddress(resolvedAddress);
+                            dp.setPort(port);
+                            sock.send(dp);
+                            sentWolPacket = true;
+                        }
+                    }
+                } catch (IOException e) {
+                    // We may have addresses that don't resolve on this subnet,
+                    // but don't throw and exit the whole function if that happens.
+                    // We'll throw it at the end if we didn't send a single packet.
+                    e.printStackTrace();
+                    lastException = e;
+                }
+            }
+        } finally {
+            sock.close();
+        }
+
+        // Propagate the DNS resolution exception if we didn't
+        // manage to get a single packet out to the host.
+        if (!sentWolPacket && lastException != null) {
+            throw lastException;
+        }
+    }
+    
+    private static byte[] macStringToBytes(String macAddress) {
+        byte[] macBytes = new byte[6];
+        @SuppressWarnings("resource")
+        Scanner scan = new Scanner(macAddress).useDelimiter(":");
+        for (int i = 0; i < macBytes.length && scan.hasNext(); i++) {
+            try {
+                macBytes[i] = (byte) Integer.parseInt(scan.next(), 16);
+            } catch (NumberFormatException e) {
+                LimeLog.warning("Malformed MAC address: "+macAddress+" (index: "+i+")");
+                break;
+            }
+        }
+        scan.close();
+        return macBytes;
+    }
+    
+    private static byte[] createWolPayload(ComputerDetails computer) {
+        byte[] payload = new byte[102];
+        byte[] macAddress = macStringToBytes(computer.macAddress);
+        int i;
+        
+        // 6 bytes of FF
+        for (i = 0; i < 6; i++) {
+            payload[i] = (byte)0xFF;
+        }
+        
+        // 16 repetitions of the MAC address
+        for (int j = 0; j < 16; j++) {
+            System.arraycopy(macAddress, 0, payload, i, macAddress.length);
+            i += macAddress.length;
+        }
+        
+        return payload;
+    }
+}

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

@@ -1,12 +1,20 @@
 package com.limelight.preferences;
 
+import java.io.IOException;
+import java.net.Inet4Address;
 import java.net.InetAddress;
+import java.net.InterfaceAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
 import java.net.UnknownHostException;
-import java.util.Locale;
+import java.util.Collections;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import com.limelight.binding.PlatformBinding;
 import com.limelight.computers.ComputerManagerService;
 import com.limelight.R;
+import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.nvstream.http.NvHTTP;
 import com.limelight.utils.Dialog;
 import com.limelight.utils.SpinnerDialog;
 import com.limelight.utils.UiHelper;
@@ -17,10 +25,10 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.content.res.Configuration;
 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;
@@ -43,42 +51,98 @@ public class AddComputerManually extends Activity {
         }
     };
 
+    private boolean isWrongSubnetSiteLocalAddress(String address) {
+        try {
+            InetAddress targetAddress = InetAddress.getByName(address);
+            if (!(targetAddress instanceof Inet4Address) || !targetAddress.isSiteLocalAddress()) {
+                return false;
+            }
+
+            // We have a site-local address. Look for a matching local interface.
+            for (NetworkInterface iface : Collections.list(NetworkInterface.getNetworkInterfaces())) {
+                for (InterfaceAddress addr : iface.getInterfaceAddresses()) {
+                    if (!(addr.getAddress() instanceof Inet4Address) || !addr.getAddress().isSiteLocalAddress()) {
+                        // Skip non-site-local or non-IPv4 addresses
+                        continue;
+                    }
+
+                    byte[] targetAddrBytes = targetAddress.getAddress();
+                    byte[] ifaceAddrBytes = addr.getAddress().getAddress();
+
+                    // Compare prefix to ensure it's the same
+                    boolean addressMatches = true;
+                    for (int i = 0; i < addr.getNetworkPrefixLength(); i++) {
+                        if ((ifaceAddrBytes[i / 8] & (1 << (i % 8))) != (targetAddrBytes[i / 8] & (1 << (i % 8)))) {
+                            addressMatches = false;
+                            break;
+                        }
+                    }
+
+                    if (addressMatches) {
+                        return false;
+                    }
+                }
+            }
+
+            // Couldn't find a matching interface
+            return true;
+        } catch (SocketException e) {
+            e.printStackTrace();
+            return false;
+        } catch (UnknownHostException e) {
+            return false;
+        }
+    }
+
     private void doAddPc(String host) {
-        String msg;
-        boolean finish = false;
+        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);
 
         try {
-            InetAddress addr = InetAddress.getByName(host);
+            ComputerDetails details = new ComputerDetails();
+            details.manualAddress = host;
 
-            if (!managerBinder.addComputerBlocking(addr)){
-                msg = getResources().getString(R.string.addpc_fail);
-            }
-            else {
-                msg = getResources().getString(R.string.addpc_success);
-                finish = true;
-            }
-        } catch (UnknownHostException e) {
-            msg = getResources().getString(R.string.addpc_unknown_host);
+            try {
+                NvHTTP http = new NvHTTP(host, managerBinder.getUniqueId(), null, PlatformBinding.getCryptoProvider(this));
+                details.serverCert = http.getCertificateIfTrusted();
+            } catch (IOException ignored) {}
+
+            success = managerBinder.addComputerBlocking(details);
+        } 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);
         }
 
         dialog.dismiss();
 
-        final boolean toastFinish = finish;
-        final String toastMsg = msg;
-        AddComputerManually.this.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Toast.makeText(AddComputerManually.this, toastMsg, Toast.LENGTH_LONG).show();
+        if (wrongSiteLocal) {
+            Dialog.displayDialog(this, getResources().getString(R.string.conn_error_title), getResources().getString(R.string.addpc_wrong_sitelocal), false);
+        }
+        else if (!success) {
+            Dialog.displayDialog(this, getResources().getString(R.string.conn_error_title), getResources().getString(R.string.addpc_fail), false);
+        }
+        else {
+            AddComputerManually.this.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                Toast.makeText(AddComputerManually.this, getResources().getString(R.string.addpc_success), Toast.LENGTH_LONG).show();
 
-                if (toastFinish && !isFinishing()) {
+                if (!isFinishing()) {
                     // Close the activity
                     AddComputerManually.this.finish();
                 }
-            }
-        });
+                }
+            });
+        }
+
     }
 
     private void startAddThread() {
@@ -142,7 +206,7 @@ public class AddComputerManually extends Activity {
 
         UiHelper.notifyNewRootView(this);
 
-        this.hostText = (TextView) findViewById(R.id.hostTextView);
+        this.hostText = findViewById(R.id.hostTextView);
         hostText.setImeOptions(EditorInfo.IME_ACTION_DONE);
         hostText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
@@ -151,12 +215,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
@@ -169,8 +228,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

@@ -0,0 +1,40 @@
+package com.limelight.preferences;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Build;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
+import android.widget.Toast;
+
+import com.limelight.R;
+
+import static com.limelight.binding.input.virtual_controller.VirtualControllerConfigurationLoader.OSC_PREFERENCE;
+
+public class ConfirmDeleteOscPreference extends DialogPreference {
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public ConfirmDeleteOscPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public ConfirmDeleteOscPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public ConfirmDeleteOscPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public ConfirmDeleteOscPreference(Context context) {
+        super(context);
+    }
+
+    public void onClick(DialogInterface dialog, int which) {
+        if (which == DialogInterface.BUTTON_POSITIVE) {
+            getContext().getSharedPreferences(OSC_PREFERENCE, Context.MODE_PRIVATE).edit().clear().apply();
+            Toast.makeText(getContext(), R.string.toast_reset_osc_success, Toast.LENGTH_SHORT).show();
+        }
+    }
+}

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

@@ -0,0 +1,37 @@
+package com.limelight.preferences;
+
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+public class GlPreferences {
+    private static final String PREF_NAME = "GlPreferences";
+
+    private static final String FINGERPRINT_PREF_STRING = "Fingerprint";
+    private static final String GL_RENDERER_PREF_STRING = "Renderer";
+
+    private SharedPreferences prefs;
+    public String glRenderer;
+    public String savedFingerprint;
+
+    private GlPreferences(SharedPreferences prefs) {
+        this.prefs = prefs;
+    }
+
+    public static GlPreferences readPreferences(Context context) {
+        SharedPreferences prefs = context.getSharedPreferences(PREF_NAME, 0);
+        GlPreferences glPrefs = new GlPreferences(prefs);
+
+        glPrefs.glRenderer = prefs.getString(GL_RENDERER_PREF_STRING, "");
+        glPrefs.savedFingerprint = prefs.getString(FINGERPRINT_PREF_STRING, "");
+
+        return glPrefs;
+    }
+
+    public boolean writePreferences() {
+        return prefs.edit()
+                .putString(GL_RENDERER_PREF_STRING, glRenderer)
+                .putString(FINGERPRINT_PREF_STRING, savedFingerprint)
+                .commit();
+    }
+}

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

@@ -3,48 +3,71 @@ package com.limelight.preferences;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.content.res.Configuration;
 import android.os.Build;
 import android.preference.PreferenceManager;
 
+import com.limelight.nvstream.jni.MoonBridge;
+
 public class PreferenceConfiguration {
-    static final String RES_FPS_PREF_STRING = "list_resolution_fps";
-    static final String BITRATE_PREF_STRING = "seekbar_bitrate";
+    private static final String LEGACY_RES_FPS_PREF_STRING = "list_resolution_fps";
+    private static final String LEGACY_ENABLE_51_SURROUND_PREF_STRING = "checkbox_51_surround";
+
+    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";
     private static final String SOPS_PREF_STRING = "checkbox_enable_sops";
     private static final String DISABLE_TOASTS_PREF_STRING = "checkbox_disable_warnings";
     private static final String HOST_AUDIO_PREF_STRING = "checkbox_host_audio";
     private static final String DEADZONE_PREF_STRING = "seekbar_deadzone";
+    private static final String OSC_OPACITY_PREF_STRING = "seekbar_osc_opacity";
     private static final String LANGUAGE_PREF_STRING = "list_languages";
     private static final String LIST_MODE_PREF_STRING = "checkbox_list_mode";
     private static final String SMALL_ICONS_PREF_STRING = "checkbox_small_icon_mode";
     private static final String MULTI_CONTROLLER_PREF_STRING = "checkbox_multi_controller";
-    private static final String ENABLE_51_SURROUND_PREF_STRING = "checkbox_51_surround";
+    static final String AUDIO_CONFIG_PREF_STRING = "list_audio_config";
     private static final String USB_DRIVER_PREF_SRING = "checkbox_usb_driver";
     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 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 ENABLE_PERF_OVERLAY_STRING = "checkbox_enable_perf_overlay";
+    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_720_30 = 5;
-    private static final int BITRATE_DEFAULT_720_60 = 10;
-    private static final int BITRATE_DEFAULT_1080_30 = 10;
-    private static final int BITRATE_DEFAULT_1080_60 = 20;
-    private static final int BITRATE_DEFAULT_4K_30 = 40;
-    private static final int BITRATE_DEFAULT_4K_60 = 80;
-
-    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;
     private static final boolean DEFAULT_HOST_AUDIO = false;
     private static final int DEFAULT_DEADZONE = 15;
+    private static final int DEFAULT_OPACITY = 90;
     public static final String DEFAULT_LANGUAGE = "default";
     private static final boolean DEFAULT_LIST_MODE = false;
     private static final boolean DEFAULT_MULTI_CONTROLLER = true;
-    private static final boolean DEFAULT_ENABLE_51_SURROUND = false;
     private static final boolean DEFAULT_USB_DRIVER = true;
     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_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_ENABLE_PERF_OVERLAY = 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;
+    private static final String DEFAULT_AUDIO_CONFIG = "2"; // Stereo
 
     public static final int FORCE_H265_ON = -1;
     public static final int AUTOSELECT_H265 = 0;
@@ -54,33 +77,110 @@ public class PreferenceConfiguration {
     public int bitrate;
     public int videoFormat;
     public int deadzonePercentage;
+    public int oscOpacity;
     public boolean stretchVideo, enableSops, playHostAudio, disableWarnings;
     public String language;
-    public boolean listMode, smallIconMode, multiController, enable51Surround, usbDriver;
+    public boolean listMode, smallIconMode, multiController, usbDriver;
     public boolean onscreenController;
+    public boolean onlyL3R3;
+    public boolean disableFrameDrop;
+    public boolean enableHdr;
+    public boolean enablePip;
+    public boolean enablePerfOverlay;
+    public boolean bindAllUsb;
+    public boolean mouseEmulation;
+    public boolean mouseNavButtons;
+    public boolean unlockFps;
+    public boolean vibrateOsc;
+    public boolean vibrateFallbackToDevice;
+    public MoonBridge.AudioConfiguration audioConfiguration;
 
-    public static int getDefaultBitrate(String resFpsString) {
-        if (resFpsString.equals("720p30")) {
-            return BITRATE_DEFAULT_720_30;
+    private static int getHeightFromResolutionString(String resString) {
+        if (resString.equalsIgnoreCase("360p")) {
+            return 360;
         }
-        else if (resFpsString.equals("720p60")) {
-            return BITRATE_DEFAULT_720_60;
+        else if (resString.equalsIgnoreCase("480p")) {
+            return 480;
         }
-        else if (resFpsString.equals("1080p30")) {
-            return BITRATE_DEFAULT_1080_30;
+        else if (resString.equalsIgnoreCase("720p")) {
+            return 720;
         }
-        else if (resFpsString.equals("1080p60")) {
-            return BITRATE_DEFAULT_1080_60;
+        else if (resString.equalsIgnoreCase("1080p")) {
+            return 1080;
         }
-        else if (resFpsString.equals("4K30")) {
-            return BITRATE_DEFAULT_4K_30;
+        else if (resString.equalsIgnoreCase("1440p")) {
+            return 1440;
         }
-        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));
         }
     }
 
@@ -106,7 +206,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) {
@@ -128,53 +230,121 @@ public class PreferenceConfiguration {
         }
     }
 
+    public static void resetStreamingSettings(Context context) {
+        // We consider resolution, FPS, bitrate, HDR, and video format as "streaming settings" here
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        prefs.edit()
+                .remove(BITRATE_PREF_STRING)
+                .remove(BITRATE_PREF_OLD_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();
+    }
+
     public static PreferenceConfiguration readPreferences(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         PreferenceConfiguration config = new PreferenceConfiguration();
 
-        config.bitrate = prefs.getInt(BITRATE_PREF_STRING, getDefaultBitrate(context));
-        String str = prefs.getString(RES_FPS_PREF_STRING, DEFAULT_RES_FPS);
-        if (str.equals("720p30")) {
-            config.width = 1280;
-            config.height = 720;
-            config.fps = 30;
+        // Migrate legacy preferences to the new locations
+        if (prefs.contains(LEGACY_ENABLE_51_SURROUND_PREF_STRING)) {
+            if (prefs.getBoolean(LEGACY_ENABLE_51_SURROUND_PREF_STRING, false)) {
+                prefs.edit()
+                        .remove(LEGACY_ENABLE_51_SURROUND_PREF_STRING)
+                        .putString(AUDIO_CONFIG_PREF_STRING, "51")
+                        .apply();
+            }
         }
-        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;
+
+        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 {
-            // Should never get here
-            config.width = 1280;
-            config.height = 720;
-            config.fps = 60;
+            // 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 audioConfig = prefs.getString(AUDIO_CONFIG_PREF_STRING, DEFAULT_AUDIO_CONFIG);
+        if (audioConfig.equals("71")) {
+            config.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_71_SURROUND;
+        }
+        else if (audioConfig.equals("51")) {
+            config.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_51_SURROUND;
+        }
+        else /* if (audioConfig.equals("2")) */ {
+            config.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_STEREO;
         }
 
         config.videoFormat = getVideoFormatValue(context);
 
         config.deadzonePercentage = prefs.getInt(DEADZONE_PREF_STRING, DEFAULT_DEADZONE);
 
+        config.oscOpacity = prefs.getInt(OSC_OPACITY_PREF_STRING, DEFAULT_OPACITY);
+
         config.language = prefs.getString(LANGUAGE_PREF_STRING, DEFAULT_LANGUAGE);
 
         // Checkbox preferences
@@ -185,9 +355,19 @@ public class PreferenceConfiguration {
         config.listMode = prefs.getBoolean(LIST_MODE_PREF_STRING, DEFAULT_LIST_MODE);
         config.smallIconMode = prefs.getBoolean(SMALL_ICONS_PREF_STRING, getDefaultSmallMode(context));
         config.multiController = prefs.getBoolean(MULTI_CONTROLLER_PREF_STRING, DEFAULT_MULTI_CONTROLLER);
-        config.enable51Surround = prefs.getBoolean(ENABLE_51_SURROUND_PREF_STRING, DEFAULT_ENABLE_51_SURROUND);
         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.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.enablePerfOverlay = prefs.getBoolean(ENABLE_PERF_OVERLAY_STRING, DEFAULT_ENABLE_PERF_OVERLAY);
+        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/SeekBarPreference.java

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.os.Bundle;
 import android.preference.DialogPreference;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -16,7 +17,8 @@ import android.widget.TextView;
 // Based on a Stack Overflow example: http://stackoverflow.com/questions/1974193/slider-on-my-preferencescreen
 public class SeekBarPreference extends DialogPreference
 {
-    private static final String SCHEMA_URL = "http://schemas.android.com/apk/res/android";
+    private static final String ANDROID_SCHEMA_URL = "http://schemas.android.com/apk/res/android";
+    private static final String SEEKBAR_SCHEMA_URL = "http://schemas.moonlight-stream.com/apk/res/seekbar";
 
     private SeekBar seekBar;
     private TextView valueText;
@@ -27,6 +29,7 @@ public class SeekBarPreference extends DialogPreference
     private final int defaultValue;
     private final int maxValue;
     private final int minValue;
+    private final int stepSize;
     private int currentValue;
 
     public SeekBarPreference(Context context, AttributeSet attrs) {
@@ -34,27 +37,28 @@ public class SeekBarPreference extends DialogPreference
         this.context = context;
 
         // Read the message from XML
-        int dialogMessageId = attrs.getAttributeResourceValue(SCHEMA_URL, "dialogMessage", 0);
+        int dialogMessageId = attrs.getAttributeResourceValue(ANDROID_SCHEMA_URL, "dialogMessage", 0);
         if (dialogMessageId == 0) {
-            dialogMessage = attrs.getAttributeValue(SCHEMA_URL, "dialogMessage");
+            dialogMessage = attrs.getAttributeValue(ANDROID_SCHEMA_URL, "dialogMessage");
         }
         else {
             dialogMessage = context.getString(dialogMessageId);
         }
 
         // Get the suffix for the number displayed in the dialog
-        int suffixId = attrs.getAttributeResourceValue(SCHEMA_URL, "text", 0);
+        int suffixId = attrs.getAttributeResourceValue(ANDROID_SCHEMA_URL, "text", 0);
         if (suffixId == 0) {
-            suffix = attrs.getAttributeValue(SCHEMA_URL, "text");
+            suffix = attrs.getAttributeValue(ANDROID_SCHEMA_URL, "text");
         }
         else {
             suffix = context.getString(suffixId);
         }
 
         // Get default, min, and max seekbar values
-        defaultValue = attrs.getAttributeIntValue(SCHEMA_URL, "defaultValue", PreferenceConfiguration.getDefaultBitrate(context));
-        maxValue = attrs.getAttributeIntValue(SCHEMA_URL, "max", 100);
-        minValue = 1;
+        defaultValue = attrs.getAttributeIntValue(ANDROID_SCHEMA_URL, "defaultValue", PreferenceConfiguration.getDefaultBitrate(context));
+        maxValue = attrs.getAttributeIntValue(ANDROID_SCHEMA_URL, "max", 100);
+        minValue = attrs.getAttributeIntValue(SEEKBAR_SCHEMA_URL, "min", 1);
+        stepSize = attrs.getAttributeIntValue(SEEKBAR_SCHEMA_URL, "step", 1);
     }
 
     @Override
@@ -75,6 +79,8 @@ public class SeekBarPreference extends DialogPreference
         valueText = new TextView(context);
         valueText.setGravity(Gravity.CENTER_HORIZONTAL);
         valueText.setTextSize(32);
+        // Default text for value; hides bug where OnSeekBarChangeListener isn't called when opacity is 0%
+        valueText.setText("0%");
         params = new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT,
                 LinearLayout.LayoutParams.WRAP_CONTENT);
@@ -89,6 +95,12 @@ public class SeekBarPreference extends DialogPreference
                     return;
                 }
 
+                int roundedValue = ((value + (stepSize - 1))/stepSize)*stepSize;
+                if (roundedValue != value) {
+                    seekBar.setProgress(roundedValue);
+                    return;
+                }
+
                 String t = String.valueOf(value);
                 valueText.setText(suffix == null ? t : t.concat(suffix.length() > 1 ? " "+suffix : suffix));
             }

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

@@ -2,24 +2,38 @@ package com.limelight.preferences;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.res.Configuration;
+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;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
+import android.util.Range;
+import android.view.Display;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
 
+import com.limelight.LimeLog;
 import com.limelight.PcView;
 import com.limelight.R;
+import com.limelight.binding.video.MediaCodecHelper;
 import com.limelight.utils.UiHelper;
 
-import java.util.Locale;
-
 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);
@@ -29,9 +43,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);
     }
@@ -53,6 +65,72 @@ public class StreamSettings extends Activity {
     }
 
     public static class SettingsFragment extends PreferenceFragment {
+
+        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().equalsIgnoreCase(value)) {
+                    matchingCount++;
+                }
+            }
+
+            // Create the new arrays
+            CharSequence[] entries = new CharSequence[pref.getEntries().length-matchingCount];
+            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().equalsIgnoreCase(value)) {
+                    // Skip matching values
+                    continue;
+                }
+
+                entries[outIndex] = pref.getEntries()[i];
+                entryValues[outIndex] = pref.getEntryValues()[i];
+                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 View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+            View view = super.onCreateView(inflater, container, savedInstanceState);
+            UiHelper.applyStatusBarPadding(view);
+            return view;
+        }
+
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
@@ -68,20 +146,259 @@ public class StreamSettings extends Activity {
                 screen.removePreference(category);
             }
 
+            // Remove PiP mode on devices pre-Oreo
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+                PreferenceCategory category =
+                        (PreferenceCategory) findPreference("category_basic_settings");
+                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();
+
+                int maxSupportedResW = 0;
+
+                // Always allow resolutions that are smaller or equal to the active
+                // display resolution because decoders can report total non-sense to us.
+                // For example, a p201 device reports:
+                // AVC Decoder: OMX.amlogic.avc.decoder.awesome
+                // HEVC Decoder: OMX.amlogic.hevc.decoder.awesome
+                // AVC supported width range: 64 - 384
+                // HEVC supported width range: 64 - 544
+                for (Display.Mode candidate : display.getSupportedModes()) {
+                    // Some devices report their dimensions in the portrait orientation
+                    // where height > width. Normalize these to the conventional width > height
+                    // arrangement before we process them.
+
+                    int width = Math.max(candidate.getPhysicalWidth(), candidate.getPhysicalHeight());
+                    int height = Math.min(candidate.getPhysicalWidth(), candidate.getPhysicalHeight());
+
+                    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
+                // decoder lists.
+                MediaCodecHelper.initialize(getContext(), GlPreferences.readPreferences(getContext()).glRenderer);
+
+                MediaCodecInfo avcDecoder = MediaCodecHelper.findProbableSafeDecoder("video/avc", -1);
+                MediaCodecInfo hevcDecoder = MediaCodecHelper.findProbableSafeDecoder("video/hevc", -1);
+
+                if (avcDecoder != null) {
+                    Range<Integer> avcWidthRange = avcDecoder.getCapabilitiesForType("video/avc").getVideoCapabilities().getSupportedWidths();
+
+                    LimeLog.info("AVC supported width range: "+avcWidthRange.getLower()+" - "+avcWidthRange.getUpper());
+
+                    // If 720p is not reported as supported, ignore all results from this API
+                    if (avcWidthRange.contains(1280)) {
+                        if (avcWidthRange.contains(3840) && maxSupportedResW < 3840) {
+                            maxSupportedResW = 3840;
+                        }
+                        else if (avcWidthRange.contains(1920) && maxSupportedResW < 1920) {
+                            maxSupportedResW = 1920;
+                        }
+                        else if (maxSupportedResW < 1280) {
+                            maxSupportedResW = 1280;
+                        }
+                    }
+                }
+
+                if (hevcDecoder != null) {
+                    Range<Integer> hevcWidthRange = hevcDecoder.getCapabilitiesForType("video/hevc").getVideoCapabilities().getSupportedWidths();
+
+                    LimeLog.info("HEVC supported width range: "+hevcWidthRange.getLower()+" - "+hevcWidthRange.getUpper());
+
+                    // If 720p is not reported as supported, ignore all results from this API
+                    if (hevcWidthRange.contains(1280)) {
+                        if (hevcWidthRange.contains(3840) && maxSupportedResW < 3840) {
+                            maxSupportedResW = 3840;
+                        }
+                        else if (hevcWidthRange.contains(1920) && maxSupportedResW < 1920) {
+                            maxSupportedResW = 1920;
+                        }
+                        else if (maxSupportedResW < 1280) {
+                            maxSupportedResW = 1280;
+                        }
+                    }
+                }
+
+                LimeLog.info("Maximum resolution slot: "+maxSupportedResW);
+
+                if (maxSupportedResW != 0) {
+                    if (maxSupportedResW < 3840) {
+                        // 4K is unsupported
+                        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
+                        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 proper 7.1 surround sound support. Remove the 7.1 option
+            // for earlier versions of Android to prevent AudioTrack initialization issues.
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+                LimeLog.info("Excluding 7.1 surround sound option based on OS");
+                removeValue(PreferenceConfiguration.AUDIO_CONFIG_PREF_STRING, "71", new Runnable() {
+                    @Override
+                    public void run() {
+                        setValue(PreferenceConfiguration.AUDIO_CONFIG_PREF_STRING, "51");
+                    }
+                });
+            }
+
+            // 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");
+                PreferenceCategory category =
+                        (PreferenceCategory) findPreference("category_advanced_settings");
+                category.removePreference(findPreference("checkbox_enable_hdr"));
+            }
+            else {
+                Display display = getActivity().getWindowManager().getDefaultDisplay();
+                Display.HdrCapabilities hdrCaps = display.getHdrCapabilities();
+
+                // We must now ensure our display is compatible with HDR10
+                boolean foundHdr10 = false;
+                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;
+                        }
+                    }
+                }
+
+                if (!foundHdr10) {
+                    LimeLog.info("Excluding HDR toggle based on display capabilities");
+                    PreferenceCategory category =
+                            (PreferenceCategory) findPreference("category_advanced_settings");
+                    category.removePreference(findPreference("checkbox_enable_hdr"));
+                }
+            }
+
             // 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/AdapterFragmentCallbacks.java

@@ -3,6 +3,6 @@ package com.limelight.ui;
 import android.widget.AbsListView;
 
 public interface AdapterFragmentCallbacks {
-    public int getAdapterFragmentLayoutId();
-    public void receiveAbsListView(AbsListView gridView);
+    int getAdapterFragmentLayoutId();
+    void receiveAbsListView(AbsListView gridView);
 }

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

@@ -1,5 +1,5 @@
 package com.limelight.ui;
 
 public interface GameGestures {
-    public void showKeyboard();
+    void showKeyboard();
 }

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/CacheHelper.java

@@ -13,7 +13,7 @@ import java.io.OutputStream;
 import java.io.Reader;
 
 public class CacheHelper {
-    private static File openPath(boolean createPath, File root, String... path) {
+    public static File openPath(boolean createPath, File root, String... path) {
         File f = root;
         for (int i = 0; i < path.length; i++) {
             String component = path[i];

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

@@ -13,18 +13,18 @@ public class Dialog implements Runnable {
     private final String title;
     private final String message;
     private final Activity activity;
-    private final boolean endAfterDismiss;
+    private final Runnable runOnDismiss;
 
     private AlertDialog alert;
 
     private static final ArrayList<Dialog> rundownDialogs = new ArrayList<>();
 
-    private Dialog(Activity activity, String title, String message, boolean endAfterDismiss)
+    private Dialog(Activity activity, String title, String message, Runnable runOnDismiss)
     {
         this.activity = activity;
         this.title = title;
         this.message = message;
-        this.endAfterDismiss = endAfterDismiss;
+        this.runOnDismiss = runOnDismiss;
     }
 
     public static void closeDialogs()
@@ -40,9 +40,21 @@ public class Dialog implements Runnable {
         }
     }
 
-    public static void displayDialog(Activity activity, String title, String message, boolean endAfterDismiss)
+    public static void displayDialog(final Activity activity, String title, String message, final boolean endAfterDismiss)
     {
-        activity.runOnUiThread(new Dialog(activity, title, message, endAfterDismiss));
+        activity.runOnUiThread(new Dialog(activity, title, message, new Runnable() {
+            @Override
+            public void run() {
+                if (endAfterDismiss) {
+                    activity.finish();
+                }
+            }
+        }));
+    }
+
+    public static void displayDialog(Activity activity, String title, String message, Runnable runOnDismiss)
+    {
+        activity.runOnUiThread(new Dialog(activity, title, message, runOnDismiss));
     }
 
     @Override
@@ -65,9 +77,7 @@ public class Dialog implements Runnable {
                       alert.dismiss();
                   }
 
-                  if (endAfterDismiss) {
-                      activity.finish();
-                  }
+                  runOnDismiss.run();
               }
         });
         alert.setButton(AlertDialog.BUTTON_NEUTRAL, activity.getResources().getText(R.string.help), new DialogInterface.OnClickListener() {
@@ -77,9 +87,7 @@ public class Dialog implements Runnable {
                     alert.dismiss();
                 }
 
-                if (endAfterDismiss) {
-                    activity.finish();
-                }
+                runOnDismiss.run();
 
                 HelpLauncher.launchTroubleshooting(activity);
             }

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

@@ -1,24 +1,43 @@
 package com.limelight.utils;
 
-import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.net.Uri;
-import android.os.Build;
 
 import com.limelight.HelpActivity;
 
 public class HelpLauncher {
 
+    private static boolean isKnownBrowser(Context context, Intent i) {
+        ResolveInfo resolvedActivity = context.getPackageManager().resolveActivity(i, PackageManager.MATCH_DEFAULT_ONLY);
+        if (resolvedActivity == null) {
+            // No browser
+            return false;
+        }
+
+        String name = resolvedActivity.activityInfo.name;
+        if (name == null) {
+            return false;
+        }
+
+        name = name.toLowerCase();
+        return name.contains("chrome") || name.contains("firefox");
+    }
+
     private static void launchUrl(Context context, String url) {
         // Try to launch the default browser
         try {
-            // Fire TV devices will lie and say they do have a browser
-            // even though the OS just shows an error dialog if we
-            // try to use it.
-            if (!"Amazon".equalsIgnoreCase(Build.MANUFACTURER)) {
-                Intent i = new Intent(Intent.ACTION_VIEW);
-                i.setData(Uri.parse(url));
+            Intent i = new Intent(Intent.ACTION_VIEW);
+            i.setData(Uri.parse(url));
+
+            // Several Android TV devices will lie and say they do have a browser
+            // even though the OS just shows an error dialog if we try to use it. We need to
+            // be a bit more clever on these devices and detect if the browser is a legitimate
+            // browser or just a fake error message activity.
+            if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK) ||
+                    isKnownBrowser(context, i)) {
                 context.startActivity(i);
                 return;
             }

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

@@ -0,0 +1,32 @@
+package com.limelight.utils;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkInfo;
+import android.os.Build;
+
+public class NetHelper {
+    public static boolean isActiveNetworkVpn(Context context) {
+        ConnectivityManager connMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            Network activeNetwork = connMgr.getActiveNetwork();
+            if (activeNetwork != null) {
+                NetworkCapabilities netCaps = connMgr.getNetworkCapabilities(activeNetwork);
+                if (netCaps != null) {
+                    return netCaps.hasTransport(NetworkCapabilities.TRANSPORT_VPN) ||
+                            !netCaps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN);
+                }
+            }
+        }
+        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            NetworkInfo activeNetworkInfo = connMgr.getActiveNetworkInfo();
+            if (activeNetworkInfo != null) {
+                return activeNetworkInfo.getType() == ConnectivityManager.TYPE_VPN;
+            }
+        }
+
+        return false;
+    }
+}

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

@@ -4,8 +4,10 @@ import android.app.Activity;
 import android.content.Intent;
 import android.widget.Toast;
 
+import com.limelight.AppView;
 import com.limelight.Game;
 import com.limelight.R;
+import com.limelight.ShortcutTrampoline;
 import com.limelight.binding.PlatformBinding;
 import com.limelight.computers.ComputerManagerService;
 import com.limelight.nvstream.http.ComputerDetails;
@@ -13,39 +15,69 @@ 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.net.InetAddress;
+import java.io.IOException;
 import java.net.UnknownHostException;
+import java.security.cert.CertificateEncodingException;
 
 public class ServerHelper {
-    public static InetAddress getCurrentAddressFromComputer(ComputerDetails computer) {
-        return computer.reachability == ComputerDetails.Reachability.LOCAL ?
-                computer.localIp : computer.remoteIp;
+    public static String getCurrentAddressFromComputer(ComputerDetails computer) {
+        return computer.activeAddress;
+    }
+
+    public static Intent createPcShortcutIntent(Activity parent, ComputerDetails computer) {
+        Intent i = new Intent(parent, ShortcutTrampoline.class);
+        i.putExtra(AppView.NAME_EXTRA, computer.name);
+        i.putExtra(AppView.UUID_EXTRA, computer.uuid);
+        i.setAction(Intent.ACTION_DEFAULT);
+        return i;
+    }
+
+    public static Intent createAppShortcutIntent(Activity parent, ComputerDetails computer, NvApp app) {
+        Intent i = new Intent(parent, ShortcutTrampoline.class);
+        i.putExtra(AppView.NAME_EXTRA, computer.name);
+        i.putExtra(AppView.UUID_EXTRA, computer.uuid);
+        i.putExtra(Game.EXTRA_APP_NAME, app.getAppName());
+        i.putExtra(Game.EXTRA_APP_ID, ""+app.getAppId());
+        i.putExtra(Game.EXTRA_APP_HDR, app.isHdrSupported());
+        i.setAction(Intent.ACTION_DEFAULT);
+        return i;
     }
 
     public static Intent createStartIntent(Activity parent, NvApp app, ComputerDetails computer,
                                            ComputerManagerService.ComputerManagerBinder managerBinder) {
         Intent intent = new Intent(parent, Game.class);
-        intent.putExtra(Game.EXTRA_HOST,
-                computer.reachability == ComputerDetails.Reachability.LOCAL ?
-                        computer.localIp.getHostAddress() : computer.remoteIp.getHostAddress());
+        intent.putExtra(Game.EXTRA_HOST, getCurrentAddressFromComputer(computer));
         intent.putExtra(Game.EXTRA_APP_NAME, app.getAppName());
         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 InetAddress address,
+                              final ComputerDetails computer,
                               final NvApp app,
                               final ComputerManagerService.ComputerManagerBinder managerBinder,
                               final Runnable onComplete) {
@@ -56,8 +88,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 {
@@ -76,8 +108,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

@@ -1,17 +1,19 @@
 package com.limelight.utils;
 
 import android.annotation.TargetApi;
-import android.content.Context;
+import android.app.Activity;
 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;
@@ -20,9 +22,10 @@ import java.util.List;
 public class ShortcutHelper {
 
     private final ShortcutManager sm;
-    private final Context context;
+    private final Activity context;
+    private final TvChannelHelper tvChannelHelper;
 
-    public ShortcutHelper(Context context) {
+    public ShortcutHelper(Activity context) {
         this.context = context;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
             sm = context.getSystemService(ShortcutManager.class);
@@ -30,6 +33,7 @@ public class ShortcutHelper {
         else {
             sm = null;
         }
+        this.tvChannelHelper = new TvChannelHelper(context);
     }
 
     @TargetApi(Build.VERSION_CODES.N_MR1)
@@ -78,40 +82,39 @@ public class ShortcutHelper {
         return false;
     }
 
-    public void reportShortcutUsed(String id) {
+    public void reportComputerShortcutUsed(ComputerDetails computer) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            ShortcutInfo sinfo = getInfoForId(id);
-            if (sinfo != null) {
-                sm.reportShortcutUsed(id);
+            if (getInfoForId(computer.uuid) != null) {
+                sm.reportShortcutUsed(computer.uuid);
             }
         }
     }
 
-    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);
-            i.putExtra(AppView.NAME_EXTRA, computerName);
-            i.putExtra(AppView.UUID_EXTRA, computerUuid);
-            i.setAction(Intent.ACTION_DEFAULT);
+    public void reportGameLaunched(ComputerDetails computer, NvApp app) {
+        tvChannelHelper.createTvChannel(computer);
+        tvChannelHelper.addGameToChannel(computer, app);
+    }
 
-            ShortcutInfo sinfo = new ShortcutInfo.Builder(context, id)
-                    .setIntent(i)
-                    .setShortLabel(computerName)
-                    .setLongLabel(computerName)
+    public void createAppViewShortcut(ComputerDetails computer, boolean forceAdd, boolean newlyPaired) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            ShortcutInfo sinfo = new ShortcutInfo.Builder(context, computer.uuid)
+                    .setIntent(ServerHelper.createPcShortcutIntent(context, computer))
+                    .setShortLabel(computer.name)
+                    .setLongLabel(computer.name)
                     .setIcon(Icon.createWithResource(context, R.mipmap.ic_pc_scut))
                     .build();
 
-            ShortcutInfo existingSinfo = getInfoForId(id);
+            ShortcutInfo existingSinfo = getInfoForId(computer.uuid);
             if (existingSinfo != null) {
                 // Update in place
                 sm.updateShortcuts(Collections.singletonList(sinfo));
-                sm.enableShortcuts(Collections.singletonList(id));
+                sm.enableShortcuts(Collections.singletonList(computer.uuid));
             }
 
             // Reap shortcuts to make space for this if it's new
             // NOTE: This CAN'T be an else on the above if, because it's
             // possible that we have an existing shortcut but it's not a dynamic one.
-            if (!isExistingDynamicShortcut(id)) {
+            if (!isExistingDynamicShortcut(computer.uuid)) {
                 // To avoid a random carousel of shortcuts popping in and out based on polling status,
                 // we only add shortcuts if it's not at the limit or the user made a conscious action
                 // to interact with this PC.
@@ -121,18 +124,81 @@ public class ShortcutHelper {
                 }
             }
         }
+
+        if (newlyPaired) {
+            // Avoid hammering the channel API for each computer poll because it will throttle us
+            tvChannelHelper.createTvChannel(computer);
+            tvChannelHelper.requestChannelOnHomeScreen(computer);
+        }
     }
 
-    public void createAppViewShortcut(String id, ComputerDetails details, boolean forceAdd) {
-        createAppViewShortcut(id, details.name, details.uuid.toString(), forceAdd);
+    public void createAppViewShortcutForOnlineHost(ComputerDetails details) {
+        createAppViewShortcut(details, false, false);
     }
 
-    public void disableShortcut(String id, CharSequence reason) {
+    private String getShortcutIdForGame(ComputerDetails computer, NvApp app) {
+        return computer.uuid + app.getAppId();
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    public boolean createPinnedGameShortcut(ComputerDetails computer, NvApp app, Bitmap iconBits) {
+        if (sm.isRequestPinShortcutSupported()) {
+            Icon appIcon;
+
+            if (iconBits != null) {
+                appIcon = Icon.createWithAdaptiveBitmap(iconBits);
+            } else {
+                appIcon = Icon.createWithResource(context, R.mipmap.ic_pc_scut);
+            }
+
+            ShortcutInfo sInfo = new ShortcutInfo.Builder(context, getShortcutIdForGame(computer, app))
+                .setIntent(ServerHelper.createAppShortcutIntent(context, computer, app))
+                .setShortLabel(app.getAppName() + " (" + computer.name + ")")
+                .setIcon(appIcon)
+                .build();
+
+            return sm.requestPinShortcut(sInfo, null);
+        } else {
+            return false;
+        }
+    }
+
+    public void disableComputerShortcut(ComputerDetails computer, CharSequence reason) {
+        tvChannelHelper.deleteChannel(computer);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            ShortcutInfo sinfo = getInfoForId(id);
-            if (sinfo != null) {
+            // Delete the computer shortcut itself
+            if (getInfoForId(computer.uuid) != null) {
+                sm.disableShortcuts(Collections.singletonList(computer.uuid), reason);
+            }
+
+            // Delete all associated app shortcuts too
+            List<ShortcutInfo> shortcuts = getAllShortcuts();
+            LinkedList<String> appShortcutIds = new LinkedList<>();
+            for (ShortcutInfo info : shortcuts) {
+                if (info.getId().startsWith(computer.uuid)) {
+                    appShortcutIds.add(info.getId());
+                }
+            }
+            sm.disableShortcuts(appShortcutIds, reason);
+        }
+    }
+
+    public void disableAppShortcut(ComputerDetails computer, NvApp app, CharSequence reason) {
+        tvChannelHelper.deleteProgram(computer, app);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            String id = getShortcutIdForGame(computer, app);
+            if (getInfoForId(id) != null) {
                 sm.disableShortcuts(Collections.singletonList(id), reason);
             }
         }
     }
+
+    public void enableAppShortcut(ComputerDetails computer, NvApp app) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            String id = getShortcutIdForGame(computer, app);
+            if (getInfoForId(id) != null) {
+                sm.enableShortcuts(Collections.singletonList(id));
+            }
+        }
+    }
 }

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

@@ -0,0 +1,345 @@
+package com.limelight.utils;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteException;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.media.tv.TvContract;
+import android.net.Uri;
+import android.os.Build;
+
+import com.limelight.LimeLog;
+import com.limelight.PosterContentProvider;
+import com.limelight.R;
+import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.nvstream.http.NvApp;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class TvChannelHelper {
+
+    private static final int ASPECT_RATIO_MOVIE_POSTER = 5;
+    private static final int TYPE_GAME = 12;
+    private static final int INTERNAL_PROVIDER_ID_INDEX = 1;
+    private static final int PROGRAM_BROWSABLE_INDEX = 2;
+    private static final int ID_INDEX = 0;
+    private Activity context;
+
+    public TvChannelHelper(Activity context) {
+        this.context = context;
+    }
+
+    void requestChannelOnHomeScreen(ComputerDetails computer) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (!isAndroidTV()) {
+                return;
+            }
+
+            Long channelId = getChannelId(computer.uuid);
+            if (channelId == null) {
+                return;
+            }
+
+            Intent intent = new Intent(TvContract.ACTION_REQUEST_CHANNEL_BROWSABLE);
+            intent.putExtra(TvContract.EXTRA_CHANNEL_ID, getChannelId(computer.uuid));
+            try {
+                context.startActivityForResult(intent, 0);
+            } catch (ActivityNotFoundException e) {
+            }
+        }
+    }
+
+    void createTvChannel(ComputerDetails computer) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (!isAndroidTV()) {
+                return;
+            }
+
+            ChannelBuilder builder = new ChannelBuilder()
+                    .setType(TvContract.Channels.TYPE_PREVIEW)
+                    .setDisplayName(computer.name)
+                    .setInternalProviderId(computer.uuid)
+                    .setAppLinkIntent(ServerHelper.createPcShortcutIntent(context, computer));
+
+            Long channelId = getChannelId(computer.uuid);
+            if (channelId != null) {
+                context.getContentResolver().update(TvContract.buildChannelUri(channelId),
+                        builder.toContentValues(), null, null);
+                return;
+            }
+
+            Uri channelUri = context.getContentResolver().insert(
+                    TvContract.Channels.CONTENT_URI, builder.toContentValues());
+            if (channelUri != null) {
+                long id = ContentUris.parseId(channelUri);
+                updateChannelIcon(id);
+            }
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    private void updateChannelIcon(long channelId) {
+        Bitmap logo = drawableToBitmap(context.getResources().getDrawable(R.drawable.ic_channel));
+        try {
+            Uri localUri = TvContract.buildChannelLogoUri(channelId);
+            try (OutputStream outputStream = context.getContentResolver().openOutputStream(localUri)) {
+                logo.compress(Bitmap.CompressFormat.PNG, 100, outputStream);
+                outputStream.flush();
+            } catch (SQLiteException | IOException e) {
+                LimeLog.warning("Failed to store the logo to the system content provider.");
+                e.printStackTrace();
+            }
+        } finally {
+            logo.recycle();
+        }
+    }
+
+    private Bitmap drawableToBitmap(Drawable drawable) {
+        int width = context.getResources().getDimensionPixelSize(R.dimen.tv_channel_logo_width);
+        int height = context.getResources().getDimensionPixelSize(R.dimen.tv_channel_logo_width);
+
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+        drawable.draw(canvas);
+        return bitmap;
+    }
+
+    void addGameToChannel(ComputerDetails computer, NvApp app) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (!isAndroidTV()) {
+                return;
+            }
+
+
+            Long channelId = getChannelId(computer.uuid);
+            if (channelId == null) {
+                return;
+            }
+
+            PreviewProgramBuilder builder = new PreviewProgramBuilder()
+                    .setChannelId(channelId)
+                    .setType(TYPE_GAME)
+                    .setTitle(app.getAppName())
+                    .setPosterArtAspectRatio(ASPECT_RATIO_MOVIE_POSTER)
+                    .setPosterArtUri(PosterContentProvider.createBoxArtUri(computer.uuid, ""+app.getAppId()))
+                    .setIntent(ServerHelper.createAppShortcutIntent(context, computer, app))
+                    .setInternalProviderId(""+app.getAppId())
+                    // Weight should increase each time we run the game
+                    .setWeight((int)((System.currentTimeMillis() - 1500000000000L) / 1000));
+
+            Long programId = getProgramId(channelId, ""+app.getAppId());
+            if (programId != null) {
+                context.getContentResolver().update(TvContract.buildPreviewProgramUri(programId),
+                        builder.toContentValues(), null, null);
+                return;
+            }
+
+            context.getContentResolver().insert(TvContract.PreviewPrograms.CONTENT_URI,
+                    builder.toContentValues());
+
+            TvContract.requestChannelBrowsable(context, channelId);
+        }
+    }
+
+    void deleteChannel(ComputerDetails computer) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (!isAndroidTV()) {
+                return;
+            }
+
+            Long channelId = getChannelId(computer.uuid);
+            if (channelId == null) {
+                return;
+            }
+
+            context.getContentResolver().delete(TvContract.buildChannelUri(channelId), null, null);
+        }
+    }
+
+    void deleteProgram(ComputerDetails computer, NvApp app) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (!isAndroidTV()) {
+                return;
+            }
+
+            Long channelId = getChannelId(computer.uuid);
+            if (channelId == null) {
+                return;
+            }
+
+
+            Long programId = getProgramId(channelId, ""+app.getAppId());
+            if (programId == null) {
+                return;
+            }
+
+            context.getContentResolver().delete(TvContract.buildPreviewProgramUri(programId), null, null);
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    private Long getChannelId(String computerUuid) {
+        try (Cursor cursor = context.getContentResolver().query(
+                TvContract.Channels.CONTENT_URI,
+                new String[] {TvContract.Channels._ID, TvContract.Channels.COLUMN_INTERNAL_PROVIDER_ID},
+                null,
+                null,
+                null)) {
+            if (cursor == null || cursor.getCount() == 0) {
+                return null;
+            }
+            while (cursor.moveToNext()) {
+                String internalProviderId = cursor.getString(INTERNAL_PROVIDER_ID_INDEX);
+                if (computerUuid.equals(internalProviderId)) {
+                    return cursor.getLong(ID_INDEX);
+                }
+            }
+
+            return null;
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    private Long getProgramId(long channelId, String appId) {
+        try (Cursor cursor = context.getContentResolver().query(
+                TvContract.buildPreviewProgramsUriForChannel(channelId),
+                new String[] {TvContract.PreviewPrograms._ID, TvContract.PreviewPrograms.COLUMN_INTERNAL_PROVIDER_ID, TvContract.PreviewPrograms.COLUMN_BROWSABLE},
+                null,
+                null,
+                null)) {
+            if (cursor == null || cursor.getCount() == 0) {
+                return null;
+            }
+            while (cursor.moveToNext()) {
+                String internalProviderId = cursor.getString(INTERNAL_PROVIDER_ID_INDEX);
+                if (appId.equals(internalProviderId)) {
+                    long id = cursor.getLong(ID_INDEX);
+                    int browsable = cursor.getInt(PROGRAM_BROWSABLE_INDEX);
+                    if (browsable != 0) {
+                        return id;
+                    } else {
+                        int countDeleted = context.getContentResolver().delete(TvContract.buildPreviewProgramUri(id), null, null);
+                        if (countDeleted > 0) {
+                            LimeLog.info("Preview program has been deleted");
+                        } else {
+                            LimeLog.warning("Preview program has not been deleted");
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+    }
+
+    private static <T> String toValueString(T value) {
+        return value == null ? null : value.toString();
+    }
+
+    private static String toUriString(Intent intent) {
+        return intent == null ? null : intent.toUri(Intent.URI_INTENT_SCHEME);
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    private boolean isAndroidTV() {
+        return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK);
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    private static class PreviewProgramBuilder {
+
+        private ContentValues mValues = new ContentValues();
+
+
+        public PreviewProgramBuilder setChannelId(Long channelId) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_CHANNEL_ID, channelId);
+            return this;
+        }
+
+        public PreviewProgramBuilder setType(int type) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_TYPE, type);
+            return this;
+        }
+
+        public PreviewProgramBuilder setTitle(String title) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_TITLE, title);
+            return this;
+        }
+
+        public PreviewProgramBuilder setPosterArtAspectRatio(int aspectRatio) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_POSTER_ART_ASPECT_RATIO, aspectRatio);
+            return this;
+        }
+
+        public PreviewProgramBuilder setIntent(Intent intent) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_INTENT_URI, toUriString(intent));
+            return this;
+        }
+
+        public PreviewProgramBuilder setIntentUri(Uri uri) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_INTENT_URI, toValueString(uri));
+            return this;
+        }
+
+        public PreviewProgramBuilder setInternalProviderId(String id) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_INTERNAL_PROVIDER_ID, id);
+            return this;
+        }
+
+        public PreviewProgramBuilder setPosterArtUri(Uri uri) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_POSTER_ART_URI, toValueString(uri));
+            return this;
+        }
+
+        public PreviewProgramBuilder setWeight(int weight) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_WEIGHT, weight);
+            return this;
+        }
+
+        public ContentValues toContentValues() {
+            return new ContentValues(mValues);
+        }
+
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    private static class ChannelBuilder {
+
+        private ContentValues mValues = new ContentValues();
+
+        public ChannelBuilder setType(String type) {
+            mValues.put(TvContract.Channels.COLUMN_TYPE, type);
+            return this;
+        }
+
+        public ChannelBuilder setDisplayName(String displayName) {
+            mValues.put(TvContract.Channels.COLUMN_DISPLAY_NAME, displayName);
+            return this;
+        }
+
+        public ChannelBuilder setInternalProviderId(String internalProviderId) {
+            mValues.put(TvContract.Channels.COLUMN_INTERNAL_PROVIDER_ID, internalProviderId);
+            return this;
+        }
+
+        public ChannelBuilder setAppLinkIntent(Intent intent) {
+            mValues.put(TvContract.Channels.COLUMN_APP_LINK_INTENT_URI, toUriString(intent));
+            return this;
+        }
+
+        public ContentValues toContentValues() {
+            return new ContentValues(mValues);
+        }
+
+    }
+}