Use the new L+ releaseOutputBuffer() that takes a PTS to reduce microstuttering on M and reduce latency on L

.github/no-response.yml

@@ -1,8 +0,0 @@
-# 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

@@ -1,14 +0,0 @@
-# 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,9 +1,6 @@
-# built application files
+#built application files
 *.apk
 *.ap_
-*.aab
-output.json
-out/
 
 # files for the dex VM
 *.dex
@@ -33,7 +30,7 @@ Thumbs.db
 #.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
 .gradle
 build/
-*.iml
+app/app.iml
 
 # Compiled JNI libraries folder
 **/jniLibs

README.md

@@ -1,42 +1,44 @@
-# Moonlight Android
+#Moonlight
 
-[Moonlight](https://moonlight-stream.org) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
+[Moonlight](http://moonlight-stream.com) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
 We reverse engineered the Shield streaming software and created a version that can be run on any Android device.
 
 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)
 * 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 an NVIDIA GeForce GTX 600 series or higher desktop or mobile GPU (GT-series and AMD GPUs not supported)
+* [GameStream compatible](http://shield.nvidia.com/play-pc-games/) computer with GTX 600/700 series GPU
 * 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 and add the PIN if needed
+* Accept the pairing confirmation on your PC
 * 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)
 
@@ -44,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,44 +1,33 @@
+import com.android.builder.model.ProductFlavor
+import org.apache.tools.ant.taskdefs.condition.Os
+
 apply plugin: 'com.android.application'
 
 android {
-    buildToolsVersion '29.0.0'
-    compileSdkVersion 29
+    compileSdkVersion 25
+    buildToolsVersion '25.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 25
 
-        versionName "7.4"
-        versionCode = 195
+        versionName "5.0.1"
+        versionCode = 123
     }
 
-    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
-
-            externalNativeBuild {
-                ndkBuild {
-                    arguments "PRODUCT_FLAVOR=root"
-                }
-            }
-
             applicationId "com.limelight.root"
-            dimension "root"
+            ndk {
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
+            }
         }
 
         nonRoot {
-            externalNativeBuild {
-                ndkBuild {
-                    arguments "PRODUCT_FLAVOR=nonRoot"
-                }
-            }
-
             applicationId "com.limelight"
-            dimension "root"
+            ndk {
+                abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64", "mips", "mips64"
+            }
         }
     }
 
@@ -46,63 +35,10 @@ android {
         disable 'MissingTranslation'
     }
 
-    bundle {
-        language {
-            // Avoid splitting by language, since we allow users
-            // to manually switch language in settings.
-            enableSplit = false
-        }
-        density {
-            // FIXME: This should not be neccessary but we get
-            // weird crashes due to missing drawable resources
-            // when this split is enabled.
-            enableSplit = false
-        }
-    }
-
     buildTypes {
-        debug {
-            applicationIdSuffix ".debug"
-
-            minifyEnabled true
-            useProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
         release {
-            // To whomever is releasing/using an APK in release mode with
-            // 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'
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt')
         }
     }
 
@@ -114,9 +50,8 @@ android {
 }
 
 dependencies {
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.59'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.59'
-    implementation 'org.jcodec:jcodec:0.2.3'
-
-    implementation project(':moonlight-common')
+    compile 'org.bouncycastle:bcprov-jdk15on:1.52'
+    compile 'org.bouncycastle:bcpkix-jdk15on:1.52'
+    compile project(':moonlight-common')
+    compile files('libs/jcodec-0.1.9-patched.jar')
 }

app/proguard-rules.pro

@@ -1,28 +0,0 @@
-# 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

@@ -1,7 +0,0 @@
-<?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,7 +4,6 @@
 
     <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" />
@@ -25,20 +24,12 @@
         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:appCategory="game"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_launcher"
         android:theme="@style/AppTheme">
 
         <!-- Samsung multi-window support -->
@@ -68,9 +59,8 @@
         </activity>
         <!-- Small hack to support launcher shortcuts without relaunching over and over again when the back button is pressed -->
         <activity
-            android:name=".ShortcutTrampoline"
+            android:name=".AppViewShortcutTrampoline"
             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
@@ -101,16 +91,12 @@
                 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="userLandscape"
+            android:screenOrientation="sensorLandscape"
             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,8 +1,9 @@
 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;
@@ -26,9 +27,7 @@ import android.app.Service;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.os.Build;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.view.ContextMenu;
@@ -39,13 +38,10 @@ 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;
@@ -62,9 +58,7 @@ 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_WITH_QUIT = 4;
-    private final static int VIEW_DETAILS_ID = 5;
-    private final static int CREATE_SHORTCUT_ID = 6;
+    private final static int START_WTIH_QUIT = 4;
 
     public final static String NAME_EXTRA = "Name";
     public final static String UUID_EXTRA = "UUID";
@@ -82,8 +76,11 @@ 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 = localBinder.getComputer(uuidString);
+                    computer = managerBinder.getComputer(UUID.fromString(uuidString));
                     if (computer == null) {
                         finish();
                         return;
@@ -93,18 +90,13 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                         appGridAdapter = new AppGridAdapter(AppView.this,
                                 PreferenceConfiguration.readPreferences(AppView.this).listMode,
                                 PreferenceConfiguration.readPreferences(AppView.this).smallIconMode,
-                                computer, localBinder.getUniqueId());
+                                computer, managerBinder.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
@@ -157,7 +149,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                 }
 
                 // Don't care about other computers
-                if (!details.uuid.equalsIgnoreCase(uuidString)) {
+                if (!details.uuid.toString().equalsIgnoreCase(uuidString)) {
                     return;
                 }
 
@@ -181,7 +173,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                         @Override
                         public void run() {
                             // Disable shortcuts referencing this PC for now
-                            shortcutHelper.disableShortcut(details.uuid,
+                            shortcutHelper.disableShortcut(details.uuid.toString(),
                                     getResources().getString(R.string.scut_not_paired));
 
                             // Display a toast to the user and quit the activity
@@ -217,9 +209,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                         blockingLoadSpinner.dismiss();
                         blockingLoadSpinner = null;
                     }
-                } catch (XmlPullParserException | IOException e) {
-                    e.printStackTrace();
-                }
+                } catch (Exception ignored) {}
             }
         });
 
@@ -247,10 +237,6 @@ 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);
@@ -263,9 +249,10 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 
         String computerName = getIntent().getStringExtra(NAME_EXTRA);
 
-        TextView label = findViewById(R.id.appListText);
-        setTitle(computerName);
-        label.setText(computerName);
+        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);
@@ -283,7 +270,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 (IOException | XmlPullParserException e) {
+        } catch (Exception e) {
             if (lastRawApplist != null) {
                 LimeLog.warning("Saved applist corrupted: "+lastRawApplist);
                 e.printStackTrace();
@@ -315,9 +302,6 @@ 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();
     }
@@ -342,25 +326,10 @@ 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_WITH_QUIT, 1, getResources().getString(R.string.applist_menu_quit_and_start));
+                menu.add(Menu.NONE, START_WTIH_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
@@ -372,7 +341,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_WITH_QUIT:
+            case START_WTIH_QUIT:
                 // Display a confirmation dialog first
                 UiHelper.displayQuitConfirmationDialog(this, new Runnable() {
                     @Override
@@ -393,7 +362,8 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                     @Override
                     public void run() {
                         suspendGridUpdates = true;
-                        ServerHelper.doQuit(AppView.this, computer,
+                        ServerHelper.doQuit(AppView.this,
+                                ServerHelper.getCurrentAddressFromComputer(computer),
                                 app.app, managerBinder, new Runnable() {
                             @Override
                             public void run() {
@@ -411,19 +381,6 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
             case CANCEL_ID:
                 return true;
 
-            case VIEW_DETAILS_ID:
-                Dialog.displayDialog(AppView.this, getResources().getString(R.string.title_details),
-                        getResources().getString(R.string.applist_details_id) + " " + app.app.getAppId(), false);
-                return true;
-
-            case CREATE_SHORTCUT_ID:
-                ImageView appImageView = info.targetView.findViewById(R.id.grid_image);
-                Bitmap appBits = ((BitmapDrawable)appImageView.getDrawable()).getBitmap();
-                if (!shortcutHelper.createPinnedGameShortcut(uuidString + Integer.valueOf(app.app.getAppId()).toString(), appBits, computer, app.app)) {
-                    Toast.makeText(AppView.this, getResources().getString(R.string.unable_to_pin_shortcut), Toast.LENGTH_LONG).show();
-                }
-                return true;
-
             default:
                 return super.onContextItemSelected(item);
         }

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

@@ -0,0 +1,164 @@
+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,8 +51,14 @@ public class HelpActivity extends Activity {
 
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                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()));
+                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;
+                }
             }
         });
 

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

@@ -2,7 +2,9 @@ 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;
@@ -16,7 +18,6 @@ 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;
@@ -28,14 +29,11 @@ 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;
@@ -53,17 +51,12 @@ 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, completeOnCreateCalled;
+    private boolean freezeUpdates, runningPolling, inForeground;
     private final ServiceConnection serviceConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName className, IBinder binder) {
             final ComputerManagerService.ComputerManagerBinder localBinder =
@@ -93,19 +86,11 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         }
     };
 
-    @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
 
-        // 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();
-        }
+        // Reinitialize views just in case orientation changed
+        initializeViews();
     }
 
     private final static int APP_LIST_ID = 1;
@@ -115,7 +100,6 @@ 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);
@@ -126,9 +110,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
 
         // Setup the list view
-        ImageButton settingsButton = findViewById(R.id.settingsButton);
-        ImageButton addComputerButton = findViewById(R.id.manuallyAddPc);
-        ImageButton helpButton = findViewById(R.id.helpButton);
+        ImageButton settingsButton = (ImageButton) findViewById(R.id.settingsButton);
+        ImageButton addComputerButton = (ImageButton) findViewById(R.id.manuallyAddPc);
+        ImageButton helpButton = (ImageButton) findViewById(R.id.helpButton);
 
         settingsButton.setOnClickListener(new OnClickListener() {
             @Override
@@ -154,7 +138,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
             .replace(R.id.pcFragmentContainer, new AdapterFragment())
             .commitAllowingStateLoss();
 
-        noPcFoundLayout = findViewById(R.id.no_pc_found_layout);
+        noPcFoundLayout = (RelativeLayout) findViewById(R.id.no_pc_found_layout);
         if (pcGridAdapter.getCount() == 0) {
             noPcFoundLayout.setVisibility(View.VISIBLE);
         }
@@ -168,52 +152,6 @@ 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);
@@ -282,9 +220,6 @@ 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();
     }
@@ -315,8 +250,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
 
         // Inflate the context menu
-        if (computer.details.state == ComputerDetails.State.OFFLINE ||
-            computer.details.state == ComputerDetails.State.UNKNOWN) {
+        if (computer.details.reachability == ComputerDetails.Reachability.OFFLINE ||
+            computer.details.reachability == ComputerDetails.Reachability.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));
         }
@@ -336,7 +271,6 @@ 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
@@ -348,8 +282,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     }
 
     private void doPair(final ComputerDetails computer) {
-        if (computer.state == ComputerDetails.State.OFFLINE ||
-                ServerHelper.getCurrentAddressFromComputer(computer) == null) {
+        if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
             Toast.makeText(PcView.this, getResources().getString(R.string.pair_pc_offline), Toast.LENGTH_SHORT).show();
             return;
         }
@@ -373,11 +306,23 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                     // Stop updates and wait while pairing
                     stopComputerUpdates(true);
 
-                    httpConn = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer),
+                    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,
                             managerBinder.getUniqueId(),
-                            computer.serverCert,
+                            PlatformBinding.getDeviceName(),
                             PlatformBinding.getCryptoProvider(PcView.this));
-                    if (httpConn.getPairState() == PairState.PAIRED) {
+                    if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
                         // Don't display any toast, but open the app list
                         message = null;
                         success = true;
@@ -389,26 +334,21 @@ 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 pm = httpConn.getPairingManager();
-
-                        PairState pairState = pm.pair(httpConn.getServerInfo(), pinStr);
-                        if (pairState == PairState.PIN_WRONG) {
+                        PairingManager.PairState pairState = httpConn.pair(httpConn.getServerInfo(), pinStr);
+                        if (pairState == PairingManager.PairState.PIN_WRONG) {
                             message = getResources().getString(R.string.pair_incorrect_pin);
                         }
-                        else if (pairState == PairState.FAILED) {
+                        else if (pairState == PairingManager.PairState.FAILED) {
                             message = getResources().getString(R.string.pair_fail);
                         }
-                        else if (pairState == PairState.ALREADY_IN_PROGRESS) {
+                        else if (pairState == PairingManager.PairState.ALREADY_IN_PROGRESS) {
                             message = getResources().getString(R.string.pair_already_in_progress);
                         }
-                        else if (pairState == PairState.PAIRED) {
+                        else if (pairState == PairingManager.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);
@@ -422,7 +362,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 (XmlPullParserException | IOException e) {
+                } catch (Exception e) {
                     e.printStackTrace();
                     message = e.getMessage();
                 }
@@ -463,6 +403,7 @@ 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() {
@@ -486,8 +427,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     }
 
     private void doUnpair(final ComputerDetails computer) {
-        if (computer.state == ComputerDetails.State.OFFLINE ||
-                ServerHelper.getCurrentAddressFromComputer(computer) == null) {
+        if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
             Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
             return;
         }
@@ -503,9 +443,21 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 NvHTTP httpConn;
                 String message;
                 try {
-                    httpConn = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer),
+                    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,
                             managerBinder.getUniqueId(),
-                            computer.serverCert,
+                            PlatformBinding.getDeviceName(),
                             PlatformBinding.getCryptoProvider(PcView.this));
                     if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
                         httpConn.unpair();
@@ -523,9 +475,8 @@ 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 (XmlPullParserException | IOException e) {
+                } catch (Exception e) {
                     message = e.getMessage();
-                    e.printStackTrace();
                 }
 
                 final String toastMessage = message;
@@ -540,7 +491,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     }
 
     private void doAppList(ComputerDetails computer) {
-        if (computer.state == ComputerDetails.State.OFFLINE) {
+        if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
             Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
             return;
         }
@@ -551,7 +502,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
         Intent i = new Intent(this, AppView.class);
         i.putExtra(AppView.NAME_EXTRA, computer.name);
-        i.putExtra(AppView.UUID_EXTRA, computer.uuid);
+        i.putExtra(AppView.UUID_EXTRA, computer.uuid.toString());
         startActivity(i);
     }
 
@@ -573,21 +524,12 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 return true;
 
             case DELETE_ID:
-                if (ActivityManager.isUserAMonkey()) {
-                    LimeLog.info("Ignoring delete PC request from monkey");
+                if (managerBinder == null) {
+                    Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
                     return true;
                 }
-                UiHelper.displayDeletePcConfirmationDialog(this, computer.details, new Runnable() {
-                    @Override
-                    public void run() {
-                        if (managerBinder == null) {
-                            Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-                            return;
-                        }
-                        managerBinder.removeComputer(computer.details.name);
-                        removeComputer(computer.details);
-                    }
-                }, null);
+                managerBinder.removeComputer(computer.details.name);
+                removeComputer(computer.details);
                 return true;
 
             case APP_LIST_ID:
@@ -600,7 +542,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                     return true;
                 }
 
-                ServerHelper.doStart(this, new NvApp("app", computer.details.runningGameId, false), computer.details, managerBinder);
+                ServerHelper.doStart(this, new NvApp("app", computer.details.runningGameId), computer.details, managerBinder);
                 return true;
 
             case QUIT_ID:
@@ -613,16 +555,13 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 UiHelper.displayQuitConfirmationDialog(this, new Runnable() {
                     @Override
                     public void run() {
-                        ServerHelper.doQuit(PcView.this, computer.details,
-                                new NvApp("app", 0, false), managerBinder, null);
+                        ServerHelper.doQuit(PcView.this,
+                                ServerHelper.getCurrentAddressFromComputer(computer.details),
+                                new NvApp("app", 0), 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);
         }
@@ -634,7 +573,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
             if (details.equals(computer.details)) {
                 // Disable or delete shortcuts referencing this PC
-                shortcutHelper.disableShortcut(details.uuid,
+                shortcutHelper.disableShortcut(details.uuid.toString(),
                         getResources().getString(R.string.scut_deleted_pc));
 
                 pcGridAdapter.removeComputer(computer);
@@ -665,7 +604,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
         // Add a launcher shortcut for this PC
         if (details.pairState == PairState.PAIRED) {
-            shortcutHelper.createAppViewShortcut(details.uuid, details, false);
+            shortcutHelper.createAppViewShortcut(details.uuid.toString(), details, false);
         }
 
         if (existingEntry != null) {
@@ -699,8 +638,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
             public void onItemClick(AdapterView<?> arg0, View arg1, int pos,
                                     long id) {
                 ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(pos);
-                if (computer.details.state == ComputerDetails.State.UNKNOWN ||
-                    computer.details.state == ComputerDetails.State.OFFLINE) {
+                if (computer.details.reachability == ComputerDetails.Reachability.UNKNOWN ||
+                    computer.details.reachability == ComputerDetails.Reachability.OFFLINE) {
                     // Open the context menu if a PC is offline or refreshing
                     openContextMenu(arg1);
                 } else if (computer.details.pairState != PairState.PAIRED) {

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

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

app/src/main/java/com/limelight/binding/audio/AndroidAudioRenderer.java

@@ -1,10 +1,8 @@
 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;
@@ -14,58 +12,10 @@ public class AndroidAudioRenderer implements AudioRenderer {
 
     private AudioTrack track;
 
-    private AudioTrack createAudioTrack(int channelConfig, int bufferSize, boolean lowLatency) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            return new AudioTrack(AudioManager.STREAM_MUSIC,
-                    48000,
-                    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(48000)
-                    .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) {
         int channelConfig;
+        int bufferSize;
         int bytesPerFrame;
 
         switch (audioConfiguration)
@@ -88,111 +38,64 @@ public class AndroidAudioRenderer implements AudioRenderer {
         // 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;
 
-        for (int i = 0; i < 4; i++) {
-            boolean lowLatency;
-            int bufferSize;
+            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) {}
 
-            // 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(48000,
+            // Now try the larger buffer size
+            bufferSize = Math.max(AudioTrack.getMinBufferSize(48000,
                             channelConfig,
                             AudioFormat.ENCODING_PCM_16BIT),
-                            bytesPerFrame * 2);
+                    bytesPerFrame * 2);
 
-                    // Round to next frame
-                    bufferSize = (((bufferSize + (bytesPerFrame - 1)) / bytesPerFrame) * bytesPerFrame);
-                    break;
-                default:
-                    // Unreachable
-                    throw new IllegalStateException();
-            }
+            // Round to next frame
+            bufferSize = (((bufferSize + (bytesPerFrame - 1)) / bytesPerFrame) * bytesPerFrame);
 
-            // Skip low latency options if hardware sample rate isn't 48000Hz
-            if (AudioTrack.getNativeOutputSampleRate(AudioManager.STREAM_MUSIC) != 48000 && lowLatency) {
-                continue;
-            }
-
-            try {
-                track = createAudioTrack(channelConfig, 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;
+            track = new AudioTrack(AudioManager.STREAM_MUSIC,
+                    48000,
+                    channelConfig,
+                    AudioFormat.ENCODING_PCM_16BIT,
+                    bufferSize,
+                    AudioTrack.MODE_STREAM);
+            track.play();
         }
 
+        LimeLog.info("Audio track buffer size: "+bufferSize);
         return 0;
     }
 
     @Override
-    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.getPendingAudioFrames() < 8) {
-            // 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 many pending audio frames: " + MoonBridge.getPendingAudioFrames());
-        }
+    public void playDecodedAudio(byte[] audioData) {
+        track.write(audioData, 0, audioData.length);
     }
 
     @Override
     public void start() {}
 
     @Override
-    public void stop() {}
-
-    @Override
-    public void cleanup() {
+    public void stop() {
         // Immediately drop all pending data
         track.pause();
         track.flush();
+    }
 
+    @Override
+    public void cleanup() {
         track.release();
     }
 }

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

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

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

@@ -2,13 +2,7 @@ package com.limelight.binding.input;
 
 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;
@@ -17,17 +11,13 @@ 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;
 
@@ -55,30 +45,24 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     private final double stickDeadzone;
     private final InputDeviceContext defaultContext = new InputDeviceContext();
     private final GameGestures gestures;
-    private final Vibrator deviceVibrator;
     private boolean hasGameController;
 
-    private final PreferenceConfiguration prefConfig;
-    private short currentControllers, initialControllers;
+    private final boolean multiControllerEnabled;
+    private short currentControllers;
 
-    public ControllerHandler(Context activityContext, NvConnection conn, GameGestures gestures, PreferenceConfiguration prefConfig) {
+    public ControllerHandler(Context activityContext, NvConnection conn, GameGestures gestures, boolean multiControllerEnabled, int deadzonePercentage) {
         this.activityContext = activityContext;
         this.conn = conn;
         this.gestures = gestures;
-        this.prefConfig = prefConfig;
-        this.deviceVibrator = (Vibrator) activityContext.getSystemService(Context.VIBRATOR_SERVICE);
+        this.multiControllerEnabled = multiControllerEnabled;
 
-        // HACK: For now we're hardcoding a 7% deadzone. Some deadzone
+        // HACK: For now we're hardcoding a 10% deadzone. Some deadzone
         // is required for controller batching support to work.
-        int deadzonePercentage = 7;
+        deadzonePercentage = 10;
 
         int[] ids = InputDevice.getDeviceIds();
         for (int id : ids) {
             InputDevice dev = InputDevice.getDevice(id);
-            if (dev == null) {
-                // This device was removed during enumeration
-                continue;
-            }
             if ((dev.getSources() & InputDevice.SOURCE_JOYSTICK) != 0 ||
                     (dev.getSources() & InputDevice.SOURCE_GAMEPAD) != 0) {
                 // This looks like a gamepad, but we'll check X and Y to be sure
@@ -108,18 +92,6 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         defaultContext.rightTriggerAxis = MotionEvent.AXIS_GAS;
         defaultContext.controllerNumber = (short) 0;
         defaultContext.assignedControllerNumber = true;
-
-        // 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) {
@@ -157,92 +129,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         onInputDeviceAdded(deviceId);
     }
 
-    public void stop() {
-        for (int i = 0; i < inputDeviceContexts.size(); i++) {
-            InputDeviceContext deviceContext = inputDeviceContexts.valueAt(i);
-
-            if (deviceContext.vibrator != null) {
-                deviceContext.vibrator.cancel();
-            }
-        }
-
-        deviceVibrator.cancel();
-    }
-
-    private static boolean hasJoystickAxes(InputDevice device) {
-        return (device.getSources() & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK &&
-                getMotionRangeForJoystickAxis(device, MotionEvent.AXIS_X) != null &&
-                getMotionRangeForJoystickAxis(device, MotionEvent.AXIS_Y) != null;
-    }
-
-    private static boolean hasGamepadButtons(InputDevice device) {
-        return (device.getSources() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD;
-    }
-
-    public static boolean isGameControllerDevice(InputDevice device) {
-        if (device == null) {
-            return true;
-        }
-
-        if (hasJoystickAxes(device) || hasGamepadButtons(device)) {
-            // Has real joystick axes or gamepad buttons
-            return true;
-        }
-
-        // Otherwise, we'll try anything that claims to be a non-alphabetic keyboard
-        return device.getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC;
-    }
-
-    public static short getAttachedControllerMask(Context context) {
-        int count = 0;
-        short mask = 0;
-
-        // 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 ask not to claim devices that appear as InputDevices
-                // otherwise we will double count them.
-                if (UsbDriverService.shouldClaimDevice(dev, false)) {
-                    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 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 this device sent data as a gamepad, zero the values before removing
         if (context.assignedControllerNumber) {
             conn.sendControllerInput(context.controllerNumber, getActiveControllerMask(),
                     (short) 0,
@@ -250,6 +138,12 @@ 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
@@ -269,7 +163,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                 LimeLog.info("Built-in buttons hardcoded as controller 0");
                 context.controllerNumber = 0;
             }
-            else if (prefConfig.multiController && devContext.hasJoystickAxes) {
+            else if (multiControllerEnabled && devContext.hasJoystickAxes) {
                 context.controllerNumber = 0;
 
                 LimeLog.info("Reserving the next available controller number");
@@ -277,10 +171,6 @@ 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;
@@ -293,7 +183,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             }
         }
         else {
-            if (prefConfig.multiController) {
+            if (multiControllerEnabled) {
                 context.controllerNumber = 0;
 
                 LimeLog.info("Reserving the next available controller number");
@@ -301,10 +191,6 @@ 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;
@@ -321,11 +207,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         context.assignedControllerNumber = true;
     }
 
-    private UsbDeviceContext createUsbDeviceContextForDevice(AbstractController device) {
+    private UsbDeviceContext createUsbDeviceContextForDevice(int deviceId) {
         UsbDeviceContext context = new UsbDeviceContext();
 
-        context.id = device.getControllerId();
-        context.device = device;
+        context.id = deviceId;
 
         context.leftStickDeadzoneRadius = (float) stickDeadzone;
         context.rightStickDeadzoneRadius = (float) stickDeadzone;
@@ -334,85 +219,6 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         return context;
     }
 
-    private static boolean isExternal(InputDevice dev) {
-        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 (getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_X) == null &&
-                getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Y) == null &&
-                devName.toLowerCase().contains("remote")) {
-            return true;
-        }
-
-        // Otherwise, dynamically try to determine whether we should allow this
-        // back button to function for navigation.
-        //
-        // First, check if this is an internal device we're being called on.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && !isExternal(dev)) {
-            InputManager im = (InputManager) activityContext.getSystemService(Context.INPUT_SERVICE);
-
-            boolean foundInternalGamepad = false;
-            boolean foundInternalSelect = false;
-            for (int id : im.getInputDeviceIds()) {
-                InputDevice currentDev = im.getInputDevice(id);
-
-                // Ignore external devices
-                if (currentDev == null || isExternal(currentDev)) {
-                    continue;
-                }
-
-                // Note that we are explicitly NOT excluding the current device we're examining here,
-                // since the other gamepad buttons may be on our current device and that's fine.
-                boolean[] keys = currentDev.hasKeys(KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BUTTON_A);
-                if (keys[0]) {
-                    foundInternalSelect = true;
-                }
-                if (keys[1]) {
-                    foundInternalGamepad = true;
-                }
-            }
-
-            // Allow the back button to function for navigation if we either:
-            // a) have no internal gamepad (most phones)
-            // b) have an internal gamepad but also have an internal select button (GPD XD)
-            // but not:
-            // c) have an internal gamepad but no internal select button (NVIDIA SHIELD Portable)
-            return !foundInternalGamepad || foundInternalSelect;
-        }
-
-        return false;
-    }
-
     private InputDeviceContext createInputDeviceContextForDevice(InputDevice dev) {
         InputDeviceContext context = new InputDeviceContext();
         String devName = dev.getName();
@@ -423,10 +229,6 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         context.name = devName;
         context.id = dev.getId();
 
-        if (dev.getVibrator().hasVibrator()) {
-            context.vibrator = dev.getVibrator();
-        }
-
         context.leftStickXAxis = MotionEvent.AXIS_X;
         context.leftStickYAxis = MotionEvent.AXIS_Y;
         if (getMotionRangeForJoystickAxis(dev, context.leftStickXAxis) != null &&
@@ -549,8 +351,6 @@ 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
@@ -570,15 +370,28 @@ 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
@@ -647,8 +460,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     }
 
     private short getActiveControllerMask() {
-        if (prefConfig.multiController) {
-            return (short)(currentControllers | initialControllers | (prefConfig.onscreenController ? 1 : 0));
+        if (multiControllerEnabled) {
+            return currentControllers;
         }
         else {
             // Only Player 1 is active with multi-controller disabled
@@ -734,16 +547,6 @@ 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);
@@ -955,16 +758,16 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             // to normal behavior, so ignore triggersIdleNegative for each trigger until
             // first touch.
             if (lt != 0) {
-                context.leftTriggerAxisUsed = true;
+                context.leftTriggerUsed = true;
             }
             if (rt != 0) {
-                context.rightTriggerAxisUsed = true;
+                context.rightTriggerUsed = true;
             }
             if (context.triggersIdleNegative) {
-                if (context.leftTriggerAxisUsed) {
+                if (context.leftTriggerUsed) {
                     lt = (lt + 1) / 2;
                 }
-                if (context.rightTriggerAxisUsed) {
+                if (context.rightTriggerUsed) {
                     rt = (rt + 1) / 2;
                 }
             }
@@ -1077,94 +880,6 @@ 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) {
@@ -1198,8 +913,7 @@ 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 &&
-                    prefConfig.mouseEmulation) {
+                SystemClock.uptimeMillis() - context.startDownTime > ControllerHandler.START_DOWN_TIME_MOUSE_MODE_MS) {
                 toggleMouseEmulation(context);
             }
             context.inputMap &= ~ControllerPacket.PLAY_FLAG;
@@ -1248,17 +962,9 @@ 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:
@@ -1368,17 +1074,9 @@ 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:
@@ -1416,30 +1114,12 @@ 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) {
-        GenericControllerContext context = usbDeviceContexts.get(controllerId);
+        UsbDeviceContext context = usbDeviceContexts.get(controllerId);
         if (context == null) {
             return;
         }
@@ -1474,19 +1154,19 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     }
 
     @Override
-    public void deviceRemoved(AbstractController controller) {
-        UsbDeviceContext context = usbDeviceContexts.get(controller.getControllerId());
+    public void deviceRemoved(int controllerId) {
+        UsbDeviceContext context = usbDeviceContexts.get(controllerId);
         if (context != null) {
-            LimeLog.info("Removed controller: "+controller.getControllerId());
+            LimeLog.info("Removed controller: "+controllerId);
             releaseControllerNumber(context);
-            usbDeviceContexts.remove(controller.getControllerId());
+            usbDeviceContexts.remove(controllerId);
         }
     }
 
     @Override
-    public void deviceAdded(AbstractController controller) {
-        UsbDeviceContext context = createUsbDeviceContextForDevice(controller);
-        usbDeviceContexts.put(controller.getControllerId(), context);
+    public void deviceAdded(int controllerId) {
+        UsbDeviceContext context = createUsbDeviceContextForDevice(controllerId);
+        usbDeviceContexts.put(controllerId, context);
     }
 
     class GenericControllerContext {
@@ -1515,7 +1195,6 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
 
     class InputDeviceContext extends GenericControllerContext {
         public String name;
-        public Vibrator vibrator;
 
         public int leftStickXAxis = -1;
         public int leftStickYAxis = -1;
@@ -1526,7 +1205,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         public int leftTriggerAxis = -1;
         public int rightTriggerAxis = -1;
         public boolean triggersIdleNegative;
-        public boolean leftTriggerAxisUsed, rightTriggerAxisUsed;
+        public boolean leftTriggerUsed, rightTriggerUsed;
 
         public int hatXAxis = -1;
         public int hatYAxis = -1;
@@ -1553,7 +1232,5 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         public long startDownTime = 0;
     }
 
-    class UsbDeviceContext extends GenericControllerContext {
-        public AbstractController device;
-    }
+    class UsbDeviceContext extends GenericControllerContext {}
 }

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

@@ -2,6 +2,8 @@ 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
@@ -18,15 +20,22 @@ public class KeyboardTranslator {
 	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;
     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;
@@ -36,6 +45,7 @@ public class KeyboardTranslator {
 	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;
@@ -47,21 +57,7 @@ public class KeyboardTranslator {
 	public static final int VK_BACK_QUOTE = 192;
 	public static final int VK_QUOTE = 222;
 	public static final int VK_PAUSE = 19;
-
-	public static boolean needsShift(int keycode) {
-		switch (keycode)
-		{
-			case KeyEvent.KEYCODE_AT:
-			case KeyEvent.KEYCODE_POUND:
-			case KeyEvent.KEYCODE_PLUS:
-			case KeyEvent.KEYCODE_STAR:
-				return true;
-
-			default:
-				return false;
-		}
-	}
-
+	
 	/**
 	 * Translates the given keycode and returns the GFE keycode
 	 * @param keycode the code to be translated
@@ -70,9 +66,10 @@ public class KeyboardTranslator {
 	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
+		/* 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;
@@ -92,11 +89,8 @@ public class KeyboardTranslator {
 		else {
 			switch (keycode) {
 			case KeyEvent.KEYCODE_ALT_LEFT:
-				translated = 0xA4;
-				break;
-
 			case KeyEvent.KEYCODE_ALT_RIGHT:
-				translated = 0xA5;
+				translated = VK_ALT;
 				break;
 				
 			case KeyEvent.KEYCODE_BACKSLASH:
@@ -116,11 +110,8 @@ public class KeyboardTranslator {
 				break;
 				
 			case KeyEvent.KEYCODE_CTRL_LEFT:
-				translated = 0xA2;
-				break;
-
 			case KeyEvent.KEYCODE_CTRL_RIGHT:
-				translated = 0xA3;
+				translated = VK_CONTROL;
 				break;
 				
 			case KeyEvent.KEYCODE_DEL:
@@ -130,8 +121,7 @@ public class KeyboardTranslator {
 			case KeyEvent.KEYCODE_ENTER:
 				translated = 0x0d;
 				break;
-
-			case KeyEvent.KEYCODE_PLUS:
+				
 			case KeyEvent.KEYCODE_EQUALS:
 				translated = 0xbb;
 				break;
@@ -141,25 +131,23 @@ public class KeyboardTranslator {
 				break;
 				
 			case KeyEvent.KEYCODE_FORWARD_DEL:
-				translated = 0x2e;
+				// Nvidia maps period to delete
+				translated = VK_PERIOD;
 				break;
 				
 			case KeyEvent.KEYCODE_INSERT:
-				translated = 0x2d;
+				translated = -1;
 				break;
 				
 			case KeyEvent.KEYCODE_LEFT_BRACKET:
 				translated = 0xdb;
 				break;
-
+				
 			case KeyEvent.KEYCODE_META_LEFT:
-				translated = 0x5b;
-				break;
-
 			case KeyEvent.KEYCODE_META_RIGHT:
-				translated = 0x5c;
+				translated = VK_WINDOWS;
 				break;
-
+				
 			case KeyEvent.KEYCODE_MINUS:
 				translated = 0xbd;
 				break;
@@ -201,11 +189,8 @@ public class KeyboardTranslator {
 				break;
 				
 			case KeyEvent.KEYCODE_SHIFT_LEFT:
-				translated = 0xA0;
-				break;
-
 			case KeyEvent.KEYCODE_SHIFT_RIGHT:
-				translated = 0xA1;
+				translated = VK_SHIFT;
 				break;
 				
 			case KeyEvent.KEYCODE_SLASH:
@@ -252,39 +237,7 @@ public class KeyboardTranslator {
 			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;

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

@@ -10,11 +10,11 @@ import android.view.View;
 import android.view.ViewGroup;
 
 @TargetApi(Build.VERSION_CODES.N)
-public class AndroidPointerIconCaptureProvider extends InputCaptureProvider {
+public class AndroidCaptureProvider extends InputCaptureProvider {
     private ViewGroup rootViewGroup;
     private Context context;
 
-    public AndroidPointerIconCaptureProvider(Activity activity) {
+    public AndroidCaptureProvider(Activity activity) {
         this.context = activity;
         this.rootViewGroup = (ViewGroup) activity.getWindow().getDecorView();
     }
@@ -33,13 +33,11 @@ public class AndroidPointerIconCaptureProvider extends InputCaptureProvider {
 
     @Override
     public void enableCapture() {
-        super.enableCapture();
         setPointerIconOnAllViews(PointerIcon.getSystemIcon(context, PointerIcon.TYPE_NULL));
     }
 
     @Override
     public void disableCapture() {
-        super.disableCapture();
         setPointerIconOnAllViews(null);
     }
 

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

@@ -1,61 +0,0 @@
-package com.limelight.binding.input.capture;
-
-import android.annotation.TargetApi;
-import android.os.Build;
-import android.view.InputDevice;
-import android.view.MotionEvent;
-import android.view.View;
-
-@TargetApi(Build.VERSION_CODES.O)
-public class AndroidNativePointerCaptureProvider extends InputCaptureProvider {
-
-    private View targetView;
-
-    public AndroidNativePointerCaptureProvider(View targetView) {
-        this.targetView = targetView;
-    }
-
-    public static boolean isCaptureProviderSupported() {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O;
-    }
-
-    @Override
-    public void enableCapture() {
-        super.enableCapture();
-        targetView.requestPointerCapture();
-    }
-
-    @Override
-    public void disableCapture() {
-        super.disableCapture();
-        targetView.releasePointerCapture();
-    }
-
-    @Override
-    public boolean isCapturingActive() {
-        return targetView.hasPointerCapture();
-    }
-
-    @Override
-    public boolean eventHasRelativeMouseAxes(MotionEvent event) {
-        return event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE;
-    }
-
-    @Override
-    public float getRelativeAxisX(MotionEvent event) {
-        float x = event.getX();
-        for (int i = 0; i < event.getHistorySize(); i++) {
-            x += event.getHistoricalX(i);
-        }
-        return x;
-    }
-
-    @Override
-    public float getRelativeAxisY(MotionEvent event) {
-        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,32 +3,25 @@ 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.EvdevCaptureProviderShim;
+import com.limelight.binding.input.evdev.EvdevCaptureProvider;
 import com.limelight.binding.input.evdev.EvdevListener;
 
 public class InputCaptureManager {
     public static InputCaptureProvider getInputCaptureProvider(Activity activity, EvdevListener rootListener) {
-        if (AndroidNativePointerCaptureProvider.isCaptureProviderSupported()) {
-            LimeLog.info("Using Android O+ native mouse capture");
-            return new AndroidNativePointerCaptureProvider(activity.findViewById(R.id.surfaceView));
-        }
-        // 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()) {
+        // Shield capture is preferred because it can capture when the cursor is over
+        // the system UI. Android N native capture can only capture over views owned
+        // by the application.
+        if (ShieldCaptureProvider.isCaptureProviderSupported()) {
             LimeLog.info("Using NVIDIA mouse capture extension");
             return new ShieldCaptureProvider(activity);
         }
-        else if (EvdevCaptureProviderShim.isCaptureProviderSupported()) {
+        else if (EvdevCaptureProvider.isCaptureProviderSupported()) {
             LimeLog.info("Using Evdev mouse capture");
-            return EvdevCaptureProviderShim.createEvdevCaptureProvider(activity, rootListener);
+            return new EvdevCaptureProvider(activity, rootListener);
         }
-        else if (AndroidPointerIconCaptureProvider.isCaptureProviderSupported()) {
-            // Android N's native capture can't capture over system UI elements
-            // so we want to only use it if there's no other option.
-            LimeLog.info("Using Android N+ pointer hiding");
-            return new AndroidPointerIconCaptureProvider(activity);
+        else if (AndroidCaptureProvider.isCaptureProviderSupported()) {
+            LimeLog.info("Using Android N+ native mouse capture");
+            return new AndroidCaptureProvider(activity);
         }
         else {
             LimeLog.info("Mouse capture not available");

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

@@ -3,25 +3,10 @@ package com.limelight.binding.input.capture;
 import android.view.MotionEvent;
 
 public abstract class InputCaptureProvider {
-    protected boolean isCapturing;
-
-    public void enableCapture() {
-        isCapturing = true;
-    }
-    public void disableCapture() {
-        isCapturing = false;
-    }
-
+    public abstract void enableCapture();
+    public abstract void disableCapture();
     public void destroy() {}
 
-    public boolean isCapturingEnabled() {
-        return isCapturing;
-    }
-
-    public boolean isCapturingActive() {
-        return isCapturing;
-    }
-
     public boolean eventHasRelativeMouseAxes(MotionEvent event) {
         return false;
     }

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

@@ -1,4 +1,10 @@
 package com.limelight.binding.input.capture;
 
 
-public class NullCaptureProvider extends InputCaptureProvider {}
+public class NullCaptureProvider extends InputCaptureProvider {
+    @Override
+    public void enableCapture() {}
+
+    @Override
+    public void disableCapture() {}
+}

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

@@ -63,13 +63,11 @@ public class ShieldCaptureProvider extends InputCaptureProvider {
 
     @Override
     public void enableCapture() {
-        super.enableCapture();
         setCursorVisibility(false);
     }
 
     @Override
     public void disableCapture() {
-        super.disableCapture();
         setCursorVisibility(true);
     }
 

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

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

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

@@ -30,18 +30,6 @@ 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];
 
@@ -126,6 +114,9 @@ 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();
@@ -140,9 +131,6 @@ 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(AbstractController controller);
-    void deviceAdded(AbstractController controller);
+    void deviceRemoved(int controllerId);
+    void deviceAdded(int controllerId);
 }

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

@@ -11,14 +11,10 @@ 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;
 
@@ -28,7 +24,6 @@ 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();
@@ -47,21 +42,26 @@ public class UsbDriverService extends Service implements UsbDriverListener {
     }
 
     @Override
-    public void deviceRemoved(AbstractController controller) {
+    public void deviceRemoved(int controllerId) {
         // Remove the the controller from our list (if not removed already)
-        controllers.remove(controller);
+        for (AbstractController controller : controllers) {
+            if (controller.getControllerId() == controllerId) {
+                controllers.remove(controller);
+                break;
+            }
+        }
 
         // Call through to the client's listener
         if (listener != null) {
-            listener.deviceRemoved(controller);
+            listener.deviceRemoved(controllerId);
         }
     }
 
     @Override
-    public void deviceAdded(AbstractController controller) {
+    public void deviceAdded(int controllerId) {
         // Call through to the client's listener
         if (listener != null) {
-            listener.deviceAdded(controller);
+            listener.deviceAdded(controllerId);
         }
     }
 
@@ -72,22 +72,10 @@ public class UsbDriverService extends Service implements UsbDriverListener {
 
             // Initial attachment broadcast
             if (action.equals(UsbManager.ACTION_USB_DEVICE_ATTACHED)) {
-                final UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+                UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_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);
+                // Continue the state machine
+                handleUsbDeviceState(device);
             }
             // Subsequent permission dialog completion intent
             else if (action.equals(ACTION_USB_PERMISSION)) {
@@ -108,7 +96,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {
             // Report all controllerMap that already exist
             if (listener != null) {
                 for (AbstractController controller : controllers) {
-                    listener.deviceAdded(controller);
+                    listener.deviceAdded(controller.getControllerId());
                 }
             }
         }
@@ -116,21 +104,11 @@ public class UsbDriverService extends Service implements UsbDriverListener {
 
     private void handleUsbDeviceState(UsbDevice device) {
         // Are we able to operate it?
-        if (shouldClaimDevice(device, prefConfig.bindAllUsb)) {
+        if (shouldClaimDevice(device)) {
             // Do we have permission yet?
             if (!usbManager.hasPermission(device)) {
                 // Let's ask for permission
-                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();
-                }
+                usbManager.requestPermission(device, PendingIntent.getBroadcast(UsbDriverService.this, 0, new Intent(ACTION_USB_PERMISSION), 0));
                 return;
             }
 
@@ -166,17 +144,13 @@ public class UsbDriverService extends Service implements UsbDriverListener {
         }
     }
 
-    private static boolean isRecognizedInputDevice(UsbDevice device) {
+    private 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()) {
@@ -191,17 +165,16 @@ public class UsbDriverService extends Service implements UsbDriverListener {
         }
     }
 
-    public static boolean shouldClaimDevice(UsbDevice device, boolean claimAllAvailable) {
+    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) || claimAllAvailable) && Xbox360Controller.canClaimDevice(device));
+                (!isRecognizedInputDevice(device) && 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();
@@ -211,7 +184,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {
 
         // Enumerate existing devices
         for (UsbDevice dev : usbManager.getDeviceList().values()) {
-            if (shouldClaimDevice(dev, prefConfig.bindAllUsb)) {
+            if (shouldClaimDevice(dev)) {
                 // Start the process of claiming this device
                 handleUsbDeviceState(dev);
             }

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

@@ -14,27 +14,21 @@ 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) {
@@ -139,17 +133,4 @@ 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,7 +8,6 @@ import com.limelight.LimeLog;
 import com.limelight.nvstream.input.ControllerPacket;
 
 import java.nio.ByteBuffer;
-import java.util.Arrays;
 
 public class XboxOneController extends AbstractXboxController {
 
@@ -20,35 +19,11 @@ public class XboxOneController extends AbstractXboxController {
             0x0738, // Mad Catz
             0x0e6f, // Unknown
             0x0f0d, // Hori
-            0x1532, // Razer Wildcat
             0x24c6, // PowerA
     };
 
-    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;
+    // FIXME: odata_serial
+    private static final byte[] XB1_INIT_DATA = {0x05, 0x20, 0x00, 0x01, 0x00};
 
     public XboxOneController(UsbDevice device, UsbDeviceConnection connection, int deviceId, UsbDriverListener listener) {
         super(device, connection, deviceId, listener);
@@ -135,55 +110,13 @@ public class XboxOneController extends AbstractXboxController {
 
     @Override
     protected boolean doInit() {
-        // 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;
-            }
+        // 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;
         }
 
         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/EvdevCaptureProvider.java

@@ -6,6 +6,7 @@ import android.os.Looper;
 import android.widget.Toast;
 
 import com.limelight.LimeLog;
+import com.limelight.LimelightBuildProps;
 import com.limelight.binding.input.capture.InputCaptureProvider;
 
 import java.io.DataOutputStream;
@@ -55,7 +56,7 @@ public class EvdevCaptureProvider extends InputCaptureProvider {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 // Launch evdev_reader directly via SU
                 try {
-                    su = new ProcessBuilder("su", "-c", evdevReaderCmd).start();
+                    su = Runtime.getRuntime().exec("su -c "+evdevReaderCmd);
                 } catch (IOException e) {
                     reportDeviceNotRooted();
                     e.printStackTrace();
@@ -151,15 +152,7 @@ public class EvdevCaptureProvider extends InputCaptureProvider {
                                 break;
 
                             case EvdevEvent.BTN_SIDE:
-                                listener.mouseButtonEvent(EvdevListener.BUTTON_X1,
-                                        event.value != 0);
-                                break;
-
                             case EvdevEvent.BTN_EXTRA:
-                                listener.mouseButtonEvent(EvdevListener.BUTTON_X2,
-                                        event.value != 0);
-                                break;
-
                             case EvdevEvent.BTN_FORWARD:
                             case EvdevEvent.BTN_BACK:
                             case EvdevEvent.BTN_TASK:
@@ -193,6 +186,10 @@ public class EvdevCaptureProvider extends InputCaptureProvider {
         this.libraryPath = activity.getApplicationInfo().nativeLibraryDir;
     }
 
+    public static boolean isCaptureProviderSupported() {
+        return LimelightBuildProps.ROOT_BUILD;
+    }
+
     private void reportDeviceNotRooted() {
         activity.runOnUiThread(new Runnable() {
             @Override
@@ -224,7 +221,6 @@ public class EvdevCaptureProvider extends InputCaptureProvider {
 
     @Override
     public void enableCapture() {
-        super.enableCapture();
         if (!started) {
             // Start the handler thread if it's our first time
             // capturing
@@ -251,7 +247,6 @@ public class EvdevCaptureProvider extends InputCaptureProvider {
 
     @Override
     public void disableCapture() {
-        super.disableCapture();
         // This may be called on the main thread
         runInNetworkSafeContextSynchronously(new Runnable() {
             @Override

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

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

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, int elementId) {
-        super(controller, context, elementId);
+    public AnalogStick(VirtualController controller, Context context) {
+        super(controller, context);
         // 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, 100);
+        radius_complete = getPercent(getCorrectWidth() / 2, 90);
         radius_dead_zone = getPercent(getCorrectWidth() / 2, 30);
         radius_analog_stick = getPercent(getCorrectWidth() / 2, 20);
 
@@ -338,7 +338,6 @@ 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

@@ -120,8 +120,8 @@ public class DigitalButton extends VirtualControllerElement {
         }
     }
 
-    public DigitalButton(VirtualController controller, int elementId, int layer, Context context) {
-        super(controller, context, elementId);
+    public DigitalButton(VirtualController controller, int layer, Context context) {
+        super(controller, context);
         this.layer = layer;
     }
 

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, EID_DPAD);
+        super(controller, context);
     }
 
     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, EID_LS);
+        super(controller, context);
 
         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, EID_LT, layer, context);
+        super(controller, 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, EID_RS);
+        super(controller, context);
 
         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, EID_RT, layer, context);
+        super(controller, layer, context);
         addDigitalButtonListener(new DigitalButton.DigitalButtonListener() {
             @Override
             public void onClick() {

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

@@ -13,13 +13,10 @@ 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 {
@@ -39,23 +36,22 @@ public class VirtualController {
 
     private static final boolean _PRINT_DEBUG_INFORMATION = false;
 
-    private ControllerHandler controllerHandler;
+    private NvConnection connection = null;
     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 ControllerHandler controllerHandler, FrameLayout layout, final Context context) {
-        this.controllerHandler = controllerHandler;
+    public VirtualController(final NvConnection conn, FrameLayout layout, final Context context) {
+        this.connection = conn;
         this.frame_layout = layout;
         this.context = context;
 
@@ -64,8 +60,6 @@ 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
@@ -74,7 +68,6 @@ public class VirtualController {
 
                 if (currentMode == ControllerMode.Configuration) {
                     currentMode = ControllerMode.Active;
-                    VirtualControllerConfigurationLoader.saveProfile(VirtualController.this, context);
                     message = "Exiting configuration mode";
                 } else {
                     currentMode = ControllerMode.Configuration;
@@ -92,27 +85,6 @@ public class VirtualController {
         });
     }
 
-    public void hide() {
-        retransmitTimer.cancel();
-        relative_layout.setVisibility(View.INVISIBLE);
-    }
-
-    public void show() {
-        relative_layout.setVisibility(View.VISIBLE);
-
-        // HACK: GFE sometimes discards gamepad packets when they are received
-        // very shortly after another. This can be critical if an axis zeroing packet
-        // is lost and causes an analog stick to get stuck. To avoid this, we send
-        // a gamepad input packet every 100 ms to ensure any loss can be recovered.
-        retransmitTimer = new Timer("OSC timer", true);
-        retransmitTimer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                sendControllerInputContext();
-            }
-        }, 100, 100);
-    }
-
     public void removeElements() {
         for (VirtualControllerElement element : elements) {
             relative_layout.removeView(element);
@@ -144,19 +116,11 @@ public class VirtualController {
 
         DisplayMetrics screen = context.getResources().getDisplayMetrics();
 
-        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);
+        int buttonSize = (int)(screen.heightPixels*0.05f);
+        layoutParamsButtonConfigure = new RelativeLayout.LayoutParams(buttonSize, buttonSize);
+        relative_layout.addView(buttonConfigure, layoutParamsButtonConfigure);
 
-        // Start with the default layout
         VirtualControllerConfigurationLoader.createDefaultLayout(this, context);
-
-        // Apply user preferences onto the default layout
-        VirtualControllerConfigurationLoader.loadFromPreferences(this, context);
     }
 
     public ControllerMode getControllerMode() {
@@ -167,23 +131,32 @@ public class VirtualController {
         return inputContext;
     }
 
-    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);
+    public void sendControllerInputContext() {
+        sendControllerInputPacket();
+    }
 
-        if (controllerHandler != null) {
-            controllerHandler.reportOscState(
-                    inputContext.inputMap,
-                    inputContext.leftStickX,
-                    inputContext.leftStickY,
-                    inputContext.rightStickX,
-                    inputContext.rightStickY,
-                    inputContext.leftTrigger,
-                    inputContext.rightTrigger
-            );
+    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();
         }
     }
 }

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

@@ -4,19 +4,13 @@
 
 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 {
-    public static final String OSC_PREFERENCE = "OSC";
+    private static final String PROFILE_PATH = "profiles";
 
     private static int getPercent(
             int percent,
@@ -64,7 +58,6 @@ public class VirtualControllerConfigurationLoader {
     }
 
     private static DigitalButton createDigitalButton(
-            final int elementId,
             final int keyShort,
             final int keyLong,
             final int layer,
@@ -72,7 +65,7 @@ public class VirtualControllerConfigurationLoader {
             final int icon,
             final VirtualController controller,
             final Context context) {
-        DigitalButton button = new DigitalButton(controller, elementId, layer, context);
+        DigitalButton button = new DigitalButton(controller, layer, context);
         button.setText(text);
         button.setIcon(icon);
 
@@ -153,176 +146,140 @@ public class VirtualControllerConfigurationLoader {
     public static void createDefaultLayout(final VirtualController controller, final Context context) {
 
         DisplayMetrics screen = context.getResources().getDisplayMetrics();
-        PreferenceConfiguration config = PreferenceConfiguration.readPreferences(context);
 
         // 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.
 
-        if (!config.onlyL3R3)
-        {
-            controller.addElement(createDigitalPad(controller, context),
-                    getPercent(5, screen.widthPixels),
-                    getPercent(BUTTON_BASE_Y, screen.heightPixels),
-                    getPercent(30, screen.widthPixels),
-                    getPercent(40, screen.heightPixels)
-            );
+        controller.addElement(createDigitalPad(controller, context),
+                getPercent(5, screen.widthPixels),
+                getPercent(BUTTON_BASE_Y, screen.heightPixels),
+                getPercent(30, screen.widthPixels),
+                getPercent(40, screen.heightPixels)
+        );
 
-            controller.addElement(createDigitalButton(
-                    VirtualControllerElement.EID_A,
-                    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(
+                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_B,
-                    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(
+                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_X,
-                    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(
+                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_Y,
-                    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(
+                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(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(
+                        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(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(
+                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(createDigitalButton(
-                    VirtualControllerElement.EID_LB,
-                    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(
+                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_RB,
-                    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(
+                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(createLeftStick(controller, context),
-                    getPercent(5, screen.widthPixels),
-                    getPercent(50, screen.heightPixels),
-                    getPercent(40, screen.widthPixels),
-                    getPercent(50, screen.heightPixels)
-            );
+        controller.addElement(createLeftStick(controller, context),
+                getPercent(5, screen.widthPixels),
+                getPercent(50, screen.heightPixels),
+                getPercent(40, screen.widthPixels),
+                getPercent(50, screen.heightPixels)
+        );
 
-            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),
+                getPercent(55, screen.widthPixels),
+                getPercent(50, screen.heightPixels),
+                getPercent(40, screen.widthPixels),
+                getPercent(50, screen.heightPixels)
+        );
 
-            controller.addElement(createDigitalButton(
-                    VirtualControllerElement.EID_BACK,
-                    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(
+                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_START,
-                    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)
-            );
-        }
-        else {
-            controller.addElement(createDigitalButton(
-                    VirtualControllerElement.EID_LSB,
-                    ControllerPacket.LS_CLK_FLAG, 0, 1, "L3", -1, controller, context),
-                    getPercent(2, screen.widthPixels),
-                    getPercent(80, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
-            );
-
-            controller.addElement(createDigitalButton(
-                    VirtualControllerElement.EID_RSB,
-                    ControllerPacket.RS_CLK_FLAG, 0, 1, "R3", -1, controller, context),
-                    getPercent(89, screen.widthPixels),
-                    getPercent(80, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
-            );
-        }
+        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)
+        );
     }
 
-    public static void saveProfile(final VirtualController controller,
+    /*
+    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,
                                    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()) {
-            String prefKey = ""+element.elementId;
+            JSONObject elementConfiguration = new JSONObject();
             try {
-                prefEditor.putString(prefKey, element.getConfiguration().toString());
-            } catch (JSONException e) {
+                elementConfiguration.put("TYPE", element.getClass().getName());
+                elementConfiguration.put("CONFIGURATION", element.getConfiguration());
+                elementConfigurations.put(elementConfiguration);
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }
 
-        prefEditor.apply();
+        SharedPreferences.Editor editor= preferences.edit();
+        editor.putString("ELEMENTS", elementConfigurations.toString());
     }
 
-	public static void loadFromPreferences(final VirtualController controller, final Context context) {
-        SharedPreferences pref = context.getSharedPreferences(OSC_PREFERENCE, Activity.MODE_PRIVATE);
+	public static void loadFromPreferences(final VirtualController controller) {
 
-        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,30 +14,10 @@ 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();
 
@@ -60,11 +40,10 @@ public abstract class VirtualControllerElement extends View {
 
     private Mode currentMode = Mode.Normal;
 
-    protected VirtualControllerElement(VirtualController controller, Context context, int elementId) {
+    protected VirtualControllerElement(VirtualController controller, Context context) {
         super(context);
 
         this.virtualController = controller;
-        this.elementId = elementId;
     }
 
     protected void moveElement(int pressed_x, int pressed_y, int x, int y) {
@@ -166,54 +145,58 @@ public abstract class VirtualControllerElement extends View {
     }
 
     protected void showConfigurationDialog() {
-        AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getContext());
+        try {
+            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",
-            */
-                "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;
-                }
+            CharSequence functions[] = new CharSequence[]{
+                    "Move",
+                    "Resize",
+                /*election
+                "Set n
+                Disable color sormal color",
+                "Set pressed color",
                 */
-                    default: { // cancel
-                        actionCancel();
+                    "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;
+                    }
+                    */
+                        default: { // cancel
+                            actionCancel();
+                            break;
+                        }
+                    }
                 }
-            }
-        });
-        AlertDialog alert = alertBuilder.create();
-        // show menu
-        alert.show();
+            });
+            AlertDialog alert = alertBuilder.create();
+            // show menu
+            alert.show();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
     @Override
@@ -295,28 +278,13 @@ public abstract class VirtualControllerElement extends View {
         return getWidth() > getHeight() ? getHeight() : getWidth();
     }
 
+    /**
+     public JSONObject getConfiguration () {
+     JSONObject configuration = new JSONObject();
+     return  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();
-    }
+     public  void loadConfiguration (JSONObject configuration) {
+     }
+     */
 }

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

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

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

@@ -18,13 +18,22 @@ import android.media.MediaFormat;
 import android.media.MediaCodec.BufferInfo;
 import android.media.MediaCodec.CodecException;
 import android.os.Build;
-import android.util.Range;
 import android.view.SurfaceHolder;
 
 public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
 
     private static final boolean USE_FRAME_RENDER_TIME = false;
-    private static final boolean FRAME_RENDER_TIME_ONLY = USE_FRAME_RENDER_TIME && false;
+
+    // This value is added to the PTS for each frame to force frames delivered right at
+    // V-sync time to be delayed until the next V-sync rather than dropping the existing frame.
+    // To make matters worse, these frames often end up being displayed for 2 V-syncs because
+    // the next frame isn't ready at the next V-sync. So without this, we end up with a pattern of:
+    // F0 - Displayed | F1 - Dropped | F2 - Displayed | F2 - Displayed again | F3 - Displayed ...
+    // which can be very noticeable for some video content and users.
+    //
+    // This value is currently 6 ms, which means that a frame ready for display less than 6 ms from
+    // the next V-sync will be delayed until the following V-sync to ensure smooth frame pacing.
+    private static final int PTS_OFFSET_NS = 6 * 1000000;
 
     // Used on versions < 5.0
     private ByteBuffer[] legacyInputBuffers;
@@ -32,14 +41,9 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     private MediaCodecInfo avcDecoder;
     private MediaCodecInfo hevcDecoder;
 
-    private byte[] vpsBuffer;
-    private byte[] spsBuffer;
-    private byte[] ppsBuffer;
-    private boolean submittedCsd;
-    private boolean submitCsdNextCall;
-
     private MediaCodec videoDecoder;
     private Thread rendererThread;
+    private Thread[] spinnerThreads;
     private boolean needsSpsBitstreamFixup, isExynos4;
     private boolean adaptivePlayback, directSubmit;
     private boolean constrainedHighProfile;
@@ -47,32 +51,16 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     private boolean refFrameInvalidationActive;
     private int initialWidth, initialHeight;
     private int videoFormat;
-    private SurfaceHolder renderTarget;
-    private volatile boolean stopping;
-    private CrashListener crashListener;
-    private boolean reportedCrash;
-    private int consecutiveCrashCount;
-    private String glRenderer;
-    private boolean foreground = true;
-    private boolean legacyFrameDropRendering = false;
+    private Object renderTarget;
+    private boolean stopping;
 
     private boolean needsBaselineSpsHack;
     private SeqParameterSet savedSps;
 
-    private RendererException initialException;
-    private long initialExceptionTimestamp;
-    private static final int EXCEPTION_REPORT_DELAY_MS = 3000;
-
     private long lastTimestampUs;
     private long decoderTimeMs;
     private long totalTimeMs;
-    private int totalFramesReceived;
-    private int totalFramesRendered;
-    private int frameLossEvents;
-    private int framesLost;
-    private int lastFrameNumber;
-    private int refreshRate;
-    private PreferenceConfiguration prefs;
+    private int totalFrames;
 
     private int numSpsIn;
     private int numPpsIn;
@@ -86,9 +74,9 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         return decoder;
     }
 
-    private MediaCodecInfo findHevcDecoder(PreferenceConfiguration prefs, boolean meteredNetwork, boolean requestedHdr) {
+    private MediaCodecInfo findHevcDecoder(int videoFormat) {
         // Don't return anything if H.265 is forced off
-        if (prefs.videoFormat == PreferenceConfiguration.FORCE_H265_OFF) {
+        if (videoFormat == PreferenceConfiguration.FORCE_H265_OFF) {
             return null;
         }
 
@@ -99,11 +87,10 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         // for even required levels of HEVC.
         MediaCodecInfo decoderInfo = MediaCodecHelper.findProbableSafeDecoder("video/hevc", -1);
         if (decoderInfo != null) {
-            if (!MediaCodecHelper.decoderIsWhitelistedForHevc(decoderInfo.getName(), meteredNetwork)) {
+            if (!MediaCodecHelper.decoderIsWhitelistedForHevc(decoderInfo.getName())) {
                 LimeLog.info("Found HEVC decoder, but it's not whitelisted - "+decoderInfo.getName());
 
-                // HDR implies HEVC forced on, since HEVCMain10HDR10 is required for HDR
-                if (prefs.videoFormat == PreferenceConfiguration.FORCE_H265_ON || requestedHdr) {
+                if (videoFormat == PreferenceConfiguration.FORCE_H265_ON) {
                     LimeLog.info("Forcing H265 enabled despite non-whitelisted decoder");
                 }
                 else {
@@ -115,20 +102,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         return decoderInfo;
     }
 
-    public void setRenderTarget(SurfaceHolder renderTarget) {
+    public void setRenderTarget(Object renderTarget) {
         this.renderTarget = renderTarget;
     }
 
-    public MediaCodecDecoderRenderer(PreferenceConfiguration prefs,
-                                     CrashListener crashListener, int consecutiveCrashCount,
-                                     boolean meteredData, boolean requestedHdr,
-                                     String glRenderer) {
+    public MediaCodecDecoderRenderer(int videoFormat) {
         //dumpDecoders();
 
-        this.prefs = prefs;
-        this.crashListener = crashListener;
-        this.consecutiveCrashCount = consecutiveCrashCount;
-        this.glRenderer = glRenderer;
+        spinnerThreads = new Thread[Runtime.getRuntime().availableProcessors()];
 
         avcDecoder = findAvcDecoder();
         if (avcDecoder != null) {
@@ -138,7 +119,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             LimeLog.warning("No AVC decoder found");
         }
 
-        hevcDecoder = findHevcDecoder(prefs, meteredData, requestedHdr);
+        hevcDecoder = findHevcDecoder(videoFormat);
         if (hevcDecoder != null) {
             LimeLog.info("Selected HEVC decoder: "+hevcDecoder.getName());
         }
@@ -153,15 +134,10 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         // shared between AVC and HEVC decoders on the same device.
         if (avcDecoder != null) {
             directSubmit = MediaCodecHelper.decoderCanDirectSubmit(avcDecoder.getName());
-            adaptivePlayback = MediaCodecHelper.decoderSupportsAdaptivePlayback(avcDecoder);
-            refFrameInvalidationAvc = MediaCodecHelper.decoderSupportsRefFrameInvalidationAvc(avcDecoder.getName(), prefs.height);
+            adaptivePlayback = MediaCodecHelper.decoderSupportsAdaptivePlayback(avcDecoder.getName());
+            refFrameInvalidationAvc = MediaCodecHelper.decoderSupportsRefFrameInvalidationAvc(avcDecoder.getName());
             refFrameInvalidationHevc = MediaCodecHelper.decoderSupportsRefFrameInvalidationHevc(avcDecoder.getName());
 
-            if (consecutiveCrashCount % 2 == 1) {
-                refFrameInvalidationAvc = refFrameInvalidationHevc = false;
-                LimeLog.warning("Disabling RFI due to previous crash");
-            }
-
             if (directSubmit) {
                 LimeLog.info("Decoder "+avcDecoder.getName()+" will use direct submit");
             }
@@ -182,38 +158,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         return avcDecoder != null;
     }
 
-    public boolean is49FpsBlacklisted() {
-        return avcDecoder != null && MediaCodecHelper.decoderBlacklistedFor49Fps(avcDecoder.getName());
-    }
-
-    public void enableLegacyFrameDropRendering() {
-        LimeLog.info("Legacy frame drop rendering enabled");
-        legacyFrameDropRendering = true;
-    }
-
-    public boolean isHevcMain10Hdr10Supported() {
-        if (hevcDecoder == null) {
-            return false;
-        }
-
-        for (MediaCodecInfo.CodecProfileLevel profileLevel : hevcDecoder.getCapabilitiesForType("video/hevc").profileLevels) {
-            if (profileLevel.profile == MediaCodecInfo.CodecProfileLevel.HEVCProfileMain10HDR10) {
-                LimeLog.info("HEVC decoder "+hevcDecoder.getName()+" supports HEVC Main10 HDR10");
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public void notifyVideoForeground() {
-        foreground = true;
-    }
-
-    public void notifyVideoBackground() {
-        foreground = false;
-    }
-
     public int getActiveVideoFormat() {
         return this.videoFormat;
     }
@@ -223,12 +167,11 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         this.initialWidth = width;
         this.initialHeight = height;
         this.videoFormat = format;
-        this.refreshRate = redrawRate;
 
         String mimeType;
         String selectedDecoderName;
 
-        if ((videoFormat & MoonBridge.VIDEO_FORMAT_MASK_H264) != 0) {
+        if (videoFormat == MoonBridge.VIDEO_FORMAT_H264) {
             mimeType = "video/avc";
             selectedDecoderName = avcDecoder.getName();
 
@@ -257,7 +200,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
 
             refFrameInvalidationActive = refFrameInvalidationAvc;
         }
-        else if ((videoFormat & MoonBridge.VIDEO_FORMAT_MASK_H265) != 0) {
+        else if (videoFormat == MoonBridge.VIDEO_FORMAT_H265) {
             mimeType = "video/hevc";
             selectedDecoderName = hevcDecoder.getName();
 
@@ -301,7 +244,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         }
 
         try {
-            videoDecoder.configure(videoFormat, renderTarget.getSurface(), null, 0);
+            videoDecoder.configure(videoFormat, ((SurfaceHolder)renderTarget).getSurface(), null, 0);
             videoDecoder.setVideoScalingMode(MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT);
 
             if (USE_FRAME_RENDER_TIME && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -334,12 +277,12 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         return 0;
     }
 
-    private void handleDecoderException(Exception e, ByteBuffer buf, int codecFlags, boolean throwOnTransient) {
+    private void handleDecoderException(Exception e, ByteBuffer buf, int codecFlags) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             if (e instanceof CodecException) {
                 CodecException codecExc = (CodecException) e;
 
-                if (codecExc.isTransient() && !throwOnTransient) {
+                if (codecExc.isTransient()) {
                     // We'll let transient exceptions go
                     LimeLog.warning(codecExc.getDiagnosticInfo());
                     return;
@@ -349,35 +292,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             }
         }
 
-        // Only throw if we're not stopping
-        if (!stopping) {
-            //
-            // There seems to be a race condition with decoder/surface teardown causing some
-            // decoders to to throw IllegalStateExceptions even before 'stopping' is set.
-            // To workaround this while allowing real exceptions to propagate, we will eat the
-            // first exception. If we are still receiving exceptions 3 seconds later, we will
-            // throw the original exception again.
-            //
-            if (initialException != null) {
-                // This isn't the first time we've had an exception processing video
-                if (System.currentTimeMillis() - initialExceptionTimestamp >= EXCEPTION_REPORT_DELAY_MS) {
-                    // It's been over 3 seconds and we're still getting exceptions. Throw the original now.
-                    if (!reportedCrash) {
-                        reportedCrash = true;
-                        crashListener.notifyCrash(initialException);
-                    }
-                    throw initialException;
-                }
+        // Only throw if this happens at the beginning of a stream
+        // but not if we're stopping
+        if (totalFrames > 0 && totalFrames < 20 && !stopping) {
+            if (buf != null || codecFlags != 0) {
+                throw new RendererException(this, e, buf, codecFlags);
             }
             else {
-                // This is the first exception we've hit
-                if (buf != null || codecFlags != 0) {
-                    initialException = new RendererException(this, e, buf, codecFlags);
-                }
-                else {
-                    initialException = new RendererException(this, e);
-                }
-                initialExceptionTimestamp = System.currentTimeMillis();
+                throw new RendererException(this, e);
             }
         }
     }
@@ -388,7 +310,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             @Override
             public void run() {
                 BufferInfo info = new BufferInfo();
-                while (!stopping) {
+                while (!isInterrupted()) {
                     try {
                         // Try to output a frame
                         int outIndex = videoDecoder.dequeueOutputBuffer(info, 50000);
@@ -406,23 +328,17 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
 
                             // Render the last buffer
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                                if (legacyFrameDropRendering) {
-                                    // Use a PTS that will cause this frame to be dropped if another comes in within
-                                    // the same V-sync period
-                                    videoDecoder.releaseOutputBuffer(lastIndex, System.nanoTime());
-                                }
-                                else {
-                                    // Use a PTS that will cause this frame to never be dropped if frame dropping
-                                    // is disabled
-                                    videoDecoder.releaseOutputBuffer(lastIndex, 0);
-                                }
+                                // On L and later, we can fine tune our PTS right before rendering, so
+                                // we take advantage of that for frame pacing using the PTS offset. Using
+                                // this version of releaseOutputBuffer() also lets SurfaceFlinger drop extra
+                                // frames in the SurfaceView<->SurfaceFlinger BufferQueue that reduces
+                                // latency if an stray extra frame ends up in the output queue.
+                                videoDecoder.releaseOutputBuffer(lastIndex, System.nanoTime() + PTS_OFFSET_NS);
                             }
                             else {
                                 videoDecoder.releaseOutputBuffer(lastIndex, true);
                             }
 
-                            totalFramesRendered++;
-
                             // Add delta time to the totals (excluding probable outliers)
                             long delta = MediaCodecHelper.getMonotonicMillis() - (presentationTimeUs / 1000);
                             if (delta >= 0 && delta < 1000) {
@@ -444,7 +360,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                             }
                         }
                     } catch (Exception e) {
-                        handleDecoderException(e, null, 0, false);
+                        handleDecoderException(e, null, 0);
                     }
                 }
             }
@@ -454,39 +370,52 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         rendererThread.start();
     }
 
+    private void startSpinnerThreads() {
+        LimeLog.info("Using "+spinnerThreads.length+" spinner threads");
+        for (int i = 0; i < spinnerThreads.length; i++) {
+            spinnerThreads[i] = new Thread() {
+                @Override
+                public void run() {
+                    // This thread exists to keep the CPU at a higher DVFS state on devices
+                    // where the governor scales clock speed sporadically, causing dropped frames.
+                    while (!isInterrupted()) {
+                        try {
+                            Thread.sleep(0, 1);
+                        } catch (InterruptedException e) {
+                            break;
+                        }
+                    }
+                }
+            };
+            spinnerThreads[i].setName("Spinner-"+i);
+            spinnerThreads[i].setPriority(Thread.MIN_PRIORITY);
+            spinnerThreads[i].start();
+        }
+    }
+
     private int dequeueInputBuffer() {
         int index = -1;
-        long startTime;
+        long startTime, queueTime;
 
         startTime = MediaCodecHelper.getMonotonicMillis();
 
         try {
-            while (index < 0 && !stopping) {
+            while (rendererThread.isAlive() && index < 0 && !stopping) {
                 index = videoDecoder.dequeueInputBuffer(10000);
             }
         } catch (Exception e) {
-            handleDecoderException(e, null, 0, true);
+            handleDecoderException(e, null, 0);
             return MediaCodec.INFO_TRY_AGAIN_LATER;
         }
 
-        int deltaMs = (int)(MediaCodecHelper.getMonotonicMillis() - startTime);
-
-        if (deltaMs >= 20) {
-            LimeLog.warning("Dequeue input buffer ran long: " + deltaMs + " ms");
+        if (index < 0) {
+            return index;
         }
 
-        if (index < 0) {
-            // We've been hung for 5 seconds and no other exception was reported,
-            // so generate a decoder hung exception
-            if (deltaMs >= 5000 && initialException == null) {
-                DecoderHungException decoderHungException = new DecoderHungException(deltaMs);
-                if (!reportedCrash) {
-                    reportedCrash = true;
-                    crashListener.notifyCrash(decoderHungException);
-                }
-                throw new RendererException(this, decoderHungException);
-            }
-            return index;
+        queueTime = MediaCodecHelper.getMonotonicMillis();
+
+        if (queueTime - startTime >= 20) {
+            LimeLog.warning("Queue input buffer ran long: " + (queueTime - startTime) + " ms");
         }
 
         return index;
@@ -495,28 +424,28 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     @Override
     public void start() {
         startRendererThread();
-    }
-
-    // !!! May be called even if setup()/start() fails !!!
-    public void prepareForStop() {
-        // Let the decoding code know to ignore codec exceptions now
-        stopping = true;
-
-        // Halt the rendering thread
-        if (rendererThread != null) {
-            rendererThread.interrupt();
-        }
+        startSpinnerThreads();
     }
 
     @Override
     public void stop() {
-        // May be called already, but we'll call it now to be safe
-        prepareForStop();
+        stopping = true;
 
-        // Wait for the renderer thread to shut down
+        // Halt the rendering thread
+        rendererThread.interrupt();
         try {
             rendererThread.join();
         } catch (InterruptedException ignored) { }
+
+        // Halt the spinner threads
+        for (Thread t : spinnerThreads) {
+            t.interrupt();
+        }
+        for (Thread t : spinnerThreads) {
+            try {
+                t.join();
+            } catch (InterruptedException ignored) { }
+        }
     }
 
     @Override
@@ -525,13 +454,31 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     }
 
     private boolean queueInputBuffer(int inputBufferIndex, int offset, int length, long timestampUs, int codecFlags) {
-        try {
-            videoDecoder.queueInputBuffer(inputBufferIndex,
-                    offset, length,
-                    timestampUs, codecFlags);
+        // Try 25 times to submit the input buffer before throwing a real exception
+        int i;
+        Exception lastException = null;
+
+        for (i = 0; i < 25; i++) {
+            try {
+                videoDecoder.queueInputBuffer(inputBufferIndex,
+                        offset, length,
+                        timestampUs, codecFlags);
+                break;
+            } catch (Exception e) {
+                handleDecoderException(e, null, codecFlags);
+                lastException = e;
+            }
+        }
+
+        if (i == 25 && totalFrames > 0 && totalFrames < 20 && !stopping) {
+            throw new RendererException(this, lastException, null, codecFlags);
+        }
+        else if (i != 25) {
+            // Queued input buffer
             return true;
-        } catch (Exception e) {
-            handleDecoderException(e, null, codecFlags, true);
+        }
+        else {
+            // Failed to queue
             return false;
         }
     }
@@ -542,12 +489,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         ByteBuffer buf;
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            try {
-                buf = videoDecoder.getInputBuffer(inputBufferIndex);
-            } catch (Exception e) {
-                handleDecoderException(e, null, 0, true);
-                return null;
-            }
+            buf = videoDecoder.getInputBuffer(inputBufferIndex);
         }
         else {
             buf = legacyInputBuffers[inputBufferIndex];
@@ -564,63 +506,48 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         // High Profile which allows the decoder to assume there will be no B-frames and
         // reduce delay and buffering accordingly. Some devices (Marvell, Exynos 4) don't
         // like it so we only set them on devices that are confirmed to benefit from it.
-        if (sps.profileIdc == 100 && constrainedHighProfile) {
+        if (sps.profile_idc == 100 && constrainedHighProfile) {
             LimeLog.info("Setting constraint set flags for constrained high profile");
-            sps.constraintSet4Flag = true;
-            sps.constraintSet5Flag = true;
+            sps.constraint_set_4_flag = true;
+            sps.constraint_set_5_flag = true;
         }
         else {
             // Force the constraints unset otherwise (some may be set by default)
-            sps.constraintSet4Flag = false;
-            sps.constraintSet5Flag = false;
+            sps.constraint_set_4_flag = false;
+            sps.constraint_set_5_flag = false;
         }
     }
 
     @SuppressWarnings("deprecation")
     @Override
-    public int submitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength, int decodeUnitType,
-                                int frameNumber, long receiveTimeMs) {
-        if (stopping) {
-            // Don't bother if we're stopping
-            return MoonBridge.DR_OK;
-        }
-
-        totalFramesReceived++;
-
-        // We can receive the same "frame" multiple times if it's an IDR frame.
-        // In that case, each frame start NALU is submitted independently.
-        if (frameNumber != lastFrameNumber && frameNumber != lastFrameNumber + 1) {
-            framesLost += frameNumber - lastFrameNumber - 1;
-            frameLossEvents++;
-        }
-
-        lastFrameNumber = frameNumber;
-
-        int inputBufferIndex;
-        ByteBuffer buf;
+    public int submitDecodeUnit(byte[] frameData, int frameLength) {
+        totalFrames++;
 
         long timestampUs = System.nanoTime() / 1000;
-
-        if (!FRAME_RENDER_TIME_ONLY) {
-            // Count time from first packet received to decode start
-            totalTimeMs += (timestampUs / 1000) - receiveTimeMs;
-        }
-
         if (timestampUs <= lastTimestampUs) {
             // We can't submit multiple buffers with the same timestamp
             // so bump it up by one before queuing
             timestampUs = lastTimestampUs + 1;
         }
-
         lastTimestampUs = timestampUs;
 
+        int inputBufferIndex = dequeueInputBuffer();
+        if (inputBufferIndex < 0) {
+            // We're being torn down now
+            return MoonBridge.DR_OK;
+        }
+
+        ByteBuffer buf = getEmptyInputBuffer(inputBufferIndex);
+
         int codecFlags = 0;
+        boolean needsSpsReplay = false;
 
         // H264 SPS
-        if (decodeUnitData[4] == 0x67) {
+        if (frameData[4] == 0x67) {
             numSpsIn++;
+            codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
 
-            ByteBuffer spsBuf = ByteBuffer.wrap(decodeUnitData);
+            ByteBuffer spsBuf = ByteBuffer.wrap(frameData);
 
             // Skip to the start of the NALU data
             spsBuf.position(5);
@@ -634,20 +561,15 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             // for known resolution combinations. Reference frame invalidation may need
             // these, so leave them be for those decoders.
             if (!refFrameInvalidationActive) {
-                if (initialWidth <= 720 && initialHeight <= 480) {
-                    // Max 5 buffered frames at 720x480x60
-                    LimeLog.info("Patching level_idc to 31");
-                    sps.levelIdc = 31;
-                }
-                else if (initialWidth <= 1280 && initialHeight <= 720) {
+                if (initialWidth == 1280 && initialHeight == 720) {
                     // Max 5 buffered frames at 1280x720x60
                     LimeLog.info("Patching level_idc to 32");
-                    sps.levelIdc = 32;
+                    sps.level_idc = 32;
                 }
-                else if (initialWidth <= 1920 && initialHeight <= 1080) {
+                else if (initialWidth == 1920 && initialHeight == 1080) {
                     // Max 4 buffered frames at 1920x1080x64
                     LimeLog.info("Patching level_idc to 42");
-                    sps.levelIdc = 42;
+                    sps.level_idc = 42;
                 }
                 else {
                     // Leave the profile alone (currently 5.0)
@@ -665,14 +587,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             // where we've enabled reference frame invalidation.
             if (!refFrameInvalidationActive) {
                 LimeLog.info("Patching num_ref_frames in SPS");
-                sps.numRefFrames = 1;
+                sps.num_ref_frames = 1;
             }
 
             // GFE 2.5.11 changed the SPS to add additional extensions
             // Some devices don't like these so we remove them here.
-            sps.vuiParams.videoSignalTypePresentFlag = false;
-            sps.vuiParams.colourDescriptionPresentFlag = false;
-            sps.vuiParams.chromaLocInfoPresentFlag = false;
+            sps.vuiParams.video_signal_type_present_flag = false;
+            sps.vuiParams.colour_description_present_flag = false;
+            sps.vuiParams.chroma_loc_info_present_flag = false;
 
             if ((needsSpsBitstreamFixup || isExynos4) && !refFrameInvalidationActive) {
                 // The SPS that comes in the current H264 bytestream doesn't set bitstream_restriction_flag
@@ -682,22 +604,22 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                 if (sps.vuiParams.bitstreamRestriction == null) {
                     LimeLog.info("Adding bitstream restrictions");
                     sps.vuiParams.bitstreamRestriction = new VUIParameters.BitstreamRestriction();
-                    sps.vuiParams.bitstreamRestriction.motionVectorsOverPicBoundariesFlag = true;
-                    sps.vuiParams.bitstreamRestriction.log2MaxMvLengthHorizontal = 16;
-                    sps.vuiParams.bitstreamRestriction.log2MaxMvLengthVertical = 16;
-                    sps.vuiParams.bitstreamRestriction.numReorderFrames = 0;
+                    sps.vuiParams.bitstreamRestriction.motion_vectors_over_pic_boundaries_flag = true;
+                    sps.vuiParams.bitstreamRestriction.log2_max_mv_length_horizontal = 16;
+                    sps.vuiParams.bitstreamRestriction.log2_max_mv_length_vertical = 16;
+                    sps.vuiParams.bitstreamRestriction.num_reorder_frames = 0;
                 }
                 else {
                     LimeLog.info("Patching bitstream restrictions");
                 }
 
-                // Some devices throw errors if maxDecFrameBuffering < numRefFrames
-                sps.vuiParams.bitstreamRestriction.maxDecFrameBuffering = sps.numRefFrames;
+                // Some devices throw errors if max_dec_frame_buffering < num_ref_frames
+                sps.vuiParams.bitstreamRestriction.max_dec_frame_buffering = sps.num_ref_frames;
 
                 // These values are the defaults for the fields, but they are more aggressive
                 // than what GFE sends in 2.5.11, but it doesn't seem to cause picture problems.
-                sps.vuiParams.bitstreamRestriction.maxBytesPerPicDenom = 2;
-                sps.vuiParams.bitstreamRestriction.maxBitsPerMbDenom = 1;
+                sps.vuiParams.bitstreamRestriction.max_bytes_per_pic_denom = 2;
+                sps.vuiParams.bitstreamRestriction.max_bits_per_mb_denom = 1;
 
                 // log2_max_mv_length_horizontal and log2_max_mv_length_vertical are set to more
                 // conservative values by GFE 2.5.11. We'll let those values stand.
@@ -711,141 +633,72 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             // If we need to hack this SPS to say we're baseline, do so now
             if (needsBaselineSpsHack) {
                 LimeLog.info("Hacking SPS to baseline");
-                sps.profileIdc = 66;
+                sps.profile_idc = 66;
                 savedSps = sps;
             }
 
             // Patch the SPS constraint flags
             doProfileSpecificSpsPatching(sps);
 
+            // Write the annex B header
+            buf.put(frameData, 0, 5);
+
             // The H264Utils.writeSPS function safely handles
             // Annex B NALUs (including NALUs with escape sequences)
-            ByteBuffer escapedNalu = H264Utils.writeSPS(sps, decodeUnitLength);
-
-            // Batch this to submit together with PPS
-            spsBuffer = new byte[5 + escapedNalu.limit()];
-            System.arraycopy(decodeUnitData, 0, spsBuffer, 0, 5);
-            escapedNalu.get(spsBuffer, 5, escapedNalu.limit());
-            return MoonBridge.DR_OK;
-        }
-        else if (decodeUnitType == MoonBridge.BUFFER_TYPE_VPS) {
-            numVpsIn++;
-
-            // Batch this to submit together with SPS and PPS per AOSP docs
-            vpsBuffer = new byte[decodeUnitLength];
-            System.arraycopy(decodeUnitData, 0, vpsBuffer, 0, decodeUnitLength);
-            return MoonBridge.DR_OK;
-        }
-        // Only the HEVC SPS hits this path (H.264 is handled above)
-        else if (decodeUnitType == MoonBridge.BUFFER_TYPE_SPS) {
-            numSpsIn++;
-
-            // Batch this to submit together with VPS and PPS per AOSP docs
-            spsBuffer = new byte[decodeUnitLength];
-            System.arraycopy(decodeUnitData, 0, spsBuffer, 0, decodeUnitLength);
-            return MoonBridge.DR_OK;
-        }
-        else if (decodeUnitType == MoonBridge.BUFFER_TYPE_PPS) {
-            numPpsIn++;
-
-            // If this is the first CSD blob or we aren't supporting
-            // adaptive playback, we will submit the CSD blob in a
-            // separate input buffer.
-            if (!submittedCsd || !adaptivePlayback) {
-                inputBufferIndex = dequeueInputBuffer();
-                if (inputBufferIndex < 0) {
-                    // We're being torn down now
-                    return MoonBridge.DR_NEED_IDR;
-                }
-
-                buf = getEmptyInputBuffer(inputBufferIndex);
-                if (buf == null) {
-                    // We're being torn down now
-                    return MoonBridge.DR_NEED_IDR;
-                }
-
-                // When we get the PPS, submit the VPS and SPS together with
-                // the PPS, as required by AOSP docs on use of MediaCodec.
-                if (vpsBuffer != null) {
-                    buf.put(vpsBuffer);
-                }
-                if (spsBuffer != null) {
-                    buf.put(spsBuffer);
-                }
-
-                // This is the CSD blob
-                codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
-            }
-            else {
-                // Batch this to submit together with the next I-frame
-                ppsBuffer = new byte[decodeUnitLength];
-                System.arraycopy(decodeUnitData, 0, ppsBuffer, 0, decodeUnitLength);
-
-                // Next call will be I-frame data
-                submitCsdNextCall = true;
+            ByteBuffer escapedNalu = H264Utils.writeSPS(sps, frameLength);
+            buf.put(escapedNalu);
 
+            if (queueInputBuffer(inputBufferIndex,
+                    0, buf.position(),
+                    timestampUs, codecFlags)) {
                 return MoonBridge.DR_OK;
             }
-        }
-        else {
-            inputBufferIndex = dequeueInputBuffer();
-            if (inputBufferIndex < 0) {
-                // We're being torn down now
+            else {
                 return MoonBridge.DR_NEED_IDR;
             }
 
-            buf = getEmptyInputBuffer(inputBufferIndex);
-            if (buf == null) {
-                // We're being torn down now
-                return MoonBridge.DR_NEED_IDR;
-            }
+            // H264 PPS
+        } else if (frameData[4] == 0x68) {
+            numPpsIn++;
+            codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
 
-            if (submitCsdNextCall) {
-                if (vpsBuffer != null) {
-                    buf.put(vpsBuffer);
-                }
-                if (spsBuffer != null) {
-                    buf.put(spsBuffer);
-                }
-                if (ppsBuffer != null) {
-                    buf.put(ppsBuffer);
-                }
 
-                submitCsdNextCall = false;
+            if (needsBaselineSpsHack) {
+                LimeLog.info("Saw PPS; disabling SPS hack");
+                needsBaselineSpsHack = false;
+
+                // Give the decoder the SPS again with the proper profile now
+                needsSpsReplay = true;
             }
         }
-
-        if (decodeUnitLength > buf.limit() - buf.position()) {
-            IllegalArgumentException exception = new IllegalArgumentException(
-                    "Decode unit length "+decodeUnitLength+" too large for input buffer "+buf.limit());
-            if (!reportedCrash) {
-                reportedCrash = true;
-                crashListener.notifyCrash(exception);
-            }
-            throw new RendererException(this, exception);
+        else if (frameData[4] == 0x40) {
+            numVpsIn++;
+            codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
+        }
+        else if (frameData[4] == 0x42) {
+            numSpsIn++;
+            codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
+        }
+        else if (frameData[4] == 0x44) {
+            numPpsIn++;
+            codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
         }
 
         // Copy data from our buffer list into the input buffer
-        buf.put(decodeUnitData, 0, decodeUnitLength);
+        buf.put(frameData, 0, frameLength);
 
         if (!queueInputBuffer(inputBufferIndex,
-                0, buf.position(),
+                0, frameLength,
                 timestampUs, codecFlags)) {
             return MoonBridge.DR_NEED_IDR;
         }
 
-        if ((codecFlags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
-            submittedCsd = true;
-
-            if (needsBaselineSpsHack) {
-                needsBaselineSpsHack = false;
-
-                if (!replaySps()) {
-                    return MoonBridge.DR_NEED_IDR;
-                }
-
-                LimeLog.info("SPS replay complete");
+        if (needsSpsReplay) {
+            if (!replaySps()) {
+                return MoonBridge.DR_NEED_IDR;
             }
+
+            LimeLog.info("SPS replay complete");
         }
 
         return MoonBridge.DR_OK;
@@ -858,15 +711,12 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         }
 
         ByteBuffer inputBuffer = getEmptyInputBuffer(inputIndex);
-        if (inputBuffer == null) {
-            return false;
-        }
 
         // Write the Annex B header
         inputBuffer.put(new byte[]{0x00, 0x00, 0x00, 0x01, 0x67});
 
         // Switch the H264 profile back to high
-        savedSps.profileIdc = 100;
+        savedSps.profile_idc = 100;
 
         // Patch the SPS constraint flags
         doProfileSpecificSpsPatching(savedSps);
@@ -910,82 +760,50 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     }
 
     public int getAverageEndToEndLatency() {
-        if (totalFramesReceived == 0) {
+        if (totalFrames == 0) {
             return 0;
         }
-        return (int)(totalTimeMs / totalFramesReceived);
+        return (int)(totalTimeMs / totalFrames);
     }
 
     public int getAverageDecoderLatency() {
-        if (totalFramesReceived == 0) {
+        if (totalFrames == 0) {
             return 0;
         }
-        return (int)(decoderTimeMs / totalFramesReceived);
+        return (int)(decoderTimeMs / totalFrames);
     }
 
-    static class DecoderHungException extends RuntimeException {
-        private int hangTimeMs;
-
-        DecoderHungException(int hangTimeMs) {
-            this.hangTimeMs = hangTimeMs;
-        }
-
-        public String toString() {
-            String str = "";
-
-            str += "Hang time: "+hangTimeMs+" ms\n";
-            str += super.toString();
-
-            return str;
-        }
-    }
-
-    static class RendererException extends RuntimeException {
+    public class RendererException extends RuntimeException {
         private static final long serialVersionUID = 8985937536997012406L;
 
-        private String text;
+        private final Exception originalException;
+        private final MediaCodecDecoderRenderer renderer;
+        private ByteBuffer currentBuffer;
+        private int currentCodecFlags;
 
-        RendererException(MediaCodecDecoderRenderer renderer, Exception e) {
-            this.text = generateText(renderer, e, null, 0);
+        public RendererException(MediaCodecDecoderRenderer renderer, Exception e) {
+            this.renderer = renderer;
+            this.originalException = e;
         }
 
-        RendererException(MediaCodecDecoderRenderer renderer, Exception e, ByteBuffer currentBuffer, int currentCodecFlags) {
-            this.text = generateText(renderer, e, currentBuffer, currentCodecFlags);
+        public RendererException(MediaCodecDecoderRenderer renderer, Exception e, ByteBuffer currentBuffer, int currentCodecFlags) {
+            this.renderer = renderer;
+            this.originalException = e;
+            this.currentBuffer = currentBuffer;
+            this.currentCodecFlags = currentCodecFlags;
         }
 
         public String toString() {
-            return text;
-        }
-
-        private String generateText(MediaCodecDecoderRenderer renderer, Exception originalException, ByteBuffer currentBuffer, int currentCodecFlags) {
             String str = "";
 
-            str += "Format: "+String.format("%x", renderer.videoFormat)+"\n";
+            str += "Format: "+renderer.videoFormat+"\n";
             str += "AVC Decoder: "+((renderer.avcDecoder != null) ? renderer.avcDecoder.getName():"(none)")+"\n";
             str += "HEVC Decoder: "+((renderer.hevcDecoder != null) ? renderer.hevcDecoder.getName():"(none)")+"\n";
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && renderer.avcDecoder != null) {
-                Range<Integer> avcWidthRange = renderer.avcDecoder.getCapabilitiesForType("video/avc").getVideoCapabilities().getSupportedWidths();
-                str += "AVC supported width range: "+avcWidthRange.getLower()+" - "+avcWidthRange.getUpper()+"\n";
-            }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && renderer.hevcDecoder != null) {
-                Range<Integer> hevcWidthRange = renderer.hevcDecoder.getCapabilitiesForType("video/hevc").getVideoCapabilities().getSupportedWidths();
-                str += "HEVC supported width range: "+hevcWidthRange.getLower()+" - "+hevcWidthRange.getUpper()+"\n";
-            }
-            str += "Adaptive playback: "+renderer.adaptivePlayback+"\n";
-            str += "GL Renderer: "+renderer.glRenderer+"\n";
-            str += "Build fingerprint: "+Build.FINGERPRINT+"\n";
-            str += "Foreground: "+renderer.foreground+"\n";
-            str += "Consecutive crashes: "+renderer.consecutiveCrashCount+"\n";
-            str += "RFI active: "+renderer.refFrameInvalidationActive+"\n";
-            str += "Video dimensions: "+renderer.initialWidth+"x"+renderer.initialHeight+"\n";
-            str += "FPS target: "+renderer.refreshRate+"\n";
-            str += "Bitrate: "+renderer.prefs.bitrate+" Kbps \n";
+            str += "Initial video dimensions: "+renderer.initialWidth+"x"+renderer.initialHeight+"\n";
             str += "In stats: "+renderer.numVpsIn+", "+renderer.numSpsIn+", "+renderer.numPpsIn+"\n";
-            str += "Total frames received: "+renderer.totalFramesReceived+"\n";
-            str += "Total frames rendered: "+renderer.totalFramesRendered+"\n";
-            str += "Frame losses: "+renderer.framesLost+" in "+renderer.frameLossEvents+" loss events\n";
-            str += "Average end-to-end client latency: "+renderer.getAverageEndToEndLatency()+"ms\n";
-            str += "Average hardware decoder latency: "+renderer.getAverageDecoderLatency()+"ms\n";
+            str += "Total frames: "+renderer.totalFrames+"\n";
+            str += "Average end-to-end client latency: "+getAverageEndToEndLatency()+"ms\n";
+            str += "Average hardware decoder latency: "+getAverageDecoderLatency()+"ms\n";
 
             if (currentBuffer != null) {
                 str += "Current buffer: ";
@@ -999,20 +817,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
 
             str += "Is Exynos 4: "+renderer.isExynos4+"\n";
 
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                if (originalException instanceof CodecException) {
-                    CodecException ce = (CodecException) originalException;
-
-                    str += "Diagnostic Info: "+ce.getDiagnosticInfo()+"\n";
-                    str += "Recoverable: "+ce.isRecoverable()+"\n";
-                    str += "Transient: "+ce.isTransient()+"\n";
-
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                        str += "Codec Error Code: "+ce.getErrorCode()+"\n";
-                    }
-                }
-            }
-
             str += "/proc/cpuinfo:\n";
             try {
                 str += MediaCodecHelper.readCpuinfo();

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

@@ -7,10 +7,9 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.pm.ConfigurationInfo;
@@ -28,18 +27,13 @@ public class MediaCodecHelper {
 
 	private static final List<String> blacklistedDecoderPrefixes;
 	private static final List<String> spsFixupBitstreamFixupDecoderPrefixes;
-	private static final List<String> blacklistedAdaptivePlaybackPrefixes;
-	private static final List<String> deprioritizedHevcDecoders;
+	private static final List<String> whitelistedAdaptiveResolutionPrefixes;
     private static final List<String> baselineProfileHackPrefixes;
     private static final List<String> directSubmitPrefixes;
 	private static final List<String> constrainedHighProfilePrefixes;
 	private static final List<String> whitelistedHevcDecoders;
 	private static final List<String> refFrameInvalidationAvcPrefixes;
     private static final List<String> refFrameInvalidationHevcPrefixes;
-    private static final List<String> blacklisted49FpsDecoderPrefixes;
-
-    private static boolean isLowEndSnapdragon = false;
-    private static boolean initialized = false;
 
     static {
         directSubmitPrefixes = new LinkedList<>();
@@ -69,22 +63,15 @@ public class MediaCodecHelper {
 	
 	static {
 		blacklistedDecoderPrefixes = new LinkedList<>();
+		
+		// Software decoders that don't support H264 high profile
+		blacklistedDecoderPrefixes.add("omx.google");
+		blacklistedDecoderPrefixes.add("AVCDecoder");
 
-		// Blacklist software decoders that don't support H264 high profile,
-		// but exclude the official AOSP and CrOS emulator from this restriction.
-		if (!Build.HARDWARE.equals("ranchu") && !Build.HARDWARE.equals("cheets")) {
-			blacklistedDecoderPrefixes.add("omx.google");
-			blacklistedDecoderPrefixes.add("AVCDecoder");
-		}
-
-		// Never use ffmpeg decoders since they're software decoders
-		blacklistedDecoderPrefixes.add("OMX.ffmpeg");
-
-		// Force these decoders disabled because:
-		// 1) They are software decoders, so the performance is terrible
-		// 2) They crash with our HEVC stream anyway (at least prior to CSD batching)
-		blacklistedDecoderPrefixes.add("OMX.qcom.video.decoder.hevcswvdec");
-		blacklistedDecoderPrefixes.add("OMX.SEC.hevc.sw.dec");
+		// Without bitstream fixups, we perform horribly on NVIDIA's HEVC
+		// decoder. While not strictly necessary, I'm going to fully blacklist this
+		// one to avoid users getting inaccurate impressions of Tegra X1/Moonlight performance.
+		blacklistedDecoderPrefixes.add("OMX.Nvidia.h265.decode");
 	}
 	
 	static {
@@ -98,13 +85,11 @@ public class MediaCodecHelper {
         baselineProfileHackPrefixes = new LinkedList<>();
         baselineProfileHackPrefixes.add("omx.intel");
 
-		blacklistedAdaptivePlaybackPrefixes = new LinkedList<>();
-		// The Intel decoder on Lollipop on Nexus Player would increase latency badly
-		// if adaptive playback was enabled so let's avoid it to be safe.
-		blacklistedAdaptivePlaybackPrefixes.add("omx.intel");
-		// The MediaTek decoder crashes at 1080p when adaptive playback is enabled
-		// on some Android TV devices with H.265 only.
-		blacklistedAdaptivePlaybackPrefixes.add("omx.mtk");
+		whitelistedAdaptiveResolutionPrefixes = new LinkedList<>();
+		whitelistedAdaptiveResolutionPrefixes.add("omx.nvidia");
+		whitelistedAdaptiveResolutionPrefixes.add("omx.qcom");
+		whitelistedAdaptiveResolutionPrefixes.add("omx.sec");
+		whitelistedAdaptiveResolutionPrefixes.add("omx.TI");
 
 		constrainedHighProfilePrefixes = new LinkedList<>();
 		constrainedHighProfilePrefixes.add("omx.intel");
@@ -113,29 +98,17 @@ public class MediaCodecHelper {
 	static {
 		whitelistedHevcDecoders = new LinkedList<>();
 
-		// Allow software HEVC decoding in the official AOSP emulator
-		if (Build.HARDWARE.equals("ranchu") && Build.BRAND.equals("google")) {
-			whitelistedHevcDecoders.add("omx.google");
-		}
-
 		// Exynos seems to be the only HEVC decoder that works reliably
 		whitelistedHevcDecoders.add("omx.exynos");
 
-		// On Darcy (Shield 2017), HEVC runs fine with no fixups required.
-		// For some reason, other X1 implementations require bitstream fixups.
-		if (Build.DEVICE.equalsIgnoreCase("darcy")) {
-			whitelistedHevcDecoders.add("omx.nvidia");
-		}
-		else {
-			// TODO: This needs a similar fixup to the Tegra 3 otherwise it buffers 16 frames
-		}
+		// TODO: This needs a similar fixup to the Tegra 3 otherwise it buffers 16 frames
+		//whitelistedHevcDecoders.add("omx.nvidia");
 
 		// Sony ATVs have broken MediaTek codecs (decoder hangs after rendering the first frame).
-		// I know the Fire TV 2 and 3 works, so I'll just whitelist Amazon devices which seem
-		// to actually be tested.
+		// I know the Fire TV 2 works, so I'll just whitelist Amazon devices which seem
+		// to actually be tested. Ugh...
 		if (Build.MANUFACTURER.equalsIgnoreCase("Amazon")) {
 			whitelistedHevcDecoders.add("omx.mtk");
-			whitelistedHevcDecoders.add("omx.amlogic");
 		}
 
 		// These theoretically have good HEVC decoding capabilities (potentially better than
@@ -147,94 +120,20 @@ public class MediaCodecHelper {
 		// during initialization to avoid SoCs with broken HEVC decoders.
 	}
 
-	static {
-		deprioritizedHevcDecoders = new LinkedList<>();
-
-		// These are decoders that work but aren't used by default for various reasons.
-
-		// Qualcomm is currently the only decoders in this group.
-	}
-
-	static {
-		blacklisted49FpsDecoderPrefixes = new LinkedList<>();
-
-		// We see a bunch of crashes on MediaTek Android TVs running
-		// at 49 FPS (PAL 50 Hz - 1). Blacklist this frame rate for
-		// these devices and hope they fix it in Pie.
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-			blacklisted49FpsDecoderPrefixes.add("omx.mtk");
-		}
-	}
-
-	private static boolean isPowerVR(String glRenderer) {
-		return glRenderer.toLowerCase().contains("powervr");
-	}
-
-	private static String getAdrenoVersionString(String glRenderer) {
-		glRenderer = glRenderer.toLowerCase().trim();
-
-		if (!glRenderer.contains("adreno")) {
-			return null;
-		}
-
-		Pattern modelNumberPattern = Pattern.compile("(.*)([0-9]{3})(.*)");
-
-		Matcher matcher = modelNumberPattern.matcher(glRenderer);
-		if (!matcher.matches()) {
-			return null;
-		}
-
-		String modelNumber = matcher.group(2);
-		LimeLog.info("Found Adreno GPU: "+modelNumber);
-		return modelNumber;
-	}
-
-	private static boolean isLowEndSnapdragonRenderer(String glRenderer) {
-		String modelNumber = getAdrenoVersionString(glRenderer);
-		if (modelNumber == null) {
-			// Not an Adreno GPU
-			return false;
-		}
-
-		// The current logic is to identify low-end SoCs based on a zero in the x0x place.
-		return modelNumber.charAt(1) == '0';
-	}
-
-	// This is a workaround for some broken devices that report
-	// only GLES 3.0 even though the GPU is an Adreno 4xx series part.
-	// An example of such a device is the Huawei Honor 5x with the
-	// Snapdragon 616 SoC (Adreno 405).
-	private static boolean isGLES31SnapdragonRenderer(String glRenderer) {
-		String modelNumber = getAdrenoVersionString(glRenderer);
-		if (modelNumber == null) {
-			// Not an Adreno GPU
-			return false;
-		}
-
-		// Snapdragon 4xx and higher support GLES 3.1
-		return modelNumber.charAt(0) >= '4';
-	}
-
-	public static void initialize(Context context, String glRenderer) {
-		if (initialized) {
-			return;
-		}
-
+	public static void initializeWithContext(Context context) {
 		ActivityManager activityManager =
 				(ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
 		ConfigurationInfo configInfo = activityManager.getDeviceConfigurationInfo();
 		if (configInfo.reqGlEsVersion != ConfigurationInfo.GL_ES_VERSION_UNDEFINED) {
 			LimeLog.info("OpenGL ES version: "+configInfo.reqGlEsVersion);
 
-			isLowEndSnapdragon = isLowEndSnapdragonRenderer(glRenderer);
-
 			// Tegra K1 and later can do reference frame invalidation properly
 			if (configInfo.reqGlEsVersion >= 0x30000) {
 				LimeLog.info("Added omx.nvidia to AVC reference frame invalidation support list");
 				refFrameInvalidationAvcPrefixes.add("omx.nvidia");
 
-				LimeLog.info("Added omx.qcom to AVC reference frame invalidation support list");
-				refFrameInvalidationAvcPrefixes.add("omx.qcom");
+                LimeLog.info("Added omx.qcom to AVC reference frame invalidation support list");
+                refFrameInvalidationAvcPrefixes.add("omx.qcom");
 
 				// Prior to M, we were tricking the decoder into using baseline profile, which
 				// won't support RFI properly.
@@ -242,49 +141,26 @@ public class MediaCodecHelper {
 					LimeLog.info("Added omx.intel to AVC reference frame invalidation support list");
 					refFrameInvalidationAvcPrefixes.add("omx.intel");
 				}
-			}
 
-			// Qualcomm's early HEVC decoders break hard on our HEVC stream. The best check to
-			// tell the good from the bad decoders are the generation of Adreno GPU included:
-			// 3xx - bad
-			// 4xx - good
-			//
-			// The "good" GPUs support GLES 3.1, but we can't just check that directly
-			// (see comment on isGLES31SnapdragonRenderer).
-			//
-			if (isGLES31SnapdragonRenderer(glRenderer)) {
-				// We prefer reference frame invalidation support (which is only doable on AVC on
-				// older Qualcomm chips) vs. enabling HEVC by default. The user can override using the settings
-				// to force HEVC on. If HDR or mobile data will be used, we'll override this and use
-				// HEVC anyway.
-				LimeLog.info("Added omx.qcom to deprioritized HEVC decoders based on GLES 3.1+ support");
-				deprioritizedHevcDecoders.add("omx.qcom");
-			}
-			else {
-				blacklistedDecoderPrefixes.add("OMX.qcom.video.decoder.hevc");
-			}
-
-			// Older MediaTek SoCs have issues with HEVC rendering but the newer chips with
-			// PowerVR GPUs have good HEVC support.
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && isPowerVR(glRenderer)) {
-				LimeLog.info("Added omx.mtk to HEVC decoders based on PowerVR GPU");
-				whitelistedHevcDecoders.add("omx.mtk");
-
-				// This SoC (MT8176 in GPD XD+) supports AVC RFI too, but the maxNumReferenceFrames setting
-				// required to make it work adds a huge amount of latency.
-				LimeLog.info("Added omx.mtk to RFI list for HEVC");
-				refFrameInvalidationHevcPrefixes.add("omx.mtk");
+				// Qualcomm's early HEVC decoders break hard on our HEVC stream. The best check to
+				// tell the good from the bad decoders are the generation of Adreno GPU included:
+				// 3xx - bad
+				// 4xx - good
+				//
+				// Unfortunately, it's not that easy to get that information here, so I'll use an
+				// approximation by checking the GLES level (<= 3.0 is bad).
+				if (configInfo.reqGlEsVersion > 0x30000) {
+					// FIXME: We prefer reference frame invalidation support (which is only doable on AVC on
+					// older Qualcomm chips) vs. enabling HEVC by default. The user can override using the settings
+					// to force HEVC on.
+					//LimeLog.info("Added omx.qcom to supported HEVC decoders based on GLES 3.1+ support");
+					//whitelistedHevcDecoders.add("omx.qcom");
+				}
 			}
 		}
-
-		initialized = true;
     }
 
 	private static boolean isDecoderInList(List<String> decoderList, String decoderName) {
-		if (!initialized) {
-			throw new IllegalStateException("MediaCodecHelper must be initialized before use");
-		}
-
 		for (String badPrefix : decoderList) {
 			if (decoderName.length() >= badPrefix.length()) {
 				String prefix = decoderName.substring(0, badPrefix.length());
@@ -300,15 +176,20 @@ public class MediaCodecHelper {
 	public static long getMonotonicMillis() {
 		return System.nanoTime() / 1000000L;
 	}
+	
+	@TargetApi(Build.VERSION_CODES.KITKAT)
+	public static boolean decoderSupportsAdaptivePlayback(String decoderName) {
+		/*
+        FIXME: Intel's decoder on Nexus Player forces the high latency path if adaptive playback is enabled
+        so we'll keep it off for now, since we don't know whether other devices also do the same
 
-	public static boolean decoderSupportsAdaptivePlayback(MediaCodecInfo decoderInfo) {
+		if (isDecoderInList(whitelistedAdaptiveResolutionPrefixes, decoderName)) {
+			LimeLog.info("Adaptive playback supported (whitelist)");
+			return true;
+		}
+		
 		// Possibly enable adaptive playback on KitKat and above
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-			if (isDecoderInList(blacklistedAdaptivePlaybackPrefixes, decoderInfo.getName())) {
-				LimeLog.info("Decoder blacklisted for adaptive playback");
-				return false;
-			}
-
 			try {
 				if (decoderInfo.getCapabilitiesForType("video/avc").
 						isFeatureSupported(CodecCapabilities.FEATURE_AdaptivePlayback))
@@ -320,7 +201,7 @@ public class MediaCodecHelper {
 			} catch (Exception e) {
 				// Tolerate buggy codecs
 			}
-		}
+		}*/
 		
 		return false;
 	}
@@ -341,22 +222,7 @@ public class MediaCodecHelper {
         return isDecoderInList(baselineProfileHackPrefixes, decoderName);
     }
 
-	public static boolean decoderBlacklistedFor49Fps(String decoderName) {
-		return isDecoderInList(blacklisted49FpsDecoderPrefixes, decoderName);
-	}
-
-	public static boolean decoderSupportsRefFrameInvalidationAvc(String decoderName, int videoHeight) {
-		// Reference frame invalidation is broken on low-end Snapdragon SoCs at 1080p.
-		if (videoHeight > 720 && isLowEndSnapdragon) {
-			return false;
-		}
-
-		// This device seems to crash constantly at 720p, so try disabling
-		// RFI to see if we can get that under control.
-		if (Build.DEVICE.equals("b3") || Build.DEVICE.equals("b5")) {
-			return false;
-		}
-
+    public static boolean decoderSupportsRefFrameInvalidationAvc(String decoderName) {
 		return isDecoderInList(refFrameInvalidationAvcPrefixes, decoderName);
 	}
 
@@ -364,7 +230,7 @@ public class MediaCodecHelper {
         return isDecoderInList(refFrameInvalidationHevcPrefixes, decoderName);
     }
 
-	public static boolean decoderIsWhitelistedForHevc(String decoderName, boolean meteredData) {
+	public static boolean decoderIsWhitelistedForHevc(String decoderName) {
 		// TODO: Shield Tablet K1/LTE?
 		//
 		// NVIDIA does partial HEVC acceleration on the Shield Tablet. I don't know
@@ -396,15 +262,6 @@ public class MediaCodecHelper {
 			return false;
 		}
 
-		// Some devices have HEVC decoders that we prefer not to use
-		// typically because it can't support reference frame invalidation.
-		// However, we will use it for HDR and for streaming over mobile networks
-		// since it works fine otherwise.
-		if (meteredData && isDecoderInList(deprioritizedHevcDecoders, decoderName)) {
-			LimeLog.info("Selected deprioritized decoder");
-			return true;
-		}
-
 		return isDecoderInList(whitelistedHevcDecoders, decoderName);
 	}
 	
@@ -452,10 +309,6 @@ public class MediaCodecHelper {
 		// This is a different algorithm than the other findXXXDecoder functions,
 		// because we want to evaluate the decoders in our list's order
 		// rather than MediaCodecList's order
-
-		if (!initialized) {
-			throw new IllegalStateException("MediaCodecHelper must be initialized before use");
-		}
 		
 		for (String preferredDecoder : preferredDecoders) {
 			for (MediaCodecInfo codecInfo : getMediaCodecList()) {
@@ -474,24 +327,6 @@ public class MediaCodecHelper {
 		
 		return null;
 	}
-
-	private static boolean isCodecBlacklisted(MediaCodecInfo codecInfo) {
-		// Use the new isSoftwareOnly() function on Android Q
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-			if (codecInfo.isSoftwareOnly()) {
-				LimeLog.info("Skipping software-only decoder: "+codecInfo.getName());
-				return true;
-			}
-		}
-
-		// Check for explicitly blacklisted decoders
-		if (isDecoderInList(blacklistedDecoderPrefixes, codecInfo.getName())) {
-			LimeLog.info("Skipping blacklisted decoder: "+codecInfo.getName());
-			return true;
-		}
-
-		return false;
-	}
 	
 	public static MediaCodecInfo findFirstDecoder(String mimeType) {
 		for (MediaCodecInfo codecInfo : getMediaCodecList()) {
@@ -500,14 +335,15 @@ public class MediaCodecHelper {
 				continue;
 			}
 			
+			// Check for explicitly blacklisted decoders
+			if (isDecoderInList(blacklistedDecoderPrefixes, codecInfo.getName())) {
+				LimeLog.info("Skipping blacklisted decoder: "+codecInfo.getName());
+				continue;
+			}
+			
 			// Find a decoder that supports the specified video format
 			for (String mime : codecInfo.getSupportedTypes()) {
 				if (mime.equalsIgnoreCase(mimeType)) {
-					// Skip blacklisted codecs
-					if (isCodecBlacklisted(codecInfo)) {
-						continue;
-					}
-
 					LimeLog.info("First decoder choice is "+codecInfo.getName());
 					return codecInfo;
 				}
@@ -547,16 +383,17 @@ public class MediaCodecHelper {
 				continue;
 			}
 			
+			// Check for explicitly blacklisted decoders
+			if (isDecoderInList(blacklistedDecoderPrefixes, codecInfo.getName())) {
+				LimeLog.info("Skipping blacklisted decoder: "+codecInfo.getName());
+				continue;
+			}
+			
 			// Find a decoder that supports the requested video format
 			for (String mime : codecInfo.getSupportedTypes()) {
 				if (mime.equalsIgnoreCase(mimeType)) {
 					LimeLog.info("Examining decoder capabilities of "+codecInfo.getName());
 
-					// Skip blacklisted codecs
-					if (isCodecBlacklisted(codecInfo)) {
-						//continue;
-					}
-
 					CodecCapabilities caps = codecInfo.getCapabilitiesForType(mime);
 
 					if (requiredProfile != -1) {

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

@@ -1,14 +1,13 @@
 package com.limelight.computers;
 
-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.net.InetAddress;
+import java.net.UnknownHostException;
 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;
@@ -18,15 +17,13 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
 
 public class ComputerDatabaseManager {
-    private static final String COMPUTER_DB_NAME = "computers2.db";
+    private static final String COMPUTER_DB_NAME = "computers.db";
     private static final String COMPUTER_TABLE_NAME = "Computers";
-    private static final String COMPUTER_UUID_COLUMN_NAME = "UUID";
     private static final String COMPUTER_NAME_COLUMN_NAME = "ComputerName";
-    private static final String LOCAL_ADDRESS_COLUMN_NAME = "LocalAddress";
-    private static final String REMOTE_ADDRESS_COLUMN_NAME = "RemoteAddress";
-    private static final String MANUAL_ADDRESS_COLUMN_NAME = "ManualAddress";
-    private static final String MAC_ADDRESS_COLUMN_NAME = "MacAddress";
-    private static final String SERVER_CERT_COLUMN_NAME = "ServerCert";
+    private 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 SQLiteDatabase computerDb;
 
@@ -39,35 +36,20 @@ public class ComputerDatabaseManager {
             c.deleteDatabase(COMPUTER_DB_NAME);
             computerDb = c.openOrCreateDatabase(COMPUTER_DB_NAME, 0, null);
         }
-        initializeDb(c);
+        initializeDb();
     }
 
     public void close() {
         computerDb.close();
     }
 
-    private void initializeDb(Context c) {
-        // Add cert column to the table if not present
-        try {
-            computerDb.execSQL(String.format((Locale)null,
-                    "ALTER TABLE %s ADD COLUMN %s TEXT",
-                    COMPUTER_TABLE_NAME, SERVER_CERT_COLUMN_NAME));
-        } catch (SQLiteException e) {}
-
-
+    private void initializeDb() {
         // 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, %s TEXT, %s TEXT, %s TEXT, %s TEXT)",
+        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_UUID_COLUMN_NAME, COMPUTER_NAME_COLUMN_NAME,
-                LOCAL_ADDRESS_COLUMN_NAME, REMOTE_ADDRESS_COLUMN_NAME, MANUAL_ADDRESS_COLUMN_NAME,
-                MAC_ADDRESS_COLUMN_NAME, SERVER_CERT_COLUMN_NAME));
-
-        // Move all computers from the old DB (if any) to the new one
-        List<ComputerDetails> oldComputers = LegacyDatabaseReader.migrateAllComputers(c);
-        for (ComputerDetails computer : oldComputers) {
-            updateComputer(computer);
-        }
+                COMPUTER_NAME_COLUMN_NAME, COMPUTER_UUID_COLUMN_NAME, LOCAL_IP_COLUMN_NAME,
+                REMOTE_IP_COLUMN_NAME, MAC_COLUMN_NAME));
     }
 
     public void deleteComputer(String name) {
@@ -76,64 +58,57 @@ public class ComputerDatabaseManager {
 
     public boolean updateComputer(ComputerDetails details) {
         ContentValues values = new ContentValues();
-        values.put(COMPUTER_UUID_COLUMN_NAME, details.uuid);
         values.put(COMPUTER_NAME_COLUMN_NAME, details.name);
-        values.put(LOCAL_ADDRESS_COLUMN_NAME, details.localAddress);
-        values.put(REMOTE_ADDRESS_COLUMN_NAME, details.remoteAddress);
-        values.put(MANUAL_ADDRESS_COLUMN_NAME, details.manualAddress);
-        values.put(MAC_ADDRESS_COLUMN_NAME, details.macAddress);
-        try {
-            if (details.serverCert != null) {
-                values.put(SERVER_CERT_COLUMN_NAME, details.serverCert.getEncoded());
-            }
-            else {
-                values.put(SERVER_CERT_COLUMN_NAME, (byte[])null);
-            }
-        } catch (CertificateEncodingException e) {
-            values.put(SERVER_CERT_COLUMN_NAME, (byte[])null);
-            e.printStackTrace();
-        }
+        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);
         return -1 != computerDb.insertWithOnConflict(COMPUTER_TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
     }
 
-    private 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);
-
-        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 List<ComputerDetails> getAllComputers() {
         Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME, null);
         LinkedList<ComputerDetails> computerList = new LinkedList<>();
         while (c.moveToNext()) {
-            ComputerDetails details = getComputerFromCursor(c);
+            ComputerDetails details = new ComputerDetails();
 
-            // If a critical field is corrupt or missing, skip the database entry
-            if (details.uuid == 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);
+
+            // 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);
         }
 
@@ -142,19 +117,49 @@ public class ComputerDatabaseManager {
         return computerList;
     }
 
-    public ComputerDetails getComputerByUUID(String uuid) {
-        Cursor c = computerDb.query(COMPUTER_TABLE_NAME, null, COMPUTER_UUID_COLUMN_NAME+"=?", new String[]{ uuid }, null, null, null);
+    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();
         if (!c.moveToFirst()) {
             // No matching computer
             c.close();
             return null;
         }
 
-        ComputerDetails details = getComputerFromCursor(c);
+        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);
+
         c.close();
 
-        // If a critical field is corrupt or missing, delete the database entry
-        if (details.uuid == null) {
+        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;
         }

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 {
-    void notifyComputerUpdated(ComputerDetails details);
+    public void notifyComputerUpdated(ComputerDetails details);
 }

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

@@ -3,25 +3,23 @@ package com.limelight.computers;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringReader;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.limelight.LimeLog;
 import com.limelight.binding.PlatformBinding;
 import com.limelight.discovery.DiscoveryService;
-import com.limelight.nvstream.NvConnection;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
-import com.limelight.nvstream.http.PairingManager;
 import com.limelight.nvstream.mdns.MdnsComputer;
 import com.limelight.nvstream.mdns.MdnsDiscoveryListener;
 import com.limelight.utils.CacheHelper;
-import com.limelight.utils.ServerHelper;
 
 import android.app.Service;
 import android.content.ComponentName;
@@ -37,7 +35,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 = 1000;
+    private static final int FAST_POLL_TIMEOUT = 500;
     private static final int OFFLINE_POLL_TRIES = 5;
     private static final int INITIAL_POLL_TRIES = 2;
     private static final int EMPTY_LIST_THRESHOLD = 3;
@@ -95,6 +93,7 @@ public class ComputerManagerService extends Service {
                 }
 
                 details.state = ComputerDetails.State.OFFLINE;
+                details.reachability = ComputerDetails.Reachability.OFFLINE;
             }
         } catch (InterruptedException e) {
             releaseLocalDatabaseReference();
@@ -105,27 +104,17 @@ public class ComputerManagerService extends Service {
 
         // If it's online, update our persistent state
         if (details.state == ComputerDetails.State.ONLINE) {
-            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;
+            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;
+                }
             }
 
-            // 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);
-            }
+            dbManager.updateComputer(details);
         }
 
         // Don't call the listener if this is a failed lookup of a new PC
@@ -143,7 +132,7 @@ public class ComputerManagerService extends Service {
             public void run() {
 
                 int offlineCount = 0;
-                while (!isInterrupted() && pollingActive && tuple.thread == this) {
+                while (!isInterrupted() && pollingActive) {
                     try {
                         // Only allow one request to the machine at a time
                         synchronized (tuple.networkLock) {
@@ -165,7 +154,7 @@ public class ComputerManagerService extends Service {
                 }
             }
         };
-        t.setName("Polling thread for " + tuple.computer.name);
+        t.setName("Polling thread for " + tuple.computer.localIp.getHostAddress());
         return t;
     }
 
@@ -186,6 +175,7 @@ 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
@@ -220,8 +210,8 @@ public class ComputerManagerService extends Service {
             }
         }
 
-        public boolean addComputerBlocking(String addr, boolean manuallyAdded) {
-            return ComputerManagerService.this.addComputerBlocking(addr, manuallyAdded);
+        public boolean addComputerBlocking(InetAddress addr) {
+            return ComputerManagerService.this.addComputerBlocking(addr);
         }
 
         public void removeComputer(String name) {
@@ -241,7 +231,7 @@ public class ComputerManagerService extends Service {
             return idManager.getUniqueId();
         }
 
-        public ComputerDetails getComputer(String uuid) {
+        public ComputerDetails getComputer(UUID uuid) {
             synchronized (pollingTuples) {
                 for (PollingTuple tuple : pollingTuples) {
                     if (uuid.equals(tuple.computer.uuid)) {
@@ -253,7 +243,7 @@ public class ComputerManagerService extends Service {
             return null;
         }
 
-        public void invalidateStateForComputer(String uuid) {
+        public void invalidateStateForComputer(UUID uuid) {
             synchronized (pollingTuples) {
                 for (PollingTuple tuple : pollingTuples) {
                     if (uuid.equals(tuple.computer.uuid)) {
@@ -261,6 +251,7 @@ 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;
                         }
                     }
                 }
@@ -298,7 +289,7 @@ public class ComputerManagerService extends Service {
             @Override
             public void notifyComputerAdded(MdnsComputer computer) {
                 // Kick off a serverinfo poll on this machine
-                addComputerBlocking(computer.getAddress().getHostAddress(), false);
+                addComputerBlocking(computer.getAddress());
             }
 
             @Override
@@ -319,8 +310,10 @@ public class ComputerManagerService extends Service {
             for (PollingTuple tuple : pollingTuples) {
                 // Check if this is the same computer
                 if (tuple.computer.uuid.equals(details.uuid)) {
-                    // Update the saved computer with potentially new details
-                    tuple.computer.update(details);
+                    // 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;
 
                     // Start a polling thread if polling is active
                     if (pollingActive && tuple.thread == null) {
@@ -345,43 +338,15 @@ public class ComputerManagerService extends Service {
         }
     }
 
-    public boolean addComputerBlocking(String addr, boolean manuallyAdded) {
+    public boolean addComputerBlocking(InetAddress addr) {
         // Setup a placeholder
         ComputerDetails fakeDetails = new ComputerDetails();
-
-        if (manuallyAdded) {
-            // Add PC UI
-            fakeDetails.manualAddress = addr;
-        }
-        else {
-            // mDNS
-            fakeDetails.localAddress = addr;
-
-            // Since we're on the same network, we can use STUN to find
-            // our WAN address, which is also very likely the WAN address
-            // of the PC. We can use this later to connect remotely.
-            fakeDetails.remoteAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
-        }
+        fakeDetails.localIp = addr;
+        fakeDetails.remoteIp = addr;
 
         // Block while we try to fill the details
         try {
-            // 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);
-            }
+            runPoll(fakeDetails, true, 0);
         } catch (InterruptedException e) {
             return false;
         }
@@ -395,10 +360,6 @@ public class ComputerManagerService extends Service {
             return true;
         }
         else {
-            if (!manuallyAdded) {
-                LimeLog.warning("Auto-discovered PC failed to respond: "+addr);
-            }
-
             return false;
         }
     }
@@ -418,7 +379,6 @@ public class ComputerManagerService extends Service {
                     if (tuple.thread != null) {
                         // Interrupt the thread on this entry
                         tuple.thread.interrupt();
-                        tuple.thread = null;
                     }
                     pollingTuples.remove(tuple);
                     break;
@@ -444,51 +404,38 @@ public class ComputerManagerService extends Service {
         }
     }
 
-    private ComputerDetails tryPollIp(ComputerDetails details, String address) {
+    private ComputerDetails tryPollIp(ComputerDetails details, InetAddress ipAddr) {
         // Fast poll this address first to determine if we can connect at the TCP layer
-        if (!fastPollIp(address)) {
+        if (!fastPollIp(ipAddr)) {
             return null;
         }
 
         try {
-            NvHTTP http = new NvHTTP(address, idManager.getUniqueId(), details.serverCert,
-                    PlatformBinding.getCryptoProvider(ComputerManagerService.this));
+            NvHTTP http = new NvHTTP(ipAddr, idManager.getUniqueId(),
+                    null, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
 
             ComputerDetails newDetails = http.getComputerDetails();
 
             // Check if this is the PC we expected
-            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)) {
+            if (details.uuid != null && newDetails.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 (XmlPullParserException | IOException e) {
-            e.printStackTrace();
+        } catch (Exception e) {
             return null;
         }
     }
 
     // Just try to establish a TCP connection to speculatively detect a running
     // GFE server
-    private boolean fastPollIp(String address) {
-        if (address == null) {
-            // Don't bother if our address is null
-            return false;
-        }
-
+    private boolean fastPollIp(InetAddress addr) {
         Socket s = new Socket();
         try {
-            s.connect(new InetSocketAddress(address, NvHTTP.HTTPS_PORT), FAST_POLL_TIMEOUT);
+            s.connect(new InetSocketAddress(addr, NvHTTP.HTTPS_PORT), FAST_POLL_TIMEOUT);
             s.close();
             return true;
         } catch (IOException e) {
@@ -496,11 +443,11 @@ public class ComputerManagerService extends Service {
         }
     }
 
-    private void startFastPollThread(final String address, final boolean[] info) {
+    private void startFastPollThread(final InetAddress addr, final boolean[] info) {
         Thread t = new Thread() {
             @Override
             public void run() {
-                boolean pollRes = fastPollIp(address);
+                boolean pollRes = fastPollIp(addr);
 
                 synchronized (info) {
                     info[0] = true; // Done
@@ -510,18 +457,16 @@ public class ComputerManagerService extends Service {
                 }
             }
         };
-        t.setName("Fast Poll - "+address);
+        t.setName("Fast Poll - "+addr.getHostAddress());
         t.start();
     }
 
-    private String fastPollPc(final String localAddress, final String remoteAddress, final String manualAddress) throws InterruptedException {
+    private ComputerDetails.Reachability fastPollPc(final InetAddress local, final InetAddress remote) throws InterruptedException {
         final boolean[] remoteInfo = new boolean[2];
         final boolean[] localInfo = new boolean[2];
-        final boolean[] manualInfo = new boolean[2];
 
-        startFastPollThread(localAddress, localInfo);
-        startFastPollThread(remoteAddress, remoteInfo);
-        startFastPollThread(manualAddress, manualInfo);
+        startFastPollThread(local, localInfo);
+        startFastPollThread(remote, remoteInfo);
 
         // Check local first
         synchronized (localInfo) {
@@ -530,78 +475,125 @@ public class ComputerManagerService extends Service {
             }
 
             if (localInfo[1]) {
-                return localAddress;
+                return ComputerDetails.Reachability.LOCAL;
             }
         }
 
-        // Now manual
-        synchronized (manualInfo) {
-            while (!manualInfo[0]) {
-                manualInfo.wait(500);
-            }
-
-            if (manualInfo[1]) {
-                return manualAddress;
-            }
-        }
-
-        // And finally, remote
+        // Now remote
         synchronized (remoteInfo) {
             while (!remoteInfo[0]) {
                 remoteInfo.wait(500);
             }
 
             if (remoteInfo[1]) {
-                return remoteAddress;
+                return ComputerDetails.Reachability.REMOTE;
             }
         }
 
-        return null;
+        return ComputerDetails.Reachability.OFFLINE;
+    }
+
+    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;
+            }
+        }
+
+        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);
     }
 
     private boolean pollComputer(ComputerDetails details) throws InterruptedException {
-        ComputerDetails polledDetails;
-
-        // Do a TCP-level connection to the HTTP server to see if it's listening.
-        // Do not write this address to details.activeAddress because:
-        // a) it's only a candidate and may be wrong (multiple PCs behind a single router)
-        // b) if it's null, it will be unexpectedly nulling the activeAddress of a possibly online PC
-        LimeLog.info("Starting fast poll for "+details.name+" ("+details.localAddress +", "+details.remoteAddress +", "+details.manualAddress +")");
-        String candidateAddress = fastPollPc(details.localAddress, details.remoteAddress, details.manualAddress);
-        LimeLog.info("Fast poll for "+details.name+" returned candidate address: "+candidateAddress);
-
-        // If no connection could be established to either IP address, there's nothing we can do
-        if (candidateAddress == null) {
+        ReachabilityTuple initialReachTuple = pollForReachability(details);
+        if (initialReachTuple == null) {
             return false;
         }
 
-        // Try using the active address from fast-poll
-        polledDetails = tryPollIp(details, candidateAddress);
-        if (polledDetails == null) {
-            // If that failed, try all unique addresses except what we've
-            // already tried
-            HashSet<String> uniqueAddresses = new HashSet<>();
-            uniqueAddresses.add(details.localAddress);
-            uniqueAddresses.add(details.remoteAddress);
-            uniqueAddresses.add(details.manualAddress);
-            for (String addr : uniqueAddresses) {
-                if (addr == null || addr.equals(candidateAddress)) {
-                    continue;
-                }
-                polledDetails = tryPollIp(details, addr);
-                if (polledDetails != null) {
-                    break;
-                }
+        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;
             }
         }
 
-        if (polledDetails != null) {
-            details.update(polledDetails);
-            return true;
-        }
-        else {
-            return false;
+        // 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;
         }
+
+        return true;
     }
 
     @Override
@@ -702,9 +694,10 @@ public class ComputerManagerService extends Service {
                 public void run() {
                     int emptyAppListResponses = 0;
                     do {
-                        // Can't poll if it's not online or paired
-                        if (computer.state != ComputerDetails.State.ONLINE ||
-                                computer.pairState != PairingManager.PairState.PAIRED) {
+                        InetAddress selectedAddr;
+
+                        // Can't poll if it's not online
+                        if (computer.state != ComputerDetails.State.ONLINE) {
                             if (listener != null) {
                                 listener.notifyComputerUpdated(computer);
                             }
@@ -716,12 +709,19 @@ 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 +744,12 @@ public class ComputerManagerService extends Service {
                                 // in a row, we'll go ahead and believe it.
                                 emptyAppListResponses++;
                             }
-                            if (!appList.isEmpty() &&
+                            if (appList != null && !appList.isEmpty() &&
                                     (!list.isEmpty() || emptyAppListResponses >= EMPTY_LIST_THRESHOLD)) {
                                 // Open the cache file
                                 OutputStream cacheOut = null;
                                 try {
-                                    cacheOut = CacheHelper.openCacheFileForOutput(getCacheDir(), "applist", computer.uuid);
+                                    cacheOut = CacheHelper.openCacheFileForOutput(getCacheDir(), "applist", computer.uuid.toString());
                                     CacheHelper.writeStringToOutputStream(cacheOut, appList);
                                 } catch (IOException e) {
                                     e.printStackTrace();
@@ -776,7 +776,7 @@ public class ComputerManagerService extends Service {
                                     listener.notifyComputerUpdated(computer);
                                 }
                             }
-                            else if (appList.isEmpty()) {
+                            else if (appList == null || appList.isEmpty()) {
                                 LimeLog.warning("Null app list received from "+computer.uuid);
                             }
                         } catch (IOException e) {
@@ -787,7 +787,6 @@ public class ComputerManagerService extends Service {
                     } while (waitPollingDelay());
                 }
             };
-            thread.setName("App list polling thread for " + computer.name);
             thread.start();
         }
 
@@ -817,10 +816,10 @@ class PollingTuple {
 }
 
 class ReachabilityTuple {
-    public final String reachableAddress;
+    public final InetAddress reachableAddress;
     public final ComputerDetails computer;
 
-    public ReachabilityTuple(ComputerDetails computer, String reachableAddress) {
+    public ReachabilityTuple(ComputerDetails computer, InetAddress reachableAddress) {
         this.computer = computer;
         this.reachableAddress = reachableAddress;
     }

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

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

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

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

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

@@ -55,10 +55,10 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
             convertView = inflater.inflate(layoutId, viewGroup, false);
         }
 
-        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);
+        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);
 
         if (imgView != null) {
             if (!populateImageView(imgView, prgView, itemList.get(i))) {

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

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

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

@@ -1,11 +1,7 @@
 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;
@@ -17,117 +13,45 @@ import java.io.OutputStream;
 
 public class DiskAssetLoader {
     // 5 MB
-    private static final long MAX_ASSET_SIZE = 5 * 1024 * 1024;
+    private 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(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 DiskAssetLoader(File cacheDir) {
+        this.cacheDir = cacheDir;
     }
 
     public boolean checkCacheExists(CachedAppAssetLoader.LoaderTuple tuple) {
-        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;
+        return CacheHelper.cacheFileExists(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
     }
 
     public Bitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple, int sampleSize) {
-        File file = CacheHelper.openPath(false, cacheDir, "boxart", tuple.computer.uuid, tuple.app.getAppId() + ".png");
-
-        // Don't bother with anything if it doesn't exist
-        if (!file.exists()) {
-            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.
+        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");
                 return null;
             }
 
-            LimeLog.info("Tuple "+tuple+" has cached art of size: "+decodeOnlyOptions.outWidth+"x"+decodeOnlyOptions.outHeight);
-
-            // Load the image scaled to the appropriate size
+            in = CacheHelper.openCacheFileForInput(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
             BitmapFactory.Options options = new BitmapFactory.Options();
-            options.inSampleSize = calculateInSampleSize(decodeOnlyOptions,
-                    STANDARD_ASSET_WIDTH / sampleSize,
-                    STANDARD_ASSET_HEIGHT / sampleSize);
-            if (isLowRamDevice) {
-                options.inPreferredConfig = Bitmap.Config.RGB_565;
-                options.inDither = true;
-            }
-            else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                options.inPreferredConfig = Bitmap.Config.HARDWARE;
-            }
-
-            bmp = BitmapFactory.decodeFile(file.getAbsolutePath(), options);
-            if (bmp != null) {
-                LimeLog.info("Tuple "+tuple+" decoded from disk cache with sample size: "+options.inSampleSize);
+            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) {}
             }
         }
-        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;
@@ -137,7 +61,7 @@ public class DiskAssetLoader {
         OutputStream out = null;
         boolean success = false;
         try {
-            out = CacheHelper.openCacheFileForOutput(cacheDir, "boxart", tuple.computer.uuid, tuple.app.getAppId() + ".png");
+            out = CacheHelper.openCacheFileForOutput(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
             CacheHelper.writeInputStreamToOutputStream(input, out, MAX_ASSET_SIZE);
             success = true;
         } catch (IOException e) {
@@ -151,7 +75,7 @@ public class DiskAssetLoader {
 
             if (!success) {
                 LimeLog.warning("Unable to populate cache with tuple: "+tuple);
-                CacheHelper.deleteCacheFile(cacheDir, "boxart", tuple.computer.uuid, tuple.app.getAppId() + ".png");
+                CacheHelper.deleteCacheFile(cacheDir, "boxart", tuple.computer.uuid.toString(), 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+"-"+tuple.app.getAppId();
+        return tuple.computer.uuid.toString()+"-"+tuple.app.getAppId();
     }
 
     public Bitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple) {

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

@@ -4,11 +4,12 @@ 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;
@@ -20,10 +21,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) {}
 
@@ -36,4 +37,13 @@ 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/preferences/AddComputerManually.java

@@ -1,12 +1,8 @@
 package com.limelight.preferences;
 
-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.Collections;
+import java.util.Locale;
 import java.util.concurrent.LinkedBlockingQueue;
 
 import com.limelight.computers.ComputerManagerService;
@@ -21,10 +17,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;
@@ -47,90 +43,42 @@ 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) {
-        boolean wrongSiteLocal = false;
-        boolean success;
+        String msg;
+        boolean finish = false;
 
         SpinnerDialog dialog = SpinnerDialog.displayDialog(this, getResources().getString(R.string.title_add_pc),
             getResources().getString(R.string.msg_add_pc), false);
 
         try {
-            success = managerBinder.addComputerBlocking(host, true);
-        } catch (IllegalArgumentException e) {
-            // This can be thrown from OkHttp if the host fails to canonicalize to a valid name.
-            // https://github.com/square/okhttp/blob/okhttp_27/okhttp/src/main/java/com/squareup/okhttp/HttpUrl.java#L705
-            e.printStackTrace();
-            success = false;
-        }
-        if (!success){
-            wrongSiteLocal = isWrongSubnetSiteLocalAddress(host);
+            InetAddress addr = InetAddress.getByName(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);
         }
 
         dialog.dismiss();
 
-        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();
+        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 (!isFinishing()) {
+                if (toastFinish && !isFinishing()) {
                     // Close the activity
                     AddComputerManually.this.finish();
                 }
-                }
-            });
-        }
-
+            }
+        });
     }
 
     private void startAddThread() {
@@ -194,7 +142,7 @@ public class AddComputerManually extends Activity {
 
         UiHelper.notifyNewRootView(this);
 
-        this.hostText = findViewById(R.id.hostTextView);
+        this.hostText = (TextView) findViewById(R.id.hostTextView);
         hostText.setImeOptions(EditorInfo.IME_ACTION_DONE);
         hostText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
@@ -203,7 +151,12 @@ public class AddComputerManually extends Activity {
                         (keyEvent != null &&
                                 keyEvent.getAction() == KeyEvent.ACTION_DOWN &&
                                 keyEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    return handleDoneEvent();
+                    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());
                 }
                 else if (actionId == EditorInfo.IME_ACTION_PREVIOUS) {
                     // This is how the Fire TV dismisses the keyboard
@@ -216,28 +169,8 @@ 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

@@ -1,40 +0,0 @@
-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

@@ -1,37 +0,0 @@
-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,17 +3,13 @@ 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;
 
 public class PreferenceConfiguration {
-    private static final String LEGACY_RES_FPS_PREF_STRING = "list_resolution_fps";
-
-
-    static final String RESOLUTION_PREF_STRING = "list_resolution";
-    static final String FPS_PREF_STRING = "list_fps";
-    static final String BITRATE_PREF_STRING = "seekbar_bitrate_kbps";
-    private static final String BITRATE_PREF_OLD_STRING = "seekbar_bitrate";
+    static final String RES_FPS_PREF_STRING = "list_resolution_fps";
+    static final String BITRATE_PREF_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";
@@ -27,19 +23,16 @@ public class PreferenceConfiguration {
     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 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";
 
-    static final String DEFAULT_RESOLUTION = "720p";
-    static final String DEFAULT_FPS = "60";
+    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;
     private static final boolean DEFAULT_STRETCH = false;
     private static final boolean DEFAULT_SOPS = true;
     private static final boolean DEFAULT_DISABLE_TOASTS = false;
@@ -52,16 +45,6 @@ public class PreferenceConfiguration {
     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_BIND_ALL_USB = false;
-    private static final boolean DEFAULT_MOUSE_EMULATION = true;
-    private static final boolean DEFAULT_MOUSE_NAV_BUTTONS = false;
-    private static final boolean DEFAULT_UNLOCK_FPS = false;
-    private static final boolean DEFAULT_VIBRATE_OSC = true;
-    private static final boolean DEFAULT_VIBRATE_FALLBACK = false;
 
     public static final int FORCE_H265_ON = -1;
     public static final int AUTOSELECT_H265 = 0;
@@ -75,103 +58,29 @@ public class PreferenceConfiguration {
     public String language;
     public boolean listMode, smallIconMode, multiController, enable51Surround, usbDriver;
     public boolean onscreenController;
-    public boolean onlyL3R3;
-    public boolean disableFrameDrop;
-    public boolean enableHdr;
-    public boolean enablePip;
-    public boolean bindAllUsb;
-    public boolean mouseEmulation;
-    public boolean mouseNavButtons;
-    public boolean unlockFps;
-    public boolean vibrateOsc;
-    public boolean vibrateFallbackToDevice;
 
-    private static int getHeightFromResolutionString(String resString) {
-        if (resString.equalsIgnoreCase("360p")) {
-            return 360;
+    public static int getDefaultBitrate(String resFpsString) {
+        if (resFpsString.equals("720p30")) {
+            return BITRATE_DEFAULT_720_30;
         }
-        else if (resString.equalsIgnoreCase("480p")) {
-            return 480;
+        else if (resFpsString.equals("720p60")) {
+            return BITRATE_DEFAULT_720_60;
         }
-        else if (resString.equalsIgnoreCase("720p")) {
-            return 720;
+        else if (resFpsString.equals("1080p30")) {
+            return BITRATE_DEFAULT_1080_30;
         }
-        else if (resString.equalsIgnoreCase("1080p")) {
-            return 1080;
+        else if (resFpsString.equals("1080p60")) {
+            return BITRATE_DEFAULT_1080_60;
         }
-        else if (resString.equalsIgnoreCase("1440p")) {
-            return 1440;
+        else if (resFpsString.equals("4K30")) {
+            return BITRATE_DEFAULT_4K_30;
         }
-        else if (resString.equalsIgnoreCase("4K")) {
-            return 2160;
+        else if (resFpsString.equals("4K60")) {
+            return BITRATE_DEFAULT_4K_60;
         }
         else {
-            // 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));
+            // Should never get here
+            return DEFAULT_BITRATE;
         }
     }
 
@@ -197,9 +106,7 @@ public class PreferenceConfiguration {
 
     public static int getDefaultBitrate(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        return getDefaultBitrate(
-                prefs.getString(RESOLUTION_PREF_STRING, DEFAULT_RESOLUTION),
-                prefs.getString(FPS_PREF_STRING, DEFAULT_FPS));
+        return getDefaultBitrate(prefs.getString(RES_FPS_PREF_STRING, DEFAULT_RES_FPS));
     }
 
     private static int getVideoFormatValue(Context context) {
@@ -221,93 +128,47 @@ 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();
 
-        // Migrate legacy preferences to the new locations
-        String str = prefs.getString(LEGACY_RES_FPS_PREF_STRING, null);
-        if (str != null) {
-            if (str.equals("360p30")) {
-                config.width = 640;
-                config.height = 360;
-                config.fps = 30;
-            }
-            else if (str.equals("360p60")) {
-                config.width = 640;
-                config.height = 360;
-                config.fps = 60;
-            }
-            else if (str.equals("720p30")) {
-                config.width = 1280;
-                config.height = 720;
-                config.fps = 30;
-            }
-            else if (str.equals("720p60")) {
-                config.width = 1280;
-                config.height = 720;
-                config.fps = 60;
-            }
-            else if (str.equals("1080p30")) {
-                config.width = 1920;
-                config.height = 1080;
-                config.fps = 30;
-            }
-            else if (str.equals("1080p60")) {
-                config.width = 1920;
-                config.height = 1080;
-                config.fps = 60;
-            }
-            else if (str.equals("4K30")) {
-                config.width = 3840;
-                config.height = 2160;
-                config.fps = 30;
-            }
-            else if (str.equals("4K60")) {
-                config.width = 3840;
-                config.height = 2160;
-                config.fps = 60;
-            }
-            else {
-                // Should never get here
-                config.width = 1280;
-                config.height = 720;
-                config.fps = 60;
-            }
-
-            prefs.edit()
-                    .remove(LEGACY_RES_FPS_PREF_STRING)
-                    .putString(RESOLUTION_PREF_STRING, getResolutionString(config.width, config.height))
-                    .putString(FPS_PREF_STRING, ""+config.fps)
-                    .apply();
+        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;
+        }
+        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 {
-            // 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);
+            // Should never get here
+            config.width = 1280;
+            config.height = 720;
+            config.fps = 60;
         }
 
         config.videoFormat = getVideoFormatValue(context);
@@ -327,16 +188,6 @@ public class PreferenceConfiguration {
         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.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

@@ -16,8 +16,7 @@ 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 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 static final String SCHEMA_URL = "http://schemas.android.com/apk/res/android";
 
     private SeekBar seekBar;
     private TextView valueText;
@@ -28,7 +27,6 @@ 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) {
@@ -36,28 +34,27 @@ public class SeekBarPreference extends DialogPreference
         this.context = context;
 
         // Read the message from XML
-        int dialogMessageId = attrs.getAttributeResourceValue(ANDROID_SCHEMA_URL, "dialogMessage", 0);
+        int dialogMessageId = attrs.getAttributeResourceValue(SCHEMA_URL, "dialogMessage", 0);
         if (dialogMessageId == 0) {
-            dialogMessage = attrs.getAttributeValue(ANDROID_SCHEMA_URL, "dialogMessage");
+            dialogMessage = attrs.getAttributeValue(SCHEMA_URL, "dialogMessage");
         }
         else {
             dialogMessage = context.getString(dialogMessageId);
         }
 
         // Get the suffix for the number displayed in the dialog
-        int suffixId = attrs.getAttributeResourceValue(ANDROID_SCHEMA_URL, "text", 0);
+        int suffixId = attrs.getAttributeResourceValue(SCHEMA_URL, "text", 0);
         if (suffixId == 0) {
-            suffix = attrs.getAttributeValue(ANDROID_SCHEMA_URL, "text");
+            suffix = attrs.getAttributeValue(SCHEMA_URL, "text");
         }
         else {
             suffix = context.getString(suffixId);
         }
 
         // Get default, min, and max seekbar values
-        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);
+        defaultValue = attrs.getAttributeIntValue(SCHEMA_URL, "defaultValue", PreferenceConfiguration.getDefaultBitrate(context));
+        maxValue = attrs.getAttributeIntValue(SCHEMA_URL, "max", 100);
+        minValue = 1;
     }
 
     @Override
@@ -92,12 +89,6 @@ 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,35 +2,24 @@ package com.limelight.preferences;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.media.MediaCodecInfo;
-import android.os.Build;
+import android.content.res.Configuration;
 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 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);
@@ -40,7 +29,9 @@ public class StreamSettings extends Activity {
         UiHelper.setLocale(this);
 
         setContentView(R.layout.activity_stream_settings);
-        reloadSettings();
+        getFragmentManager().beginTransaction().replace(
+                R.id.stream_settings, new SettingsFragment()
+        ).commit();
 
         UiHelper.notifyNewRootView(this);
     }
@@ -62,68 +53,10 @@ 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 void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
+
             addPreferencesFromResource(R.xml.preferences);
             PreferenceScreen screen = getPreferenceScreen();
 
@@ -135,247 +68,20 @@ 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 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
-            findPreference(PreferenceConfiguration.RESOLUTION_PREF_STRING).setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            Preference pref = findPreference(PreferenceConfiguration.RES_FPS_PREF_STRING);
+            pref.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, 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);
+                    prefs.edit()
+                            .putInt(PreferenceConfiguration.BITRATE_PREF_STRING,
+                                    PreferenceConfiguration.getDefaultBitrate(valueStr))
+                            .apply();
 
                     // 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 {
-    int getAdapterFragmentLayoutId();
-    void receiveAbsListView(AbsListView gridView);
+    public int getAdapterFragmentLayoutId();
+    public void receiveAbsListView(AbsListView gridView);
 }

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

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

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

@@ -3,21 +3,15 @@ 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);
     }
@@ -58,29 +52,4 @@ 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 {
-    public static File openPath(boolean createPath, File root, String... path) {
+    private 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 Runnable runOnDismiss;
+    private final boolean endAfterDismiss;
 
     private AlertDialog alert;
 
     private static final ArrayList<Dialog> rundownDialogs = new ArrayList<>();
 
-    private Dialog(Activity activity, String title, String message, Runnable runOnDismiss)
+    private Dialog(Activity activity, String title, String message, boolean endAfterDismiss)
     {
         this.activity = activity;
         this.title = title;
         this.message = message;
-        this.runOnDismiss = runOnDismiss;
+        this.endAfterDismiss = endAfterDismiss;
     }
 
     public static void closeDialogs()
@@ -40,21 +40,9 @@ public class Dialog implements Runnable {
         }
     }
 
-    public static void displayDialog(final Activity activity, String title, String message, final boolean endAfterDismiss)
+    public static void displayDialog(Activity activity, String title, String message, boolean 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));
+        activity.runOnUiThread(new Dialog(activity, title, message, endAfterDismiss));
     }
 
     @Override
@@ -77,7 +65,9 @@ public class Dialog implements Runnable {
                       alert.dismiss();
                   }
 
-                  runOnDismiss.run();
+                  if (endAfterDismiss) {
+                      activity.finish();
+                  }
               }
         });
         alert.setButton(AlertDialog.BUTTON_NEUTRAL, activity.getResources().getText(R.string.help), new DialogInterface.OnClickListener() {
@@ -87,7 +77,9 @@ public class Dialog implements Runnable {
                     alert.dismiss();
                 }
 
-                runOnDismiss.run();
+                if (endAfterDismiss) {
+                    activity.finish();
+                }
 
                 HelpLauncher.launchTroubleshooting(activity);
             }

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

@@ -1,43 +1,24 @@
 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 {
-            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)) {
+            // 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));
                 context.startActivity(i);
                 return;
             }

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

@@ -13,50 +13,39 @@ import com.limelight.nvstream.http.GfeHttpResponseException;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
 
-import org.xmlpull.v1.XmlPullParserException;
-
 import java.io.FileNotFoundException;
-import java.io.IOException;
+import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.security.cert.CertificateEncodingException;
 
 public class ServerHelper {
-    public static String getCurrentAddressFromComputer(ComputerDetails computer) {
-        return computer.activeAddress;
+    public static InetAddress getCurrentAddressFromComputer(ComputerDetails computer) {
+        return computer.reachability == ComputerDetails.Reachability.LOCAL ?
+                computer.localIp : computer.remoteIp;
     }
 
     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, getCurrentAddressFromComputer(computer));
+        intent.putExtra(Game.EXTRA_HOST,
+                computer.reachability == ComputerDetails.Reachability.LOCAL ?
+                        computer.localIp.getHostAddress() : computer.remoteIp.getHostAddress());
         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_PC_UUID, computer.uuid);
+        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_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 ComputerDetails computer,
+                              final InetAddress address,
                               final NvApp app,
                               final ComputerManagerService.ComputerManagerBinder managerBinder,
                               final Runnable onComplete) {
@@ -67,8 +56,8 @@ public class ServerHelper {
                 NvHTTP httpConn;
                 String message;
                 try {
-                    httpConn = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer),
-                            managerBinder.getUniqueId(), computer.serverCert, PlatformBinding.getCryptoProvider(parent));
+                    httpConn = new NvHTTP(address,
+                            managerBinder.getUniqueId(), null, PlatformBinding.getCryptoProvider(parent));
                     if (httpConn.quitApp()) {
                         message = parent.getResources().getString(R.string.applist_quit_success) + " " + app.getAppName();
                     } else {
@@ -87,9 +76,8 @@ public class ServerHelper {
                     message = parent.getResources().getString(R.string.error_unknown_host);
                 } catch (FileNotFoundException e) {
                     message = parent.getResources().getString(R.string.error_404);
-                } catch (IOException | XmlPullParserException e) {
+                } catch (Exception e) {
                     message = e.getMessage();
-                    e.printStackTrace();
                 } finally {
                     if (onComplete != null) {
                         onComplete.run();

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

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

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

@@ -5,14 +5,10 @@ import android.app.AlertDialog;
 import android.app.UiModeManager;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.os.Build;
 import android.view.View;
-import android.view.WindowManager;
 
 import com.limelight.R;
-import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.preferences.PreferenceConfiguration;
 
 import java.util.Locale;
@@ -60,54 +56,6 @@ public class UiHelper {
             rootView.setPadding(horizontalPaddingPixels, verticalPaddingPixels,
                     horizontalPaddingPixels, verticalPaddingPixels);
         }
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            // Allow this non-streaming activity to layout under notches.
-            //
-            // We should NOT do this for the Game activity unless
-            // the user specifically opts in, because it can obscure
-            // parts of the streaming surface.
-            activity.getWindow().getAttributes().layoutInDisplayCutoutMode =
-                    WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
-        }
-    }
-
-    public static void showDecoderCrashDialog(Activity activity) {
-        final SharedPreferences prefs = activity.getSharedPreferences("DecoderTombstone", 0);
-        final int crashCount = prefs.getInt("CrashCount", 0);
-        int lastNotifiedCrashCount = prefs.getInt("LastNotifiedCrashCount", 0);
-
-        // Remember the last crash count we notified at, so we don't
-        // display the crash dialog every time the app is started until
-        // they stream again
-        if (crashCount != 0 && crashCount != lastNotifiedCrashCount) {
-            if (crashCount % 3 == 0) {
-                // At 3 consecutive crashes, we'll forcefully reset their settings
-                PreferenceConfiguration.resetStreamingSettings(activity);
-                Dialog.displayDialog(activity,
-                        activity.getResources().getString(R.string.title_decoding_reset),
-                        activity.getResources().getString(R.string.message_decoding_reset),
-                        new Runnable() {
-                            @Override
-                            public void run() {
-                                // Mark notification as acknowledged on dismissal
-                                prefs.edit().putInt("LastNotifiedCrashCount", crashCount).apply();
-                            }
-                        });
-            }
-            else {
-                Dialog.displayDialog(activity,
-                        activity.getResources().getString(R.string.title_decoding_error),
-                        activity.getResources().getString(R.string.message_decoding_error),
-                        new Runnable() {
-                            @Override
-                            public void run() {
-                                // Mark notification as acknowledged on dismissal
-                                prefs.edit().putInt("LastNotifiedCrashCount", crashCount).apply();
-                            }
-                        });
-            }
-        }
     }
 
     public static void displayQuitConfirmationDialog(Activity parent, final Runnable onYes, final Runnable onNo) {
@@ -136,32 +84,4 @@ public class UiHelper {
                 .setNegativeButton(parent.getResources().getString(R.string.no), dialogClickListener)
                 .show();
     }
-
-    public static void displayDeletePcConfirmationDialog(Activity parent, ComputerDetails computer, final Runnable onYes, final Runnable onNo) {
-        DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-                switch (which){
-                    case DialogInterface.BUTTON_POSITIVE:
-                        if (onYes != null) {
-                            onYes.run();
-                        }
-                        break;
-
-                    case DialogInterface.BUTTON_NEGATIVE:
-                        if (onNo != null) {
-                            onNo.run();
-                        }
-                        break;
-                }
-            }
-        };
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(parent);
-        builder.setMessage(parent.getResources().getString(R.string.delete_pc_msg))
-                .setTitle(computer.name)
-                .setPositiveButton(parent.getResources().getString(R.string.yes), dialogClickListener)
-                .setNegativeButton(parent.getResources().getString(R.string.no), dialogClickListener)
-                .show();
-    }
 }

app/src/main/jni/Application.mk

@@ -1,4 +1,10 @@
-# Application.mk for Moonlight
+# Application.mk for Limelight
 
 # Our minimum version is Android 4.1
 APP_PLATFORM := android-16
+
+# Support all modern ABIs
+APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 mips mips64
+
+# We want an optimized build
+APP_OPTIM := release

app/src/main/jni/evdev_reader/Android.mk

@@ -5,32 +5,28 @@ include $(call all-subdir-makefiles)
 
 LOCAL_PATH := $(MY_LOCAL_PATH)
 
-# Only build evdev_reader for the rooted APK flavor
-ifeq (root,$(PRODUCT_FLAVOR))
-    include $(CLEAR_VARS)
-    LOCAL_MODULE    := evdev_reader
-    LOCAL_SRC_FILES := evdev_reader.c
-    LOCAL_LDLIBS    := -llog
+include $(CLEAR_VARS)
+LOCAL_MODULE    := evdev_reader
+LOCAL_SRC_FILES := evdev_reader.c
+LOCAL_LDLIBS    := -llog
 
 
-    # This next portion of the makefile is mostly copied from build-executable.mk but
-    # creates a binary with the libXXX.so form so the APK will install and drop
-    # the binary correctly.
+# This next portion of the makefile is mostly copied from build-executable.mk but
+# creates a binary with the libXXX.so form so the APK will install and drop
+# the binary correctly.
 
-    LOCAL_BUILD_SCRIPT := BUILD_EXECUTABLE
-    LOCAL_MAKEFILE     := $(local-makefile)
+LOCAL_BUILD_SCRIPT := BUILD_EXECUTABLE
+LOCAL_MAKEFILE     := $(local-makefile)
 
-    $(call check-defined-LOCAL_MODULE,$(LOCAL_BUILD_SCRIPT))
-    $(call check-LOCAL_MODULE,$(LOCAL_MAKEFILE))
-    $(call check-LOCAL_MODULE_FILENAME)
+$(call check-defined-LOCAL_MODULE,$(LOCAL_BUILD_SCRIPT))
+$(call check-LOCAL_MODULE,$(LOCAL_MAKEFILE))
+$(call check-LOCAL_MODULE_FILENAME)
 
-    # we are building target objects
-    my := TARGET_
+# we are building target objects
+my := TARGET_
 
-    $(call handle-module-filename,lib,$(TARGET_SONAME_EXTENSION))
-    $(call handle-module-built)
-
-    LOCAL_MODULE_CLASS := EXECUTABLE
-    include $(BUILD_SYSTEM)/build-module.mk
-endif
+$(call handle-module-filename,lib,$(TARGET_SONAME_EXTENSION))
+$(call handle-module-built)
 
+LOCAL_MODULE_CLASS := EXECUTABLE
+include $(BUILD_SYSTEM)/build-module.mk

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

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

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

@@ -1,5 +1,9 @@
-<vector android:height="128dp" android:width="128dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="128dp"
+        android:height="128dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:pathData="M23.64,7c-0.45,-0.34 -4.93,-4 -11.64,-4 -1.5,0 -2.89,0.19 -4.15,0.48L18.18,13.8 23.64,7zM17.04,15.22L3.27,1.44 2,2.72l2.05,2.06C1.91,5.76 0.59,6.82 0.36,7l11.63,14.49 0.01,0.01 0.01,-0.01 3.9,-4.86 3.32,3.32 1.27,-1.27 -3.46,-3.46z"
+        android:fillColor="#FFFFFF"/>
 </vector>

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

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

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

@@ -6,7 +6,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".preferences.AddComputerManually" >
+    tools:context=".AddComputerManually" >
 
     <TextView
         android:id="@+id/manuallyAddPcText"
@@ -22,11 +22,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/manuallyAddPcText"
-        android:layout_toLeftOf="@+id/addPcButton"
-        android:layout_toStartOf="@+id/addPcButton"
         android:layout_marginTop="25dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
         android:ems="10"
         android:singleLine="true"
         android:inputType="textNoSuggestions"
@@ -34,15 +34,5 @@
         
         <requestFocus />
     </EditText>
-
-    <Button
-        android:id="@+id/addPcButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="25dp"
-        android:layout_below="@+id/manuallyAddPcText"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:text="@android:string/ok"/>
 	
 </RelativeLayout>

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

@@ -10,16 +10,4 @@
         android:layout_height="match_parent"
         android:layout_gravity="center" />
 
-    <TextView
-        android:id="@+id/notificationOverlay"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginStart="10dp"
-        android:layout_gravity="right"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:gravity="right"
-        android:background="#80000000"
-        android:visibility="gone" />
-
 </merge>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/activity_help"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    tools:context="com.limelight.HelpActivity">
+
+    <WebView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true" />
+</RelativeLayout>

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

@@ -7,6 +7,6 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:id="@+id/stream_settings"
-    tools:context=".preferences.StreamSettings">
+    tools:context=".StreamSettings">
 
 </RelativeLayout>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_pc_scut.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_pc_scut_background"/>
-    <foreground android:drawable="@mipmap/ic_pc_scut_foreground"/>
-</adaptive-icon>