Version 9.8.6

Currently translated at 90.1% (164 of 182 strings)

Translation: Moonlight Game Streaming/moonlight-android
Translate-URL: https://hosted.weblate.org/projects/moonlight/moonlight-android/nb_NO/

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,48 @@
+---
+name: Bug report
+about: Follow the troubleshooting guide before reporting a bug
+
+---
+**READ ME FIRST!**
+If you're here because something basic is not working (like gamepad input, video, or similar), it's probably something specific to your setup, so make sure you've gone through the Troubleshooting Guide first: https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting
+
+If you still have trouble with basic functionality after following the guide, join our Discord server where there are many other volunteers who can help (or direct you back here if it looks like a Moonlight bug after all). https://moonlight-stream.org/discord
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Steps to reproduce**
+Any special steps that are required for the bug to appear.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem. If the issue is related to video glitching or poor quality, please include screenshots.
+
+**Affected games**
+List the games you've tried that exhibit the issue. To see if the issue is game-specific, try streaming Steam Big Picture with Moonlight and see if the issue persists there.
+
+**Other Moonlight clients**
+- Does the issue occur when using Moonlight on PC or iOS?
+
+**Moonlight settings (please complete the following information)**
+- Have any settings been adjusted from defaults?
+- If so, which settings have been changed?
+- Does the problem still occur after reverting settings back to default?
+
+**Gamepad-related issues (please complete if problem is gamepad-related)**
+- Do you have any gamepads connected to your host PC directly?
+- If gamepad input is not working, does it work if you use Moonlight's on-screen controls?
+- Does the problem still remain if you stream the desktop and use https://html5gamepad.com to test your gamepad?
+  - Instructions for streaming the desktop can be found here: https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide
+
+**Device details (please complete the following information)**
+ - Android version: [e.g. Android 10]
+ - Device model: [e.g. Samsung Galaxy S21]
+
+**Server PC details (please complete the following information)**
+ - OS: [e.g. Windows 10 1809]
+ - GeForce Experience version: [e.g. 3.16.0.140]
+ - Nvidia GPU driver: [e.g. 417.35]
+ - Antivirus and firewall software: [e.g. Windows Defender and Windows Firewall]
+
+**Additional context**
+Anything else you think may be relevant to the issue or special about your specific setup.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/auto-comment.yml

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

.gitignore

@@ -3,6 +3,7 @@
 *.ap_
 *.aab
 output.json
+output-metadata.json
 out/
 
 # files for the dex VM

.travis.yml

@@ -1,15 +0,0 @@
-language: android
-dist: trusty
-
-git:
-  depth: 1
-
-android:
-  components:
-    - tools
-    - platform-tools
-    - build-tools-29.0.1
-    - android-29
-
-install:
-  - yes | sdkmanager "ndk-bundle"

README.md

@@ -1,56 +1,28 @@
 # Moonlight Android
 
-[![Travis CI Status](https://travis-ci.org/moonlight-stream/moonlight-android.svg?branch=master)](https://travis-ci.org/moonlight-stream/moonlight-android)
+[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/232a8tadrrn8jv0k/branch/master?svg=true)](https://ci.appveyor.com/project/cgutman/moonlight-android/branch/master)
+[![Translation Status](https://hosted.weblate.org/widgets/moonlight/-/moonlight-android/svg-badge.svg)](https://hosted.weblate.org/projects/moonlight/moonlight-android/)
 
-[Moonlight](https://moonlight-stream.org) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
-We reverse engineered the Shield streaming software and created a version that can be run on any Android device.
+[Moonlight for Android](https://moonlight-stream.org) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
 
-Moonlight will allow you to stream your full collection of games from your Windows PC to your Android device,
+Moonlight for Android 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.
 
-Check our [wiki](https://github.com/moonlight-stream/moonlight-docs/wiki) for more detailed information or a troubleshooting guide. 
+Moonlight also has a [PC client](https://github.com/moonlight-stream/moonlight-qt) and [iOS/tvOS client](https://github.com/moonlight-stream/moonlight-ios).
 
-## Features
+You can follow development on our [Discord server](https://moonlight-stream.org/discord) and help translate Moonlight into your language on [Weblate](https://hosted.weblate.org/projects/moonlight/moonlight-android/).
 
-* 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
-
-* Download and install Moonlight for Android from
-[Google Play](https://play.google.com/store/apps/details?id=com.limelight), [F-Droid](https://f-droid.org/packages/com.limelight/), [Amazon App Store](http://www.amazon.com/gp/product/B00JK4MFN2), or directly from the [releases page](https://github.com/moonlight-stream/moonlight-android/releases)
-* Download [GeForce Experience](http://www.geforce.com/geforce-experience) and install on your Windows PC
-
-## Requirements
-
-* [GameStream compatible](http://shield.nvidia.com/play-pc-games/) computer with an NVIDIA GeForce GTX 600 series or higher desktop or mobile GPU (GT-series and AMD GPUs not supported)
-* Android device running 4.1 (Jelly Bean) or higher
-* High-end wireless router (802.11n dual-band recommended)
-
-## Usage
-
-* 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
-* Tap your PC again to view the list of apps to stream
-* Play games!
-
-## Contribute
-
-This project is being actively developed at [XDA Developers](http://forum.xda-developers.com/showthread.php?t=2505510)
-
-1. Fork us
-2. Write code
-3. Send Pull Requests
+## Downloads
+* [Google Play Store](https://play.google.com/store/apps/details?id=com.limelight)
+* [Amazon App Store](https://www.amazon.com/gp/product/B00JK4MFN2)
+* [F-Droid](https://f-droid.org/packages/com.limelight)
+* [APK](https://github.com/moonlight-stream/moonlight-android/releases)
 
 ## 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
+* Build the APK using Android Studio or gradle
 
 ## Authors
 

app/build.gradle

@@ -1,14 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    ndkVersion "22.1.7171670"
+
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 29
+        targetSdkVersion 30
 
-        versionName "8.2"
-        versionCode = 199
+        versionName "9.8.6"
+        versionCode = 257
     }
 
     flavorDimensions "root"
@@ -65,7 +67,6 @@ android {
             applicationIdSuffix ".debug"
 
             minifyEnabled true
-            useProguard false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         release {
@@ -114,10 +115,10 @@ android {
 }
 
 dependencies {
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.62'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.62'
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.66'
+    implementation 'org.bouncycastle:bcpkix-jdk15on:1.66'
     implementation 'org.jcodec:jcodec:0.2.3'
-    implementation 'com.squareup.okhttp3:okhttp:3.12.3'
-    implementation 'com.squareup.okio:okio:1.17.4'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.12'
+    implementation 'com.squareup.okio:okio:1.17.5'
     implementation 'org.jmdns:jmdns:3.5.5'
 }

app/src/main/AndroidManifest.xml

@@ -42,6 +42,7 @@
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher"
         android:installLocation="auto"
+        android:gwpAsanMode="always"
         android:theme="@style/AppTheme">
         <provider
             android:name=".PosterContentProvider"
@@ -63,6 +64,7 @@
 
         <activity
             android:name=".PcView"
+            android:exported="true"
             android:resizeableActivity="true"
             android:configChanges="mcc|mnc|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
             <intent-filter>
@@ -120,10 +122,20 @@
             android:resizeableActivity="true"
             android:launchMode="singleTask"
             android:excludeFromRecents="true"
-            android:theme="@style/StreamTheme">
+            android:theme="@style/StreamTheme"
+            android:preferMinimalPostProcessing="true">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.limelight.AppView" />
+
+            <!-- Special metadata for NVIDIA Shield devices to prevent input buffering
+                 and most importantly, opt out of mouse acceleration while streaming -->
+            <meta-data
+                android:name="com.nvidia.immediateInput"
+                android:value="true" />
+            <meta-data
+                android:name="com.nvidia.rawCursorInput"
+                android:value="true" />
         </activity>
 
         <service

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

@@ -2,6 +2,7 @@ package com.limelight;
 
 import java.io.IOException;
 import java.io.StringReader;
+import java.util.HashSet;
 import java.util.List;
 
 import com.limelight.computers.ComputerManagerListener;
@@ -26,6 +27,8 @@ import android.app.Service;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Build;
@@ -58,17 +61,22 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
     private int lastRunningAppId;
     private boolean suspendGridUpdates;
     private boolean inForeground;
+    private boolean showHiddenApps;
+    private HashSet<Integer> hiddenAppIds = new HashSet<>();
 
     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 HIDE_APP_ID = 7;
+
+    public final static String HIDDEN_APPS_PREF_FILENAME = "HiddenApps";
 
     public final static String NAME_EXTRA = "Name";
     public final static String UUID_EXTRA = "UUID";
     public final static String NEW_PAIR_EXTRA = "NewPair";
+    public final static String SHOW_HIDDEN_APPS_EXTRA = "ShowHiddenApps";
 
     private ComputerManagerService.ComputerManagerBinder managerBinder;
     private final ServiceConnection serviceConnection = new ServiceConnection() {
@@ -96,15 +104,17 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 
                     try {
                         appGridAdapter = new AppGridAdapter(AppView.this,
-                                PreferenceConfiguration.readPreferences(AppView.this).listMode,
-                                PreferenceConfiguration.readPreferences(AppView.this).smallIconMode,
-                                computer, localBinder.getUniqueId());
+                                PreferenceConfiguration.readPreferences(AppView.this),
+                                computer, localBinder.getUniqueId(),
+                                showHiddenApps);
                     } catch (Exception e) {
                         e.printStackTrace();
                         finish();
                         return;
                     }
 
+                    appGridAdapter.updateHiddenApps(hiddenAppIds, true);
+
                     // 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.
@@ -147,6 +157,27 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         }
     };
 
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+
+        // If appGridAdapter is initialized, let it know about the configuration change.
+        // If not, it will pick it up when it initializes.
+        if (appGridAdapter != null) {
+            // Update the app grid adapter to create grid items with the correct layout
+            appGridAdapter.updateLayoutWithPreferences(this, PreferenceConfiguration.readPreferences(this));
+
+            try {
+                // Reinflate the app grid itself to pick up the layout change
+                getFragmentManager().beginTransaction()
+                        .replace(R.id.appFragmentContainer, new AdapterFragment())
+                        .commitAllowingStateLoss();
+            } catch (IllegalStateException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     private void startComputerUpdates() {
         // Don't start polling if we're not bound or in the foreground
         if (managerBinder == null || !inForeground) {
@@ -264,8 +295,14 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 
         UiHelper.notifyNewRootView(this);
 
+        showHiddenApps = getIntent().getBooleanExtra(SHOW_HIDDEN_APPS_EXTRA, false);
         uuidString = getIntent().getStringExtra(UUID_EXTRA);
 
+        SharedPreferences hiddenAppsPrefs = getSharedPreferences(HIDDEN_APPS_PREF_FILENAME, MODE_PRIVATE);
+        for (String hiddenAppIdStr : hiddenAppsPrefs.getStringSet(uuidString, new HashSet<String>())) {
+            hiddenAppIds.add(Integer.parseInt(hiddenAppIdStr));
+        }
+
         String computerName = getIntent().getStringExtra(NAME_EXTRA);
 
         TextView label = findViewById(R.id.appListText);
@@ -277,6 +314,21 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                 Service.BIND_AUTO_CREATE);
     }
 
+    private void updateHiddenApps(boolean hideImmediately) {
+        HashSet<String> hiddenAppIdStringSet = new HashSet<>();
+
+        for (Integer hiddenAppId : hiddenAppIds) {
+            hiddenAppIdStringSet.add(hiddenAppId.toString());
+        }
+
+        getSharedPreferences(HIDDEN_APPS_PREF_FILENAME, MODE_PRIVATE)
+                .edit()
+                .putStringSet(uuidString, hiddenAppIdStringSet)
+                .apply();
+
+        appGridAdapter.updateHiddenApps(hiddenAppIds, hideImmediately);
+    }
+
     private void populateAppGridWithCache() {
         try {
             // Try to load from cache
@@ -334,9 +386,12 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
         super.onCreateContextMenu(menu, v, menuInfo);
-        
+
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
         AppObject selectedApp = (AppObject) appGridAdapter.getItem(info.position);
+
+        menu.setHeaderTitle(selectedApp.app.getAppName());
+
         if (lastRunningAppId != 0) {
             if (lastRunningAppId == selectedApp.app.getAppId()) {
                 menu.add(Menu.NONE, START_OR_RESUME_ID, 1, getResources().getString(R.string.applist_menu_resume));
@@ -344,10 +399,17 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
             }
             else {
                 menu.add(Menu.NONE, START_WITH_QUIT, 1, getResources().getString(R.string.applist_menu_quit_and_start));
-                menu.add(Menu.NONE, CANCEL_ID, 2, getResources().getString(R.string.applist_menu_cancel));
             }
         }
-        menu.add(Menu.NONE, VIEW_DETAILS_ID, 3, getResources().getString(R.string.applist_menu_details));
+
+        // Only show the hide checkbox if this is not the currently running app or it's already hidden
+        if (lastRunningAppId != selectedApp.app.getAppId() || selectedApp.isHidden) {
+            MenuItem hideAppItem = menu.add(Menu.NONE, HIDE_APP_ID, 3, getResources().getString(R.string.applist_menu_hide_app));
+            hideAppItem.setCheckable(true);
+            hideAppItem.setChecked(selectedApp.isHidden);
+        }
+
+        menu.add(Menu.NONE, VIEW_DETAILS_ID, 4, 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
@@ -358,7 +420,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                 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));
+                    menu.add(Menu.NONE, CREATE_SHORTCUT_ID, 5, getResources().getString(R.string.applist_menu_scut));
                 }
             }
         }
@@ -409,12 +471,20 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                 }, null);
                 return true;
 
-            case CANCEL_ID:
+            case VIEW_DETAILS_ID:
+                Dialog.displayDialog(AppView.this, getResources().getString(R.string.title_details), app.app.toString(), false);
                 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);
+            case HIDE_APP_ID:
+                if (item.isChecked()) {
+                    // Transitioning hidden to shown
+                    hiddenAppIds.remove(app.app.getAppId());
+                }
+                else {
+                    // Transitioning shown to hidden
+                    hiddenAppIds.add(app.app.getAppId());
+                }
+                updateHiddenApps(false);
                 return true;
 
             case CREATE_SHORTCUT_ID:
@@ -496,6 +566,12 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                     if (!foundExistingApp) {
                         // This app must be new
                         appGridAdapter.addApp(new AppObject(app));
+
+                        // We could have a leftover shortcut from last time this PC was paired
+                        // or if this app was removed then added again. Enable those shortcuts
+                        // again if present.
+                        shortcutHelper.enableAppShortcut(computer, app);
+
                         updated = true;
                     }
                 }
@@ -538,9 +614,8 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 
     @Override
     public int getAdapterFragmentLayoutId() {
-        return PreferenceConfiguration.readPreferences(this).listMode ?
-                R.layout.list_view : (PreferenceConfiguration.readPreferences(AppView.this).smallIconMode ?
-                    R.layout.app_grid_view_small : R.layout.app_grid_view);
+        return PreferenceConfiguration.readPreferences(AppView.this).smallIconMode ?
+                    R.layout.app_grid_view_small : R.layout.app_grid_view;
     }
 
     @Override
@@ -565,9 +640,10 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         listView.requestFocus();
     }
 
-    public class AppObject {
+    public static class AppObject {
         public final NvApp app;
         public boolean isRunning;
+        public boolean isHidden;
 
         public AppObject(NvApp app) {
             if (app == null) {

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

@@ -6,9 +6,11 @@ import com.limelight.binding.input.ControllerHandler;
 import com.limelight.binding.input.KeyboardTranslator;
 import com.limelight.binding.input.capture.InputCaptureManager;
 import com.limelight.binding.input.capture.InputCaptureProvider;
-import com.limelight.binding.input.TouchContext;
+import com.limelight.binding.input.touch.AbsoluteTouchContext;
+import com.limelight.binding.input.touch.RelativeTouchContext;
 import com.limelight.binding.input.driver.UsbDriverService;
 import com.limelight.binding.input.evdev.EvdevListener;
+import com.limelight.binding.input.touch.TouchContext;
 import com.limelight.binding.input.virtual_controller.VirtualController;
 import com.limelight.binding.video.CrashListener;
 import com.limelight.binding.video.MediaCodecDecoderRenderer;
@@ -27,6 +29,8 @@ import com.limelight.preferences.PreferenceConfiguration;
 import com.limelight.ui.GameGestures;
 import com.limelight.ui.StreamView;
 import com.limelight.utils.Dialog;
+import com.limelight.utils.NetHelper;
+import com.limelight.utils.ServerHelper;
 import com.limelight.utils.ShortcutHelper;
 import com.limelight.utils.SpinnerDialog;
 import com.limelight.utils.UiHelper;
@@ -42,6 +46,7 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Point;
 import android.graphics.Rect;
@@ -59,6 +64,7 @@ import android.view.Display;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
+import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.view.View;
 import android.view.View.OnGenericMotionListener;
@@ -72,6 +78,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import java.io.ByteArrayInputStream;
+import java.lang.reflect.Field;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
@@ -83,8 +90,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     OnSystemUiVisibilityChangeListener, GameGestures, StreamView.InputCallbacks,
     PerfOverlayListener
 {
-    private int lastMouseX = Integer.MIN_VALUE;
-    private int lastMouseY = Integer.MIN_VALUE;
     private int lastButtonState = 0;
 
     // Only 2 touches are supported
@@ -94,6 +99,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     private static final int REFERENCE_HORIZ_RES = 1280;
     private static final int REFERENCE_VERT_RES = 720;
 
+    private static final int STYLUS_DOWN_DEAD_ZONE_DELAY = 100;
+    private static final int STYLUS_DOWN_DEAD_ZONE_RADIUS = 20;
+
+    private static final int STYLUS_UP_DEAD_ZONE_DELAY = 150;
+    private static final int STYLUS_UP_DEAD_ZONE_RADIUS = 50;
+
     private static final int THREE_FINGER_TAP_THRESHOLD = 300;
 
     private ControllerHandler controllerHandler;
@@ -115,6 +126,10 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     private boolean grabbedInput = true;
     private boolean grabComboDown = false;
     private StreamView streamView;
+    private long lastAbsTouchUpTime = 0;
+    private long lastAbsTouchDownTime = 0;
+    private float lastAbsTouchUpX, lastAbsTouchUpY;
+    private float lastAbsTouchDownX, lastAbsTouchDownY;
 
     private boolean isHidingOverlays;
     private TextView notificationOverlayView;
@@ -199,11 +214,17 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         prefConfig = PreferenceConfiguration.readPreferences(this);
         tombstonePrefs = Game.this.getSharedPreferences("DecoderTombstone", 0);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P && prefConfig.stretchVideo) {
+        if (prefConfig.stretchVideo) {
             // Allow the activity to layout under notches if the fill-screen option
             // was turned on by the user
-            getWindow().getAttributes().layoutInDisplayCutoutMode =
-                    WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                getWindow().getAttributes().layoutInDisplayCutoutMode =
+                        WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+            }
+            else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                getWindow().getAttributes().layoutInDisplayCutoutMode =
+                        WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+            }
         }
 
         // Listen for events on the game surface
@@ -225,7 +246,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             streamView.setOnCapturedPointerListener(new View.OnCapturedPointerListener() {
                 @Override
                 public boolean onCapturedPointer(View view, MotionEvent motionEvent) {
-                    return handleMotionEvent(motionEvent);
+                    return handleMotionEvent(view, motionEvent);
                 }
             });
         }
@@ -397,45 +418,61 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         // Hopefully, we can get rid of this once someone comes up with a better way
         // to track the state of the pipeline and time frames.
         int roundedRefreshRate = Math.round(displayRefreshRate);
-        if ((!prefConfig.disableFrameDrop || prefConfig.unlockFps) && prefConfig.fps >= roundedRefreshRate) {
-            if (prefConfig.unlockFps) {
-                // Use frame drops when rendering above the screen frame rate
-                decoderRenderer.enableLegacyFrameDropRendering();
-                LimeLog.info("Using drop mode for FPS > Hz");
+        int chosenFrameRate = prefConfig.fps;
+        if (!prefConfig.disableFrameDrop || prefConfig.unlockFps) {
+            if (Build.DEVICE.equals("coral") || Build.DEVICE.equals("flame")) {
+                // HACK: Pixel 4 (XL) ignores the preferred display mode and lowers refresh rate,
+                // causing frame pacing issues. See https://issuetracker.google.com/issues/143401475
+                // To work around this, use frame drop mode if we want to stream at >= 60 FPS.
+                if (prefConfig.fps >= 60) {
+                    LimeLog.info("Using Pixel 4 rendering hack");
+                    decoderRenderer.enableLegacyFrameDropRendering();
+                }
             }
-            else if (roundedRefreshRate <= 49) {
-                // Let's avoid clearly bogus refresh rates and fall back to legacy rendering
-                decoderRenderer.enableLegacyFrameDropRendering();
-                LimeLog.info("Bogus refresh rate: "+roundedRefreshRate);
-            }
-            // HACK: Avoid crashing on some MTK devices
-            else if (roundedRefreshRate == 50 && decoderRenderer.is49FpsBlacklisted()) {
-                // Use the old rendering strategy on these broken devices
-                decoderRenderer.enableLegacyFrameDropRendering();
-            }
-            else {
-                prefConfig.fps = roundedRefreshRate - 1;
-                LimeLog.info("Adjusting FPS target for screen to "+prefConfig.fps);
+            else if (prefConfig.fps >= roundedRefreshRate) {
+                if (prefConfig.unlockFps) {
+                    // Use frame drops when rendering above the screen frame rate
+                    decoderRenderer.enableLegacyFrameDropRendering();
+                    LimeLog.info("Using drop mode for FPS > Hz");
+                } else if (roundedRefreshRate <= 49) {
+                    // Let's avoid clearly bogus refresh rates and fall back to legacy rendering
+                    decoderRenderer.enableLegacyFrameDropRendering();
+                    LimeLog.info("Bogus refresh rate: " + roundedRefreshRate);
+                }
+                // HACK: Avoid crashing on some MTK devices
+                else if (decoderRenderer.isBlacklistedForFrameRate(roundedRefreshRate - 1)) {
+                    // Use the old rendering strategy on these broken devices
+                    decoderRenderer.enableLegacyFrameDropRendering();
+                } else {
+                    chosenFrameRate = roundedRefreshRate - 1;
+                    LimeLog.info("Adjusting FPS target for screen to " + chosenFrameRate);
+                }
             }
         }
 
+        boolean vpnActive = NetHelper.isActiveNetworkVpn(this);
+        if (vpnActive) {
+            LimeLog.info("Detected active network is a VPN");
+        }
+
         StreamConfiguration config = new StreamConfiguration.Builder()
                 .setResolution(prefConfig.width, prefConfig.height)
-                .setRefreshRate(prefConfig.fps)
+                .setLaunchRefreshRate(prefConfig.fps)
+                .setRefreshRate(chosenFrameRate)
                 .setApp(new NvApp(appName != null ? appName : "app", appId, willStreamHdr))
                 .setBitrate(prefConfig.bitrate)
                 .setEnableSops(prefConfig.enableSops)
                 .enableLocalAudioPlayback(prefConfig.playHostAudio)
-                .setMaxPacketSize(1392)
-                .setRemoteConfiguration(StreamConfiguration.STREAM_CFG_AUTO)
+                .setMaxPacketSize(vpnActive ? 1024 : 1392) // Lower MTU on VPN
+                .setRemoteConfiguration(vpnActive ? // Use remote optimizations on VPN
+                        StreamConfiguration.STREAM_CFG_REMOTE :
+                        StreamConfiguration.STREAM_CFG_AUTO)
                 .setHevcBitratePercentageMultiplier(75)
                 .setHevcSupported(decoderRenderer.isHevcSupported())
                 .setEnableHdr(willStreamHdr)
                 .setAttachedGamepadMask(gamepadMask)
                 .setClientRefreshRateX100((int)(displayRefreshRate * 100))
-                .setAudioConfiguration(prefConfig.enable51Surround ?
-                        MoonBridge.AUDIO_CONFIGURATION_51_SURROUND :
-                        MoonBridge.AUDIO_CONFIGURATION_STEREO)
+                .setAudioConfiguration(prefConfig.audioConfiguration)
                 .build();
 
         // Initialize the connection
@@ -447,9 +484,14 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
         // Initialize touch contexts
         for (int i = 0; i < touchContextMap.length; i++) {
-            touchContextMap[i] = new TouchContext(conn, i,
-                    REFERENCE_HORIZ_RES, REFERENCE_VERT_RES,
-                    streamView);
+            if (!prefConfig.touchscreenTrackpad) {
+                touchContextMap[i] = new AbsoluteTouchContext(conn, i, streamView);
+            }
+            else {
+                touchContextMap[i] = new RelativeTouchContext(conn, i,
+                        REFERENCE_HORIZ_RES, REFERENCE_VERT_RES,
+                        streamView);
+            }
         }
 
         // Use sustained performance mode on N+ to ensure consistent
@@ -556,6 +598,10 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     public void onWindowFocusChanged(boolean hasFocus) {
         super.onWindowFocusChanged(hasFocus);
 
+        // We can't guarantee the state of modifiers keys which may have
+        // lifted while focus was not on us. Clear the modifier state.
+        this.modifierFlags = 0;
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             // Capture is lost when focus is lost, so it must be requested again
             // when focus is regained.
@@ -575,6 +621,11 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         }
     }
 
+    private boolean isRefreshRateGoodMatch(float refreshRate) {
+        return refreshRate >= prefConfig.fps &&
+                Math.round(refreshRate) % prefConfig.fps <= 3;
+    }
+
     private float prepareDisplayForRendering() {
         Display display = getWindowManager().getDefaultDisplay();
         WindowManager.LayoutParams windowLayoutParams = getWindow().getAttributes();
@@ -583,41 +634,61 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         // On M, we can explicitly set the optimal display mode
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             Display.Mode bestMode = display.getMode();
+            boolean isNativeResolutionStream = PreferenceConfiguration.isNativeResolution(prefConfig.width, prefConfig.height);
+            boolean refreshRateIsGood = isRefreshRateGoodMatch(bestMode.getRefreshRate());
             for (Display.Mode candidate : display.getSupportedModes()) {
-                boolean refreshRateOk = candidate.getRefreshRate() >= bestMode.getRefreshRate();
-                boolean resolutionOk = candidate.getPhysicalWidth() >= bestMode.getPhysicalWidth() &&
-                        candidate.getPhysicalHeight() >= bestMode.getPhysicalHeight() &&
-                        candidate.getPhysicalWidth() <= 4096;
+                boolean refreshRateReduced = candidate.getRefreshRate() < bestMode.getRefreshRate();
+                boolean resolutionReduced = candidate.getPhysicalWidth() < bestMode.getPhysicalWidth() ||
+                        candidate.getPhysicalHeight() < bestMode.getPhysicalHeight();
+                boolean resolutionFitsStream = candidate.getPhysicalWidth() >= prefConfig.width &&
+                        candidate.getPhysicalHeight() >= prefConfig.height;
 
                 LimeLog.info("Examining display mode: "+candidate.getPhysicalWidth()+"x"+
                         candidate.getPhysicalHeight()+"x"+candidate.getRefreshRate());
 
-                // On non-4K streams, we force the resolution to never change
-                if (prefConfig.width < 3840) {
+                if (candidate.getPhysicalWidth() > 4096 && prefConfig.width <= 4096) {
+                    // Avoid resolutions options above 4K to be safe
+                    continue;
+                }
+
+                // On non-4K streams, we force the resolution to never change unless it's above
+                // 60 FPS, which may require a resolution reduction due to HDMI bandwidth limitations,
+                // or it's a native resolution stream.
+                if (prefConfig.width < 3840 && prefConfig.fps <= 60 && !isNativeResolutionStream) {
                     if (display.getMode().getPhysicalWidth() != candidate.getPhysicalWidth() ||
                             display.getMode().getPhysicalHeight() != candidate.getPhysicalHeight()) {
                         continue;
                     }
                 }
 
-                // Ensure the frame rate stays around 60 Hz for <= 60 FPS streams
-                if (prefConfig.fps <= 60) {
-                    if (candidate.getRefreshRate() >= 63) {
+                // Make sure the resolution doesn't regress unless if it's over 60 FPS
+                // where we may need to reduce resolution to achieve the desired refresh rate.
+                if (resolutionReduced && !(prefConfig.fps > 60 && resolutionFitsStream)) {
+                    continue;
+                }
+
+                if (refreshRateIsGood) {
+                    // We have a good matching refresh rate, so we're looking for equal or greater
+                    // that is also a good matching refresh rate for our stream frame rate.
+                    if (refreshRateReduced || !isRefreshRateGoodMatch(candidate.getRefreshRate())) {
                         continue;
                     }
                 }
-
-                // Make sure the refresh rate doesn't regress
-                if (!refreshRateOk) {
-                    continue;
-                }
-
-                // Make sure the resolution doesn't regress
-                if (!resolutionOk) {
-                    continue;
+                else if (!isRefreshRateGoodMatch(candidate.getRefreshRate())) {
+                    // We didn't have a good match and this match isn't good either, so just don't
+                    // reduce the refresh rate.
+                    if (refreshRateReduced) {
+                        continue;
+                    }
+                } else {
+                    // We didn't have a good match and this match is good. Prefer this refresh rate
+                    // even if it reduces the refresh rate. Lowering the refresh rate can be beneficial
+                    // when streaming a 60 FPS stream on a 90 Hz device. We want to select 60 Hz to
+                    // match the frame rate even if the active display mode is 90 Hz.
                 }
 
                 bestMode = candidate;
+                refreshRateIsGood = isRefreshRateGoodMatch(candidate.getRefreshRate());
             }
             LimeLog.info("Selected display mode: "+bestMode.getPhysicalWidth()+"x"+
                     bestMode.getPhysicalHeight()+"x"+bestMode.getRefreshRate());
@@ -628,9 +699,9 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             float bestRefreshRate = display.getRefreshRate();
             for (float candidate : display.getSupportedRefreshRates()) {
-                if (candidate > bestRefreshRate) {
-                    LimeLog.info("Examining refresh rate: "+candidate);
+                LimeLog.info("Examining refresh rate: "+candidate);
 
+                if (candidate > bestRefreshRate) {
                     // Ensure the frame rate stays around 60 Hz for <= 60 FPS streams
                     if (prefConfig.fps <= 60) {
                         if (candidate >= 63) {
@@ -651,6 +722,11 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             displayRefreshRate = display.getRefreshRate();
         }
 
+        // Enable HDMI ALLM (game mode) on Android R
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            windowLayoutParams.preferMinimalPostProcessing = true;
+        }
+
         // Apply the display mode change
         getWindow().setAttributes(windowLayoutParams);
 
@@ -685,7 +761,18 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             streamView.setDesiredAspectRatio((double)prefConfig.width / (double)prefConfig.height);
         }
 
-        return displayRefreshRate;
+        if (getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEVISION) ||
+                getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
+            // TVs may take a few moments to switch refresh rates, and we can probably assume
+            // it will be eventually activated.
+            // TODO: Improve this
+            return displayRefreshRate;
+        }
+        else {
+            // Use the actual refresh rate of the display, since the preferred refresh rate or mode
+            // may not actually be applied (ex: Pixel 4 with Smooth Display disabled).
+            return getWindowManager().getDefaultDisplay().getRefreshRate();
+        }
     }
 
     @SuppressLint("InlinedApi")
@@ -794,34 +881,36 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             displayedFailureDialog = true;
             stopConnection();
 
-            int averageEndToEndLat = decoderRenderer.getAverageEndToEndLatency();
-            int averageDecoderLat = decoderRenderer.getAverageDecoderLatency();
-            String message = null;
-            if (averageEndToEndLat > 0) {
-                message = getResources().getString(R.string.conn_client_latency)+" "+averageEndToEndLat+" ms";
-                if (averageDecoderLat > 0) {
-                    message += " ("+getResources().getString(R.string.conn_client_latency_hw)+" "+averageDecoderLat+" ms)";
+            if (prefConfig.enableLatencyToast) {
+                int averageEndToEndLat = decoderRenderer.getAverageEndToEndLatency();
+                int averageDecoderLat = decoderRenderer.getAverageDecoderLatency();
+                String message = null;
+                if (averageEndToEndLat > 0) {
+                    message = getResources().getString(R.string.conn_client_latency)+" "+averageEndToEndLat+" ms";
+                    if (averageDecoderLat > 0) {
+                        message += " ("+getResources().getString(R.string.conn_client_latency_hw)+" "+averageDecoderLat+" ms)";
+                    }
+                }
+                else if (averageDecoderLat > 0) {
+                    message = getResources().getString(R.string.conn_hardware_latency)+" "+averageDecoderLat+" ms";
                 }
-            }
-            else if (averageDecoderLat > 0) {
-                message = getResources().getString(R.string.conn_hardware_latency)+" "+averageDecoderLat+" ms";
-            }
 
-            // Add the video codec to the post-stream toast
-            if (message != null) {
-                if (videoFormat == MoonBridge.VIDEO_FORMAT_H265_MAIN10) {
-                    message += " [H.265 HDR]";
+                // Add the video codec to the post-stream toast
+                if (message != null) {
+                    if (videoFormat == MoonBridge.VIDEO_FORMAT_H265_MAIN10) {
+                        message += " [H.265 HDR]";
+                    }
+                    else if (videoFormat == MoonBridge.VIDEO_FORMAT_H265) {
+                        message += " [H.265]";
+                    }
+                    else if (videoFormat == MoonBridge.VIDEO_FORMAT_H264) {
+                        message += " [H.264]";
+                    }
                 }
-                else if (videoFormat == MoonBridge.VIDEO_FORMAT_H265) {
-                    message += " [H.265]";
-                }
-                else if (videoFormat == MoonBridge.VIDEO_FORMAT_H264) {
-                    message += " [H.264]";
-                }
-            }
 
-            if (message != null) {
-                Toast.makeText(this, message, Toast.LENGTH_LONG).show();
+                if (message != null) {
+                    Toast.makeText(this, message, Toast.LENGTH_LONG).show();
+                }
             }
 
             // Clear the tombstone count if we terminated normally
@@ -911,8 +1000,14 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         return false;
     }
 
-    private static byte getModifierState(KeyEvent event) {
-        byte modifier = 0;
+    // We cannot simply use modifierFlags for all key event processing, because
+    // some IMEs will not generate real key events for pressing Shift. Instead
+    // they will simply send key events with isShiftPressed() returning true,
+    // and we will need to send the modifier flag ourselves.
+    private byte getModifierState(KeyEvent event) {
+        // Start with the global modifier state to ensure we cover the case
+        // detailed in https://github.com/moonlight-stream/moonlight-android/issues/840
+        byte modifier = getModifierState();
         if (event.isShiftPressed()) {
             modifier |= KeyboardPacket.MODIFIER_SHIFT;
         }
@@ -944,11 +1039,19 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         // Handle a synthetic back button event that some Android OS versions
         // create as a result of a right-click. This event WILL repeat if
         // the right mouse button is held down, so we ignore those.
-        if (!prefConfig.mouseNavButtons &&
-                (event.getSource() == InputDevice.SOURCE_MOUSE ||
+        if ((event.getSource() == InputDevice.SOURCE_MOUSE ||
                 event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) &&
                 event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
-            conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
+
+            // Send the right mouse button event if mouse back and forward
+            // are disabled. If they are enabled, handleMotionEvent() will take
+            // care of this.
+            if (!prefConfig.mouseNavButtons) {
+                conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
+            }
+
+            // Always return true, otherwise the back press will be propagated
+            // up to the parent and finish the activity.
             return true;
         }
 
@@ -972,6 +1075,11 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 return true;
             }
 
+            // Eat repeat down events
+            if (event.getRepeatCount() > 0) {
+                return true;
+            }
+
             // Pass through keyboard input if we're not grabbing
             if (!grabbedInput) {
                 return false;
@@ -980,7 +1088,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
             byte modifiers = getModifierState(event);
             if (KeyboardTranslator.needsShift(event.getKeyCode())) {
                 modifiers |= KeyboardPacket.MODIFIER_SHIFT;
-                conn.sendKeyboardInput((short) 0x8010, KeyboardPacket.KEY_DOWN, modifiers);
             }
             conn.sendKeyboardInput(translated, KeyboardPacket.KEY_DOWN, modifiers);
         }
@@ -1002,11 +1109,19 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
         // Handle a synthetic back button event that some Android OS versions
         // create as a result of a right-click.
-        if (!prefConfig.mouseNavButtons &&
-                (event.getSource() == InputDevice.SOURCE_MOUSE ||
+        if ((event.getSource() == InputDevice.SOURCE_MOUSE ||
                 event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) &&
                 event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
-            conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
+
+            // Send the right mouse button event if mouse back and forward
+            // are disabled. If they are enabled, handleMotionEvent() will take
+            // care of this.
+            if (!prefConfig.mouseNavButtons) {
+                conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
+            }
+
+            // Always return true, otherwise the back press will be propagated
+            // up to the parent and finish the activity.
             return true;
         }
 
@@ -1038,9 +1153,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 modifiers |= KeyboardPacket.MODIFIER_SHIFT;
             }
             conn.sendKeyboardInput(translated, KeyboardPacket.KEY_UP, modifiers);
-            if (KeyboardTranslator.needsShift(event.getKeyCode())) {
-                conn.sendKeyboardInput((short) 0x8010, KeyboardPacket.KEY_UP, getModifierState(event));
-            }
         }
 
         return true;
@@ -1064,7 +1176,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     }
 
     // Returns true if the event was consumed
-    private boolean handleMotionEvent(MotionEvent event) {
+    // NB: View is only present if called from a view callback
+    private boolean handleMotionEvent(View view, MotionEvent event) {
         // Pass through keyboard input if we're not grabbing
         if (!grabbedInput) {
             return false;
@@ -1078,17 +1191,39 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         else if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0 ||
                   event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE)
         {
-            // This case is for mice
+            // This case is for mice and non-finger touch devices
             if (event.getSource() == InputDevice.SOURCE_MOUSE ||
+                    event.getSource() == InputDevice.SOURCE_TOUCHPAD ||
                     event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE ||
                     (event.getPointerCount() >= 1 &&
-                            event.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE))
+                            (event.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE ||
+                                    event.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS ||
+                                    event.getToolType(0) == MotionEvent.TOOL_TYPE_ERASER)))
             {
                 int changedButtons = event.getButtonState() ^ lastButtonState;
 
                 // Ignore mouse input if we're not capturing from our input source
                 if (!inputCaptureProvider.isCapturingActive()) {
-                    return false;
+                    // We return true here because otherwise the events may end up causing
+                    // Android to synthesize d-pad events.
+                    return true;
+                }
+
+                // Always update the position before sending any button events. If we're
+                // dealing with a stylus without hover support, our position might be
+                // significantly different than before.
+                if (inputCaptureProvider.eventHasRelativeMouseAxes(event)) {
+                    // Send the deltas straight from the motion event
+                    short deltaX = (short)inputCaptureProvider.getRelativeAxisX(event);
+                    short deltaY = (short)inputCaptureProvider.getRelativeAxisY(event);
+
+                    if (deltaX != 0 || deltaY != 0) {
+                        conn.sendMouseMove(deltaX, deltaY);
+                    }
+                }
+                else if (view != null) {
+                    // Otherwise send absolute position
+                    updateMousePosition(view, event);
                 }
 
                 if (event.getActionMasked() == MotionEvent.ACTION_SCROLL) {
@@ -1096,13 +1231,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                     byte vScrollClicks = (byte) event.getAxisValue(MotionEvent.AXIS_VSCROLL);
                     conn.sendMouseScroll(vScrollClicks);
                 }
-                else if (event.getActionMasked() == MotionEvent.ACTION_HOVER_ENTER ||
-                         event.getActionMasked() == MotionEvent.ACTION_HOVER_EXIT) {
-                    // On some devices (Galaxy S8 without Oreo pointer capture), we can
-                    // get spurious ACTION_HOVER_ENTER events when right clicking with
-                    // incorrect X and Y coordinates. Just eat this event without processing it.
-                    return true;
-                }
 
                 if ((changedButtons & MotionEvent.BUTTON_PRIMARY) != 0) {
                     if ((event.getButtonState() & MotionEvent.BUTTON_PRIMARY) != 0) {
@@ -1113,8 +1241,9 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                     }
                 }
 
-                if ((changedButtons & MotionEvent.BUTTON_SECONDARY) != 0) {
-                    if ((event.getButtonState() & MotionEvent.BUTTON_SECONDARY) != 0) {
+                // Mouse secondary or stylus primary is right click (stylus down is left click)
+                if ((changedButtons & (MotionEvent.BUTTON_SECONDARY | MotionEvent.BUTTON_STYLUS_PRIMARY)) != 0) {
+                    if ((event.getButtonState() & (MotionEvent.BUTTON_SECONDARY | MotionEvent.BUTTON_STYLUS_PRIMARY)) != 0) {
                         conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
                     }
                     else {
@@ -1122,8 +1251,9 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                     }
                 }
 
-                if ((changedButtons & MotionEvent.BUTTON_TERTIARY) != 0) {
-                    if ((event.getButtonState() & MotionEvent.BUTTON_TERTIARY) != 0) {
+                // Mouse tertiary or stylus secondary is middle click
+                if ((changedButtons & (MotionEvent.BUTTON_TERTIARY | MotionEvent.BUTTON_STYLUS_SECONDARY)) != 0) {
+                    if ((event.getButtonState() & (MotionEvent.BUTTON_TERTIARY | MotionEvent.BUTTON_STYLUS_SECONDARY)) != 0) {
                         conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_MIDDLE);
                     }
                     else {
@@ -1151,36 +1281,58 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                     }
                 }
 
-                // Get relative axis values if we can
-                if (inputCaptureProvider.eventHasRelativeMouseAxes(event)) {
-                    // Send the deltas straight from the motion event
-                    conn.sendMouseMove((short) inputCaptureProvider.getRelativeAxisX(event),
-                            (short) inputCaptureProvider.getRelativeAxisY(event));
+                // Handle stylus presses
+                if (event.getPointerCount() == 1 && event.getActionIndex() == 0) {
+                    if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
+                        if (event.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS) {
+                            lastAbsTouchDownTime = SystemClock.uptimeMillis();
+                            lastAbsTouchDownX = event.getX(0);
+                            lastAbsTouchDownY = event.getY(0);
 
-                    // We have to also update the position Android thinks the cursor is at
-                    // in order to avoid jumping when we stop moving or click.
-                    lastMouseX = (int)event.getX();
-                    lastMouseY = (int)event.getY();
-                }
-                else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    // We get a normal (non-relative) MotionEvent when starting pointer capture to synchronize the
-                    // location of the cursor with our app. We don't want this, so we must discard this event.
-                    lastMouseX = (int)event.getX();
-                    lastMouseY = (int)event.getY();
-                }
-                else {
-                    // Don't process the history. We just want the current position now.
-                    updateMousePosition((int)event.getX(), (int)event.getY());
+                            // Stylus is left click
+                            conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_LEFT);
+                        } else if (event.getToolType(0) == MotionEvent.TOOL_TYPE_ERASER) {
+                            lastAbsTouchDownTime = SystemClock.uptimeMillis();
+                            lastAbsTouchDownX = event.getX(0);
+                            lastAbsTouchDownY = event.getY(0);
+
+                            // Eraser is right click
+                            conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
+                        }
+                    }
+                    else if (event.getActionMasked() == MotionEvent.ACTION_UP || event.getActionMasked() == MotionEvent.ACTION_CANCEL) {
+                        if (event.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS) {
+                            lastAbsTouchUpTime = SystemClock.uptimeMillis();
+                            lastAbsTouchUpX = event.getX(0);
+                            lastAbsTouchUpY = event.getY(0);
+
+                            // Stylus is left click
+                            conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
+                        } else if (event.getToolType(0) == MotionEvent.TOOL_TYPE_ERASER) {
+                            lastAbsTouchUpTime = SystemClock.uptimeMillis();
+                            lastAbsTouchUpX = event.getX(0);
+                            lastAbsTouchUpY = event.getY(0);
+
+                            // Eraser is right click
+                            conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
+                        }
+                    }
                 }
 
                 lastButtonState = event.getButtonState();
             }
-            // This case is for touch-based input devices
+            // This case is for fingers
             else
             {
                 if (virtualController != null &&
-                        virtualController.getControllerMode() == VirtualController.ControllerMode.Configuration) {
-                    // Ignore presses when the virtual controller is in configuration mode
+                        (virtualController.getControllerMode() == VirtualController.ControllerMode.MoveButtons ||
+                         virtualController.getControllerMode() == VirtualController.ControllerMode.ResizeButtons)) {
+                    // Ignore presses when the virtual controller is being configured
+                    return true;
+                }
+
+                if (view == null && !prefConfig.touchscreenTrackpad) {
+                    // Absolute touch events should be dropped outside our view.
                     return true;
                 }
 
@@ -1213,7 +1365,10 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 {
                 case MotionEvent.ACTION_POINTER_DOWN:
                 case MotionEvent.ACTION_DOWN:
-                    context.touchDownEvent(eventX, eventY);
+                    for (TouchContext touchContext : touchContextMap) {
+                        touchContext.setPointerCount(event.getPointerCount());
+                    }
+                    context.touchDownEvent(eventX, eventY, true);
                     break;
                 case MotionEvent.ACTION_POINTER_UP:
                 case MotionEvent.ACTION_UP:
@@ -1226,9 +1381,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                         }
                     }
                     context.touchUpEvent(eventX, eventY);
+                    for (TouchContext touchContext : touchContextMap) {
+                        touchContext.setPointerCount(event.getPointerCount() - 1);
+                    }
                     if (actionIndex == 0 && event.getPointerCount() > 1 && !context.isCancelled()) {
                         // The original secondary touch now becomes primary
-                        context.touchDownEvent((int)event.getX(1), (int)event.getY(1));
+                        context.touchDownEvent((int)event.getX(1), (int)event.getY(1), false);
                     }
                     break;
                 case MotionEvent.ACTION_MOVE:
@@ -1257,6 +1415,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                         }
                     }
                     break;
+                case MotionEvent.ACTION_CANCEL:
+                    for (TouchContext aTouchContext : touchContextMap) {
+                        aTouchContext.cancelTouch();
+                        aTouchContext.setPointerCount(0);
+                    }
+                    break;
                 default:
                     return false;
                 }
@@ -1272,48 +1436,67 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
     @Override
     public boolean onTouchEvent(MotionEvent event) {
-        return handleMotionEvent(event) || super.onTouchEvent(event);
+        return handleMotionEvent(null, event) || super.onTouchEvent(event);
 
     }
 
     @Override
     public boolean onGenericMotionEvent(MotionEvent event) {
-        return handleMotionEvent(event) || super.onGenericMotionEvent(event);
+        return handleMotionEvent(null, event) || super.onGenericMotionEvent(event);
 
     }
 
-    private void updateMousePosition(int eventX, int eventY) {
-        // Send a mouse move if we already have a mouse location
-        // and the mouse coordinates change
-        if (lastMouseX != Integer.MIN_VALUE &&
-            lastMouseY != Integer.MIN_VALUE &&
-            !(lastMouseX == eventX && lastMouseY == eventY))
+    private void updateMousePosition(View view, MotionEvent event) {
+        // X and Y are already relative to the provided view object
+        float eventX = event.getX(0);
+        float eventY = event.getY(0);
+
+        if (event.getPointerCount() == 1 && event.getActionIndex() == 0 &&
+                (event.getToolType(0) == MotionEvent.TOOL_TYPE_ERASER ||
+                event.getToolType(0) == MotionEvent.TOOL_TYPE_STYLUS))
         {
-            int deltaX = eventX - lastMouseX;
-            int deltaY = eventY - lastMouseY;
+            switch (event.getActionMasked()) {
+                case MotionEvent.ACTION_DOWN:
+                case MotionEvent.ACTION_HOVER_ENTER:
+                case MotionEvent.ACTION_HOVER_EXIT:
+                case MotionEvent.ACTION_HOVER_MOVE:
+                    if (SystemClock.uptimeMillis() - lastAbsTouchUpTime <= STYLUS_UP_DEAD_ZONE_DELAY &&
+                            Math.sqrt(Math.pow(eventX - lastAbsTouchUpX, 2) + Math.pow(eventY - lastAbsTouchUpY, 2)) <= STYLUS_UP_DEAD_ZONE_RADIUS) {
+                        // Enforce a small deadzone between touch up and hover or touch down to allow more precise double-clicking
+                        return;
+                    }
+                    break;
 
-            // Scale the deltas if the device resolution is different
-            // than the stream resolution
-            deltaX = (int)Math.round((double)deltaX * (REFERENCE_HORIZ_RES / (double)streamView.getWidth()));
-            deltaY = (int)Math.round((double)deltaY * (REFERENCE_VERT_RES / (double)streamView.getHeight()));
-
-            conn.sendMouseMove((short)deltaX, (short)deltaY);
+                case MotionEvent.ACTION_MOVE:
+                case MotionEvent.ACTION_UP:
+                    if (SystemClock.uptimeMillis() - lastAbsTouchDownTime <= STYLUS_DOWN_DEAD_ZONE_DELAY &&
+                            Math.sqrt(Math.pow(eventX - lastAbsTouchDownX, 2) + Math.pow(eventY - lastAbsTouchDownY, 2)) <= STYLUS_DOWN_DEAD_ZONE_RADIUS) {
+                        // Enforce a small deadzone between touch down and move or touch up to allow more precise double-clicking
+                        return;
+                    }
+                    break;
+            }
         }
 
-        // Update pointer location for delta calculation next time
-        lastMouseX = eventX;
-        lastMouseY = eventY;
+        // We may get values slightly outside our view region on ACTION_HOVER_ENTER and ACTION_HOVER_EXIT.
+        // Normalize these to the view size. We can't just drop them because we won't always get an event
+        // right at the boundary of the view, so dropping them would result in our cursor never really
+        // reaching the sides of the screen.
+        eventX = Math.min(Math.max(eventX, 0), view.getWidth());
+        eventY = Math.min(Math.max(eventY, 0), view.getHeight());
+
+        conn.sendMousePosition((short)eventX, (short)eventY, (short)view.getWidth(), (short)view.getHeight());
     }
 
     @Override
-    public boolean onGenericMotion(View v, MotionEvent event) {
-        return handleMotionEvent(event);
+    public boolean onGenericMotion(View view, MotionEvent event) {
+        return handleMotionEvent(view, event);
     }
 
     @SuppressLint("ClickableViewAccessibility")
     @Override
-    public boolean onTouch(View v, MotionEvent event) {
-        return handleMotionEvent(event);
+    public boolean onTouch(View view, MotionEvent event) {
+        return handleMotionEvent(view, event);
     }
 
     @Override
@@ -1352,7 +1535,11 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     }
 
     @Override
-    public void stageFailed(final String stage, final long errorCode) {
+    public void stageFailed(final String stage, final int portFlags, final int errorCode) {
+        // Perform a connection test if the failure could be due to a blocked port
+        // This does network I/O, so don't do it on the main thread.
+        final int portTestResult = MoonBridge.testClientConnectivity(ServerHelper.CONNECTION_TEST_SERVER, 443, portFlags);
+
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -1367,18 +1554,33 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
                     // If video initialization failed and the surface is still valid, display extra information for the user
                     if (stage.contains("video") && streamView.getHolder().getSurface().isValid()) {
-                        Toast.makeText(Game.this, "Video decoder failed to initialize. Your device may not support the selected resolution.", Toast.LENGTH_LONG).show();
+                        Toast.makeText(Game.this, getResources().getText(R.string.video_decoder_init_failed), Toast.LENGTH_LONG).show();
                     }
 
-                    Dialog.displayDialog(Game.this, getResources().getString(R.string.conn_error_title),
-                            getResources().getString(R.string.conn_error_msg) + " " + stage, true);
+                    String dialogText = getResources().getString(R.string.conn_error_msg) + " " + stage +" (error "+errorCode+")";
+
+                    if (portFlags != 0) {
+                        dialogText += "\n\n" + getResources().getString(R.string.check_ports_msg) + "\n" +
+                                MoonBridge.stringifyPortFlags(portFlags, "\n");
+                    }
+
+                    if (portTestResult != MoonBridge.ML_TEST_RESULT_INCONCLUSIVE && portTestResult != 0)  {
+                        dialogText += "\n\n" + getResources().getString(R.string.nettest_text_blocked);
+                    }
+
+                    Dialog.displayDialog(Game.this, getResources().getString(R.string.conn_error_title), dialogText, true);
                 }
             }
         });
     }
 
     @Override
-    public void connectionTerminated(final long errorCode) {
+    public void connectionTerminated(final int errorCode) {
+        // Perform a connection test if the failure could be due to a blocked port
+        // This does network I/O, so don't do it on the main thread.
+        final int portFlags = MoonBridge.getPortFlagsFromTerminationErrorCode(errorCode);
+        final int portTestResult = MoonBridge.testClientConnectivity(ServerHelper.CONNECTION_TEST_SERVER,443, portFlags);
+
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
@@ -1395,9 +1597,41 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
                     // Display the error dialog if it was an unexpected termination.
                     // Otherwise, just finish the activity immediately.
-                    if (errorCode != 0) {
+                    if (errorCode != MoonBridge.ML_ERROR_GRACEFUL_TERMINATION) {
+                        String message;
+
+                        if (portTestResult != MoonBridge.ML_TEST_RESULT_INCONCLUSIVE && portTestResult != 0) {
+                            // If we got a blocked result, that supersedes any other error message
+                            message = getResources().getString(R.string.nettest_text_blocked);
+                        }
+                        else {
+                            switch (errorCode) {
+                                case MoonBridge.ML_ERROR_NO_VIDEO_TRAFFIC:
+                                    message = getResources().getString(R.string.no_video_received_error);
+                                    break;
+
+                                case MoonBridge.ML_ERROR_NO_VIDEO_FRAME:
+                                    message = getResources().getString(R.string.no_frame_received_error);
+                                    break;
+
+                                case MoonBridge.ML_ERROR_UNEXPECTED_EARLY_TERMINATION:
+                                case MoonBridge.ML_ERROR_PROTECTED_CONTENT:
+                                    message = getResources().getString(R.string.early_termination_error);
+                                    break;
+
+                                default:
+                                    message = getResources().getString(R.string.conn_terminated_msg);
+                                    break;
+                            }
+                        }
+
+                        if (portFlags != 0) {
+                            message += "\n\n" + getResources().getString(R.string.check_ports_msg) + "\n" +
+                                    MoonBridge.stringifyPortFlags(portFlags, "\n");
+                        }
+
                         Dialog.displayDialog(Game.this, getResources().getString(R.string.conn_terminated_title),
-                                getResources().getString(R.string.conn_terminated_msg), true);
+                                message, true);
                     }
                     else {
                         finish();
@@ -1517,6 +1751,11 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     @Override
     public void surfaceCreated(SurfaceHolder holder) {
         surfaceCreated = true;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            // Tell the OS about our frame rate to allow it to adapt the display refresh rate appropriately
+            holder.getSurface().setFrameRate(prefConfig.fps, Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE);
+        }
     }
 
     @Override

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

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

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

@@ -109,7 +109,6 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         }
     }
 
-    private final static int APP_LIST_ID = 1;
     private final static int PAIR_ID = 2;
     private final static int UNPAIR_ID = 3;
     private final static int WOL_ID = 4;
@@ -117,6 +116,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
     private final static int RESUME_ID = 6;
     private final static int QUIT_ID = 7;
     private final static int VIEW_DETAILS_ID = 8;
+    private final static int FULL_APP_LIST_ID = 9;
+    private final static int TEST_NETWORK_ID = 10;
 
     private void initializeViews() {
         setContentView(R.layout.activity_pc_view);
@@ -126,6 +127,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         // Set default preferences if we've never been run
         PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
 
+        // Set the correct layout for the PC grid
+        pcGridAdapter.updateLayoutWithPreferences(this, PreferenceConfiguration.readPreferences(this));
+
         // Setup the list view
         ImageButton settingsButton = findViewById(R.id.settingsButton);
         ImageButton addComputerButton = findViewById(R.id.manuallyAddPc);
@@ -223,9 +227,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         bindService(new Intent(PcView.this, ComputerManagerService.class), serviceConnection,
                 Service.BIND_AUTO_CREATE);
 
-        pcGridAdapter = new PcGridAdapter(this,
-                PreferenceConfiguration.readPreferences(this).listMode,
-                PreferenceConfiguration.readPreferences(this).smallIconMode);
+        pcGridAdapter = new PcGridAdapter(this, PreferenceConfiguration.readPreferences(this));
 
         initializeViews();
     }
@@ -315,15 +317,32 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
         ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
 
+        // Add a header with PC status details
+        menu.clearHeader();
+        String headerTitle = computer.details.name + " - ";
+        switch (computer.details.state)
+        {
+            case ONLINE:
+                headerTitle += getResources().getString(R.string.pcview_menu_header_online);
+                break;
+            case OFFLINE:
+                menu.setHeaderIcon(R.drawable.ic_pc_offline);
+                headerTitle += getResources().getString(R.string.pcview_menu_header_offline);
+                break;
+            case UNKNOWN:
+                headerTitle += getResources().getString(R.string.pcview_menu_header_unknown);
+                break;
+        }
+
+        menu.setHeaderTitle(headerTitle);
+
         // Inflate the context menu
         if (computer.details.state == ComputerDetails.State.OFFLINE ||
             computer.details.state == ComputerDetails.State.UNKNOWN) {
             menu.add(Menu.NONE, WOL_ID, 1, getResources().getString(R.string.pcview_menu_send_wol));
-            menu.add(Menu.NONE, DELETE_ID, 2, getResources().getString(R.string.pcview_menu_delete_pc));
         }
         else if (computer.details.pairState != PairState.PAIRED) {
             menu.add(Menu.NONE, PAIR_ID, 1, getResources().getString(R.string.pcview_menu_pair_pc));
-            menu.add(Menu.NONE, DELETE_ID, 2, getResources().getString(R.string.pcview_menu_delete_pc));
         }
         else {
             if (computer.details.runningGameId != 0) {
@@ -331,13 +350,12 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit));
             }
 
-            menu.add(Menu.NONE, APP_LIST_ID, 3, getResources().getString(R.string.pcview_menu_app_list));
-
-            // FIXME: We used to be able to unpair here but it's been broken since GFE 2.1.x, so I've replaced
-            // 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, FULL_APP_LIST_ID, 4, getResources().getString(R.string.pcview_menu_app_list));
         }
-        menu.add(Menu.NONE, VIEW_DETAILS_ID, 5,  getResources().getString(R.string.pcview_menu_details));
+
+        menu.add(Menu.NONE, TEST_NETWORK_ID, 5, getResources().getString(R.string.pcview_menu_test_network));
+        menu.add(Menu.NONE, DELETE_ID, 6, getResources().getString(R.string.pcview_menu_delete_pc));
+        menu.add(Menu.NONE, VIEW_DETAILS_ID, 7,  getResources().getString(R.string.pcview_menu_details));
     }
 
     @Override
@@ -441,7 +459,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
                         if (toastSuccess) {
                             // Open the app list after a successful pairing attempt
-                            doAppList(computer, true);
+                            doAppList(computer, true, false);
                         }
                         else {
                             // Start polling again if we're still in the foreground
@@ -540,7 +558,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         }).start();
     }
 
-    private void doAppList(ComputerDetails computer, boolean newlyPaired) {
+    private void doAppList(ComputerDetails computer, boolean newlyPaired, boolean showHiddenGames) {
         if (computer.state == ComputerDetails.State.OFFLINE) {
             Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
             return;
@@ -554,6 +572,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         i.putExtra(AppView.NAME_EXTRA, computer.name);
         i.putExtra(AppView.UUID_EXTRA, computer.uuid);
         i.putExtra(AppView.NEW_PAIR_EXTRA, newlyPaired);
+        i.putExtra(AppView.SHOW_HIDDEN_APPS_EXTRA, showHiddenGames);
         startActivity(i);
     }
 
@@ -591,8 +610,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 }, null);
                 return true;
 
-            case APP_LIST_ID:
-                doAppList(computer.details, false);
+            case FULL_APP_LIST_ID:
+                doAppList(computer.details, false, true);
                 return true;
 
             case RESUME_ID:
@@ -624,6 +643,10 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 Dialog.displayDialog(PcView.this, getResources().getString(R.string.title_details), computer.details.toString(), false);
                 return true;
 
+            case TEST_NETWORK_ID:
+                ServerHelper.doNetworkTest(PcView.this);
+                return true;
+
             default:
                 return super.onContextItemSelected(item);
         }
@@ -634,6 +657,12 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
         new DiskAssetLoader(this).deleteAssetsForComputer(details.uuid);
 
+        // Delete hidden games preference value
+        getSharedPreferences(AppView.HIDDEN_APPS_PREF_FILENAME, MODE_PRIVATE)
+                .edit()
+                .remove(details.uuid)
+                .apply();
+
         for (int i = 0; i < pcGridAdapter.getCount(); i++) {
             ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
 
@@ -691,9 +720,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
     @Override
     public int getAdapterFragmentLayoutId() {
-        return PreferenceConfiguration.readPreferences(this).listMode ?
-                R.layout.list_view : (PreferenceConfiguration.readPreferences(this).smallIconMode ?
-                R.layout.pc_grid_view_small : R.layout.pc_grid_view);
+        return R.layout.pc_grid_view;
     }
 
     @Override
@@ -712,7 +739,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                     // Pair an unpaired machine by default
                     doPair(computer.details);
                 } else {
-                    doAppList(computer.details, false);
+                    doAppList(computer.details, false, false);
                 }
             }
         });
@@ -720,7 +747,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
         registerForContextMenu(listView);
     }
 
-    public class ComputerObject {
+    public static class ComputerObject {
         public ComputerDetails details;
 
         public ComputerObject(ComputerDetails details) {

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

@@ -14,10 +14,10 @@ public class AndroidAudioRenderer implements AudioRenderer {
 
     private AudioTrack track;
 
-    private AudioTrack createAudioTrack(int channelConfig, int bufferSize, boolean lowLatency) {
+    private AudioTrack createAudioTrack(int channelConfig, int sampleRate, int bufferSize, boolean lowLatency) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             return new AudioTrack(AudioManager.STREAM_MUSIC,
-                    48000,
+                    sampleRate,
                     channelConfig,
                     AudioFormat.ENCODING_PCM_16BIT,
                     bufferSize,
@@ -28,7 +28,7 @@ public class AndroidAudioRenderer implements AudioRenderer {
                     .setUsage(AudioAttributes.USAGE_GAME);
             AudioFormat format = new AudioFormat.Builder()
                     .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
-                    .setSampleRate(48000)
+                    .setSampleRate(sampleRate)
                     .setChannelMask(channelConfig)
                     .build();
 
@@ -64,25 +64,46 @@ public class AndroidAudioRenderer implements AudioRenderer {
     }
 
     @Override
-    public int setup(int audioConfiguration) {
+    public int setup(MoonBridge.AudioConfiguration audioConfiguration, int sampleRate, int samplesPerFrame) {
         int channelConfig;
         int bytesPerFrame;
 
-        switch (audioConfiguration)
+        switch (audioConfiguration.channelCount)
         {
-            case MoonBridge.AUDIO_CONFIGURATION_STEREO:
+            case 2:
                 channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
-                bytesPerFrame = 2 * 240 * 2;
                 break;
-            case MoonBridge.AUDIO_CONFIGURATION_51_SURROUND:
+            case 4:
+                channelConfig = AudioFormat.CHANNEL_OUT_QUAD;
+                break;
+            case 6:
                 channelConfig = AudioFormat.CHANNEL_OUT_5POINT1;
-                bytesPerFrame = 6 * 240 * 2;
+                break;
+            case 8:
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    // AudioFormat.CHANNEL_OUT_7POINT1_SURROUND isn't available until Android 6.0,
+                    // yet the CHANNEL_OUT_SIDE_LEFT and CHANNEL_OUT_SIDE_RIGHT constants were added
+                    // in 5.0, so just hardcode the constant so we can work on Lollipop.
+                    channelConfig = 0x000018fc; // AudioFormat.CHANNEL_OUT_7POINT1_SURROUND
+                }
+                else {
+                    // On KitKat and lower, creation of the AudioTrack will fail if we specify
+                    // CHANNEL_OUT_SIDE_LEFT or CHANNEL_OUT_SIDE_RIGHT. That leaves us with
+                    // the old CHANNEL_OUT_7POINT1 which uses left-of-center and right-of-center
+                    // speakers instead of side-left and side-right. This non-standard layout
+                    // is probably not what the user wants, but we don't really have a choice.
+                    channelConfig = AudioFormat.CHANNEL_OUT_7POINT1;
+                }
                 break;
             default:
                 LimeLog.severe("Decoder returned unhandled channel count");
                 return -1;
         }
 
+        LimeLog.info("Audio channel config: "+String.format("0x%X", channelConfig));
+
+        bytesPerFrame = audioConfiguration.channelCount * samplesPerFrame * 2;
+
         // We're not supposed to request less than the minimum
         // buffer size for our buffer, but it appears that we can
         // do this on many devices and it lowers audio latency.
@@ -122,7 +143,7 @@ public class AndroidAudioRenderer implements AudioRenderer {
                 case 1:
                 case 3:
                     // Try the larger buffer size
-                    bufferSize = Math.max(AudioTrack.getMinBufferSize(48000,
+                    bufferSize = Math.max(AudioTrack.getMinBufferSize(sampleRate,
                             channelConfig,
                             AudioFormat.ENCODING_PCM_16BIT),
                             bytesPerFrame * 2);
@@ -135,13 +156,13 @@ public class AndroidAudioRenderer implements AudioRenderer {
                     throw new IllegalStateException();
             }
 
-            // Skip low latency options if hardware sample rate isn't 48000Hz
-            if (AudioTrack.getNativeOutputSampleRate(AudioManager.STREAM_MUSIC) != 48000 && lowLatency) {
+            // Skip low latency options if hardware sample rate doesn't match the content
+            if (AudioTrack.getNativeOutputSampleRate(AudioManager.STREAM_MUSIC) != sampleRate && lowLatency) {
                 continue;
             }
 
             try {
-                track = createAudioTrack(channelConfig, bufferSize, lowLatency);
+                track = createAudioTrack(channelConfig, sampleRate, bufferSize, lowLatency);
                 track.play();
 
                 // Successfully created working AudioTrack. We're done here.
@@ -170,14 +191,14 @@ public class AndroidAudioRenderer implements AudioRenderer {
     @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) {
+        if (MoonBridge.getPendingAudioDuration() < 40) {
             // This will block until the write is completed. That can cause a backlog
             // of pending audio data, so we do the above check to be able to bound
             // latency at 40 ms in that situation.
             track.write(audioData, 0, audioData.length);
         }
         else {
-            LimeLog.info("Too many pending audio frames: " + MoonBridge.getPendingAudioFrames());
+            LimeLog.info("Too much pending audio data: " + MoonBridge.getPendingAudioDuration() +" ms");
         }
     }
 

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

@@ -102,9 +102,7 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
             LimeLog.warning("Corrupted certificate");
             return false;
         } catch (NoSuchAlgorithmException e) {
-            // Should never happen
-            e.printStackTrace();
-            return false;
+            throw new RuntimeException(e);
         } catch (InvalidKeySpecException e) {
             // May happen if the key is corrupt
             LimeLog.warning("Corrupted key");
@@ -124,10 +122,8 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
             KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA", bcProvider);
             keyPairGenerator.initialize(2048);
             keyPair = keyPairGenerator.generateKeyPair();
-        } catch (NoSuchAlgorithmException e1) {
-            // Should never happen
-            e1.printStackTrace();
-            return false;
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
         }
 
         Date now = new Date();
@@ -152,8 +148,6 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
             cert = new JcaX509CertificateConverter().setProvider(bcProvider).getCertificate(certBuilder.build(sigGen));
             key = (RSAPrivateKey) keyPair.getPrivate();
         } catch (Exception e) {
-            // Nothing should go wrong here
-            e.printStackTrace();
             throw new RuntimeException(e);
         }
 

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

@@ -1,5 +1,6 @@
 package com.limelight.binding.input;
 
+import android.app.Activity;
 import android.content.Context;
 import android.hardware.input.InputManager;
 import android.hardware.usb.UsbDevice;
@@ -51,7 +52,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     private final SparseArray<UsbDeviceContext> usbDeviceContexts = new SparseArray<>();
 
     private final NvConnection conn;
-    private final Context activityContext;
+    private final Activity activityContext;
     private final double stickDeadzone;
     private final InputDeviceContext defaultContext = new InputDeviceContext();
     private final GameGestures gestures;
@@ -61,7 +62,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     private final PreferenceConfiguration prefConfig;
     private short currentControllers, initialControllers;
 
-    public ControllerHandler(Context activityContext, NvConnection conn, GameGestures gestures, PreferenceConfiguration prefConfig) {
+    public ControllerHandler(Activity activityContext, NvConnection conn, GameGestures gestures, PreferenceConfiguration prefConfig) {
         this.activityContext = activityContext;
         this.conn = conn;
         this.gestures = gestures;
@@ -106,8 +107,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         defaultContext.rightStickDeadzoneRadius = (float) stickDeadzone;
         defaultContext.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
         defaultContext.rightTriggerAxis = MotionEvent.AXIS_GAS;
+        defaultContext.hatXAxis = MotionEvent.AXIS_HAT_X;
+        defaultContext.hatYAxis = MotionEvent.AXIS_HAT_Y;
         defaultContext.controllerNumber = (short) 0;
         defaultContext.assignedControllerNumber = true;
+        defaultContext.external = false;
 
         // Some devices (GPD XD) have a back button which sends input events
         // with device ID == 0. This hits the default context which would normally
@@ -146,6 +150,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         if (context != null) {
             LimeLog.info("Removed controller: "+context.name+" ("+deviceId+")");
             releaseControllerNumber(context);
+            context.destroy();
             inputDeviceContexts.remove(deviceId);
         }
     }
@@ -160,10 +165,12 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     public void stop() {
         for (int i = 0; i < inputDeviceContexts.size(); i++) {
             InputDeviceContext deviceContext = inputDeviceContexts.valueAt(i);
+            deviceContext.destroy();
+        }
 
-            if (deviceContext.vibrator != null) {
-                deviceContext.vibrator.cancel();
-            }
+        for (int i = 0; i < usbDeviceContexts.size(); i++) {
+            UsbDeviceContext deviceContext = usbDeviceContexts.valueAt(i);
+            deviceContext.destroy();
         }
 
         deviceVibrator.cancel();
@@ -189,6 +196,28 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             return true;
         }
 
+        // HACK for https://issuetracker.google.com/issues/163120692
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R) {
+            if (device.getId() == -1) {
+                // This "virtual" device could be input from any of the attached devices.
+                // Look to see if any gamepads are connected.
+                int[] ids = InputDevice.getDeviceIds();
+                for (int id : ids) {
+                    InputDevice dev = InputDevice.getDevice(id);
+                    if (dev == null) {
+                        // This device was removed during enumeration
+                        continue;
+                    }
+
+                    // If there are any gamepad devices connected, we'll
+                    // report that this virtual device is a gamepad.
+                    if (hasJoystickAxes(dev) || hasGamepadButtons(dev)) {
+                        return true;
+                    }
+                }
+            }
+        }
+
         // Otherwise, we'll try anything that claims to be a non-alphabetic keyboard
         return device.getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC;
     }
@@ -215,9 +244,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         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
+                // We explicitly check not to claim devices that appear as InputDevices
                 // otherwise we will double count them.
-                if (UsbDriverService.shouldClaimDevice(dev, false)) {
+                if (UsbDriverService.shouldClaimDevice(dev, false) &&
+                        !UsbDriverService.isRecognizedInputDevice(dev)) {
                     LimeLog.info("Counting UsbDevice: "+dev.getDeviceName());
                     mask |= 1 << count++;
                 }
@@ -263,9 +293,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             InputDeviceContext devContext = (InputDeviceContext) context;
 
             LimeLog.info(devContext.name+" ("+context.id+") needs a controller number assigned");
-            if (devContext.name != null &&
-                    (devContext.name.contains("gpio-keys") || // This is the back button on Shield portable consoles
-                            devContext.name.contains("joy_key"))) { // These are the gamepad buttons on the Archos Gamepad 2
+            if (!devContext.external) {
                 LimeLog.info("Built-in buttons hardcoded as controller 0");
                 context.controllerNumber = 0;
             }
@@ -326,6 +354,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
 
         context.id = device.getControllerId();
         context.device = device;
+        context.external = true;
+
+        context.vendorId = device.getVendorId();
+        context.productId = device.getProductId();
 
         context.leftStickDeadzoneRadius = (float) stickDeadzone;
         context.rightStickDeadzoneRadius = (float) stickDeadzone;
@@ -335,6 +367,24 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     }
 
     private static boolean isExternal(InputDevice dev) {
+        // The ASUS Tinker Board inaccurately reports Bluetooth gamepads as internal,
+        // causing shouldIgnoreBack() to believe it should pass through back as a
+        // navigation event for any attached gamepads.
+        if (Build.MODEL.equals("Tinker Board")) {
+            return true;
+        }
+
+        String deviceName = dev.getName();
+        if (deviceName.contains("gpio") || // This is the back button on Shield portable consoles
+                deviceName.contains("joy_key") || // These are the gamepad buttons on the Archos Gamepad 2
+                deviceName.contains("keypad") || // These are gamepad buttons on the XPERIA Play
+                deviceName.equalsIgnoreCase("NVIDIA Corporation NVIDIA Controller v01.01") || // Gamepad on Shield Portable
+                deviceName.equalsIgnoreCase("NVIDIA Corporation NVIDIA Controller v01.02")) // Gamepad on Shield Portable (?)
+        {
+            LimeLog.info(dev.getName()+" is internal by hardcoded mapping");
+            return false;
+        }
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             // Landroid/view/InputDevice;->isExternal()Z is officially public on Android Q
             return dev.isExternal();
@@ -368,9 +418,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         }
 
         // 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")) {
+        if (!hasJoystickAxes(dev) && devName.toLowerCase().contains("remote")) {
             return true;
         }
 
@@ -393,11 +441,14 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
 
                 // 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]) {
+                if (currentDev.hasKeys(KeyEvent.KEYCODE_BUTTON_SELECT)[0]) {
                     foundInternalSelect = true;
                 }
-                if (keys[1]) {
+
+                // We don't check KEYCODE_BUTTON_A here, since the Shield Android TV has a
+                // virtual mouse device that claims to have KEYCODE_BUTTON_A. Instead, we rely
+                // on the SOURCE_GAMEPAD flag to be set on gamepad devices.
+                if (hasGamepadButtons(currentDev)) {
                     foundInternalGamepad = true;
                 }
             }
@@ -409,8 +460,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             // c) have an internal gamepad but no internal select button (NVIDIA SHIELD Portable)
             return !foundInternalGamepad || foundInternalSelect;
         }
-
-        return false;
+        else {
+            // For external devices, we want to pass through the back button if the device
+            // has no gamepad axes or gamepad buttons.
+            return !hasJoystickAxes(dev) && !hasGamepadButtons(dev);
+        }
     }
 
     private InputDeviceContext createInputDeviceContextForDevice(InputDevice dev) {
@@ -418,15 +472,33 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         String devName = dev.getName();
 
         LimeLog.info("Creating controller context for device: "+devName);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            LimeLog.info("Vendor ID: "+dev.getVendorId());
+            LimeLog.info("Product ID: "+dev.getProductId());
+        }
         LimeLog.info(dev.toString());
 
         context.name = devName;
         context.id = dev.getId();
+        context.external = isExternal(dev);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            context.vendorId = dev.getVendorId();
+            context.productId = dev.getProductId();
+        }
 
         if (dev.getVibrator().hasVibrator()) {
             context.vibrator = dev.getVibrator();
         }
 
+        // Detect if the gamepad has Mode and Select buttons according to the Android key layouts.
+        // We do this first because other codepaths below may override these defaults.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            boolean[] buttons = dev.hasKeys(KeyEvent.KEYCODE_BUTTON_MODE, KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BACK, 0);
+            context.hasMode = buttons[0];
+            context.hasSelect = buttons[1] || buttons[2];
+        }
+
         context.leftStickXAxis = MotionEvent.AXIS_X;
         context.leftStickYAxis = MotionEvent.AXIS_Y;
         if (getMotionRangeForJoystickAxis(dev, context.leftStickXAxis) != null &&
@@ -464,25 +536,49 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             InputDevice.MotionRange rxRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RX);
             InputDevice.MotionRange ryRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RY);
             if (rxRange != null && ryRange != null && devName != null) {
-                if (devName.contains("Xbox") || devName.contains("XBox") || devName.contains("X-Box")) {
-                    // Xbox controllers use RX and RY for right stick
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                    if (dev.getVendorId() == 0x054c) { // Sony
+                        if (dev.hasKeys(KeyEvent.KEYCODE_BUTTON_C)[0]) {
+                            LimeLog.info("Detected non-standard DualShock 4 mapping");
+                            context.isNonStandardDualShock4 = true;
+                        }
+                        else {
+                            LimeLog.info("Detected DualShock 4 (Linux standard mapping)");
+                            context.usesLinuxGamepadStandardFaceButtons = true;
+                        }
+                    }
+                }
+                else if (!devName.contains("Xbox") && !devName.contains("XBox") && !devName.contains("X-Box")) {
+                    LimeLog.info("Assuming non-standard DualShock 4 mapping on < 4.4");
+                    context.isNonStandardDualShock4 = true;
+                }
+
+                if (context.isNonStandardDualShock4) {
+                    // The old DS4 driver uses RX and RY for triggers
+                    context.leftTriggerAxis = MotionEvent.AXIS_RX;
+                    context.rightTriggerAxis = MotionEvent.AXIS_RY;
+
+                    // DS4 has Select and Mode buttons (possibly mapped non-standard)
+                    context.hasSelect = true;
+                    context.hasMode = true;
+                }
+                else {
+                    // If it's not a non-standard DS4 controller, it's probably an Xbox controller or
+                    // other sane controller that uses RX and RY for right stick and Z and RZ for triggers.
                     context.rightStickXAxis = MotionEvent.AXIS_RX;
                     context.rightStickYAxis = MotionEvent.AXIS_RY;
 
-                    // Xbox controllers use Z and RZ for triggers
-                    context.leftTriggerAxis = MotionEvent.AXIS_Z;
-                    context.rightTriggerAxis = MotionEvent.AXIS_RZ;
-                    context.triggersIdleNegative = true;
-                    context.isXboxController = true;
+                    // While it's likely that Z and RZ are triggers, we may have digital trigger buttons
+                    // instead. We must check that we actually have Z and RZ axes before assigning them.
+                    if (getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Z) != null &&
+                            getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RZ) != null) {
+                        context.leftTriggerAxis = MotionEvent.AXIS_Z;
+                        context.rightTriggerAxis = MotionEvent.AXIS_RZ;
+                    }
                 }
-                else {
-                    // DS4 controller uses RX and RY for triggers
-                    context.leftTriggerAxis = MotionEvent.AXIS_RX;
-                    context.rightTriggerAxis = MotionEvent.AXIS_RY;
-                    context.triggersIdleNegative = true;
 
-                    context.isDualShock4 = true;
-                }
+                // Triggers always idle negative on axes that are centered at zero
+                context.triggersIdleNegative = true;
             }
         }
 
@@ -539,13 +635,15 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         }
 
         // The ADT-1 controller needs a similar fixup to the ASUS Gamepad
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             // The device name provided is just "Gamepad" which is pretty useless, so we
             // use VID/PID instead
             if (dev.getVendorId() == 0x18d1 && dev.getProductId() == 0x2c40) {
                 context.backIsStart = true;
                 context.modeIsSelect = true;
                 context.triggerDeadzone = 0.30f;
+                context.hasSelect = true;
+                context.hasMode = false;
             }
         }
 
@@ -558,11 +656,13 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             if (devName.contains("ASUS Gamepad")) {
                 // We can only do this check on KitKat or higher, but it doesn't matter since ATV
                 // is Android 5.0 anyway
-                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
                     boolean[] hasStartKey = dev.hasKeys(KeyEvent.KEYCODE_BUTTON_START, KeyEvent.KEYCODE_MENU, 0);
                     if (!hasStartKey[0] && !hasStartKey[1]) {
                         context.backIsStart = true;
                         context.modeIsSelect = true;
+                        context.hasSelect = true;
+                        context.hasMode = false;
                     }
                 }
 
@@ -571,14 +671,26 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                 context.triggerDeadzone = 0.30f;
             }
             // SHIELD controllers will use small stick deadzones
-            else if (devName.contains("SHIELD")) {
+            else if (devName.contains("SHIELD") || devName.contains("NVIDIA Controller")) {
                 context.leftStickDeadzoneRadius = 0.07f;
                 context.rightStickDeadzoneRadius = 0.07f;
+
+                // The big Nvidia button on the Shield controllers acts like a Search button. It
+                // summons the Google Assistant on the Shield TV. On my Pixel 4, it seems to do
+                // nothing, so we can hijack it to act like a mode button.
+                if (devName.contains("NVIDIA Controller v01.03") || devName.contains("NVIDIA Controller v01.04")) {
+                    context.searchIsMode = true;
+                    context.hasMode = 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;
+
+                // Serval has Select and Mode buttons (possibly mapped non-standard)
+                context.hasMode = true;
+                context.hasSelect = 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
@@ -588,7 +700,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             // required fixup is ignoring the select button.
             else if (devName.equals("Xbox Wireless Controller")) {
                 if (gasRange == null) {
-                    context.isXboxBtController = true;
+                    context.isNonStandardXboxBtController = true;
+
+                    // Xbox One S has Select and Mode buttons (possibly mapped non-standard)
+                    context.hasMode = true;
+                    context.hasSelect = true;
                 }
             }
         }
@@ -611,6 +727,13 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             return null;
         }
 
+        // HACK for https://issuetracker.google.com/issues/163120692
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R) {
+            if (event.getDeviceId() == -1) {
+                return defaultContext;
+            }
+        }
+
         // Return the existing context if it exists
         InputDeviceContext context = inputDeviceContexts.get(event.getDeviceId());
         if (context != null) {
@@ -767,7 +890,61 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             }
         }
 
-        if (context.isDualShock4) {
+        // Override mode button for 8BitDo controllers
+        if (context.vendorId == 0x2dc8 && event.getScanCode() == 306) {
+            return KeyEvent.KEYCODE_BUTTON_MODE;
+        }
+
+        // This mapping was adding in Android 10, then changed based on
+        // kernel changes (adding hid-nintendo) in Android 11. If we're
+        // on anything newer than Pie, just use the built-in mapping.
+        if ((context.vendorId == 0x057e && context.productId == 0x2009 && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) || // Switch Pro controller
+                (context.vendorId == 0x0f0d && context.productId == 0x00c1)) { // HORIPAD for Switch
+            switch (event.getScanCode()) {
+                case 0x130:
+                    return KeyEvent.KEYCODE_BUTTON_A;
+                case 0x131:
+                    return KeyEvent.KEYCODE_BUTTON_B;
+                case 0x132:
+                    return KeyEvent.KEYCODE_BUTTON_X;
+                case 0x133:
+                    return KeyEvent.KEYCODE_BUTTON_Y;
+                case 0x134:
+                    return KeyEvent.KEYCODE_BUTTON_L1;
+                case 0x135:
+                    return KeyEvent.KEYCODE_BUTTON_R1;
+                case 0x136:
+                    return KeyEvent.KEYCODE_BUTTON_L2;
+                case 0x137:
+                    return KeyEvent.KEYCODE_BUTTON_R2;
+                case 0x138:
+                    return KeyEvent.KEYCODE_BUTTON_SELECT;
+                case 0x139:
+                    return KeyEvent.KEYCODE_BUTTON_START;
+                case 0x13A:
+                    return KeyEvent.KEYCODE_BUTTON_THUMBL;
+                case 0x13B:
+                    return KeyEvent.KEYCODE_BUTTON_THUMBR;
+                case 0x13D:
+                    return KeyEvent.KEYCODE_BUTTON_MODE;
+            }
+        }
+
+        if (context.usesLinuxGamepadStandardFaceButtons) {
+            // Android's Generic.kl swaps BTN_NORTH and BTN_WEST
+            switch (event.getScanCode()) {
+                case 304:
+                    return KeyEvent.KEYCODE_BUTTON_A;
+                case 305:
+                    return KeyEvent.KEYCODE_BUTTON_B;
+                case 307:
+                    return KeyEvent.KEYCODE_BUTTON_Y;
+                case 308:
+                    return KeyEvent.KEYCODE_BUTTON_X;
+            }
+        }
+
+        if (context.isNonStandardDualShock4) {
             switch (event.getScanCode()) {
                 case 304:
                     return KeyEvent.KEYCODE_BUTTON_X;
@@ -812,7 +989,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                     return KeyEvent.KEYCODE_BUTTON_START;
             }
         }
-        else if (context.isXboxBtController) {
+        else if (context.isNonStandardXboxBtController) {
             switch (event.getScanCode()) {
                 case 306:
                     return KeyEvent.KEYCODE_BUTTON_X;
@@ -841,19 +1018,25 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                 return KeyEvent.KEYCODE_BUTTON_MODE;
             }
         }
+        else if (context.vendorId == 0x0b05 && // ASUS
+                     (context.productId == 0x7900 || // Kunai - USB
+                      context.productId == 0x7902)) // Kunai - Bluetooth
+        {
+            // ROG Kunai has special M1-M4 buttons that are accessible via the
+            // joycon-style detachable controllers that we should map to Start
+            // and Select.
+            switch (event.getScanCode()) {
+                case 264:
+                case 266:
+                    return KeyEvent.KEYCODE_BUTTON_START;
 
-        if (context.hatXAxis != -1 && context.hatYAxis != -1) {
-            switch (event.getKeyCode()) {
-            // These are duplicate dpad events for hat input
-            case KeyEvent.KEYCODE_DPAD_LEFT:
-            case KeyEvent.KEYCODE_DPAD_RIGHT:
-            case KeyEvent.KEYCODE_DPAD_CENTER:
-            case KeyEvent.KEYCODE_DPAD_UP:
-            case KeyEvent.KEYCODE_DPAD_DOWN:
-                return 0;
+                case 265:
+                case 267:
+                    return KeyEvent.KEYCODE_BUTTON_SELECT;
             }
         }
-        else if (context.hatXAxis == -1 &&
+
+        if (context.hatXAxis == -1 &&
                  context.hatYAxis == -1 &&
                  /* FIXME: There's no good way to know for sure if xpad is bound
                     to this device, so we won't use the name to validate if these
@@ -907,10 +1090,29 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             // Emulate the select button with mode
             return KeyEvent.KEYCODE_BUTTON_SELECT;
         }
+        else if (context.searchIsMode && keyCode == KeyEvent.KEYCODE_SEARCH) {
+            // Emulate the mode button with search
+            return KeyEvent.KEYCODE_BUTTON_MODE;
+        }
 
         return keyCode;
     }
 
+    private int handleFlipFaceButtons(int keyCode) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_BUTTON_A:
+                return KeyEvent.KEYCODE_BUTTON_B;
+            case KeyEvent.KEYCODE_BUTTON_B:
+                return KeyEvent.KEYCODE_BUTTON_A;
+            case KeyEvent.KEYCODE_BUTTON_X:
+                return KeyEvent.KEYCODE_BUTTON_Y;
+            case KeyEvent.KEYCODE_BUTTON_Y:
+                return KeyEvent.KEYCODE_BUTTON_X;
+            default:
+                return keyCode;
+        }
+    }
+
     private Vector2d populateCachedVector(float x, float y) {
         // Reinitialize our cached Vector2d object
         inputVector.initialize(x, y);
@@ -984,17 +1186,21 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             context.inputMap &= ~(ControllerPacket.LEFT_FLAG | ControllerPacket.RIGHT_FLAG);
             if (hatX < -0.5) {
                 context.inputMap |= ControllerPacket.LEFT_FLAG;
+                context.hatXAxisUsed = true;
             }
             else if (hatX > 0.5) {
                 context.inputMap |= ControllerPacket.RIGHT_FLAG;
+                context.hatXAxisUsed = true;
             }
 
             context.inputMap &= ~(ControllerPacket.UP_FLAG | ControllerPacket.DOWN_FLAG);
             if (hatY < -0.5) {
                 context.inputMap |= ControllerPacket.UP_FLAG;
+                context.hatYAxisUsed = true;
             }
             else if (hatY > 0.5) {
                 context.inputMap |= ControllerPacket.DOWN_FLAG;
+                context.hatYAxisUsed = true;
             }
         }
 
@@ -1172,6 +1378,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         }
 
         int keyCode = handleRemapping(context, event);
+
+        if (prefConfig.flipFaceButtons) {
+            keyCode = handleFlipFaceButtons(keyCode);
+        }
+
         if (keyCode == 0) {
             return true;
         }
@@ -1209,15 +1420,31 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             context.inputMap &= ~ControllerPacket.BACK_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_LEFT:
+            if (context.hatXAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap &= ~ControllerPacket.LEFT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_RIGHT:
+            if (context.hatXAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap &= ~ControllerPacket.RIGHT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_UP:
+            if (context.hatYAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap &= ~ControllerPacket.UP_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_DOWN:
+            if (context.hatYAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap &= ~ControllerPacket.DOWN_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_B:
@@ -1301,6 +1528,12 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         }
 
         sendControllerInputPacket(context);
+
+        if (context.pendingExit && context.inputMap == 0) {
+            // All buttons from the quit combo are lifted. Finish the activity now.
+            activityContext.finish();
+        }
+
         return true;
     }
 
@@ -1311,12 +1544,18 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         }
 
         int keyCode = handleRemapping(context, event);
+
+        if (prefConfig.flipFaceButtons) {
+            keyCode = handleFlipFaceButtons(keyCode);
+        }
+
         if (keyCode == 0) {
             return true;
         }
 
         switch (keyCode) {
         case KeyEvent.KEYCODE_BUTTON_MODE:
+            context.hasMode = true;
             context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_START:
@@ -1328,18 +1567,35 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             break;
         case KeyEvent.KEYCODE_BACK:
         case KeyEvent.KEYCODE_BUTTON_SELECT:
+            context.hasSelect = true;
             context.inputMap |= ControllerPacket.BACK_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_LEFT:
+            if (context.hatXAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap |= ControllerPacket.LEFT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_RIGHT:
+            if (context.hatXAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap |= ControllerPacket.RIGHT_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_UP:
+            if (context.hatYAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap |= ControllerPacket.UP_FLAG;
             break;
         case KeyEvent.KEYCODE_DPAD_DOWN:
+            if (context.hatYAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
             context.inputMap |= ControllerPacket.DOWN_FLAG;
             break;
         case KeyEvent.KEYCODE_BUTTON_B:
@@ -1385,30 +1641,50 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             return false;
         }
 
+        // Start+Back+LB+RB is the quit combo
+        if (context.inputMap == (ControllerPacket.BACK_FLAG | ControllerPacket.PLAY_FLAG |
+                                 ControllerPacket.LB_FLAG | ControllerPacket.RB_FLAG)) {
+            // Wait for the combo to lift and then finish the activity
+            context.pendingExit = true;
+        }
+
         // Start+LB acts like select for controllers with one button
-        if ((context.inputMap & ControllerPacket.PLAY_FLAG) != 0 &&
-            ((context.inputMap & ControllerPacket.LB_FLAG) != 0 ||
-              SystemClock.uptimeMillis() - context.lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
-        {
-            context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG);
-            context.inputMap |= ControllerPacket.BACK_FLAG;
+        if (!context.hasSelect) {
+            if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG) ||
+                    (context.inputMap == ControllerPacket.PLAY_FLAG &&
+                            SystemClock.uptimeMillis() - context.lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
+            {
+                context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG);
+                context.inputMap |= ControllerPacket.BACK_FLAG;
 
-            context.emulatingButtonFlags |= ControllerHandler.EMULATING_SELECT;
+                context.emulatingButtonFlags |= ControllerHandler.EMULATING_SELECT;
+            }
         }
 
-        // We detect select+start or start+RB as the special button combo
-        if (((context.inputMap & ControllerPacket.RB_FLAG) != 0 ||
-             (SystemClock.uptimeMillis() - context.lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS) ||
-             (context.inputMap & ControllerPacket.BACK_FLAG) != 0) &&
-            (context.inputMap & ControllerPacket.PLAY_FLAG) != 0)
-        {
-            context.inputMap &= ~(ControllerPacket.BACK_FLAG | ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG);
-            context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
+        // If there is a physical select button, we'll use Start+Select as the special button combo
+        // otherwise we'll use Start+RB.
+        if (!context.hasMode) {
+            if (context.hasSelect) {
+                if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.BACK_FLAG)) {
+                    context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.BACK_FLAG);
+                    context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
 
-            context.emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
+                    context.emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
+                }
+            }
+            else {
+                if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG) ||
+                        (context.inputMap == ControllerPacket.PLAY_FLAG &&
+                                SystemClock.uptimeMillis() - context.lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
+                {
+                    context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG);
+                    context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
+
+                    context.emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
+                }
+            }
         }
 
-
         // We don't need to send repeat key down events, but the platform
         // sends us events that claim to be repeats but they're from different
         // devices, so we just send them all and deal with some duplicates.
@@ -1479,6 +1755,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         if (context != null) {
             LimeLog.info("Removed controller: "+controller.getControllerId());
             releaseControllerNumber(context);
+            context.destroy();
             usbDeviceContexts.remove(controller.getControllerId());
         }
     }
@@ -1489,8 +1766,12 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         usbDeviceContexts.put(controller.getControllerId(), context);
     }
 
-    class GenericControllerContext {
+    static class GenericControllerContext {
         public int id;
+        public boolean external;
+
+        public int vendorId;
+        public int productId;
 
         public float leftStickDeadzoneRadius;
         public float rightStickDeadzoneRadius;
@@ -1511,6 +1792,13 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         public boolean mouseEmulationActive;
         public Timer mouseEmulationTimer;
         public short mouseEmulationLastInputMap;
+
+        public void destroy() {
+            if (mouseEmulationTimer != null) {
+                mouseEmulationTimer.cancel();
+                mouseEmulationTimer = null;
+            }
+        }
     }
 
     class InputDeviceContext extends GenericControllerContext {
@@ -1530,17 +1818,22 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
 
         public int hatXAxis = -1;
         public int hatYAxis = -1;
+        public boolean hatXAxisUsed, hatYAxisUsed;
 
-        public boolean isDualShock4;
-        public boolean isXboxController;
-        public boolean isXboxBtController;
+        public boolean isNonStandardDualShock4;
+        public boolean usesLinuxGamepadStandardFaceButtons;
+        public boolean isNonStandardXboxBtController;
         public boolean isServal;
         public boolean backIsStart;
         public boolean modeIsSelect;
+        public boolean searchIsMode;
         public boolean ignoreBack;
         public boolean hasJoystickAxes;
+        public boolean pendingExit;
 
         public int emulatingButtonFlags = 0;
+        public boolean hasSelect;
+        public boolean hasMode;
 
         // Used for OUYA bumper state tracking since they force all buttons
         // up when the OUYA button goes down. We watch the last time we get
@@ -1551,9 +1844,25 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         public long lastRbUpTime = 0;
 
         public long startDownTime = 0;
+
+        @Override
+        public void destroy() {
+            super.destroy();
+
+            if (vibrator != null) {
+                vibrator.cancel();
+            }
+        }
     }
 
     class UsbDeviceContext extends GenericControllerContext {
         public AbstractController device;
+
+        @Override
+        public void destroy() {
+            super.destroy();
+
+            // Nothing for now
+        }
     }
 }

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

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

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

@@ -1,17 +1,22 @@
 package com.limelight.binding.input.capture;
 
 import android.annotation.TargetApi;
+import android.app.Activity;
 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 {
 
+// We extend AndroidPointerIconCaptureProvider because we want to also get the
+// pointer icon hiding behavior over our stream view just in case pointer capture
+// is unavailable on this system (ex: DeX, ChromeOS)
+@TargetApi(Build.VERSION_CODES.O)
+public class AndroidNativePointerCaptureProvider extends AndroidPointerIconCaptureProvider {
     private View targetView;
 
-    public AndroidNativePointerCaptureProvider(View targetView) {
+    public AndroidNativePointerCaptureProvider(Activity activity, View targetView) {
+        super(activity, targetView);
         this.targetView = targetView;
     }
 
@@ -31,30 +36,33 @@ public class AndroidNativePointerCaptureProvider extends InputCaptureProvider {
         targetView.releasePointerCapture();
     }
 
-    @Override
-    public boolean isCapturingActive() {
-        return targetView.hasPointerCapture();
-    }
-
     @Override
     public boolean eventHasRelativeMouseAxes(MotionEvent event) {
-        return event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE;
+        // SOURCE_MOUSE_RELATIVE is how SOURCE_MOUSE appears when our view has pointer capture.
+        // SOURCE_TOUCHPAD will have relative axes populated iff our view has pointer capture.
+        // See https://developer.android.com/reference/android/view/View#requestPointerCapture()
+        return event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE ||
+                (event.getSource() == InputDevice.SOURCE_TOUCHPAD && targetView.hasPointerCapture());
     }
 
     @Override
     public float getRelativeAxisX(MotionEvent event) {
-        float x = event.getX();
+        int axis = (event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) ?
+                MotionEvent.AXIS_X : MotionEvent.AXIS_RELATIVE_X;
+        float x = event.getAxisValue(axis);
         for (int i = 0; i < event.getHistorySize(); i++) {
-            x += event.getHistoricalX(i);
+            x += event.getHistoricalAxisValue(axis, i);
         }
         return x;
     }
 
     @Override
     public float getRelativeAxisY(MotionEvent event) {
-        float y = event.getY();
+        int axis = (event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) ?
+                MotionEvent.AXIS_Y : MotionEvent.AXIS_RELATIVE_Y;
+        float y = event.getAxisValue(axis);
         for (int i = 0; i < event.getHistorySize(); i++) {
-            y += event.getHistoricalY(i);
+            y += event.getHistoricalAxisValue(axis, i);
         }
         return y;
     }

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

@@ -7,55 +7,30 @@ import android.os.Build;
 import android.view.MotionEvent;
 import android.view.PointerIcon;
 import android.view.View;
-import android.view.ViewGroup;
 
 @TargetApi(Build.VERSION_CODES.N)
 public class AndroidPointerIconCaptureProvider extends InputCaptureProvider {
-    private ViewGroup rootViewGroup;
+    private View targetView;
     private Context context;
 
-    public AndroidPointerIconCaptureProvider(Activity activity) {
+    public AndroidPointerIconCaptureProvider(Activity activity, View targetView) {
         this.context = activity;
-        this.rootViewGroup = (ViewGroup) activity.getWindow().getDecorView();
+        this.targetView = targetView;
     }
 
     public static boolean isCaptureProviderSupported() {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
     }
 
-    private void setPointerIconOnAllViews(PointerIcon icon) {
-        for (int i = 0; i < rootViewGroup.getChildCount(); i++) {
-            View view = rootViewGroup.getChildAt(i);
-            view.setPointerIcon(icon);
-        }
-        rootViewGroup.setPointerIcon(icon);
-    }
-
     @Override
     public void enableCapture() {
         super.enableCapture();
-        setPointerIconOnAllViews(PointerIcon.getSystemIcon(context, PointerIcon.TYPE_NULL));
+        targetView.setPointerIcon(PointerIcon.getSystemIcon(context, PointerIcon.TYPE_NULL));
     }
 
     @Override
     public void disableCapture() {
         super.disableCapture();
-        setPointerIconOnAllViews(null);
-    }
-
-    @Override
-    public boolean eventHasRelativeMouseAxes(MotionEvent event) {
-        return event.getAxisValue(MotionEvent.AXIS_RELATIVE_X) != 0 ||
-                event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y) != 0;
-    }
-
-    @Override
-    public float getRelativeAxisX(MotionEvent event) {
-        return event.getAxisValue(MotionEvent.AXIS_RELATIVE_X);
-    }
-
-    @Override
-    public float getRelativeAxisY(MotionEvent event) {
-        return event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y);
+        targetView.setPointerIcon(null);
     }
 }

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

@@ -12,7 +12,7 @@ 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));
+            return new AndroidNativePointerCaptureProvider(activity, 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
@@ -28,7 +28,7 @@ public class InputCaptureManager {
             // 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);
+            return new AndroidPointerIconCaptureProvider(activity, activity.findViewById(R.id.surfaceView));
         }
         else {
             LimeLog.info("Mouse capture not available");

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

@@ -75,8 +75,10 @@ public class ShieldCaptureProvider extends InputCaptureProvider {
 
     @Override
     public boolean eventHasRelativeMouseAxes(MotionEvent event) {
-        return event.getAxisValue(AXIS_RELATIVE_X) != 0 ||
-                event.getAxisValue(AXIS_RELATIVE_Y) != 0;
+        // All mouse events should use relative axes, even if they are zero. This avoids triggering
+        // cursor jumps if we get an event with no associated motion, like ACTION_DOWN or ACTION_UP.
+        return event.getPointerCount() == 1 && event.getActionIndex() == 0 &&
+                event.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE;
     }
 
     @Override

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

@@ -3,6 +3,8 @@ package com.limelight.binding.input.driver;
 public abstract class AbstractController {
 
     private final int deviceId;
+    private final int vendorId;
+    private final int productId;
 
     private UsbDriverListener listener;
 
@@ -15,6 +17,14 @@ public abstract class AbstractController {
         return deviceId;
     }
 
+    public int getVendorId() {
+        return vendorId;
+    }
+
+    public int getProductId() {
+        return productId;
+    }
+
     protected void setButtonFlag(int buttonFlag, int data) {
         if (data != 0) {
             buttonFlags |= buttonFlag;
@@ -32,9 +42,11 @@ public abstract class AbstractController {
     public abstract boolean start();
     public abstract void stop();
 
-    public AbstractController(int deviceId, UsbDriverListener listener) {
+    public AbstractController(int deviceId, UsbDriverListener listener, int vendorId, int productId) {
         this.deviceId = deviceId;
         this.listener = listener;
+        this.vendorId = vendorId;
+        this.productId = productId;
     }
 
     public abstract void rumble(short lowFreqMotor, short highFreqMotor);

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

@@ -22,7 +22,7 @@ public abstract class AbstractXboxController extends AbstractController {
     protected UsbEndpoint inEndpt, outEndpt;
 
     public AbstractXboxController(UsbDevice device, UsbDeviceConnection connection, int deviceId, UsbDriverListener listener) {
-        super(deviceId, listener);
+        super(deviceId, listener, device.getVendorId(), device.getProductId());
         this.device = device;
         this.connection = connection;
     }

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

@@ -166,7 +166,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {
         }
     }
 
-    private static boolean isRecognizedInputDevice(UsbDevice device) {
+    public static boolean isRecognizedInputDevice(UsbDevice device) {
         // On KitKat and later, we can determine if this VID and PID combo
         // matches an existing input device and defer to the built-in controller
         // support in that case. Prior to KitKat, we'll always return true to be safe.
@@ -191,10 +191,32 @@ public class UsbDriverService extends Service implements UsbDriverListener {
         }
     }
 
+    public static boolean kernelSupportsXboxOne() {
+        String kernelVersion = System.getProperty("os.version");
+        LimeLog.info("Kernel Version: "+kernelVersion);
+
+        if (kernelVersion == null) {
+            // We'll assume this is some newer version of Android
+            // that doesn't let you read the kernel version this way.
+            return true;
+        }
+        else if (kernelVersion.startsWith("2.") || kernelVersion.startsWith("3.")) {
+            // These are old kernels that definitely don't support Xbox One controllers properly
+            return false;
+        }
+        else if (kernelVersion.startsWith("4.4.") || kernelVersion.startsWith("4.9.")) {
+            // These aren't guaranteed to have backported kernel patches for proper Xbox One
+            // support (though some devices will).
+            return false;
+        }
+        else {
+            // The next AOSP common kernel is 4.14 which has working Xbox One controller support
+            return true;
+        }
+    }
+
     public static boolean shouldClaimDevice(UsbDevice device, boolean claimAllAvailable) {
-        // 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) ||
+        return ((!kernelSupportsXboxOne() || !isRecognizedInputDevice(device) || claimAllAvailable) && XboxOneController.canClaimDevice(device)) ||
                 ((!isRecognizedInputDevice(device) || claimAllAvailable) && Xbox360Controller.canClaimDevice(device));
     }
 

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

@@ -26,6 +26,7 @@ public class Xbox360Controller extends AbstractXboxController {
             0x0f0d, // Hori
             0x1038, // SteelSeries
             0x11c9, // Nacon
+            0x1209, // Ardwiino
             0x12ab, // Unknown
             0x1430, // RedOctane
             0x146b, // BigBen
@@ -33,8 +34,11 @@ public class Xbox360Controller extends AbstractXboxController {
             0x15e4, // Numark
             0x162e, // Joytech
             0x1689, // Razer Onza
+            0x1949, // Lab126 (Amazon Luna)
             0x1bad, // Harmonix
+            0x20d6, // PowerA
             0x24c6, // PowerA
+            0x2f24, // GameSir
     };
 
     public static boolean canClaimDevice(UsbDevice device) {
@@ -66,8 +70,8 @@ public class Xbox360Controller extends AbstractXboxController {
 
     @Override
     protected boolean handleRead(ByteBuffer buffer) {
-        if (buffer.limit() < 14) {
-            LimeLog.severe("Read too small: "+buffer.limit());
+        if (buffer.remaining() < 14) {
+            LimeLog.severe("Read too small: "+buffer.remaining());
             return false;
         }
 

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

@@ -21,10 +21,13 @@ public class XboxOneController extends AbstractXboxController {
             0x0e6f, // Unknown
             0x0f0d, // Hori
             0x1532, // Razer Wildcat
+            0x20d6, // PowerA
             0x24c6, // PowerA
+            0x2e24, // Hyperkin
     };
 
     private static final byte[] FW2015_INIT = {0x05, 0x20, 0x00, 0x01, 0x00};
+    private static final byte[] ONE_S_INIT = {0x05, 0x20, 0x00, 0x0f, 0x06};
     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};
@@ -38,6 +41,8 @@ public class XboxOneController extends AbstractXboxController {
             new InitPacket(0x0e6f, 0x0165, HORI_INIT),
             new InitPacket(0x0f0d, 0x0067, HORI_INIT),
             new InitPacket(0x0000, 0x0000, FW2015_INIT),
+            new InitPacket(0x045e, 0x02ea, ONE_S_INIT),
+            new InitPacket(0x045e, 0x0b00, ONE_S_INIT),
             new InitPacket(0x0e6f, 0x0000, PDP_INIT1),
             new InitPacket(0x0e6f, 0x0000, PDP_INIT2),
             new InitPacket(0x24c6, 0x541a, RUMBLE_INIT1),
@@ -98,11 +103,21 @@ public class XboxOneController extends AbstractXboxController {
         switch (buffer.get())
         {
             case 0x20:
+                if (buffer.remaining() < 17) {
+                    LimeLog.severe("XBone button/axis read too small: "+buffer.remaining());
+                    return false;
+                }
+
                 buffer.position(buffer.position()+3);
                 processButtons(buffer);
                 return true;
 
             case 0x07:
+                if (buffer.remaining() < 4) {
+                    LimeLog.severe("XBone mode read too small: "+buffer.remaining());
+                    return false;
+                }
+
                 // The Xbox One S controller needs acks for mode reports otherwise
                 // it retransmits them forever.
                 if (buffer.get() == 0x30) {

app/src/main/java/com/limelight/binding/input/touch/AbsoluteTouchContext.java

@@ -0,0 +1,272 @@
+package com.limelight.binding.input.touch;
+
+import android.os.SystemClock;
+import android.view.View;
+
+import com.limelight.nvstream.NvConnection;
+import com.limelight.nvstream.input.MouseButtonPacket;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class AbsoluteTouchContext implements TouchContext {
+    private int lastTouchDownX = 0;
+    private int lastTouchDownY = 0;
+    private long lastTouchDownTime = 0;
+    private int lastTouchUpX = 0;
+    private int lastTouchUpY = 0;
+    private long lastTouchUpTime = 0;
+    private int lastTouchLocationX = 0;
+    private int lastTouchLocationY = 0;
+    private boolean cancelled;
+    private boolean confirmedLongPress;
+    private boolean confirmedTap;
+    private Timer longPressTimer;
+    private Timer tapDownTimer;
+    private float accumulatedScrollDelta;
+
+    private final NvConnection conn;
+    private final int actionIndex;
+    private final View targetView;
+
+    private static final int SCROLL_SPEED_DIVISOR = 20;
+
+    private static final int LONG_PRESS_TIME_THRESHOLD = 650;
+    private static final int LONG_PRESS_DISTANCE_THRESHOLD = 30;
+
+    private static final int DOUBLE_TAP_TIME_THRESHOLD = 250;
+    private static final int DOUBLE_TAP_DISTANCE_THRESHOLD = 60;
+
+    private static final int TOUCH_DOWN_DEAD_ZONE_TIME_THRESHOLD = 100;
+    private static final int TOUCH_DOWN_DEAD_ZONE_DISTANCE_THRESHOLD = 20;
+
+    public AbsoluteTouchContext(NvConnection conn, int actionIndex, View view)
+    {
+        this.conn = conn;
+        this.actionIndex = actionIndex;
+        this.targetView = view;
+    }
+
+    @Override
+    public int getActionIndex()
+    {
+        return actionIndex;
+    }
+
+    @Override
+    public boolean touchDownEvent(int eventX, int eventY, boolean isNewFinger)
+    {
+        if (!isNewFinger) {
+            // We don't handle finger transitions for absolute mode
+            return true;
+        }
+
+        lastTouchLocationX = lastTouchDownX = eventX;
+        lastTouchLocationY = lastTouchDownY = eventY;
+        lastTouchDownTime = SystemClock.uptimeMillis();
+        cancelled = confirmedTap = confirmedLongPress = false;
+        accumulatedScrollDelta = 0;
+
+        if (actionIndex == 0) {
+            // Start the timers
+            startTapDownTimer();
+            startLongPressTimer();
+        }
+
+        return true;
+    }
+
+    private boolean distanceExceeds(int deltaX, int deltaY, double limit) {
+        return Math.sqrt(Math.pow(deltaX, 2) + Math.pow(deltaY, 2)) > limit;
+    }
+
+    private void updatePosition(int eventX, int eventY) {
+        // We may get values slightly outside our view region on ACTION_HOVER_ENTER and ACTION_HOVER_EXIT.
+        // Normalize these to the view size. We can't just drop them because we won't always get an event
+        // right at the boundary of the view, so dropping them would result in our cursor never really
+        // reaching the sides of the screen.
+        eventX = Math.min(Math.max(eventX, 0), targetView.getWidth());
+        eventY = Math.min(Math.max(eventY, 0), targetView.getHeight());
+
+        conn.sendMousePosition((short)eventX, (short)eventY, (short)targetView.getWidth(), (short)targetView.getHeight());
+    }
+
+    @Override
+    public void touchUpEvent(int eventX, int eventY)
+    {
+        if (cancelled) {
+            return;
+        }
+
+        if (actionIndex == 0) {
+            // Cancel the timers
+            cancelLongPressTimer();
+            cancelTapDownTimer();
+
+            // Raise the mouse buttons that we currently have down
+            if (confirmedLongPress) {
+                conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
+            }
+            else if (confirmedTap) {
+                conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
+            }
+            else {
+                // If we get here, this means that the tap completed within the touch down
+                // deadzone time. We'll need to send the touch down and up events now at the
+                // original touch down position.
+                tapConfirmed();
+                try {
+                    // FIXME: Sleeping on the main thread sucks
+                    Thread.sleep(50);
+                } catch (InterruptedException ignored) {}
+                conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
+            }
+        }
+
+        lastTouchLocationX = lastTouchUpX = eventX;
+        lastTouchLocationY = lastTouchUpY = eventY;
+        lastTouchUpTime = SystemClock.uptimeMillis();
+    }
+
+    private synchronized void startLongPressTimer() {
+        longPressTimer = new Timer(true);
+        longPressTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                synchronized (AbsoluteTouchContext.this) {
+                    // Check if someone cancelled us
+                    if (longPressTimer == null) {
+                        return;
+                    }
+
+                    // Uncancellable now
+                    longPressTimer = null;
+
+                    // This timer should have already expired, but cancel it just in case
+                    cancelTapDownTimer();
+
+                    // Switch from a left click to a right click after a long press
+                    confirmedLongPress = true;
+                    if (confirmedTap) {
+                        conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
+                    }
+                    conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
+                }
+            }
+        }, LONG_PRESS_TIME_THRESHOLD);
+    }
+
+    private synchronized void cancelLongPressTimer() {
+        if (longPressTimer != null) {
+            longPressTimer.cancel();
+            longPressTimer = null;
+        }
+    }
+
+    private synchronized void startTapDownTimer() {
+        tapDownTimer = new Timer(true);
+        tapDownTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                synchronized (AbsoluteTouchContext.this) {
+                    // Check if someone cancelled us
+                    if (tapDownTimer == null) {
+                        return;
+                    }
+
+                    // Uncancellable now
+                    tapDownTimer = null;
+
+                    // Start our tap
+                    tapConfirmed();
+                }
+            }
+        }, TOUCH_DOWN_DEAD_ZONE_TIME_THRESHOLD);
+    }
+
+    private synchronized void cancelTapDownTimer() {
+        if (tapDownTimer != null) {
+            tapDownTimer.cancel();
+            tapDownTimer = null;
+        }
+    }
+
+    private void tapConfirmed() {
+        if (confirmedTap || confirmedLongPress) {
+            return;
+        }
+
+        confirmedTap = true;
+        cancelTapDownTimer();
+
+        // Left button down at original position
+        if (lastTouchDownTime - lastTouchUpTime > DOUBLE_TAP_TIME_THRESHOLD ||
+                distanceExceeds(lastTouchDownX - lastTouchUpX, lastTouchDownY - lastTouchUpY, DOUBLE_TAP_DISTANCE_THRESHOLD)) {
+            // Don't reposition for finger down events within the deadzone. This makes double-clicking easier.
+            updatePosition(lastTouchDownX, lastTouchDownY);
+        }
+        conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_LEFT);
+    }
+
+    @Override
+    public boolean touchMoveEvent(int eventX, int eventY)
+    {
+        if (cancelled) {
+            return true;
+        }
+
+        if (actionIndex == 0) {
+            if (distanceExceeds(eventX - lastTouchDownX, eventY - lastTouchDownY, LONG_PRESS_DISTANCE_THRESHOLD)) {
+                // Moved too far since touch down. Cancel the long press timer.
+                cancelLongPressTimer();
+            }
+
+            // Ignore motion within the deadzone period after touch down
+            if (confirmedTap || distanceExceeds(eventX - lastTouchDownX, eventY - lastTouchDownY, TOUCH_DOWN_DEAD_ZONE_DISTANCE_THRESHOLD)) {
+                tapConfirmed();
+                updatePosition(eventX, eventY);
+            }
+        }
+        else if (actionIndex == 1) {
+            accumulatedScrollDelta += (eventY - lastTouchLocationY) / (float)SCROLL_SPEED_DIVISOR;
+            if ((short)accumulatedScrollDelta != 0) {
+                conn.sendMouseHighResScroll((short)accumulatedScrollDelta);
+                accumulatedScrollDelta -= (short)accumulatedScrollDelta;
+            }
+        }
+
+        lastTouchLocationX = eventX;
+        lastTouchLocationY = eventY;
+
+        return true;
+    }
+
+    @Override
+    public void cancelTouch() {
+        cancelled = true;
+
+        // Cancel the timers
+        cancelLongPressTimer();
+        cancelTapDownTimer();
+
+        // Raise the mouse buttons
+        if (confirmedLongPress) {
+            conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
+        }
+        else if (confirmedTap) {
+            conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
+        }
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setPointerCount(int pointerCount) {
+        if (actionIndex == 0 && pointerCount > 1) {
+            cancelTouch();
+        }
+    }
+}

app/src/main/java/com/limelight/binding/input/touch/RelativeTouchContext.java

@@ -1,5 +1,6 @@
-package com.limelight.binding.input;
+package com.limelight.binding.input.touch;
 
+import android.os.SystemClock;
 import android.view.View;
 
 import com.limelight.nvstream.NvConnection;
@@ -8,7 +9,7 @@ import com.limelight.nvstream.input.MouseButtonPacket;
 import java.util.Timer;
 import java.util.TimerTask;
 
-public class TouchContext {
+public class RelativeTouchContext implements TouchContext {
     private int lastTouchX = 0;
     private int lastTouchY = 0;
     private int originalTouchX = 0;
@@ -17,9 +18,12 @@ public class TouchContext {
     private boolean cancelled;
     private boolean confirmedMove;
     private boolean confirmedDrag;
+    private boolean confirmedScroll;
     private Timer dragTimer;
     private double distanceMoved;
     private double xFactor, yFactor;
+    private int pointerCount;
+    private int maxPointerCountInGesture;
 
     private final NvConnection conn;
     private final int actionIndex;
@@ -32,8 +36,10 @@ public class TouchContext {
     private static final int TAP_TIME_THRESHOLD = 250;
     private static final int DRAG_TIME_THRESHOLD = 650;
 
-    public TouchContext(NvConnection conn, int actionIndex,
-                        int referenceWidth, int referenceHeight, View view)
+    private static final int SCROLL_SPEED_DIVISOR = 20;
+
+    public RelativeTouchContext(NvConnection conn, int actionIndex,
+                                int referenceWidth, int referenceHeight, View view)
     {
         this.conn = conn;
         this.actionIndex = actionIndex;
@@ -42,6 +48,7 @@ public class TouchContext {
         this.targetView = view;
     }
 
+    @Override
     public int getActionIndex()
     {
         return actionIndex;
@@ -57,8 +64,18 @@ public class TouchContext {
 
     private boolean isTap()
     {
-        long timeDelta = System.currentTimeMillis() - originalTouchTime;
+        if (confirmedDrag || confirmedMove || confirmedScroll) {
+            return false;
+        }
 
+        // If this input wasn't the last finger down, do not report
+        // a tap. This ensures we don't report duplicate taps for each
+        // finger on a multi-finger tap gesture
+        if (actionIndex + 1 != maxPointerCountInGesture) {
+            return false;
+        }
+
+        long timeDelta = SystemClock.uptimeMillis() - originalTouchTime;
         return isWithinTapBounds(lastTouchX, lastTouchY) && timeDelta <= TAP_TIME_THRESHOLD;
     }
 
@@ -72,7 +89,8 @@ public class TouchContext {
         }
     }
 
-    public boolean touchDownEvent(int eventX, int eventY)
+    @Override
+    public boolean touchDownEvent(int eventX, int eventY, boolean isNewFinger)
     {
         // Get the view dimensions to scale inputs on this touch
         xFactor = referenceWidth / (double)targetView.getWidth();
@@ -80,18 +98,23 @@ public class TouchContext {
 
         originalTouchX = lastTouchX = eventX;
         originalTouchY = lastTouchY = eventY;
-        originalTouchTime = System.currentTimeMillis();
-        cancelled = confirmedDrag = confirmedMove = false;
-        distanceMoved = 0;
 
-        if (actionIndex == 0) {
-            // Start the timer for engaging a drag
-            startDragTimer();
+        if (isNewFinger) {
+            maxPointerCountInGesture = pointerCount;
+            originalTouchTime = SystemClock.uptimeMillis();
+            cancelled = confirmedDrag = confirmedMove = confirmedScroll = false;
+            distanceMoved = 0;
+
+            if (actionIndex == 0) {
+                // Start the timer for engaging a drag
+                startDragTimer();
+            }
         }
 
         return true;
     }
 
+    @Override
     public void touchUpEvent(int eventX, int eventY)
     {
         if (cancelled) {
@@ -124,11 +147,14 @@ public class TouchContext {
     }
 
     private synchronized void startDragTimer() {
+        // Cancel any existing drag timers
+        cancelDragTimer();
+
         dragTimer = new Timer(true);
         dragTimer.schedule(new TimerTask() {
             @Override
             public void run() {
-                synchronized (TouchContext.this) {
+                synchronized (RelativeTouchContext.this) {
                     // Check if someone already set move
                     if (confirmedMove) {
                         return;
@@ -179,20 +205,33 @@ public class TouchContext {
         }
     }
 
+    private void checkForConfirmedScroll() {
+        // Enter scrolling mode if we've already left the tap zone
+        // and we have 2 fingers on screen. Leave scroll mode if
+        // we no longer have 2 fingers on screen
+        confirmedScroll = (actionIndex == 0 && pointerCount == 2 && confirmedMove);
+    }
+
+    @Override
     public boolean touchMoveEvent(int eventX, int eventY)
     {
+        if (cancelled) {
+            return true;
+        }
+
         if (eventX != lastTouchX || eventY != lastTouchY)
         {
+            checkForConfirmedMove(eventX, eventY);
+            checkForConfirmedScroll();
+
             // We only send moves and drags for the primary touch point
             if (actionIndex == 0) {
-                checkForConfirmedMove(eventX, eventY);
-
                 int deltaX = eventX - lastTouchX;
                 int deltaY = eventY - lastTouchY;
 
                 // Scale the deltas based on the factors passed to our constructor
-                deltaX = (int)Math.round((double)Math.abs(deltaX) * xFactor);
-                deltaY = (int)Math.round((double)Math.abs(deltaY) * yFactor);
+                deltaX = (int) Math.round((double) Math.abs(deltaX) * xFactor);
+                deltaY = (int) Math.round((double) Math.abs(deltaY) * yFactor);
 
                 // Fix up the signs
                 if (eventX < lastTouchX) {
@@ -202,6 +241,16 @@ public class TouchContext {
                     deltaY = -deltaY;
                 }
 
+                if (pointerCount == 2) {
+                    if (confirmedScroll) {
+                        deltaY /= SCROLL_SPEED_DIVISOR;
+
+                        conn.sendMouseHighResScroll((short) deltaY);
+                    }
+                } else {
+                    conn.sendMouseMove((short) deltaX, (short) deltaY);
+                }
+
                 // If the scaling factor ended up rounding deltas to zero, wait until they are
                 // non-zero to update lastTouch that way devices that report small touch events often
                 // will work correctly
@@ -211,8 +260,6 @@ public class TouchContext {
                 if (deltaY != 0) {
                     lastTouchY = eventY;
                 }
-
-                conn.sendMouseMove((short)deltaX, (short)deltaY);
             }
             else {
                 lastTouchX = eventX;
@@ -223,6 +270,7 @@ public class TouchContext {
         return true;
     }
 
+    @Override
     public void cancelTouch() {
         cancelled = true;
 
@@ -235,7 +283,17 @@ public class TouchContext {
         }
     }
 
+    @Override
     public boolean isCancelled() {
         return cancelled;
     }
+
+    @Override
+    public void setPointerCount(int pointerCount) {
+        this.pointerCount = pointerCount;
+
+        if (pointerCount > maxPointerCountInGesture) {
+            maxPointerCountInGesture = pointerCount;
+        }
+    }
 }

app/src/main/java/com/limelight/binding/input/touch/TouchContext.java

@@ -0,0 +1,11 @@
+package com.limelight.binding.input.touch;
+
+public interface TouchContext {
+    int getActionIndex();
+    void setPointerCount(int pointerCount);
+    boolean touchDownEvent(int eventX, int eventY, boolean isNewFinger);
+    boolean touchMoveEvent(int eventX, int eventY);
+    void touchUpEvent(int eventX, int eventY);
+    void cancelTouch();
+    boolean isCancelled();
+}

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

@@ -8,6 +8,7 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.os.SystemClock;
 import android.view.MotionEvent;
 
 import java.util.ArrayList;
@@ -210,7 +211,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, 100) - 2 * getDefaultStrokeWidth();
         radius_dead_zone = getPercent(getCorrectWidth() / 2, 30);
         radius_analog_stick = getPercent(getCorrectWidth() / 2, 20);
 
@@ -270,7 +271,7 @@ public class AnalogStick extends VirtualControllerElement {
         // We also release the deadzone if the user keeps the stick pressed for a bit to allow
         // them to make precise movements.
         stick_state = (stick_state == STICK_STATE.MOVED_ACTIVE ||
-                System.currentTimeMillis() - timeLastClick > timeoutDeadzone ||
+                SystemClock.uptimeMillis() - timeLastClick > timeoutDeadzone ||
                 movement_radius > radius_dead_zone) ?
                 STICK_STATE.MOVED_ACTIVE : STICK_STATE.MOVED_IN_DEAD_ZONE;
 
@@ -293,12 +294,12 @@ public class AnalogStick extends VirtualControllerElement {
         movement_radius = getMovementRadius(relative_x, relative_y);
         movement_angle = getAngle(relative_x, relative_y);
 
-        // chop radius if out of outer circle and already pressed
+        // pass touch event to parent if out of outer circle
+        if (movement_radius > radius_complete && !isPressed())
+            return false;
+
+        // chop radius if out of outer circle or near the edge
         if (movement_radius > (radius_complete - radius_analog_stick)) {
-            // not pressed already, so ignore event from outer circle
-            if (!isPressed()) {
-                return false;
-            }
             movement_radius = radius_complete - radius_analog_stick;
         }
 
@@ -311,7 +312,7 @@ public class AnalogStick extends VirtualControllerElement {
                 stick_state = STICK_STATE.MOVED_IN_DEAD_ZONE;
                 // check for double click
                 if (lastClickState == CLICK_STATE.SINGLE &&
-                        timeLastClick + timeoutDoubleClick > System.currentTimeMillis()) {
+                        timeLastClick + timeoutDoubleClick > SystemClock.uptimeMillis()) {
                     click_state = CLICK_STATE.DOUBLE;
                     notifyOnDoubleClick();
                 } else {
@@ -319,7 +320,7 @@ public class AnalogStick extends VirtualControllerElement {
                     notifyOnClick();
                 }
                 // reset last click timestamp
-                timeLastClick = System.currentTimeMillis();
+                timeLastClick = SystemClock.uptimeMillis();
                 // set item pressed and update
                 setPressed(true);
                 break;

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

@@ -8,6 +8,7 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.view.MotionEvent;
 
@@ -60,6 +61,7 @@ public class DigitalButton extends VirtualControllerElement {
     private TimerLongClickTimerTask longClickTimerTask = null;
 
     private final Paint paint = new Paint();
+    private final RectF rect = new RectF();
 
     private int layer;
     private DigitalButton movingButton = null;
@@ -144,14 +146,18 @@ public class DigitalButton extends VirtualControllerElement {
         // set transparent background
         canvas.drawColor(Color.TRANSPARENT);
 
-        paint.setTextSize(getPercent(getWidth(), 30));
+        paint.setTextSize(getPercent(getWidth(), 25));
         paint.setTextAlign(Paint.Align.CENTER);
         paint.setStrokeWidth(getDefaultStrokeWidth());
 
         paint.setColor(isPressed() ? pressedColor : getDefaultColor());
         paint.setStyle(Paint.Style.STROKE);
-        canvas.drawRect(paint.getStrokeWidth(), paint.getStrokeWidth(),
-                getWidth() - paint.getStrokeWidth(), getHeight() - paint.getStrokeWidth(), paint);
+
+        rect.left = rect.top = paint.getStrokeWidth();
+        rect.right = getWidth() - rect.left;
+        rect.bottom = getHeight() - rect.top;
+
+        canvas.drawOval(rect, paint);
 
         if (icon != -1) {
             Drawable d = getResources().getDrawable(icon);
@@ -171,6 +177,15 @@ public class DigitalButton extends VirtualControllerElement {
             listener.onClick();
         }
 
+        if (timerLongClick != null) {
+            timerLongClick.cancel();
+            timerLongClick = null;
+        }
+        if (longClickTimerTask != null) {
+            longClickTimerTask.cancel();
+            longClickTimerTask = null;
+        }
+
         timerLongClick = new Timer();
         longClickTimerTask = new TimerLongClickTimerTask();
         timerLongClick.schedule(longClickTimerTask, timerLongClickTimeout);
@@ -194,9 +209,11 @@ public class DigitalButton extends VirtualControllerElement {
         // We may be called for a release without a prior click
         if (timerLongClick != null) {
             timerLongClick.cancel();
+            timerLongClick = null;
         }
         if (longClickTimerTask != null) {
             longClickTimerTask.cancel();
+            longClickTimerTask = null;
         }
     }
 

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

@@ -22,7 +22,7 @@ import java.util.Timer;
 import java.util.TimerTask;
 
 public class VirtualController {
-    public class ControllerInputContext {
+    public static class ControllerInputContext {
         public short inputMap = 0x0000;
         public byte leftTrigger = 0x00;
         public byte rightTrigger = 0x00;
@@ -34,7 +34,8 @@ public class VirtualController {
 
     public enum ControllerMode {
         Active,
-        Configuration
+        MoveButtons,
+        ResizeButtons
     }
 
     private static final boolean _PRINT_DEBUG_INFORMATION = false;
@@ -72,13 +73,16 @@ public class VirtualController {
             public void onClick(View v) {
                 String message;
 
-                if (currentMode == ControllerMode.Configuration) {
+                if (currentMode == ControllerMode.Active){
+                    currentMode = ControllerMode.MoveButtons;
+                    message = "Entering configuration mode (Move buttons)";
+                } else if (currentMode == ControllerMode.MoveButtons) {
+                    currentMode = ControllerMode.ResizeButtons;
+                    message = "Entering configuration mode (Resize buttons)";
+                } else {
                     currentMode = ControllerMode.Active;
                     VirtualControllerConfigurationLoader.saveProfile(VirtualController.this, context);
                     message = "Exiting configuration mode";
-                } else {
-                    currentMode = ControllerMode.Configuration;
-                    message = "Entering configuration mode";
                 }
 
                 Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
@@ -90,6 +94,7 @@ public class VirtualController {
                 }
             }
         });
+
     }
 
     public void hide() {
@@ -120,6 +125,13 @@ public class VirtualController {
         elements.clear();
     }
 
+    public void setOpacity(int opacity) {
+        for (VirtualControllerElement element : elements) {
+            element.setOpacity(opacity);
+        }
+    }
+
+
     public void addElement(VirtualControllerElement element, int x, int y, int width, int height) {
         elements.add(element);
         RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(width, height);

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

@@ -24,6 +24,11 @@ public class VirtualControllerConfigurationLoader {
         return (int) (((float) total / (float) 100) * (float) percent);
     }
 
+    // The default controls are specified using a grid of 128*72 cells at 16:9
+    private static int screenScale(int units, int height) {
+        return (int) (((float) height / (float) 72) * (float) units);
+    }
+
     private static DigitalPad createDigitalPad(
             final VirtualController controller,
             final Context context) {
@@ -145,149 +150,186 @@ public class VirtualControllerConfigurationLoader {
         return new RightAnalogStick(controller, context);
     }
 
-    private static final int BUTTON_BASE_X = 65;
-    private static final int BUTTON_BASE_Y = 5;
-    private static final int BUTTON_WIDTH = getPercent(30, 33);
-    private static final int BUTTON_HEIGHT = getPercent(40, 33);
+
+    private static final int TRIGGER_L_BASE_X = 1;
+    private static final int TRIGGER_R_BASE_X = 92;
+    private static final int TRIGGER_DISTANCE = 23;
+    private static final int TRIGGER_BASE_Y = 31;
+    private static final int TRIGGER_WIDTH = 12;
+    private static final int TRIGGER_HEIGHT = 9;
+
+    // Face buttons are defined based on the Y button (button number 9)
+    private static final int BUTTON_BASE_X = 106;
+    private static final int BUTTON_BASE_Y = 1;
+    private static final int BUTTON_SIZE = 10;
+
+    private static final int DPAD_BASE_X = 4;
+    private static final int DPAD_BASE_Y = 41;
+    private static final int DPAD_SIZE = 30;
+
+    private static final int ANALOG_L_BASE_X = 6;
+    private static final int ANALOG_L_BASE_Y = 4;
+    private static final int ANALOG_R_BASE_X = 98;
+    private static final int ANALOG_R_BASE_Y = 42;
+    private static final int ANALOG_SIZE = 26;
+
+    private static final int L3_R3_BASE_Y = 60;
+
+    private static final int START_X = 83;
+    private static final int BACK_X = 34;
+    private static final int START_BACK_Y = 64;
+    private static final int START_BACK_WIDTH = 12;
+    private static final int START_BACK_HEIGHT = 7;
 
     public static void createDefaultLayout(final VirtualController controller, final Context context) {
 
         DisplayMetrics screen = context.getResources().getDisplayMetrics();
         PreferenceConfiguration config = PreferenceConfiguration.readPreferences(context);
 
+        // Displace controls on the right by this amount of pixels to account for different aspect ratios
+        int rightDisplacement = screen.widthPixels - screen.heightPixels * 16 / 9;
+
+        int height = screen.heightPixels;
+
         // NOTE: Some of these getPercent() expressions seem like they can be combined
         // into a single call. Due to floating point rounding, this isn't actually possible.
 
         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)
+                    screenScale(DPAD_BASE_X, height),
+                    screenScale(DPAD_BASE_Y, height),
+                    screenScale(DPAD_SIZE, height),
+                    screenScale(DPAD_SIZE, height)
             );
 
             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)
+                    !config.flipFaceButtons ? ControllerPacket.A_FLAG : ControllerPacket.B_FLAG, 0, 1,
+                    !config.flipFaceButtons ? "A" : "B", -1, controller, context),
+                    screenScale(BUTTON_BASE_X, height) + rightDisplacement,
+                    screenScale(BUTTON_BASE_Y + 2 * BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height)
             );
 
             controller.addElement(createDigitalButton(
                     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)
+                    config.flipFaceButtons ? ControllerPacket.A_FLAG : ControllerPacket.B_FLAG, 0, 1,
+                    config.flipFaceButtons ? "A" : "B", -1, controller, context),
+                    screenScale(BUTTON_BASE_X + BUTTON_SIZE, height) + rightDisplacement,
+                    screenScale(BUTTON_BASE_Y + BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height)
             );
 
             controller.addElement(createDigitalButton(
                     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)
+                    !config.flipFaceButtons ? ControllerPacket.X_FLAG : ControllerPacket.Y_FLAG, 0, 1,
+                    !config.flipFaceButtons ? "X" : "Y", -1, controller, context),
+                    screenScale(BUTTON_BASE_X - BUTTON_SIZE, height) + rightDisplacement,
+                    screenScale(BUTTON_BASE_Y + BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height)
             );
 
             controller.addElement(createDigitalButton(
                     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)
+                    config.flipFaceButtons ? ControllerPacket.X_FLAG : ControllerPacket.Y_FLAG, 0, 1,
+                    config.flipFaceButtons ? "X" : "Y", -1, controller, context),
+                    screenScale(BUTTON_BASE_X, height) + rightDisplacement,
+                    screenScale(BUTTON_BASE_Y, height),
+                    screenScale(BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height)
             );
 
             controller.addElement(createLeftTrigger(
-                    0, "LT", -1, controller, context),
-                    getPercent(BUTTON_BASE_X, screen.widthPixels),
-                    getPercent(BUTTON_BASE_Y, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
+                    1, "LT", -1, controller, context),
+                    screenScale(TRIGGER_L_BASE_X, height),
+                    screenScale(TRIGGER_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
             );
 
             controller.addElement(createRightTrigger(
-                    0, "RT", -1, controller, context),
-                    getPercent(BUTTON_BASE_X, screen.widthPixels) + 2 * getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_BASE_Y, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
+                    1, "RT", -1, controller, context),
+                    screenScale(TRIGGER_R_BASE_X + TRIGGER_DISTANCE, height) + rightDisplacement,
+                    screenScale(TRIGGER_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
             );
 
             controller.addElement(createDigitalButton(
                     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)
+                    screenScale(TRIGGER_L_BASE_X + TRIGGER_DISTANCE, height),
+                    screenScale(TRIGGER_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
             );
 
             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)
+                    screenScale(TRIGGER_R_BASE_X, height) + rightDisplacement,
+                    screenScale(TRIGGER_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
             );
 
             controller.addElement(createLeftStick(controller, context),
-                    getPercent(5, screen.widthPixels),
-                    getPercent(50, screen.heightPixels),
-                    getPercent(40, screen.widthPixels),
-                    getPercent(50, screen.heightPixels)
+                    screenScale(ANALOG_L_BASE_X, height),
+                    screenScale(ANALOG_L_BASE_Y, height),
+                    screenScale(ANALOG_SIZE, height),
+                    screenScale(ANALOG_SIZE, height)
             );
 
             controller.addElement(createRightStick(controller, context),
-                    getPercent(55, screen.widthPixels),
-                    getPercent(50, screen.heightPixels),
-                    getPercent(40, screen.widthPixels),
-                    getPercent(50, screen.heightPixels)
+                    screenScale(ANALOG_R_BASE_X, height) + rightDisplacement,
+                    screenScale(ANALOG_R_BASE_Y, height),
+                    screenScale(ANALOG_SIZE, height),
+                    screenScale(ANALOG_SIZE, height)
             );
 
             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)
+                    screenScale(BACK_X, height),
+                    screenScale(START_BACK_Y, height),
+                    screenScale(START_BACK_WIDTH, height),
+                    screenScale(START_BACK_HEIGHT, height)
             );
 
             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)
+                    screenScale(START_X, height) + rightDisplacement,
+                    screenScale(START_BACK_Y, height),
+                    screenScale(START_BACK_WIDTH, height),
+                    screenScale(START_BACK_HEIGHT, height)
             );
         }
         else {
             controller.addElement(createDigitalButton(
                     VirtualControllerElement.EID_LSB,
                     ControllerPacket.LS_CLK_FLAG, 0, 1, "L3", -1, controller, context),
-                    getPercent(2, screen.widthPixels),
-                    getPercent(80, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
+                    screenScale(TRIGGER_L_BASE_X, height),
+                    screenScale(L3_R3_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
             );
 
             controller.addElement(createDigitalButton(
                     VirtualControllerElement.EID_RSB,
                     ControllerPacket.RS_CLK_FLAG, 0, 1, "R3", -1, controller, context),
-                    getPercent(89, screen.widthPixels),
-                    getPercent(80, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
+                    screenScale(TRIGGER_R_BASE_X + TRIGGER_DISTANCE, height) + rightDisplacement,
+                    screenScale(L3_R3_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
             );
         }
+
+        controller.setOpacity(config.oscOpacity);
     }
 
     public static void saveProfile(final VirtualController controller,
@@ -306,7 +348,7 @@ public class VirtualControllerConfigurationLoader {
         prefEditor.apply();
     }
 
-	public static void loadFromPreferences(final VirtualController controller, final Context context) {
+    public static void loadFromPreferences(final VirtualController controller, final Context context) {
         SharedPreferences pref = context.getSharedPreferences(OSC_PREFERENCE, Activity.MODE_PRIVATE);
 
         for (VirtualControllerElement element : controller.getElements()) {
@@ -324,5 +366,5 @@ public class VirtualControllerConfigurationLoader {
                 }
             }
         }
-	}
-}
+    }
+}

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

@@ -43,7 +43,8 @@ public abstract class VirtualControllerElement extends View {
 
     private int normalColor = 0xF0888888;
     protected int pressedColor = 0xF00000FF;
-    private int configNormalColor = 0xF0FF0000;
+    private int configMoveColor = 0xF0FF0000;
+    private int configResizeColor = 0xF0FF00FF;
     private int configSelectedColor = 0xF000FF00;
 
     protected int startSize_x;
@@ -112,34 +113,34 @@ public abstract class VirtualControllerElement extends View {
 
     /*
     protected void actionShowNormalColorChooser() {
-		AmbilWarnaDialog colorDialog = new AmbilWarnaDialog(getContext(), normalColor, true, new AmbilWarnaDialog.OnAmbilWarnaListener() {
-			@Override
-			public void onCancel(AmbilWarnaDialog dialog)
-			{}
+        AmbilWarnaDialog colorDialog = new AmbilWarnaDialog(getContext(), normalColor, true, new AmbilWarnaDialog.OnAmbilWarnaListener() {
+            @Override
+            public void onCancel(AmbilWarnaDialog dialog)
+            {}
 
-			@Override
-			public void onOk(AmbilWarnaDialog dialog, int color) {
-				normalColor = color;
-				invalidate();
-			}
-		});
-		colorDialog.show();
-	}
+            @Override
+            public void onOk(AmbilWarnaDialog dialog, int color) {
+                normalColor = color;
+                invalidate();
+            }
+        });
+        colorDialog.show();
+    }
 
-	protected void actionShowPressedColorChooser() {
-		AmbilWarnaDialog colorDialog = new AmbilWarnaDialog(getContext(), normalColor, true, new AmbilWarnaDialog.OnAmbilWarnaListener() {
-			@Override
-			public void onCancel(AmbilWarnaDialog dialog) {
-			}
+    protected void actionShowPressedColorChooser() {
+        AmbilWarnaDialog colorDialog = new AmbilWarnaDialog(getContext(), normalColor, true, new AmbilWarnaDialog.OnAmbilWarnaListener() {
+            @Override
+            public void onCancel(AmbilWarnaDialog dialog) {
+            }
 
-			@Override
-			public void onOk(AmbilWarnaDialog dialog, int color) {
-				pressedColor = color;
-				invalidate();
-			}
-		});
-		colorDialog.show();
-	}
+            @Override
+            public void onOk(AmbilWarnaDialog dialog, int color) {
+                pressedColor = color;
+                invalidate();
+            }
+        });
+        colorDialog.show();
+    }
     */
 
     protected void actionEnableMove() {
@@ -156,8 +157,12 @@ public abstract class VirtualControllerElement extends View {
     }
 
     protected int getDefaultColor() {
-        return (virtualController.getControllerMode() == VirtualController.ControllerMode.Configuration) ?
-                configNormalColor : normalColor;
+        if (virtualController.getControllerMode() == VirtualController.ControllerMode.MoveButtons)
+            return configMoveColor;
+        else if (virtualController.getControllerMode() == VirtualController.ControllerMode.ResizeButtons)
+            return configResizeColor;
+        else
+            return normalColor;
     }
 
     protected int getDefaultStrokeWidth() {
@@ -195,11 +200,11 @@ public abstract class VirtualControllerElement extends View {
                         break;
                     }
                 /*
-                case 2:	{ // set default color
+                case 2: { // set default color
                     actionShowNormalColorChooser();
                     break;
                 }
-                case 3:	{ // set pressed color
+                case 3: { // set pressed color
                     actionShowPressedColorChooser();
                     break;
                 }
@@ -230,7 +235,10 @@ public abstract class VirtualControllerElement extends View {
                 startSize_x = getWidth();
                 startSize_y = getHeight();
 
-                actionEnableMove();
+                if (virtualController.getControllerMode() == VirtualController.ControllerMode.MoveButtons)
+                    actionEnableMove();
+                else if (virtualController.getControllerMode() == VirtualController.ControllerMode.ResizeButtons)
+                    actionEnableResize();
 
                 return true;
             }
@@ -287,6 +295,15 @@ public abstract class VirtualControllerElement extends View {
         invalidate();
     }
 
+
+    public void setOpacity(int opacity) {
+        int hexOpacity = opacity * 255 / 100;
+        this.normalColor = (hexOpacity << 24) | (normalColor & 0x00FFFFFF);
+        this.pressedColor = (hexOpacity << 24) | (pressedColor & 0x00FFFFFF);
+
+        invalidate();
+    }
+
     protected final float getPercent(float value, float percent) {
         return value / 100 * percent;
     }

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

@@ -20,6 +20,7 @@ import android.media.MediaFormat;
 import android.media.MediaCodec.BufferInfo;
 import android.media.MediaCodec.CodecException;
 import android.os.Build;
+import android.os.SystemClock;
 import android.util.Range;
 import android.view.SurfaceHolder;
 
@@ -45,6 +46,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     private Thread rendererThread;
     private boolean needsSpsBitstreamFixup, isExynos4;
     private boolean adaptivePlayback, directSubmit;
+    private boolean lowLatency;
     private boolean constrainedHighProfile;
     private boolean refFrameInvalidationAvc, refFrameInvalidationHevc;
     private boolean refFrameInvalidationActive;
@@ -60,6 +62,10 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     private boolean legacyFrameDropRendering = false;
     private PerfOverlayListener perfListener;
 
+    private MediaFormat inputFormat;
+    private MediaFormat outputFormat;
+    private MediaFormat configuredFormat;
+
     private boolean needsBaselineSpsHack;
     private SeqParameterSet savedSps;
 
@@ -104,8 +110,10 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             if (!MediaCodecHelper.decoderIsWhitelistedForHevc(decoderInfo.getName(), meteredNetwork)) {
                 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) {
+                // HDR implies HEVC forced on, since HEVCMain10HDR10 is required for HDR.
+                // > 4K streaming also requires HEVC, so force it on there too.
+                if (prefs.videoFormat == PreferenceConfiguration.FORCE_H265_ON || requestedHdr ||
+                        prefs.width > 4096 || prefs.height > 4096) {
                     LimeLog.info("Forcing H265 enabled despite non-whitelisted decoder");
                 }
                 else {
@@ -161,7 +169,6 @@ 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);
             refFrameInvalidationHevc = MediaCodecHelper.decoderSupportsRefFrameInvalidationHevc(avcDecoder.getName());
 
@@ -190,8 +197,8 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         return avcDecoder != null;
     }
 
-    public boolean is49FpsBlacklisted() {
-        return avcDecoder != null && MediaCodecHelper.decoderBlacklistedFor49Fps(avcDecoder.getName());
+    public boolean isBlacklistedForFrameRate(int frameRate) {
+        return avcDecoder != null && MediaCodecHelper.decoderBlacklistedForFrameRate(avcDecoder.getName(), frameRate);
     }
 
     public void enableLegacyFrameDropRendering() {
@@ -245,6 +252,11 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                 return -1;
             }
 
+            if (width > 4096 || height > 4096) {
+                LimeLog.severe("> 4K streaming only supported on HEVC");
+                return -1;
+            }
+
             // These fixups only apply to H264 decoders
             needsSpsBitstreamFixup = MediaCodecHelper.decoderNeedsSpsBitstreamRestrictions(selectedDecoderName);
             needsBaselineSpsHack = MediaCodecHelper.decoderNeedsBaselineSpsHack(selectedDecoderName);
@@ -264,6 +276,9 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             }
 
             refFrameInvalidationActive = refFrameInvalidationAvc;
+
+            lowLatency = MediaCodecHelper.decoderSupportsLowLatency(avcDecoder, mimeType);
+            adaptivePlayback = MediaCodecHelper.decoderSupportsAdaptivePlayback(avcDecoder, mimeType);
         }
         else if ((videoFormat & MoonBridge.VIDEO_FORMAT_MASK_H265) != 0) {
             mimeType = "video/hevc";
@@ -275,6 +290,9 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             }
 
             refFrameInvalidationActive = refFrameInvalidationHevc;
+
+            lowLatency = MediaCodecHelper.decoderSupportsLowLatency(hevcDecoder, mimeType);
+            adaptivePlayback = MediaCodecHelper.decoderSupportsAdaptivePlayback(hevcDecoder, mimeType);
         }
         else {
             // Unknown format
@@ -293,6 +311,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
 
         MediaFormat videoFormat = MediaFormat.createVideoFormat(mimeType, width, height);
 
+        // Avoid setting KEY_FRAME_RATE on Lollipop and earlier to reduce compatibility risk
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            // We use prefs.fps instead of redrawRate here because the low latency hack in Game.java
+            // may leave us with an odd redrawRate value like 59 or 49 which might cause the decoder
+            // to puke. To be safe, we'll use the unmodified value.
+            videoFormat.setInteger(MediaFormat.KEY_FRAME_RATE, prefs.fps);
+        }
+
         // Adaptive playback can also be enabled by the whitelist on pre-KitKat devices
         // so we don't fill these pre-KitKat
         if (adaptivePlayback && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
@@ -300,16 +326,39 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             videoFormat.setInteger(MediaFormat.KEY_MAX_HEIGHT, height);
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // Operate at maximum rate to lower latency as much as possible on
-            // some Qualcomm platforms. We could also set KEY_PRIORITY to 0 (realtime)
-            // but that will actually result in the decoder crashing if it can't satisfy
-            // our (ludicrous) operating rate requirement.
-            videoFormat.setInteger(MediaFormat.KEY_OPERATING_RATE, Short.MAX_VALUE);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R && lowLatency) {
+            videoFormat.setInteger(MediaFormat.KEY_LOW_LATENCY, 1);
         }
+        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            // Set the Qualcomm vendor low latency extension if the Android R option is unavailable
+            if (MediaCodecHelper.decoderSupportsQcomVendorLowLatency(selectedDecoderName)) {
+                // MediaCodec supports vendor-defined format keys using the "vendor.<extension name>.<parameter name>" syntax.
+                // These allow access to functionality that is not exposed through documented MediaFormat.KEY_* values.
+                // https://cs.android.com/android/platform/superproject/+/master:hardware/qcom/sdm845/media/mm-video-v4l2/vidc/common/inc/vidc_vendor_extensions.h;l=67
+                //
+                // Examples of Qualcomm's vendor extensions for Snapdragon 845:
+                // https://cs.android.com/android/platform/superproject/+/master:hardware/qcom/sdm845/media/mm-video-v4l2/vidc/vdec/src/omx_vdec_extensions.hpp
+                // https://cs.android.com/android/_/android/platform/hardware/qcom/sm8150/media/+/0621ceb1c1b19564999db8293574a0e12952ff6c
+                videoFormat.setInteger("vendor.qti-ext-dec-low-latency.enable", 1);
+            }
+
+            if (MediaCodecHelper.decoderSupportsMaxOperatingRate(selectedDecoderName)) {
+                videoFormat.setInteger(MediaFormat.KEY_OPERATING_RATE, Short.MAX_VALUE);
+            }
+        }
+
+        configuredFormat = videoFormat;
+        LimeLog.info("Configuring with format: "+configuredFormat);
 
         try {
             videoDecoder.configure(videoFormat, renderTarget.getSurface(), null, 0);
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                // This will contain the actual accepted input format attributes
+                inputFormat = videoDecoder.getInputFormat();
+                LimeLog.info("Input format: "+inputFormat);
+            }
+
             videoDecoder.setVideoScalingMode(MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT);
 
             if (USE_FRAME_RENDER_TIME && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -334,6 +383,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
                 legacyInputBuffers = videoDecoder.getInputBuffers();
             }
+
         } catch (Exception e) {
             e.printStackTrace();
             return -5;
@@ -368,7 +418,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             //
             if (initialException != null) {
                 // This isn't the first time we've had an exception processing video
-                if (System.currentTimeMillis() - initialExceptionTimestamp >= EXCEPTION_REPORT_DELAY_MS) {
+                if (SystemClock.uptimeMillis() - 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;
@@ -385,7 +435,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                 else {
                     initialException = new RendererException(this, e);
                 }
-                initialExceptionTimestamp = System.currentTimeMillis();
+                initialExceptionTimestamp = SystemClock.uptimeMillis();
             }
         }
     }
@@ -445,7 +495,8 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                                     break;
                                 case MediaCodec.INFO_OUTPUT_FORMAT_CHANGED:
                                     LimeLog.info("Output format changed");
-                                    LimeLog.info("New output Format: " + videoDecoder.getOutputFormat());
+                                    outputFormat = videoDecoder.getOutputFormat();
+                                    LimeLog.info("New output format: " + outputFormat);
                                     break;
                                 default:
                                     break;
@@ -587,14 +638,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
     @SuppressWarnings("deprecation")
     @Override
     public int submitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength, int decodeUnitType,
-                                int frameNumber, long receiveTimeMs) {
+                                int frameNumber, long receiveTimeMs, long enqueueTimeMs) {
         if (stopping) {
             // Don't bother if we're stopping
             return MoonBridge.DR_OK;
         }
 
         if (lastFrameNumber == 0) {
-            activeWindowVideoStats.measurementStartTimestamp = System.currentTimeMillis();
+            activeWindowVideoStats.measurementStartTimestamp = SystemClock.uptimeMillis();
         } else if (frameNumber != lastFrameNumber && frameNumber != lastFrameNumber + 1) {
             // We can receive the same "frame" multiple times if it's an IDR frame.
             // In that case, each frame start NALU is submitted independently.
@@ -606,7 +657,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         lastFrameNumber = frameNumber;
 
         // Flip stats windows roughly every second
-        if (System.currentTimeMillis() >= activeWindowVideoStats.measurementStartTimestamp + 1000) {
+        if (SystemClock.uptimeMillis() >= activeWindowVideoStats.measurementStartTimestamp + 1000) {
             if (prefs.enablePerfOverlay) {
                 VideoStats lastTwo = new VideoStats();
                 lastTwo.add(lastWindowVideoStats);
@@ -639,7 +690,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             globalVideoStats.add(activeWindowVideoStats);
             lastWindowVideoStats.copy(activeWindowVideoStats);
             activeWindowVideoStats.clear();
-            activeWindowVideoStats.measurementStartTimestamp = System.currentTimeMillis();
+            activeWindowVideoStats.measurementStartTimestamp = SystemClock.uptimeMillis();
         }
 
         activeWindowVideoStats.totalFramesReceived++;
@@ -648,11 +699,13 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
         int inputBufferIndex;
         ByteBuffer buf;
 
-        long timestampUs = System.nanoTime() / 1000;
+        long timestampUs = enqueueTimeMs * 1000;
 
         if (!FRAME_RENDER_TIME_ONLY) {
-            // Count time from first packet received to decode start
-            activeWindowVideoStats.totalTimeMs += (timestampUs / 1000) - receiveTimeMs;
+            // Count time from first packet received to enqueue time as receive time
+            // We will count DU queue time as part of decoding, because it is directly
+            // caused by a slow decoder.
+            activeWindowVideoStats.totalTimeMs += enqueueTimeMs - receiveTimeMs;
         }
 
         if (timestampUs <= lastTimestampUs) {
@@ -683,17 +736,17 @@ 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) {
+                if (initialWidth <= 720 && initialHeight <= 480 && refreshRate <= 60) {
                     // Max 5 buffered frames at 720x480x60
                     LimeLog.info("Patching level_idc to 31");
                     sps.levelIdc = 31;
                 }
-                else if (initialWidth <= 1280 && initialHeight <= 720) {
+                else if (initialWidth <= 1280 && initialHeight <= 720 && refreshRate <= 60) {
                     // Max 5 buffered frames at 1280x720x60
                     LimeLog.info("Patching level_idc to 32");
                     sps.levelIdc = 32;
                 }
-                else if (initialWidth <= 1920 && initialHeight <= 1080) {
+                else if (initialWidth <= 1920 && initialHeight <= 1080 && refreshRate <= 60) {
                     // Max 4 buffered frames at 1920x1080x64
                     LimeLog.info("Patching level_idc to 42");
                     sps.levelIdc = 42;
@@ -718,12 +771,16 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             }
 
             // 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;
+            // Some devices don't like these so we remove them here on old devices.
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+                sps.vuiParams.videoSignalTypePresentFlag = false;
+                sps.vuiParams.colourDescriptionPresentFlag = false;
+                sps.vuiParams.chromaLocInfoPresentFlag = false;
+            }
 
-            if ((needsSpsBitstreamFixup || isExynos4) && !refFrameInvalidationActive) {
+            // Some older devices used to choke on a bitstream restrictions, so we won't provide them
+            // unless explicitly whitelisted. For newer devices, leave the bitstream restrictions present.
+            if (needsSpsBitstreamFixup || isExynos4 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 // The SPS that comes in the current H264 bytestream doesn't set bitstream_restriction_flag
                 // or max_dec_frame_buffering which increases decoding latency on Tegra.
 
@@ -1014,18 +1071,39 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
             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";
+                str += "AVC supported width range: "+avcWidthRange+"\n";
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    try {
+                        Range<Double> avcFpsRange = renderer.avcDecoder.getCapabilitiesForType("video/avc").getVideoCapabilities().getAchievableFrameRatesFor(renderer.initialWidth, renderer.initialHeight);
+                        str += "AVC achievable FPS range: "+avcFpsRange+"\n";
+                    } catch (IllegalArgumentException e) {
+                        str += "AVC achievable FPS range: UNSUPPORTED!\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 += "HEVC supported width range: "+hevcWidthRange+"\n";
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    try {
+                        Range<Double> hevcFpsRange = renderer.hevcDecoder.getCapabilitiesForType("video/hevc").getVideoCapabilities().getAchievableFrameRatesFor(renderer.initialWidth, renderer.initialHeight);
+                        str += "HEVC achievable FPS range: " + hevcFpsRange + "\n";
+                    } catch (IllegalArgumentException e) {
+                        str += "HEVC achievable FPS range: UNSUPPORTED!\n";
+                    }
+                }
             }
+            str += "Configured format: "+renderer.configuredFormat+"\n";
+            str += "Input format: "+renderer.inputFormat+"\n";
+            str += "Output format: "+renderer.outputFormat+"\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 += "Using modern SPS patching: "+(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)+"\n";
+            str += "Low latency mode: "+renderer.lowLatency+"\n";
             str += "Video dimensions: "+renderer.initialWidth+"x"+renderer.initialHeight+"\n";
             str += "FPS target: "+renderer.refreshRate+"\n";
             str += "Bitrate: "+renderer.prefs.bitrate+" Kbps \n";

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

@@ -1,5 +1,7 @@
 package com.limelight.binding.video;
 
+import android.os.SystemClock;
+
 class VideoStats {
 
     long decoderTimeMs;
@@ -24,7 +26,7 @@ class VideoStats {
             this.measurementStartTimestamp = other.measurementStartTimestamp;
         }
 
-        assert other.measurementStartTimestamp <= this.measurementStartTimestamp;
+        assert other.measurementStartTimestamp >= this.measurementStartTimestamp;
     }
 
     void copy(VideoStats other) {
@@ -50,7 +52,7 @@ class VideoStats {
     }
 
     VideoStatsFps getFps() {
-        float elapsed = (System.currentTimeMillis() - this.measurementStartTimestamp) / (float) 1000;
+        float elapsed = (SystemClock.uptimeMillis() - this.measurementStartTimestamp) / (float) 1000;
 
         VideoStatsFps fps = new VideoStatsFps();
         if (elapsed > 0) {

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

@@ -4,12 +4,16 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringReader;
 import java.net.Inet4Address;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.net.UnknownHostException;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 
 import com.limelight.LimeLog;
 import com.limelight.binding.PlatformBinding;
@@ -22,14 +26,21 @@ import com.limelight.nvstream.http.PairingManager;
 import com.limelight.nvstream.mdns.MdnsComputer;
 import com.limelight.nvstream.mdns.MdnsDiscoveryListener;
 import com.limelight.utils.CacheHelper;
+import com.limelight.utils.NetHelper;
 import com.limelight.utils.ServerHelper;
 
 import android.app.Service;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
 import android.os.Binder;
+import android.os.Build;
 import android.os.IBinder;
+import android.os.SystemClock;
 
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -54,6 +65,7 @@ public class ComputerManagerService extends Service {
     private ComputerManagerListener listener = null;
     private final AtomicInteger activePolls = new AtomicInteger(0);
     private boolean pollingActive = false;
+    private final Lock defaultNetworkLock = new ReentrantLock();
 
     private DiscoveryService.DiscoveryBinder discoveryBinder;
     private final ServiceConnection discoveryServiceConnection = new ServiceConnection() {
@@ -125,6 +137,18 @@ public class ComputerManagerService extends Service {
                 dbManager.updateComputer(existingComputer);
             }
             else {
+                try {
+                    // If the active address is a site-local address (RFC 1918),
+                    // then use STUN to populate the external address field if
+                    // it's not set already.
+                    if (details.remoteAddress == null) {
+                        InetAddress addr = InetAddress.getByName(details.activeAddress);
+                        if (addr.isSiteLocalAddress()) {
+                            populateExternalAddress(details);
+                        }
+                    }
+                } catch (UnknownHostException ignored) {}
+
                 dbManager.updateComputer(details);
             }
         }
@@ -153,7 +177,7 @@ public class ComputerManagerService extends Service {
                                 LimeLog.warning(tuple.computer.name + " is offline (try " + offlineCount + ")");
                                 offlineCount++;
                             } else {
-                                tuple.lastSuccessfulPollMs = System.currentTimeMillis();
+                                tuple.lastSuccessfulPollMs = SystemClock.elapsedRealtime();
                                 offlineCount = 0;
                             }
                         }
@@ -184,7 +208,7 @@ public class ComputerManagerService extends Service {
             synchronized (pollingTuples) {
                 for (PollingTuple tuple : pollingTuples) {
                     // Enforce the poll data TTL
-                    if (System.currentTimeMillis() - tuple.lastSuccessfulPollMs > POLL_DATA_TTL_MS) {
+                    if (SystemClock.elapsedRealtime() - tuple.lastSuccessfulPollMs > POLL_DATA_TTL_MS) {
                         LimeLog.info("Timing out polled state for "+tuple.computer.name);
                         tuple.computer.state = ComputerDetails.State.UNKNOWN;
                     }
@@ -294,6 +318,66 @@ public class ComputerManagerService extends Service {
         return false;
     }
 
+    private void populateExternalAddress(ComputerDetails details) {
+        boolean boundToNetwork = false;
+        boolean activeNetworkIsVpn = NetHelper.isActiveNetworkVpn(this);
+        ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        // Check if we're currently connected to a VPN which may send our
+        // STUN request from an unexpected interface
+        if (activeNetworkIsVpn) {
+            // Acquire the default network lock since we could be changing global process state
+            defaultNetworkLock.lock();
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                // On Lollipop or later, we can bind our process to the underlying interface
+                // to ensure our STUN request goes out on that interface or not at all (which is
+                // preferable to getting a VPN endpoint address back).
+                Network[] networks = connMgr.getAllNetworks();
+                for (Network net : networks) {
+                    NetworkCapabilities netCaps = connMgr.getNetworkCapabilities(net);
+                    if (netCaps != null) {
+                        if (!netCaps.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) &&
+                                !netCaps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
+                            // This network looks like an underlying multicast-capable transport,
+                            // so let's guess that it's probably where our mDNS response came from.
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                                if (connMgr.bindProcessToNetwork(net)) {
+                                    boundToNetwork = true;
+                                    break;
+                                }
+                            }
+                            else if (ConnectivityManager.setProcessDefaultNetwork(net)) {
+                                boundToNetwork = true;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // Perform the STUN request if we're not on a VPN or if we bound to a network
+        if (!activeNetworkIsVpn || boundToNetwork) {
+            details.remoteAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
+        }
+
+        // Unbind from the network
+        if (boundToNetwork) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                connMgr.bindProcessToNetwork(null);
+            }
+            else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                ConnectivityManager.setProcessDefaultNetwork(null);
+            }
+        }
+
+        // Unlock the network state
+        if (activeNetworkIsVpn) {
+            defaultNetworkLock.unlock();
+        }
+    }
+
     private MdnsDiscoveryListener createDiscoveryListener() {
         return new MdnsDiscoveryListener() {
             @Override
@@ -308,7 +392,7 @@ public class ComputerManagerService extends Service {
                     // our WAN address, which is also very likely the WAN address
                     // of the PC. We can use this later to connect remotely.
                     if (computer.getLocalAddress() instanceof Inet4Address) {
-                        details.remoteAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
+                        populateExternalAddress(details);
                     }
                 }
                 if (computer.getIpv6Address() != null) {

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

@@ -1,6 +1,8 @@
 package com.limelight.grid;
 
-import android.app.Activity;
+import android.content.Context;
+import android.graphics.BitmapFactory;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -13,9 +15,14 @@ import com.limelight.grid.assets.DiskAssetLoader;
 import com.limelight.grid.assets.MemoryAssetLoader;
 import com.limelight.grid.assets.NetworkAssetLoader;
 import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.preferences.PreferenceConfiguration;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 @SuppressWarnings("unchecked")
 public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
@@ -23,15 +30,63 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
     private static final int SMALL_WIDTH_DP = 100;
     private static final int LARGE_WIDTH_DP = 150;
 
-    private final CachedAppAssetLoader loader;
+    private final ComputerDetails computer;
+    private final String uniqueId;
+    private final boolean showHiddenApps;
 
-    public AppGridAdapter(Activity activity, boolean listMode, boolean small, ComputerDetails computer, String uniqueId) {
-        super(activity, listMode ? R.layout.simple_row : (small ? R.layout.app_grid_item_small : R.layout.app_grid_item));
+    private CachedAppAssetLoader loader;
+    private Set<Integer> hiddenAppIds = new HashSet<>();
+    private ArrayList<AppView.AppObject> allApps = new ArrayList<>();
 
-        int dpi = activity.getResources().getDisplayMetrics().densityDpi;
+    public AppGridAdapter(Context context, PreferenceConfiguration prefs, ComputerDetails computer, String uniqueId, boolean showHiddenApps) {
+        super(context, getLayoutIdForPreferences(prefs));
+
+        this.computer = computer;
+        this.uniqueId = uniqueId;
+        this.showHiddenApps = showHiddenApps;
+
+        updateLayoutWithPreferences(context, prefs);
+    }
+
+    public void updateHiddenApps(Set<Integer> newHiddenAppIds, boolean hideImmediately) {
+        this.hiddenAppIds.clear();
+        this.hiddenAppIds.addAll(newHiddenAppIds);
+
+        if (hideImmediately) {
+            // Reconstruct the itemList with the new hidden app set
+            itemList.clear();
+            for (AppView.AppObject app : allApps) {
+                app.isHidden = hiddenAppIds.contains(app.app.getAppId());
+
+                if (!app.isHidden || showHiddenApps) {
+                    itemList.add(app);
+                }
+            }
+        }
+        else {
+            // Just update the isHidden state to show the correct UI indication
+            for (AppView.AppObject app : allApps) {
+                app.isHidden = hiddenAppIds.contains(app.app.getAppId());
+            }
+        }
+
+        notifyDataSetChanged();
+    }
+
+    private static int getLayoutIdForPreferences(PreferenceConfiguration prefs) {
+        if (prefs.smallIconMode) {
+            return R.layout.app_grid_item_small;
+        }
+        else {
+            return R.layout.app_grid_item;
+        }
+    }
+
+    public void updateLayoutWithPreferences(Context context, PreferenceConfiguration prefs) {
+        int dpi = context.getResources().getDisplayMetrics().densityDpi;
         int dp;
 
-        if (small) {
+        if (prefs.smallIconMode) {
             dp = SMALL_WIDTH_DP;
         }
         else {
@@ -45,10 +100,19 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         }
         LimeLog.info("Art scaling divisor: " + scalingDivisor);
 
+        if (loader != null) {
+            // Cancel operations on the old loader
+            cancelQueuedOperations();
+        }
+
         this.loader = new CachedAppAssetLoader(computer, scalingDivisor,
                 new NetworkAssetLoader(context, uniqueId),
                 new MemoryAssetLoader(),
-                new DiskAssetLoader(context));
+                new DiskAssetLoader(context),
+                BitmapFactory.decodeResource(context.getResources(), R.drawable.no_app_image));
+
+        // This will trigger the view to reload with the new layout
+        setLayoutId(getLayoutIdForPreferences(prefs));
     }
 
     public void cancelQueuedOperations() {
@@ -57,8 +121,8 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
         loader.freeCacheMemory();
     }
 
-    private void sortList() {
-        Collections.sort(itemList, new Comparator<AppView.AppObject>() {
+    private static void sortList(List<AppView.AppObject> list) {
+        Collections.sort(list, new Comparator<AppView.AppObject>() {
             @Override
             public int compare(AppView.AppObject lhs, AppView.AppObject rhs) {
                 return lhs.app.getAppName().toLowerCase().compareTo(rhs.app.getAppName().toLowerCase());
@@ -67,43 +131,54 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
     }
 
     public void addApp(AppView.AppObject app) {
-        // Queue a request to fetch this bitmap into cache
-        loader.queueCacheLoad(app.app);
+        // Update hidden state
+        app.isHidden = hiddenAppIds.contains(app.app.getAppId());
 
-        // Add the app to our sorted list
-        itemList.add(app);
-        sortList();
+        // Always add the app to the all apps list
+        allApps.add(app);
+        sortList(allApps);
+
+        // Add the app to the adapter data if it's not hidden
+        if (showHiddenApps || !app.isHidden) {
+            // Queue a request to fetch this bitmap into cache
+            loader.queueCacheLoad(app.app);
+
+            // Add the app to our sorted list
+            itemList.add(app);
+            sortList(itemList);
+        }
     }
 
     public void removeApp(AppView.AppObject app) {
         itemList.remove(app);
+        allApps.remove(app);
     }
 
     @Override
-    public boolean populateImageView(ImageView imgView, ProgressBar prgView, AppView.AppObject obj) {
+    public void clear() {
+        super.clear();
+        allApps.clear();
+    }
+
+    @Override
+    public void populateView(View parentView, ImageView imgView, ProgressBar prgView, TextView txtView, ImageView overlayView, AppView.AppObject obj) {
         // Let the cached asset loader handle it
-        loader.populateImageView(obj.app, imgView, prgView);
-        return true;
-    }
+        loader.populateImageView(obj.app, imgView, txtView);
 
-    @Override
-    public boolean populateTextView(TextView txtView, AppView.AppObject obj) {
-        // Select the text view so it starts marquee mode
-        txtView.setSelected(true);
-
-        // Return false to use the app's toString method
-        return false;
-    }
-
-    @Override
-    public boolean populateOverlayView(ImageView overlayView, AppView.AppObject obj) {
         if (obj.isRunning) {
             // Show the play button overlay
             overlayView.setImageResource(R.drawable.ic_play);
-            return true;
+            overlayView.setVisibility(View.VISIBLE);
+        }
+        else {
+            overlayView.setVisibility(View.GONE);
         }
 
-        // No overlay
-        return false;
+        if (obj.isHidden) {
+            parentView.setAlpha(0.40f);
+        }
+        else {
+            parentView.setAlpha(1.0f);
+        }
     }
 }

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

@@ -15,17 +15,26 @@ import java.util.ArrayList;
 
 public abstract class GenericGridAdapter<T> extends BaseAdapter {
     protected final Context context;
-    protected final int layoutId;
-    protected final ArrayList<T> itemList = new ArrayList<>();
-    protected final LayoutInflater inflater;
+    private int layoutId;
+    final ArrayList<T> itemList = new ArrayList<>();
+    private final LayoutInflater inflater;
 
-    public GenericGridAdapter(Context context, int layoutId) {
+    GenericGridAdapter(Context context, int layoutId) {
         this.context = context;
         this.layoutId = layoutId;
 
         this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     }
 
+    void setLayoutId(int layoutId) {
+        if (layoutId != this.layoutId) {
+            this.layoutId = layoutId;
+
+            // Force the view to be redrawn with the new layout
+            notifyDataSetInvalidated();
+        }
+    }
+
     public void clear() {
         itemList.clear();
     }
@@ -45,9 +54,7 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
         return i;
     }
 
-    public abstract boolean populateImageView(ImageView imgView, ProgressBar prgView, T obj);
-    public abstract boolean populateTextView(TextView txtView, T obj);
-    public abstract boolean populateOverlayView(ImageView overlayView, T obj);
+    public abstract void populateView(View parentView, ImageView imgView, ProgressBar prgView, TextView txtView, ImageView overlayView, T obj);
 
     @Override
     public View getView(int i, View convertView, ViewGroup viewGroup) {
@@ -60,22 +67,7 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
         TextView txtView = convertView.findViewById(R.id.grid_text);
         ProgressBar prgView = convertView.findViewById(R.id.grid_spinner);
 
-        if (imgView != null) {
-            if (!populateImageView(imgView, prgView, itemList.get(i))) {
-                imgView.setImageBitmap(null);
-            }
-        }
-        if (!populateTextView(txtView, itemList.get(i))) {
-            txtView.setText(itemList.get(i).toString());
-        }
-        if (overlayView != null) {
-            if (!populateOverlayView(overlayView, itemList.get(i))) {
-                overlayView.setVisibility(View.INVISIBLE);
-            }
-            else {
-                overlayView.setVisibility(View.VISIBLE);
-            }
-        }
+        populateView(convertView, imgView, prgView, txtView, overlayView, itemList.get(i));
 
         return convertView;
     }

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

@@ -10,14 +10,24 @@ import com.limelight.PcView;
 import com.limelight.R;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.PairingManager;
+import com.limelight.preferences.PreferenceConfiguration;
 
 import java.util.Collections;
 import java.util.Comparator;
 
 public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
 
-    public PcGridAdapter(Context context, boolean listMode, boolean small) {
-        super(context, listMode ? R.layout.simple_row : (small ? R.layout.pc_grid_item_small : R.layout.pc_grid_item));
+    public PcGridAdapter(Context context, PreferenceConfiguration prefs) {
+        super(context, getLayoutIdForPreferences(prefs));
+    }
+
+    private static int getLayoutIdForPreferences(PreferenceConfiguration prefs) {
+        return R.layout.pc_grid_item;
+    }
+
+    public void updateLayoutWithPreferences(Context context, PreferenceConfiguration prefs) {
+        // This will trigger the view to reload with the new layout
+        setLayoutId(getLayoutIdForPreferences(prefs));
     }
 
     public void addComputer(PcView.ComputerObject computer) {
@@ -39,7 +49,8 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
     }
 
     @Override
-    public boolean populateImageView(ImageView imgView, ProgressBar prgView, PcView.ComputerObject obj) {
+    public void populateView(View parentView, ImageView imgView, ProgressBar prgView, TextView txtView, ImageView overlayView, PcView.ComputerObject obj) {
+        imgView.setImageResource(R.drawable.ic_computer);
         if (obj.details.state == ComputerDetails.State.ONLINE) {
             imgView.setAlpha(1.0f);
         }
@@ -54,12 +65,7 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
             prgView.setVisibility(View.INVISIBLE);
         }
 
-        imgView.setImageResource(R.drawable.ic_computer);
-        return true;
-    }
-
-    @Override
-    public boolean populateTextView(TextView txtView, PcView.ComputerObject obj) {
+        txtView.setText(obj.details.name);
         if (obj.details.state == ComputerDetails.State.ONLINE) {
             txtView.setAlpha(1.0f);
         }
@@ -67,16 +73,10 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
             txtView.setAlpha(0.4f);
         }
 
-        // Return false to use the computer's toString method
-        return false;
-    }
-
-    @Override
-    public boolean populateOverlayView(ImageView overlayView, PcView.ComputerObject obj) {
         if (obj.details.state == ComputerDetails.State.OFFLINE) {
             overlayView.setImageResource(R.drawable.ic_pc_offline);
             overlayView.setAlpha(0.4f);
-            return true;
+            overlayView.setVisibility(View.VISIBLE);
         }
         // We must check if the status is exactly online and unpaired
         // to avoid colliding with the loading spinner when status is unknown
@@ -84,8 +84,10 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
                 obj.details.pairState == PairingManager.PairState.NOT_PAIRED) {
             overlayView.setImageResource(R.drawable.ic_lock);
             overlayView.setAlpha(1.0f);
-            return true;
+            overlayView.setVisibility(View.VISIBLE);
+        }
+        else {
+            overlayView.setVisibility(View.GONE);
         }
-        return false;
     }
 }

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

@@ -6,9 +6,12 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
-import android.widget.ProgressBar;
+import android.widget.TextView;
 
+import com.limelight.R;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvApp;
 
@@ -52,15 +55,17 @@ public class CachedAppAssetLoader {
     private final MemoryAssetLoader memoryLoader;
     private final DiskAssetLoader diskLoader;
     private final Bitmap placeholderBitmap;
+    private final Bitmap noAppImageBitmap;
 
     public CachedAppAssetLoader(ComputerDetails computer, double scalingDivider,
                                 NetworkAssetLoader networkLoader, MemoryAssetLoader memoryLoader,
-                                DiskAssetLoader diskLoader) {
+                                DiskAssetLoader diskLoader, Bitmap noAppImageBitmap) {
         this.computer = computer;
         this.scalingDivider = scalingDivider;
         this.networkLoader = networkLoader;
         this.memoryLoader = memoryLoader;
         this.diskLoader = diskLoader;
+        this.noAppImageBitmap = noAppImageBitmap;
         this.placeholderBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
     }
 
@@ -87,7 +92,7 @@ public class CachedAppAssetLoader {
         memoryLoader.clearCache();
     }
 
-    private Bitmap doNetworkAssetLoad(LoaderTuple tuple, LoaderTask task) {
+    private ScaledBitmap doNetworkAssetLoad(LoaderTuple tuple, LoaderTask task) {
         // Try 3 times
         for (int i = 0; i < 3; i++) {
             // Check again whether we've been cancelled or the image view is gone
@@ -108,7 +113,7 @@ public class CachedAppAssetLoader {
                 // If there's a task associated with this load, we should return the bitmap
                 if (task != null) {
                     // If the cached bitmap is valid, return it. Otherwise, we'll try the load again
-                    Bitmap bmp = diskLoader.loadBitmapFromCache(tuple, (int) scalingDivider);
+                    ScaledBitmap bmp = diskLoader.loadBitmapFromCache(tuple, (int) scalingDivider);
                     if (bmp != null) {
                         return bmp;
                     }
@@ -130,29 +135,29 @@ public class CachedAppAssetLoader {
         return null;
     }
 
-    private class LoaderTask extends AsyncTask<LoaderTuple, Void, Bitmap> {
+    private class LoaderTask extends AsyncTask<LoaderTuple, Void, ScaledBitmap> {
         private final WeakReference<ImageView> imageViewRef;
-        private final WeakReference<ProgressBar> progressViewRef;
+        private final WeakReference<TextView> textViewRef;
         private final boolean diskOnly;
 
         private LoaderTuple tuple;
 
-        public LoaderTask(ImageView imageView, ProgressBar prgView, boolean diskOnly) {
+        public LoaderTask(ImageView imageView, TextView textView, boolean diskOnly) {
             this.imageViewRef = new WeakReference<>(imageView);
-            this.progressViewRef = new WeakReference<>(prgView);
+            this.textViewRef = new WeakReference<>(textView);
             this.diskOnly = diskOnly;
         }
 
         @Override
-        protected Bitmap doInBackground(LoaderTuple... params) {
+        protected ScaledBitmap doInBackground(LoaderTuple... params) {
             tuple = params[0];
 
             // Check whether it has been cancelled or the views are gone
-            if (isCancelled() || imageViewRef.get() == null || progressViewRef.get() == null) {
+            if (isCancelled() || imageViewRef.get() == null || textViewRef.get() == null) {
                 return null;
             }
 
-            Bitmap bmp = diskLoader.loadBitmapFromCache(tuple, (int) scalingDivider);
+            ScaledBitmap bmp = diskLoader.loadBitmapFromCache(tuple, (int) scalingDivider);
             if (bmp == null) {
                 if (!diskOnly) {
                     // Try to load the asset from the network
@@ -181,44 +186,61 @@ public class CachedAppAssetLoader {
 
             // If the current loader task for this view isn't us, do nothing
             final ImageView imageView = imageViewRef.get();
-            final ProgressBar prgView = progressViewRef.get();
+            final TextView textView = textViewRef.get();
             if (getLoaderTask(imageView) == this) {
-                // Now display the progress bar since we have to hit the network
-                if (prgView != null) {
-                    prgView.setVisibility(View.VISIBLE);
-                }
-
-                // Set off another loader task on the network executor
-                LoaderTask task = new LoaderTask(imageView, prgView, false);
-                AsyncDrawable asyncDrawable = new AsyncDrawable(imageView.getResources(), placeholderBitmap, task);
-                imageView.setVisibility(View.VISIBLE);
+                // Set off another loader task on the network executor. This time our AsyncDrawable
+                // will use the app image placeholder bitmap, rather than an empty bitmap.
+                LoaderTask task = new LoaderTask(imageView, textView, false);
+                AsyncDrawable asyncDrawable = new AsyncDrawable(imageView.getResources(), noAppImageBitmap, task);
                 imageView.setImageDrawable(asyncDrawable);
+                imageView.startAnimation(AnimationUtils.loadAnimation(imageView.getContext(), R.anim.boxart_fadein));
+                imageView.setVisibility(View.VISIBLE);
+                textView.setVisibility(View.VISIBLE);
                 task.executeOnExecutor(networkExecutor, tuple);
             }
         }
 
         @Override
-        protected void onPostExecute(Bitmap bitmap) {
+        protected void onPostExecute(final ScaledBitmap bitmap) {
             // Do nothing if cancelled
             if (isCancelled()) {
                 return;
             }
 
             final ImageView imageView = imageViewRef.get();
-            final ProgressBar prgView = progressViewRef.get();
+            final TextView textView = textViewRef.get();
             if (getLoaderTask(imageView) == this) {
-                // Set the bitmap
+                // Fade in the box art
                 if (bitmap != null) {
-                    imageView.setImageBitmap(bitmap);
-                }
+                    // Show the text if it's a placeholder
+                    textView.setVisibility(isBitmapPlaceholder(bitmap) ? View.VISIBLE : View.GONE);
 
-                // Hide the progress bar
-                if (prgView != null) {
-                    prgView.setVisibility(View.INVISIBLE);
-                }
+                    if (imageView.getVisibility() == View.VISIBLE) {
+                        // Fade out the placeholder first
+                        Animation fadeOutAnimation = AnimationUtils.loadAnimation(imageView.getContext(), R.anim.boxart_fadeout);
+                        fadeOutAnimation.setAnimationListener(new Animation.AnimationListener() {
+                            @Override
+                            public void onAnimationStart(Animation animation) {}
 
-                // Show the view
-                imageView.setVisibility(View.VISIBLE);
+                            @Override
+                            public void onAnimationEnd(Animation animation) {
+                                // Fade in the new box art
+                                imageView.setImageBitmap(bitmap.bitmap);
+                                imageView.startAnimation(AnimationUtils.loadAnimation(imageView.getContext(), R.anim.boxart_fadein));
+                            }
+
+                            @Override
+                            public void onAnimationRepeat(Animation animation) {}
+                        });
+                        imageView.startAnimation(fadeOutAnimation);
+                    }
+                    else {
+                        // View is invisible already, so just fade in the new art
+                        imageView.setImageBitmap(bitmap.bitmap);
+                        imageView.startAnimation(AnimationUtils.loadAnimation(imageView.getContext(), R.anim.boxart_fadein));
+                        imageView.setVisibility(View.VISIBLE);
+                    }
+                }
             }
         }
     }
@@ -296,7 +318,13 @@ public class CachedAppAssetLoader {
         });
     }
 
-    public boolean populateImageView(NvApp app, ImageView imgView, ProgressBar prgView) {
+    private boolean isBitmapPlaceholder(ScaledBitmap bitmap) {
+        return (bitmap == null) ||
+                (bitmap.originalWidth == 130 && bitmap.originalHeight == 180) || // GFE 2.0
+                (bitmap.originalWidth == 628 && bitmap.originalHeight == 888); // GFE 3.0
+    }
+
+    public boolean populateImageView(NvApp app, ImageView imgView, TextView textView) {
         LoaderTuple tuple = new LoaderTuple(computer, app);
 
         // If there's already a task in progress for this view,
@@ -306,22 +334,26 @@ public class CachedAppAssetLoader {
             return true;
         }
 
-        // Hide the progress bar always on initial load
-        prgView.setVisibility(View.INVISIBLE);
+        // Always set the name text so we have it if needed later
+        textView.setText(app.getAppName());
 
         // First, try the memory cache in the current context
-        Bitmap bmp = memoryLoader.loadBitmapFromCache(tuple);
+        ScaledBitmap bmp = memoryLoader.loadBitmapFromCache(tuple);
         if (bmp != null) {
             // Show the bitmap immediately
             imgView.setVisibility(View.VISIBLE);
-            imgView.setImageBitmap(bmp);
+            imgView.setImageBitmap(bmp.bitmap);
+
+            // Show the text if it's a placeholder bitmap
+            textView.setVisibility(isBitmapPlaceholder(bmp) ? View.VISIBLE : View.GONE);
             return true;
         }
 
         // If it's not in memory, create an async task to load it. This task will be attached
         // via AsyncDrawable to this view.
-        final LoaderTask task = new LoaderTask(imgView, prgView, true);
+        final LoaderTask task = new LoaderTask(imgView, textView, true);
         final AsyncDrawable asyncDrawable = new AsyncDrawable(imgView.getResources(), placeholderBitmap, task);
+        textView.setVisibility(View.INVISIBLE);
         imgView.setVisibility(View.INVISIBLE);
         imgView.setImageDrawable(asyncDrawable);
 
@@ -330,7 +362,7 @@ public class CachedAppAssetLoader {
         return false;
     }
 
-    public class LoaderTuple {
+    public static class LoaderTuple {
         public final ComputerDetails computer;
         public final NvApp app;
 

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

@@ -64,7 +64,7 @@ public class DiskAssetLoader {
         return inSampleSize;
     }
 
-    public Bitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple, int sampleSize) {
+    public ScaledBitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple, int sampleSize) {
         File file = getFile(tuple.computer.uuid, tuple.app.getAppId());
 
         // Don't bother with anything if it doesn't exist
@@ -110,27 +110,33 @@ public class DiskAssetLoader {
             bmp = BitmapFactory.decodeFile(file.getAbsolutePath(), options);
             if (bmp != null) {
                 LimeLog.info("Tuple "+tuple+" decoded from disk cache with sample size: "+options.inSampleSize);
+                return new ScaledBitmap(decodeOnlyOptions.outWidth, decodeOnlyOptions.outHeight, bmp);
             }
         }
         else {
             // On P, we can get a bitmap back in one step with ImageDecoder
+            final ScaledBitmap scaledBitmap = new ScaledBitmap();
             try {
-                bmp = ImageDecoder.decodeBitmap(ImageDecoder.createSource(file), new ImageDecoder.OnHeaderDecodedListener() {
+                scaledBitmap.bitmap = ImageDecoder.decodeBitmap(ImageDecoder.createSource(file), new ImageDecoder.OnHeaderDecodedListener() {
                     @Override
                     public void onHeaderDecoded(ImageDecoder imageDecoder, ImageDecoder.ImageInfo imageInfo, ImageDecoder.Source source) {
+                        scaledBitmap.originalWidth = imageInfo.getSize().getWidth();
+                        scaledBitmap.originalHeight = imageInfo.getSize().getHeight();
+
                         imageDecoder.setTargetSize(STANDARD_ASSET_WIDTH, STANDARD_ASSET_HEIGHT);
                         if (isLowRamDevice) {
                             imageDecoder.setMemorySizePolicy(ImageDecoder.MEMORY_POLICY_LOW_RAM);
                         }
                     }
                 });
+                return scaledBitmap;
             } catch (IOException e) {
                 e.printStackTrace();
                 return null;
             }
         }
 
-        return bmp;
+        return null;
     }
 
     public File getFile(String computerUuid, int appId) {

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

@@ -1,37 +1,74 @@
 package com.limelight.grid.assets;
 
-import android.graphics.Bitmap;
 import android.util.LruCache;
 
 import com.limelight.LimeLog;
 
+import java.lang.ref.SoftReference;
+import java.util.HashMap;
+
 public class MemoryAssetLoader {
     private static final int maxMemory = (int) (Runtime.getRuntime().maxMemory() / 1024);
-    private static final LruCache<String, Bitmap> memoryCache = new LruCache<String, Bitmap>(maxMemory / 16) {
+    private static final LruCache<String, ScaledBitmap> memoryCache = new LruCache<String, ScaledBitmap>(maxMemory / 16) {
         @Override
-        protected int sizeOf(String key, Bitmap bitmap) {
+        protected int sizeOf(String key, ScaledBitmap bitmap) {
             // Sizeof returns kilobytes
-            return bitmap.getByteCount() / 1024;
+            return bitmap.bitmap.getByteCount() / 1024;
+        }
+
+        @Override
+        protected void entryRemoved(boolean evicted, String key, ScaledBitmap oldValue, ScaledBitmap newValue) {
+            super.entryRemoved(evicted, key, oldValue, newValue);
+
+            if (evicted) {
+                // Keep a soft reference around to the bitmap as long as we can
+                evictionCache.put(key, new SoftReference<>(oldValue));
+            }
         }
     };
+    private static final HashMap<String, SoftReference<ScaledBitmap>> evictionCache = new HashMap<>();
 
     private static String constructKey(CachedAppAssetLoader.LoaderTuple tuple) {
         return tuple.computer.uuid+"-"+tuple.app.getAppId();
     }
 
-    public Bitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple) {
-        Bitmap bmp = memoryCache.get(constructKey(tuple));
+    public ScaledBitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple) {
+        final String key = constructKey(tuple);
+
+        ScaledBitmap bmp = memoryCache.get(key);
         if (bmp != null) {
-            LimeLog.info("Memory cache hit for tuple: "+tuple);
+            LimeLog.info("LRU cache hit for tuple: "+tuple);
+            return bmp;
         }
-        return bmp;
+
+        SoftReference<ScaledBitmap> bmpRef = evictionCache.get(key);
+        if (bmpRef != null) {
+            bmp = bmpRef.get();
+            if (bmp != null) {
+                LimeLog.info("Eviction cache hit for tuple: "+tuple);
+
+                // Put this entry back into the LRU cache
+                evictionCache.remove(key);
+                memoryCache.put(key, bmp);
+
+                return bmp;
+            }
+            else {
+                // The data is gone, so remove the dangling SoftReference now
+                evictionCache.remove(key);
+            }
+        }
+
+        return null;
     }
 
-    public void populateCache(CachedAppAssetLoader.LoaderTuple tuple, Bitmap bitmap) {
+    public void populateCache(CachedAppAssetLoader.LoaderTuple tuple, ScaledBitmap bitmap) {
         memoryCache.put(constructKey(tuple), bitmap);
     }
 
     public void clearCache() {
+        // We must evict first because that will push all items into the eviction cache
         memoryCache.evictAll();
+        evictionCache.clear();
     }
 }

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

@@ -0,0 +1,18 @@
+package com.limelight.grid.assets;
+
+import android.graphics.Bitmap;
+
+public class ScaledBitmap {
+    public int originalWidth;
+    public int originalHeight;
+
+    public Bitmap bitmap;
+
+    public ScaledBitmap() {}
+
+    public ScaledBitmap(int originalWidth, int originalHeight, Bitmap bitmap) {
+        this.originalWidth = originalWidth;
+        this.originalHeight = originalHeight;
+        this.bitmap = bitmap;
+    }
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -4,8 +4,8 @@ import java.security.cert.X509Certificate;
 import java.security.interfaces.RSAPrivateKey;
 
 public interface LimelightCryptoProvider {
-	X509Certificate getClientCertificate();
-	RSAPrivateKey getClientPrivateKey();
-	byte[] getPemEncodedClientCertificate();
-	String encodeBase64String(byte[] data);
+    X509Certificate getClientCertificate();
+    RSAPrivateKey getClientPrivateKey();
+    byte[] getPemEncodedClientCertificate();
+    String encodeBase64String(byte[] data);
 }

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

@@ -3,59 +3,68 @@ package com.limelight.nvstream.http;
 import com.limelight.LimeLog;
 
 public class NvApp {
-	private String appName = "";
-	private int appId;
-	private boolean initialized;
-	private boolean hdrSupported;
-	
-	public NvApp() {}
-	
-	public NvApp(String appName) {
-		this.appName = appName;
-	}
-	
-	public NvApp(String appName, int appId, boolean hdrSupported) {
-		this.appName = appName;
-		this.appId = appId;
-		this.hdrSupported = hdrSupported;
-		this.initialized = true;
-	}
-	
-	public void setAppName(String appName) {
-		this.appName = appName;
-	}
-	
-	public void setAppId(String appId) {
-		try {
-			this.appId = Integer.parseInt(appId);
-			this.initialized = true;
-		} catch (NumberFormatException e) {
-			LimeLog.warning("Malformed app ID: "+appId);
-		}
-	}
-	
-	public void setAppId(int appId) {
-		this.appId = appId;
-		this.initialized = true;
-	}
+    private String appName = "";
+    private int appId;
+    private boolean initialized;
+    private boolean hdrSupported;
+    
+    public NvApp() {}
+    
+    public NvApp(String appName) {
+        this.appName = appName;
+    }
+    
+    public NvApp(String appName, int appId, boolean hdrSupported) {
+        this.appName = appName;
+        this.appId = appId;
+        this.hdrSupported = hdrSupported;
+        this.initialized = true;
+    }
+    
+    public void setAppName(String appName) {
+        this.appName = appName;
+    }
+    
+    public void setAppId(String appId) {
+        try {
+            this.appId = Integer.parseInt(appId);
+            this.initialized = true;
+        } catch (NumberFormatException e) {
+            LimeLog.warning("Malformed app ID: "+appId);
+        }
+    }
+    
+    public void setAppId(int appId) {
+        this.appId = appId;
+        this.initialized = true;
+    }
 
-	public void setHdrSupported(boolean hdrSupported) {
-		this.hdrSupported = hdrSupported;
-	}
-	
-	public String getAppName() {
-		return this.appName;
-	}
-	
-	public int getAppId() {
-		return this.appId;
-	}
+    public void setHdrSupported(boolean hdrSupported) {
+        this.hdrSupported = hdrSupported;
+    }
+    
+    public String getAppName() {
+        return this.appName;
+    }
+    
+    public int getAppId() {
+        return this.appId;
+    }
 
-	public boolean isHdrSupported() {
-		return this.hdrSupported;
-	}
-	
-	public boolean isInitialized() {
-		return this.initialized;
-	}
+    public boolean isHdrSupported() {
+        return this.hdrSupported;
+    }
+    
+    public boolean isInitialized() {
+        return this.initialized;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder str = new StringBuilder();
+        str.append("Name: ").append(appName).append("\n");
+        str.append("HDR: ").append(hdrSupported ? "Yes" : "No").append("\n");
+        str.append("ID: ").append(appId).append("\n");
+        return str.toString();
+    }
 }

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

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

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

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

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

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

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

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

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

@@ -7,8 +7,9 @@ import com.limelight.nvstream.av.video.VideoDecoderRenderer;
 public class MoonBridge {
     /* See documentation in Limelight.h for information about these functions and constants */
 
-    public static final int AUDIO_CONFIGURATION_STEREO = 0;
-    public static final int AUDIO_CONFIGURATION_51_SURROUND = 1;
+    public static final AudioConfiguration AUDIO_CONFIGURATION_STEREO = new AudioConfiguration(2, 0x3);
+    public static final AudioConfiguration AUDIO_CONFIGURATION_51_SURROUND = new AudioConfiguration(6, 0x3F);
+    public static final AudioConfiguration AUDIO_CONFIGURATION_71_SURROUND = new AudioConfiguration(8, 0x63F);
 
     public static final int VIDEO_FORMAT_H264 = 0x0001;
     public static final int VIDEO_FORMAT_H265 = 0x0100;
@@ -32,6 +33,31 @@ public class MoonBridge {
     public static final int CONN_STATUS_OKAY = 0;
     public static final int CONN_STATUS_POOR = 1;
 
+    public static final int ML_ERROR_GRACEFUL_TERMINATION = 0;
+    public static final int ML_ERROR_NO_VIDEO_TRAFFIC = -100;
+    public static final int ML_ERROR_NO_VIDEO_FRAME = -101;
+    public static final int ML_ERROR_UNEXPECTED_EARLY_TERMINATION = -102;
+    public static final int ML_ERROR_PROTECTED_CONTENT = -103;
+
+    public static final int ML_PORT_INDEX_TCP_47984 = 0;
+    public static final int ML_PORT_INDEX_TCP_47989 = 1;
+    public static final int ML_PORT_INDEX_TCP_48010 = 2;
+    public static final int ML_PORT_INDEX_UDP_47998 = 8;
+    public static final int ML_PORT_INDEX_UDP_47999 = 9;
+    public static final int ML_PORT_INDEX_UDP_48000 = 10;
+    public static final int ML_PORT_INDEX_UDP_48010 = 11;
+
+    public static final int ML_PORT_FLAG_ALL = 0xFFFFFFFF;
+    public static final int ML_PORT_FLAG_TCP_47984 = 0x0001;
+    public static final int ML_PORT_FLAG_TCP_47989 = 0x0002;
+    public static final int ML_PORT_FLAG_TCP_48010 = 0x0004;
+    public static final int ML_PORT_FLAG_UDP_47998 = 0x0100;
+    public static final int ML_PORT_FLAG_UDP_47999 = 0x0200;
+    public static final int ML_PORT_FLAG_UDP_48000 = 0x0400;
+    public static final int ML_PORT_FLAG_UDP_48010 = 0x0800;
+
+    public static final int ML_TEST_RESULT_INCONCLUSIVE = 0xFFFFFFFF;
+
     private static AudioRenderer audioRenderer;
     private static VideoDecoderRenderer videoRenderer;
     private static NvConnectionListener connectionListener;
@@ -45,6 +71,57 @@ public class MoonBridge {
         return slices << 24;
     }
 
+    public static class AudioConfiguration {
+        public final int channelCount;
+        public final int channelMask;
+
+        public AudioConfiguration(int channelCount, int channelMask) {
+            this.channelCount = channelCount;
+            this.channelMask = channelMask;
+        }
+
+        // Creates an AudioConfiguration from the integer value returned by moonlight-common-c
+        // See CHANNEL_COUNT_FROM_AUDIO_CONFIGURATION() and CHANNEL_MASK_FROM_AUDIO_CONFIGURATION()
+        // in Limelight.h
+        private AudioConfiguration(int audioConfiguration) {
+            // Check the magic byte before decoding to make sure we got something that's actually
+            // a MAKE_AUDIO_CONFIGURATION()-based value and not something else like an older version
+            // hardcoded AUDIO_CONFIGURATION value from an earlier version of moonlight-common-c.
+            if ((audioConfiguration & 0xFF) != 0xCA) {
+                throw new IllegalArgumentException("Audio configuration has invalid magic byte!");
+            }
+
+            this.channelCount = (audioConfiguration >> 8) & 0xFF;
+            this.channelMask = (audioConfiguration >> 16) & 0xFFFF;
+        }
+
+        // See SURROUNDAUDIOINFO_FROM_AUDIO_CONFIGURATION() in Limelight.h
+        public int getSurroundAudioInfo() {
+            return channelMask << 16 | channelCount;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj instanceof AudioConfiguration) {
+                AudioConfiguration that = (AudioConfiguration)obj;
+                return this.toInt() == that.toInt();
+            }
+
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return toInt();
+        }
+
+        // Returns the integer value expected by moonlight-common-c
+        // See MAKE_AUDIO_CONFIGURATION() in Limelight.h
+        public int toInt() {
+            return ((channelMask) << 16) | (channelCount << 8) | 0xCA;
+        }
+    }
+
     public static int bridgeDrSetup(int videoFormat, int width, int height, int redrawRate) {
         if (videoRenderer != null) {
             return videoRenderer.setup(videoFormat, width, height, redrawRate);
@@ -73,20 +150,20 @@ public class MoonBridge {
     }
 
     public static int bridgeDrSubmitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength,
-                                               int decodeUnitType,
-                                               int frameNumber, long receiveTimeMs) {
+                                               int decodeUnitType, int frameNumber,
+                                               long receiveTimeMs, long enqueueTimeMs) {
         if (videoRenderer != null) {
             return videoRenderer.submitDecodeUnit(decodeUnitData, decodeUnitLength,
-                    decodeUnitType, frameNumber, receiveTimeMs);
+                    decodeUnitType, frameNumber, receiveTimeMs, enqueueTimeMs);
         }
         else {
             return DR_OK;
         }
     }
 
-    public static int bridgeArInit(int audioConfiguration) {
+    public static int bridgeArInit(int audioConfiguration, int sampleRate, int samplesPerFrame) {
         if (audioRenderer != null) {
-            return audioRenderer.setup(audioConfiguration);
+            return audioRenderer.setup(new AudioConfiguration(audioConfiguration), sampleRate, samplesPerFrame);
         }
         else {
             return -1;
@@ -129,9 +206,9 @@ public class MoonBridge {
         }
     }
 
-    public static void bridgeClStageFailed(int stage, long errorCode) {
+    public static void bridgeClStageFailed(int stage, int errorCode) {
         if (connectionListener != null) {
-            connectionListener.stageFailed(getStageName(stage), errorCode);
+            connectionListener.stageFailed(getStageName(stage), getPortFlagsFromStage(stage), errorCode);
         }
     }
 
@@ -141,7 +218,7 @@ public class MoonBridge {
         }
     }
 
-    public static void bridgeClConnectionTerminated(long errorCode) {
+    public static void bridgeClConnectionTerminated(int errorCode) {
         if (connectionListener != null) {
             connectionListener.connectionTerminated(errorCode);
         }
@@ -187,6 +264,8 @@ public class MoonBridge {
 
     public static native void sendMouseMove(short deltaX, short deltaY);
 
+    public static native void sendMousePosition(short x, short y, short referenceWidth, short referenceHeight);
+
     public static native void sendMouseButton(byte buttonEvent, byte mouseButton);
 
     public static native void sendMultiControllerInput(short controllerNumber,
@@ -204,13 +283,23 @@ public class MoonBridge {
 
     public static native void sendMouseScroll(byte scrollClicks);
 
+    public static native void sendMouseHighResScroll(short scrollAmount);
+
     public static native String getStageName(int stage);
 
     public static native String findExternalAddressIP4(String stunHostName, int stunPort);
 
-    public static native int getPendingAudioFrames();
+    public static native int getPendingAudioDuration();
 
     public static native int getPendingVideoFrames();
 
+    public static native int testClientConnectivity(String testServerHostName, int referencePort, int testFlags);
+
+    public static native int getPortFlagsFromStage(int stage);
+
+    public static native int getPortFlagsFromTerminationErrorCode(int errorCode);
+
+    public static native String stringifyPortFlags(int portFlags, String separator);
+
     public static native void init();
 }

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

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

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

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

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

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

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

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

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

@@ -15,7 +15,9 @@ import com.limelight.computers.ComputerManagerService;
 import com.limelight.R;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvHTTP;
+import com.limelight.nvstream.jni.MoonBridge;
 import com.limelight.utils.Dialog;
+import com.limelight.utils.ServerHelper;
 import com.limelight.utils.SpinnerDialog;
 import com.limelight.utils.UiHelper;
 
@@ -97,6 +99,7 @@ public class AddComputerManually extends Activity {
     private void doAddPc(String host) {
         boolean wrongSiteLocal = false;
         boolean success;
+        int portTestResult;
 
         SpinnerDialog dialog = SpinnerDialog.displayDialog(this, getResources().getString(R.string.title_add_pc),
             getResources().getString(R.string.msg_add_pc), false);
@@ -104,12 +107,6 @@ public class AddComputerManually extends Activity {
         try {
             ComputerDetails details = new ComputerDetails();
             details.manualAddress = host;
-
-            try {
-                NvHTTP http = new NvHTTP(host, managerBinder.getUniqueId(), null, PlatformBinding.getCryptoProvider(this));
-                details.serverCert = http.getCertificateIfTrusted();
-            } catch (IOException ignored) {}
-
             success = managerBinder.addComputerBlocking(details);
         } catch (IllegalArgumentException e) {
             // This can be thrown from OkHttp if the host fails to canonicalize to a valid name.
@@ -120,6 +117,14 @@ public class AddComputerManually extends Activity {
         if (!success){
             wrongSiteLocal = isWrongSubnetSiteLocalAddress(host);
         }
+        if (!success && !wrongSiteLocal) {
+            // Run the test before dismissing the spinner because it can take a few seconds.
+            portTestResult = MoonBridge.testClientConnectivity(ServerHelper.CONNECTION_TEST_SERVER, 443,
+                    MoonBridge.ML_PORT_FLAG_TCP_47984 | MoonBridge.ML_PORT_FLAG_TCP_47989);
+        } else {
+            // Don't bother with the test if we succeeded or the IP address was bogus
+            portTestResult = MoonBridge.ML_TEST_RESULT_INCONCLUSIVE;
+        }
 
         dialog.dismiss();
 
@@ -127,7 +132,14 @@ public class AddComputerManually extends Activity {
             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);
+            String dialogText;
+            if (portTestResult != MoonBridge.ML_TEST_RESULT_INCONCLUSIVE && portTestResult != 0)  {
+                dialogText = getResources().getString(R.string.nettest_text_blocked);
+            }
+            else {
+                dialogText = getResources().getString(R.string.addpc_fail);
+            }
+            Dialog.displayDialog(this, getResources().getString(R.string.conn_error_title), dialogText, false);
         }
         else {
             AddComputerManually.this.runOnUiThread(new Runnable() {

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

@@ -6,9 +6,11 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.preference.PreferenceManager;
 
+import com.limelight.nvstream.jni.MoonBridge;
+
 public class PreferenceConfiguration {
     private static final String LEGACY_RES_FPS_PREF_STRING = "list_resolution_fps";
-
+    private static final String LEGACY_ENABLE_51_SURROUND_PREF_STRING = "checkbox_51_surround";
 
     static final String RESOLUTION_PREF_STRING = "list_resolution";
     static final String FPS_PREF_STRING = "list_fps";
@@ -19,11 +21,11 @@ public class PreferenceConfiguration {
     private static final String DISABLE_TOASTS_PREF_STRING = "checkbox_disable_warnings";
     private static final String HOST_AUDIO_PREF_STRING = "checkbox_host_audio";
     private static final String DEADZONE_PREF_STRING = "seekbar_deadzone";
+    private static final String OSC_OPACITY_PREF_STRING = "seekbar_osc_opacity";
     private static final String LANGUAGE_PREF_STRING = "list_languages";
-    private static final String LIST_MODE_PREF_STRING = "checkbox_list_mode";
     private static final String SMALL_ICONS_PREF_STRING = "checkbox_small_icon_mode";
     private static final String MULTI_CONTROLLER_PREF_STRING = "checkbox_multi_controller";
-    private static final String ENABLE_51_SURROUND_PREF_STRING = "checkbox_51_surround";
+    static final String AUDIO_CONFIG_PREF_STRING = "list_audio_config";
     private static final String USB_DRIVER_PREF_SRING = "checkbox_usb_driver";
     private static final String VIDEO_FORMAT_PREF_STRING = "video_format";
     private static final String ONSCREEN_CONTROLLER_PREF_STRING = "checkbox_show_onscreen_controls";
@@ -38,18 +40,20 @@ public class PreferenceConfiguration {
     static final String UNLOCK_FPS_STRING = "checkbox_unlock_fps";
     private static final String VIBRATE_OSC_PREF_STRING = "checkbox_vibrate_osc";
     private static final String VIBRATE_FALLBACK_PREF_STRING = "checkbox_vibrate_fallback";
+    private static final String FLIP_FACE_BUTTONS_PREF_STRING = "checkbox_flip_face_buttons";
+    private static final String TOUCHSCREEN_TRACKPAD_PREF_STRING = "checkbox_touchscreen_trackpad";
+    private static final String LATENCY_TOAST_PREF_STRING = "checkbox_enable_post_stream_toast";
 
-    static final String DEFAULT_RESOLUTION = "720p";
+    static final String DEFAULT_RESOLUTION = "1280x720";
     static final String DEFAULT_FPS = "60";
     private static final boolean DEFAULT_STRETCH = false;
     private static final boolean DEFAULT_SOPS = true;
     private static final boolean DEFAULT_DISABLE_TOASTS = false;
     private static final boolean DEFAULT_HOST_AUDIO = false;
     private static final int DEFAULT_DEADZONE = 15;
+    private static final int DEFAULT_OPACITY = 90;
     public static final String DEFAULT_LANGUAGE = "default";
-    private static final boolean DEFAULT_LIST_MODE = false;
     private static final boolean DEFAULT_MULTI_CONTROLLER = true;
-    private static final boolean DEFAULT_ENABLE_51_SURROUND = false;
     private static final boolean DEFAULT_USB_DRIVER = true;
     private static final String DEFAULT_VIDEO_FORMAT = "auto";
     private static final boolean ONSCREEN_CONTROLLER_DEFAULT = false;
@@ -64,83 +68,119 @@ public class PreferenceConfiguration {
     private static final boolean DEFAULT_UNLOCK_FPS = false;
     private static final boolean DEFAULT_VIBRATE_OSC = true;
     private static final boolean DEFAULT_VIBRATE_FALLBACK = false;
+    private static final boolean DEFAULT_FLIP_FACE_BUTTONS = false;
+    private static final boolean DEFAULT_TOUCHSCREEN_TRACKPAD = true;
+    private static final String DEFAULT_AUDIO_CONFIG = "2"; // Stereo
+    private static final boolean DEFAULT_LATENCY_TOAST = false;
 
     public static final int FORCE_H265_ON = -1;
     public static final int AUTOSELECT_H265 = 0;
     public static final int FORCE_H265_OFF = 1;
 
+    public static final String RES_360P = "640x360";
+    public static final String RES_480P = "854x480";
+    public static final String RES_720P = "1280x720";
+    public static final String RES_1080P = "1920x1080";
+    public static final String RES_1440P = "2560x1440";
+    public static final String RES_4K = "3840x2160";
+    public static final String RES_NATIVE = "Native";
+
     public int width, height, fps;
     public int bitrate;
     public int videoFormat;
     public int deadzonePercentage;
+    public int oscOpacity;
     public boolean stretchVideo, enableSops, playHostAudio, disableWarnings;
     public String language;
-    public boolean listMode, smallIconMode, multiController, enable51Surround, usbDriver;
+    public boolean smallIconMode, multiController, usbDriver, flipFaceButtons;
     public boolean onscreenController;
     public boolean onlyL3R3;
     public boolean disableFrameDrop;
     public boolean enableHdr;
     public boolean enablePip;
     public boolean enablePerfOverlay;
+    public boolean enableLatencyToast;
     public boolean bindAllUsb;
     public boolean mouseEmulation;
     public boolean mouseNavButtons;
     public boolean unlockFps;
     public boolean vibrateOsc;
     public boolean vibrateFallbackToDevice;
+    public boolean touchscreenTrackpad;
+    public MoonBridge.AudioConfiguration audioConfiguration;
 
-    private static int getHeightFromResolutionString(String resString) {
+    public static boolean isNativeResolution(int width, int height) {
+        // It's not a native resolution if it matches an existing resolution option
+        if (width == 640 && height == 360) {
+            return false;
+        }
+        else if (width == 854 && height == 480) {
+            return false;
+        }
+        else if (width == 1280 && height == 720) {
+            return false;
+        }
+        else if (width == 1920 && height == 1080) {
+            return false;
+        }
+        else if (width == 2560 && height == 1440) {
+            return false;
+        }
+        else if (width == 3840 && height == 2160) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private static String convertFromLegacyResolutionString(String resString) {
         if (resString.equalsIgnoreCase("360p")) {
-            return 360;
+            return RES_360P;
         }
         else if (resString.equalsIgnoreCase("480p")) {
-            return 480;
+            return RES_480P;
         }
         else if (resString.equalsIgnoreCase("720p")) {
-            return 720;
+            return RES_720P;
         }
         else if (resString.equalsIgnoreCase("1080p")) {
-            return 1080;
+            return RES_1080P;
         }
         else if (resString.equalsIgnoreCase("1440p")) {
-            return 1440;
+            return RES_1440P;
         }
         else if (resString.equalsIgnoreCase("4K")) {
-            return 2160;
+            return RES_4K;
         }
         else {
             // Should be unreachable
-            return 720;
+            return RES_720P;
         }
     }
 
     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;
-        }
+        return Integer.parseInt(resString.split("x")[0]);
+    }
+
+    private static int getHeightFromResolutionString(String resString) {
+        return Integer.parseInt(resString.split("x")[1]);
     }
 
     private static String getResolutionString(int width, int height) {
         switch (height) {
             case 360:
-                return "360p";
+                return RES_360P;
             case 480:
-                return "480p";
+                return RES_480P;
             default:
             case 720:
-                return "720p";
+                return RES_720P;
             case 1080:
-                return "1080p";
+                return RES_1080P;
             case 1440:
-                return "1440p";
+                return RES_1440P;
             case 2160:
-                return "4K";
-
+                return RES_4K;
         }
     }
 
@@ -244,6 +284,15 @@ public class PreferenceConfiguration {
         PreferenceConfiguration config = new PreferenceConfiguration();
 
         // Migrate legacy preferences to the new locations
+        if (prefs.contains(LEGACY_ENABLE_51_SURROUND_PREF_STRING)) {
+            if (prefs.getBoolean(LEGACY_ENABLE_51_SURROUND_PREF_STRING, false)) {
+                prefs.edit()
+                        .remove(LEGACY_ENABLE_51_SURROUND_PREF_STRING)
+                        .putString(AUDIO_CONFIG_PREF_STRING, "51")
+                        .apply();
+            }
+        }
+
         String str = prefs.getString(LEGACY_RES_FPS_PREF_STRING, null);
         if (str != null) {
             if (str.equals("360p30")) {
@@ -302,21 +351,47 @@ public class PreferenceConfiguration {
         else {
             // Use the new preference location
             String resStr = prefs.getString(RESOLUTION_PREF_STRING, PreferenceConfiguration.DEFAULT_RESOLUTION);
+
+            // Convert legacy resolution strings to the new style
+            if (!resStr.contains("x")) {
+                resStr = PreferenceConfiguration.convertFromLegacyResolutionString(resStr);
+                prefs.edit().putString(RESOLUTION_PREF_STRING, resStr).apply();
+            }
+
             config.width = PreferenceConfiguration.getWidthFromResolutionString(resStr);
             config.height = PreferenceConfiguration.getHeightFromResolutionString(resStr);
             config.fps = Integer.parseInt(prefs.getString(FPS_PREF_STRING, PreferenceConfiguration.DEFAULT_FPS));
         }
 
+        if (!prefs.contains(SMALL_ICONS_PREF_STRING)) {
+            // We need to write small icon mode's default to disk for the settings page to display
+            // the current state of the option properly
+            prefs.edit().putBoolean(SMALL_ICONS_PREF_STRING, getDefaultSmallMode(context)).apply();
+        }
+
         // This must happen after the preferences migration to ensure the preferences are populated
         config.bitrate = prefs.getInt(BITRATE_PREF_STRING, prefs.getInt(BITRATE_PREF_OLD_STRING, 0) * 1000);
         if (config.bitrate == 0) {
             config.bitrate = getDefaultBitrate(context);
         }
 
+        String audioConfig = prefs.getString(AUDIO_CONFIG_PREF_STRING, DEFAULT_AUDIO_CONFIG);
+        if (audioConfig.equals("71")) {
+            config.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_71_SURROUND;
+        }
+        else if (audioConfig.equals("51")) {
+            config.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_51_SURROUND;
+        }
+        else /* if (audioConfig.equals("2")) */ {
+            config.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_STEREO;
+        }
+
         config.videoFormat = getVideoFormatValue(context);
 
         config.deadzonePercentage = prefs.getInt(DEADZONE_PREF_STRING, DEFAULT_DEADZONE);
 
+        config.oscOpacity = prefs.getInt(OSC_OPACITY_PREF_STRING, DEFAULT_OPACITY);
+
         config.language = prefs.getString(LANGUAGE_PREF_STRING, DEFAULT_LANGUAGE);
 
         // Checkbox preferences
@@ -324,10 +399,8 @@ public class PreferenceConfiguration {
         config.enableSops = prefs.getBoolean(SOPS_PREF_STRING, DEFAULT_SOPS);
         config.stretchVideo = prefs.getBoolean(STRETCH_PREF_STRING, DEFAULT_STRETCH);
         config.playHostAudio = prefs.getBoolean(HOST_AUDIO_PREF_STRING, DEFAULT_HOST_AUDIO);
-        config.listMode = prefs.getBoolean(LIST_MODE_PREF_STRING, DEFAULT_LIST_MODE);
         config.smallIconMode = prefs.getBoolean(SMALL_ICONS_PREF_STRING, getDefaultSmallMode(context));
         config.multiController = prefs.getBoolean(MULTI_CONTROLLER_PREF_STRING, DEFAULT_MULTI_CONTROLLER);
-        config.enable51Surround = prefs.getBoolean(ENABLE_51_SURROUND_PREF_STRING, DEFAULT_ENABLE_51_SURROUND);
         config.usbDriver = prefs.getBoolean(USB_DRIVER_PREF_SRING, DEFAULT_USB_DRIVER);
         config.onscreenController = prefs.getBoolean(ONSCREEN_CONTROLLER_PREF_STRING, ONSCREEN_CONTROLLER_DEFAULT);
         config.onlyL3R3 = prefs.getBoolean(ONLY_L3_R3_PREF_STRING, ONLY_L3_R3_DEFAULT);
@@ -341,6 +414,9 @@ public class PreferenceConfiguration {
         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);
+        config.flipFaceButtons = prefs.getBoolean(FLIP_FACE_BUTTONS_PREF_STRING, DEFAULT_FLIP_FACE_BUTTONS);
+        config.touchscreenTrackpad = prefs.getBoolean(TOUCHSCREEN_TRACKPAD_PREF_STRING, DEFAULT_TOUCHSCREEN_TRACKPAD);
+        config.enableLatencyToast = prefs.getBoolean(LATENCY_TOAST_PREF_STRING, DEFAULT_LATENCY_TOAST);
 
         return config;
     }

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

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.os.Bundle;
 import android.preference.DialogPreference;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -13,6 +14,8 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import java.util.Locale;
+
 // Based on a Stack Overflow example: http://stackoverflow.com/questions/1974193/slider-on-my-preferencescreen
 public class SeekBarPreference extends DialogPreference
 {
@@ -29,6 +32,8 @@ public class SeekBarPreference extends DialogPreference
     private final int maxValue;
     private final int minValue;
     private final int stepSize;
+    private final int keyStepSize;
+    private final int divisor;
     private int currentValue;
 
     public SeekBarPreference(Context context, AttributeSet attrs) {
@@ -58,6 +63,8 @@ public class SeekBarPreference extends DialogPreference
         maxValue = attrs.getAttributeIntValue(ANDROID_SCHEMA_URL, "max", 100);
         minValue = attrs.getAttributeIntValue(SEEKBAR_SCHEMA_URL, "min", 1);
         stepSize = attrs.getAttributeIntValue(SEEKBAR_SCHEMA_URL, "step", 1);
+        divisor = attrs.getAttributeIntValue(SEEKBAR_SCHEMA_URL, "divisor", 1);
+        keyStepSize = attrs.getAttributeIntValue(SEEKBAR_SCHEMA_URL, "keyStep", 0);
     }
 
     @Override
@@ -78,6 +85,8 @@ public class SeekBarPreference extends DialogPreference
         valueText = new TextView(context);
         valueText.setGravity(Gravity.CENTER_HORIZONTAL);
         valueText.setTextSize(32);
+        // Default text for value; hides bug where OnSeekBarChangeListener isn't called when opacity is 0%
+        valueText.setText("0%");
         params = new LinearLayout.LayoutParams(
                 LinearLayout.LayoutParams.MATCH_PARENT,
                 LinearLayout.LayoutParams.WRAP_CONTENT);
@@ -98,7 +107,14 @@ public class SeekBarPreference extends DialogPreference
                     return;
                 }
 
-                String t = String.valueOf(value);
+                String t;
+                if (divisor != 1) {
+                    float floatValue = roundedValue / (float)divisor;
+                    t = String.format((Locale)null, "%.1f", floatValue);
+                }
+                else {
+                    t = String.valueOf(value);
+                }
                 valueText.setText(suffix == null ? t : t.concat(suffix.length() > 1 ? " "+suffix : suffix));
             }
 
@@ -116,6 +132,9 @@ public class SeekBarPreference extends DialogPreference
         }
 
         seekBar.setMax(maxValue);
+        if (keyStepSize != 0) {
+            seekBar.setKeyProgressIncrement(keyStepSize);
+        }
         seekBar.setProgress(currentValue);
 
         return layout;
@@ -125,6 +144,9 @@ public class SeekBarPreference extends DialogPreference
     protected void onBindDialogView(View v) {
         super.onBindDialogView(v);
         seekBar.setMax(maxValue);
+        if (keyStepSize != 0) {
+            seekBar.setKeyProgressIncrement(keyStepSize);
+        }
         seekBar.setProgress(currentValue);
     }
 

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

@@ -1,5 +1,6 @@
 package com.limelight.preferences;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.media.MediaCodecInfo;
@@ -7,6 +8,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.app.Activity;
 import android.os.Handler;
+import android.os.Vibrator;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
@@ -23,8 +25,11 @@ import com.limelight.LimeLog;
 import com.limelight.PcView;
 import com.limelight.R;
 import com.limelight.binding.video.MediaCodecHelper;
+import com.limelight.utils.Dialog;
 import com.limelight.utils.UiHelper;
 
+import java.util.Arrays;
+
 public class StreamSettings extends Activity {
     private PreferenceConfiguration previousPrefs;
 
@@ -54,9 +59,7 @@ public class StreamSettings extends Activity {
 
         // Check for changes that require a UI reload to take effect
         PreferenceConfiguration newPrefs = PreferenceConfiguration.readPreferences(this);
-        if (newPrefs.listMode != previousPrefs.listMode ||
-                newPrefs.smallIconMode != previousPrefs.smallIconMode ||
-                !newPrefs.language.equals(previousPrefs.language)) {
+        if (!newPrefs.language.equals(previousPrefs.language)) {
             // Restart the PC view to apply UI changes
             Intent intent = new Intent(this, PcView.class);
             intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -65,6 +68,7 @@ public class StreamSettings extends Activity {
     }
 
     public static class SettingsFragment extends PreferenceFragment {
+        private int nativeResolutionStartIndex = Integer.MAX_VALUE;
 
         private void setValue(String preferenceKey, String value) {
             ListPreference pref = (ListPreference) findPreference(preferenceKey);
@@ -72,6 +76,37 @@ public class StreamSettings extends Activity {
             pref.setValue(value);
         }
 
+        private void addNativeResolutionEntry(int nativeWidth, int nativeHeight) {
+            ListPreference pref = (ListPreference) findPreference(PreferenceConfiguration.RESOLUTION_PREF_STRING);
+
+            String newName = getResources().getString(R.string.resolution_prefix_native) + " ("+nativeWidth+"x"+nativeHeight+")";
+            String newValue = nativeWidth+"x"+nativeHeight;
+
+            CharSequence[] values = pref.getEntryValues();
+
+            // Check if the native resolution is already present
+            for (CharSequence value : values) {
+                if (newValue.equals(value.toString())) {
+                    // It is present in the default list, so don't add it again
+                    return;
+                }
+            }
+
+            CharSequence[] newEntries = Arrays.copyOf(pref.getEntries(), pref.getEntries().length + 1);
+            CharSequence[] newValues = Arrays.copyOf(values, values.length + 1);
+
+            // Add the new native option
+            newEntries[newEntries.length - 1] = newName;
+            newValues[newValues.length - 1] = newValue;
+
+            pref.setEntries(newEntries);
+            pref.setEntryValues(newValues);
+
+            if (newValues.length - 1 < nativeResolutionStartIndex) {
+                nativeResolutionStartIndex = newValues.length - 1;
+            }
+        }
+
         private void removeValue(String preferenceKey, String value, Runnable onMatched) {
             int matchingCount = 0;
 
@@ -108,8 +143,6 @@ public class StreamSettings extends Activity {
             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);
@@ -141,18 +174,42 @@ public class StreamSettings extends Activity {
             // hide on-screen controls category on non touch screen devices
             if (!getActivity().getPackageManager().
                     hasSystemFeature("android.hardware.touchscreen")) {
-                PreferenceCategory category =
-                        (PreferenceCategory) findPreference("category_onscreen_controls");
-                screen.removePreference(category);
+                {
+                    PreferenceCategory category =
+                            (PreferenceCategory) findPreference("category_onscreen_controls");
+                    screen.removePreference(category);
+                }
+
+                {
+                    PreferenceCategory category =
+                            (PreferenceCategory) findPreference("category_input_settings");
+                    category.removePreference(findPreference("checkbox_touchscreen_trackpad"));
+                }
             }
 
-            // Remove PiP mode on devices pre-Oreo
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            // Remove PiP mode on devices pre-Oreo, where the feature is not available (some low RAM devices),
+            // and on Fire OS where it violates the Amazon App Store guidelines for some reason.
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O ||
+                    !getActivity().getPackageManager().hasSystemFeature("android.software.picture_in_picture") ||
+                    getActivity().getPackageManager().hasSystemFeature("com.amazon.software.fireos")) {
                 PreferenceCategory category =
-                        (PreferenceCategory) findPreference("category_basic_settings");
+                        (PreferenceCategory) findPreference("category_ui_settings");
                 category.removePreference(findPreference("checkbox_enable_pip"));
             }
 
+            // Remove the vibration options if the device can't vibrate
+            if (!((Vibrator)getActivity().getSystemService(Context.VIBRATOR_SERVICE)).hasVibrator()) {
+                PreferenceCategory category =
+                        (PreferenceCategory) findPreference("category_input_settings");
+                category.removePreference(findPreference("checkbox_vibrate_fallback"));
+
+                // The entire OSC category may have already been removed by the touchscreen check above
+                category = (PreferenceCategory) findPreference("category_onscreen_controls");
+                if (category != null) {
+                    category.removePreference(findPreference("checkbox_vibrate_osc"));
+                }
+            }
+
             int maxSupportedFps = 0;
 
             // Hide non-supported resolution/FPS combinations
@@ -176,6 +233,8 @@ public class StreamSettings extends Activity {
                     int width = Math.max(candidate.getPhysicalWidth(), candidate.getPhysicalHeight());
                     int height = Math.min(candidate.getPhysicalWidth(), candidate.getPhysicalHeight());
 
+                    addNativeResolutionEntry(width, height);
+
                     if ((width >= 3840 || height >= 2160) && maxSupportedResW < 3840) {
                         maxSupportedResW = 3840;
                     }
@@ -241,33 +300,33 @@ public class StreamSettings extends Activity {
                 if (maxSupportedResW != 0) {
                     if (maxSupportedResW < 3840) {
                         // 4K is unsupported
-                        removeValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "4K", new Runnable() {
+                        removeValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.RES_4K, new Runnable() {
                             @Override
                             public void run() {
                                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
-                                setValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "1440p");
+                                setValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.RES_1440P);
                                 resetBitrateToDefault(prefs, null, null);
                             }
                         });
                     }
                     if (maxSupportedResW < 2560) {
                         // 1440p is unsupported
-                        removeValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "1440p", new Runnable() {
+                        removeValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.RES_1440P, new Runnable() {
                             @Override
                             public void run() {
                                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
-                                setValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "1080p");
+                                setValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.RES_1080P);
                                 resetBitrateToDefault(prefs, null, null);
                             }
                         });
                     }
                     if (maxSupportedResW < 1920) {
                         // 1080p is unsupported
-                        removeValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "1080p", new Runnable() {
+                        removeValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.RES_1080P, new Runnable() {
                             @Override
                             public void run() {
                                 SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
-                                setValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "720p");
+                                setValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.RES_720P);
                                 resetBitrateToDefault(prefs, null, null);
                             }
                         });
@@ -275,6 +334,12 @@ public class StreamSettings extends Activity {
                     // Never remove 720p
                 }
             }
+            else {
+                Display display = getActivity().getWindowManager().getDefaultDisplay();
+                int width = Math.max(display.getWidth(), display.getHeight());
+                int height = Math.min(display.getWidth(), display.getHeight());
+                addNativeResolutionEntry(width, height);
+            }
 
             if (!PreferenceConfiguration.readPreferences(this.getActivity()).unlockFps) {
                 // We give some extra room in case the FPS is rounded down
@@ -302,12 +367,24 @@ public class StreamSettings extends Activity {
                 // Never remove 30 FPS or 60 FPS
             }
 
+            // Android L introduces proper 7.1 surround sound support. Remove the 7.1 option
+            // for earlier versions of Android to prevent AudioTrack initialization issues.
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+                LimeLog.info("Excluding 7.1 surround sound option based on OS");
+                removeValue(PreferenceConfiguration.AUDIO_CONFIG_PREF_STRING, "71", new Runnable() {
+                    @Override
+                    public void run() {
+                        setValue(PreferenceConfiguration.AUDIO_CONFIG_PREF_STRING, "51");
+                    }
+                });
+            }
+
             // Android L introduces the drop duplicate behavior of releaseOutputBuffer()
             // that the unlock FPS option relies on to not massively increase latency.
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
                 LimeLog.info("Excluding unlock FPS toggle based on OS");
                 PreferenceCategory category =
-                        (PreferenceCategory) findPreference("category_basic_settings");
+                        (PreferenceCategory) findPreference("category_advanced_settings");
                 category.removePreference(findPreference("checkbox_unlock_fps"));
             }
             else {
@@ -372,6 +449,25 @@ public class StreamSettings extends Activity {
                     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
                     String valueStr = (String) newValue;
 
+                    // Detect if this value is the native resolution option
+                    CharSequence[] values = ((ListPreference)preference).getEntryValues();
+                    boolean isNativeRes = true;
+                    for (int i = 0; i < values.length; i++) {
+                        // Look for a match prior to the start of the native resolution entries
+                        if (valueStr.equals(values[i].toString()) && i < nativeResolutionStartIndex) {
+                            isNativeRes = false;
+                            break;
+                        }
+                    }
+
+                    // If this is native resolution, show the warning dialog
+                    if (isNativeRes) {
+                        Dialog.displayDialog(getActivity(),
+                                getResources().getString(R.string.title_native_res_dialog),
+                                getResources().getString(R.string.text_native_res_dialog),
+                                false);
+                    }
+
                     // Write the new bitrate value
                     resetBitrateToDefault(prefs, valueStr, null);
 

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

@@ -3,41 +3,22 @@ package com.limelight.utils;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.net.Uri;
 
 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)) {
+            // 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 used to try to be clever and check
+            // the package name of the resolved intent, but it's not worth it anymore with Android 11's
+            // package visibility changes. We'll just always use the WebView on Android TV.
+            if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
                 context.startActivity(i);
                 return;
             }

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

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

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

@@ -6,6 +6,7 @@ import android.widget.Toast;
 
 import com.limelight.AppView;
 import com.limelight.Game;
+import com.limelight.PcView;
 import com.limelight.R;
 import com.limelight.ShortcutTrampoline;
 import com.limelight.binding.PlatformBinding;
@@ -14,6 +15,7 @@ import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.GfeHttpResponseException;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
+import com.limelight.nvstream.jni.MoonBridge;
 
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -23,6 +25,8 @@ import java.net.UnknownHostException;
 import java.security.cert.CertificateEncodingException;
 
 public class ServerHelper {
+    public static final String CONNECTION_TEST_SERVER = "android.conntest.moonlight-stream.org";
+
     public static String getCurrentAddressFromComputer(ComputerDetails computer) {
         return computer.activeAddress;
     }
@@ -76,6 +80,38 @@ public class ServerHelper {
         parent.startActivity(createStartIntent(parent, app, computer, managerBinder));
     }
 
+    public static void doNetworkTest(final Activity parent) {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                SpinnerDialog spinnerDialog = SpinnerDialog.displayDialog(parent,
+                        parent.getResources().getString(R.string.nettest_title_waiting),
+                        parent.getResources().getString(R.string.nettest_text_waiting),
+                        false);
+
+                int ret = MoonBridge.testClientConnectivity(CONNECTION_TEST_SERVER, 443, MoonBridge.ML_PORT_FLAG_ALL);
+                spinnerDialog.dismiss();
+
+                String dialogSummary;
+                if (ret == MoonBridge.ML_TEST_RESULT_INCONCLUSIVE) {
+                    dialogSummary = parent.getResources().getString(R.string.nettest_text_inconclusive);
+                }
+                else if (ret == 0) {
+                    dialogSummary = parent.getResources().getString(R.string.nettest_text_success);
+                }
+                else {
+                    dialogSummary = parent.getResources().getString(R.string.nettest_text_failure);
+                    dialogSummary += MoonBridge.stringifyPortFlags(ret, "\n");
+                }
+
+                Dialog.displayDialog(parent,
+                        parent.getResources().getString(R.string.nettest_title_done),
+                        dialogSummary,
+                        false);
+            }
+        }).start();
+    }
+
     public static void doQuit(final Activity parent,
                               final ComputerDetails computer,
                               final NvApp app,

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

@@ -192,4 +192,13 @@ public class ShortcutHelper {
             }
         }
     }
+
+    public void enableAppShortcut(ComputerDetails computer, NvApp app) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            String id = getShortcutIdForGame(computer, app);
+            if (getInfoForId(id) != null) {
+                sm.enableShortcuts(Collections.singletonList(id));
+            }
+        }
+    }
 }

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

@@ -77,8 +77,18 @@ public class TvChannelHelper {
                 return;
             }
 
-            Uri channelUri = context.getContentResolver().insert(
-                    TvContract.Channels.CONTENT_URI, builder.toContentValues());
+            Uri channelUri;
+
+            try {
+                channelUri = context.getContentResolver().insert(
+                        TvContract.Channels.CONTENT_URI, builder.toContentValues());
+            } catch (IllegalArgumentException e) {
+                // This can happen on HarmonyOS devices which report to
+                // support Leanback APIs, yet don't implement this URI
+                e.printStackTrace();
+                return;
+            }
+
             if (channelUri != null) {
                 long id = ContentUris.parseId(channelUri);
                 updateChannelIcon(id);
@@ -144,8 +154,15 @@ public class TvChannelHelper {
                 return;
             }
 
-            context.getContentResolver().insert(TvContract.PreviewPrograms.CONTENT_URI,
-                    builder.toContentValues());
+            try {
+                context.getContentResolver().insert(TvContract.PreviewPrograms.CONTENT_URI,
+                        builder.toContentValues());
+            } catch (IllegalArgumentException e) {
+                // This can happen on HarmonyOS devices which report to
+                // support Leanback APIs, yet don't implement this URI
+                e.printStackTrace();
+                return;
+            }
 
             TvContract.requestChannelBrowsable(context, channelId);
         }

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

@@ -68,17 +68,6 @@ public class UiHelper {
         View rootView = activity.findViewById(android.R.id.content);
         UiModeManager modeMgr = (UiModeManager) activity.getSystemService(Context.UI_MODE_SERVICE);
 
-        if (modeMgr.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION)
-        {
-            // Increase view padding on TVs
-            float scale = activity.getResources().getDisplayMetrics().density;
-            int verticalPaddingPixels = (int) (TV_VERTICAL_PADDING_DP*scale + 0.5f);
-            int horizontalPaddingPixels = (int) (TV_HORIZONTAL_PADDING_DP*scale + 0.5f);
-
-            rootView.setPadding(horizontalPaddingPixels, verticalPaddingPixels,
-                    horizontalPaddingPixels, verticalPaddingPixels);
-        }
-
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             // Allow this non-streaming activity to layout under notches.
             //
@@ -89,7 +78,16 @@ public class UiHelper {
                     WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        if (modeMgr.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) {
+            // Increase view padding on TVs
+            float scale = activity.getResources().getDisplayMetrics().density;
+            int verticalPaddingPixels = (int) (TV_VERTICAL_PADDING_DP*scale + 0.5f);
+            int horizontalPaddingPixels = (int) (TV_HORIZONTAL_PADDING_DP*scale + 0.5f);
+
+            rootView.setPadding(horizontalPaddingPixels, verticalPaddingPixels,
+                    horizontalPaddingPixels, verticalPaddingPixels);
+        }
+        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             // Draw under the status bar on Android Q devices
 
             // Using getDecorView() here breaks the translucent status/navigation bar when gestures are disabled

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

@@ -1,47 +1,47 @@
 package com.limelight.utils;
 
 public class Vector2d {
-	private float x;
-	private float y;
-	private double magnitude;
-	
-	public static final Vector2d ZERO = new Vector2d();
-	
-	public Vector2d() {
-		initialize(0, 0);
-	}
-	
-	public void initialize(float x, float y) {
-		this.x = x;
-		this.y = y;
-		this.magnitude = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
-	}
-	
-	public double getMagnitude() {
-		return magnitude;
-	}
-	
-	public void getNormalized(Vector2d vector) {
-		vector.initialize((float)(x / magnitude), (float)(y / magnitude));
-	}
-	
-	public void scalarMultiply(double factor) {
-		initialize((float)(x * factor), (float)(y * factor));
-	}
-	
-	public void setX(float x) {
-		initialize(x, this.y);
-	}
-	
-	public void setY(float y) {
-		initialize(this.x, y);
-	}
-	
-	public float getX() {
-		return x;
-	}
-	
-	public float getY() {
-		return y;
-	}
+    private float x;
+    private float y;
+    private double magnitude;
+    
+    public static final Vector2d ZERO = new Vector2d();
+    
+    public Vector2d() {
+        initialize(0, 0);
+    }
+    
+    public void initialize(float x, float y) {
+        this.x = x;
+        this.y = y;
+        this.magnitude = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
+    }
+    
+    public double getMagnitude() {
+        return magnitude;
+    }
+    
+    public void getNormalized(Vector2d vector) {
+        vector.initialize((float)(x / magnitude), (float)(y / magnitude));
+    }
+    
+    public void scalarMultiply(double factor) {
+        initialize((float)(x * factor), (float)(y * factor));
+    }
+    
+    public void setX(float x) {
+        initialize(x, this.y);
+    }
+    
+    public void setY(float y) {
+        initialize(this.x, y);
+    }
+    
+    public float getX() {
+        return x;
+    }
+    
+    public float getY() {
+        return y;
+    }
 }

app/src/main/jni/moonlight-core/Android.mk

@@ -11,6 +11,7 @@ LOCAL_MODULE    := moonlight-core
 LOCAL_SRC_FILES := moonlight-common-c/src/AudioStream.c \
                    moonlight-common-c/src/ByteBuffer.c \
                    moonlight-common-c/src/Connection.c \
+                   moonlight-common-c/src/ConnectionTester.c \
                    moonlight-common-c/src/ControlStream.c \
                    moonlight-common-c/src/FakeCallbacks.c \
                    moonlight-common-c/src/InputStream.c \

app/src/main/jni/moonlight-core/callbacks.c

@@ -79,17 +79,17 @@ Java_com_limelight_nvstream_jni_MoonBridge_init(JNIEnv *env, jclass clazz) {
     BridgeDrStartMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrStart", "()V");
     BridgeDrStopMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrStop", "()V");
     BridgeDrCleanupMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrCleanup", "()V");
-    BridgeDrSubmitDecodeUnitMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrSubmitDecodeUnit", "([BIIIJ)I");
-    BridgeArInitMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArInit", "(I)I");
+    BridgeDrSubmitDecodeUnitMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrSubmitDecodeUnit", "([BIIIJJ)I");
+    BridgeArInitMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArInit", "(III)I");
     BridgeArStartMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArStart", "()V");
     BridgeArStopMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArStop", "()V");
     BridgeArCleanupMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArCleanup", "()V");
     BridgeArPlaySampleMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArPlaySample", "([S)V");
     BridgeClStageStartingMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageStarting", "(I)V");
     BridgeClStageCompleteMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageComplete", "(I)V");
-    BridgeClStageFailedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageFailed", "(IJ)V");
+    BridgeClStageFailedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageFailed", "(II)V");
     BridgeClConnectionStartedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClConnectionStarted", "()V");
-    BridgeClConnectionTerminatedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClConnectionTerminated", "(J)V");
+    BridgeClConnectionTerminatedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClConnectionTerminated", "(I)V");
     BridgeClRumbleMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClRumble", "(SSS)V");
     BridgeClConnectionStatusUpdateMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClConnectionStatusUpdate", "(I)V");
 }
@@ -98,12 +98,9 @@ int BridgeDrSetup(int videoFormat, int width, int height, int redrawRate, void*
     JNIEnv* env = GetThreadEnv();
     int err;
 
-    if ((*env)->ExceptionCheck(env)) {
-        return -1;
-    }
-
     err = (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeDrSetupMethod, videoFormat, width, height, redrawRate);
     if ((*env)->ExceptionCheck(env)) {
+        // This is called on a Java thread, so it's safe to return
         return -1;
     }
     else if (err != 0) {
@@ -119,20 +116,12 @@ int BridgeDrSetup(int videoFormat, int width, int height, int redrawRate, void*
 void BridgeDrStart(void) {
     JNIEnv* env = GetThreadEnv();
 
-    if ((*env)->ExceptionCheck(env)) {
-        return;
-    }
-
     (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeDrStartMethod);
 }
 
 void BridgeDrStop(void) {
     JNIEnv* env = GetThreadEnv();
 
-    if ((*env)->ExceptionCheck(env)) {
-        return;
-    }
-
     (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeDrStopMethod);
 }
 
@@ -141,10 +130,6 @@ void BridgeDrCleanup(void) {
 
     (*env)->DeleteGlobalRef(env, DecodedFrameBuffer);
 
-    if ((*env)->ExceptionCheck(env)) {
-        return;
-    }
-
     (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeDrCleanupMethod);
 }
 
@@ -152,10 +137,6 @@ int BridgeDrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) {
     JNIEnv* env = GetThreadEnv();
     int ret;
 
-    if ((*env)->ExceptionCheck(env)) {
-        return DR_OK;
-    }
-
     // Increase the size of our frame data buffer if our frame won't fit
     if ((*env)->GetArrayLength(env, DecodedFrameBuffer) < decodeUnit->fullLength) {
         (*env)->DeleteGlobalRef(env, DecodedFrameBuffer);
@@ -176,8 +157,11 @@ int BridgeDrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) {
 
             ret = (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeDrSubmitDecodeUnitMethod,
                                               DecodedFrameBuffer, currentEntry->length, currentEntry->bufferType,
-                                              decodeUnit->frameNumber, decodeUnit->receiveTimeMs);
+                                              decodeUnit->frameNumber, (jlong)decodeUnit->receiveTimeMs,
+                                              (jlong)decodeUnit->enqueueTimeMs);
             if ((*env)->ExceptionCheck(env)) {
+                // We will crash here
+                (*JVM)->DetachCurrentThread(JVM);
                 return DR_OK;
             }
             else if (ret != DR_OK) {
@@ -192,22 +176,27 @@ int BridgeDrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) {
         currentEntry = currentEntry->next;
     }
 
-    return (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeDrSubmitDecodeUnitMethod,
+    ret = (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeDrSubmitDecodeUnitMethod,
                                        DecodedFrameBuffer, offset, BUFFER_TYPE_PICDATA,
                                        decodeUnit->frameNumber,
-                                       decodeUnit->receiveTimeMs);
+                                       (jlong)decodeUnit->receiveTimeMs, (jlong)decodeUnit->enqueueTimeMs);
+    if ((*env)->ExceptionCheck(env)) {
+        // We will crash here
+        (*JVM)->DetachCurrentThread(JVM);
+        return DR_OK;
+    }
+    else {
+        return ret;
+    }
 }
 
 int BridgeArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig, void* context, int flags) {
     JNIEnv* env = GetThreadEnv();
     int err;
 
+    err = (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeArInitMethod, audioConfiguration, opusConfig->sampleRate, opusConfig->samplesPerFrame);
     if ((*env)->ExceptionCheck(env)) {
-        return -1;
-    }
-
-    err = (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeArInitMethod, audioConfiguration);
-    if ((*env)->ExceptionCheck(env)) {
+        // This is called on a Java thread, so it's safe to return
         err = -1;
     }
     if (err == 0) {
@@ -233,20 +222,12 @@ int BridgeArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusCon
 void BridgeArStart(void) {
     JNIEnv* env = GetThreadEnv();
 
-    if ((*env)->ExceptionCheck(env)) {
-        return;
-    }
-
     (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeArStartMethod);
 }
 
 void BridgeArStop(void) {
     JNIEnv* env = GetThreadEnv();
 
-    if ((*env)->ExceptionCheck(env)) {
-        return;
-    }
-
     (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeArStopMethod);
 }
 
@@ -257,21 +238,13 @@ void BridgeArCleanup() {
 
     (*env)->DeleteGlobalRef(env, DecodedAudioBuffer);
 
-    if ((*env)->ExceptionCheck(env)) {
-        return;
-    }
-
     (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeArCleanupMethod);
 }
 
 void BridgeArDecodeAndPlaySample(char* sampleData, int sampleLength) {
     JNIEnv* env = GetThreadEnv();
 
-    if ((*env)->ExceptionCheck(env)) {
-        return;
-    }
-
-    jshort* decodedData = (*env)->GetShortArrayElements(env, DecodedAudioBuffer, 0);
+    jshort* decodedData = (*env)->GetPrimitiveArrayCritical(env, DecodedAudioBuffer, NULL);
 
     int decodeLen = opus_multistream_decode(Decoder,
                                             (const unsigned char*)sampleData,
@@ -280,85 +253,77 @@ void BridgeArDecodeAndPlaySample(char* sampleData, int sampleLength) {
                                             OpusConfig.samplesPerFrame,
                                             0);
     if (decodeLen > 0) {
-        // We must release the array elements first to ensure the data is copied before the callback
-        (*env)->ReleaseShortArrayElements(env, DecodedAudioBuffer, decodedData, 0);
+        // We must release the array elements before making further JNI calls
+        (*env)->ReleasePrimitiveArrayCritical(env, DecodedAudioBuffer, decodedData, 0);
 
         (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeArPlaySampleMethod, DecodedAudioBuffer);
+        if ((*env)->ExceptionCheck(env)) {
+            // We will crash here
+            (*JVM)->DetachCurrentThread(JVM);
+        }
     }
     else {
         // We can abort here to avoid the copy back since no data was modified
-        (*env)->ReleaseShortArrayElements(env, DecodedAudioBuffer, decodedData, JNI_ABORT);
+        (*env)->ReleasePrimitiveArrayCritical(env, DecodedAudioBuffer, decodedData, JNI_ABORT);
     }
 }
 
 void BridgeClStageStarting(int stage) {
     JNIEnv* env = GetThreadEnv();
 
-    if ((*env)->ExceptionCheck(env)) {
-        return;
-    }
-
     (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClStageStartingMethod, stage);
 }
 
 void BridgeClStageComplete(int stage) {
     JNIEnv* env = GetThreadEnv();
 
-    if ((*env)->ExceptionCheck(env)) {
-        return;
-    }
-
     (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClStageCompleteMethod, stage);
 }
 
-void BridgeClStageFailed(int stage, long errorCode) {
+void BridgeClStageFailed(int stage, int errorCode) {
     JNIEnv* env = GetThreadEnv();
 
-    if ((*env)->ExceptionCheck(env)) {
-        return;
-    }
-
     (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClStageFailedMethod, stage, errorCode);
 }
 
 void BridgeClConnectionStarted(void) {
     JNIEnv* env = GetThreadEnv();
 
-    if ((*env)->ExceptionCheck(env)) {
-        return;
-    }
-
-    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClConnectionStartedMethod, NULL);
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClConnectionStartedMethod);
 }
 
-void BridgeClConnectionTerminated(long errorCode) {
+void BridgeClConnectionTerminated(int errorCode) {
     JNIEnv* env = GetThreadEnv();
 
-    if ((*env)->ExceptionCheck(env)) {
-        return;
-    }
-
     (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClConnectionTerminatedMethod, errorCode);
+    if ((*env)->ExceptionCheck(env)) {
+        // We will crash here
+        (*JVM)->DetachCurrentThread(JVM);
+    }
 }
 
 void BridgeClRumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor) {
     JNIEnv* env = GetThreadEnv();
 
+    // The seemingly redundant short casts are required in order to convert the unsigned short to a signed short.
+    // If we leave it as an unsigned short, CheckJNI will fail when the value exceeds 32767. The cast itself is
+    // fine because the Java code treats the value as unsigned even though it's stored in a signed type.
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClRumbleMethod, controllerNumber, (short)lowFreqMotor, (short)highFreqMotor);
     if ((*env)->ExceptionCheck(env)) {
-        return;
+        // We will crash here
+        (*JVM)->DetachCurrentThread(JVM);
     }
-
-    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClRumbleMethod, controllerNumber, lowFreqMotor, highFreqMotor);
 }
 
 void BridgeClConnectionStatusUpdate(int connectionStatus) {
     JNIEnv* env = GetThreadEnv();
 
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClConnectionStatusUpdateMethod, connectionStatus);
     if ((*env)->ExceptionCheck(env)) {
+        // We will crash here
+        (*JVM)->DetachCurrentThread(JVM);
         return;
     }
-
-    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClConnectionStatusUpdateMethod, connectionStatus);
 }
 
 void BridgeClLogMessage(const char* format, ...) {
@@ -382,6 +347,7 @@ static AUDIO_RENDERER_CALLBACKS BridgeAudioRendererCallbacks = {
         .stop = BridgeArStop,
         .cleanup = BridgeArCleanup,
         .decodeAndPlaySample = BridgeArDecodeAndPlaySample,
+        .capabilities = CAPABILITY_SUPPORTS_ARBITRARY_AUDIO_DURATION
 };
 
 static CONNECTION_LISTENER_CALLBACKS BridgeConnListenerCallbacks = {

app/src/main/jni/moonlight-core/simplejni.c

@@ -10,6 +10,12 @@ Java_com_limelight_nvstream_jni_MoonBridge_sendMouseMove(JNIEnv *env, jclass cla
     LiSendMouseMoveEvent(deltaX, deltaY);
 }
 
+JNIEXPORT void JNICALL
+Java_com_limelight_nvstream_jni_MoonBridge_sendMousePosition(JNIEnv *env, jclass clazz,
+        jshort x, jshort y, jshort referenceWidth, jshort referenceHeight) {
+    LiSendMousePositionEvent(x, y, referenceWidth, referenceHeight);
+}
+
 JNIEXPORT void JNICALL
 Java_com_limelight_nvstream_jni_MoonBridge_sendMouseButton(JNIEnv *env, jclass clazz, jbyte buttonEvent, jbyte mouseButton) {
     LiSendMouseButtonEvent(buttonEvent, mouseButton);
@@ -43,6 +49,11 @@ Java_com_limelight_nvstream_jni_MoonBridge_sendMouseScroll(JNIEnv *env, jclass c
     LiSendScrollEvent(scrollClicks);
 }
 
+JNIEXPORT void JNICALL
+Java_com_limelight_nvstream_jni_MoonBridge_sendMouseHighResScroll(JNIEnv *env, jclass clazz, jshort scrollAmount) {
+    LiSendHighResScrollEvent(scrollAmount);
+}
+
 JNIEXPORT void JNICALL
 Java_com_limelight_nvstream_jni_MoonBridge_stopConnection(JNIEnv *env, jclass clazz) {
     LiStopConnection();
@@ -83,11 +94,44 @@ Java_com_limelight_nvstream_jni_MoonBridge_findExternalAddressIP4(JNIEnv *env, j
 }
 
 JNIEXPORT jint JNICALL
-Java_com_limelight_nvstream_jni_MoonBridge_getPendingAudioFrames(JNIEnv *env, jclass clazz) {
-    return LiGetPendingAudioFrames();
+Java_com_limelight_nvstream_jni_MoonBridge_getPendingAudioDuration(JNIEnv *env, jclass clazz) {
+    return LiGetPendingAudioDuration();
 }
 
 JNIEXPORT jint JNICALL
 Java_com_limelight_nvstream_jni_MoonBridge_getPendingVideoFrames(JNIEnv *env, jclass clazz) {
     return LiGetPendingVideoFrames();
+}
+
+JNIEXPORT jint JNICALL
+Java_com_limelight_nvstream_jni_MoonBridge_testClientConnectivity(JNIEnv *env, jclass clazz, jstring testServerHostName, jint referencePort, jint testFlags) {
+    int ret;
+    const char* testServerHostNameStr = (*env)->GetStringUTFChars(env, testServerHostName, NULL);
+
+    ret = LiTestClientConnectivity(testServerHostNameStr, (unsigned short)referencePort, testFlags);
+
+    (*env)->ReleaseStringUTFChars(env, testServerHostName, testServerHostNameStr);
+
+    return ret;
+}
+
+JNIEXPORT jint JNICALL
+Java_com_limelight_nvstream_jni_MoonBridge_getPortFlagsFromStage(JNIEnv *env, jclass clazz, jint stage) {
+    return LiGetPortFlagsFromStage(stage);
+}
+
+JNIEXPORT jint JNICALL
+Java_com_limelight_nvstream_jni_MoonBridge_getPortFlagsFromTerminationErrorCode(JNIEnv *env, jclass clazz, jint errorCode) {
+    return LiGetPortFlagsFromTerminationErrorCode(errorCode);
+}
+
+JNIEXPORT jstring JNICALL
+Java_com_limelight_nvstream_jni_MoonBridge_stringifyPortFlags(JNIEnv *env, jclass clazz, jint portFlags, jstring separator) {
+    const char* separatorStr = (*env)->GetStringUTFChars(env, separator, NULL);
+    char outputBuffer[512];
+
+    LiStringifyPortFlags(portFlags, separatorStr, outputBuffer, sizeof(outputBuffer));
+
+    (*env)->ReleaseStringUTFChars(env, separator, separatorStr);
+    return (*env)->NewStringUTF(env, outputBuffer);
 }

app/src/main/res/anim/boxart_fadein.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <alpha
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:duration="100"/>
+</set>

app/src/main/res/anim/boxart_fadeout.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:duration="100"/>
+</set>

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

@@ -1,49 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:padding="20dp">
-    <RelativeLayout
-        android:id="@+id/grid_image_layout"
+    android:layout_width="150dp"
+    android:layout_height="200dp"
+    android:padding="10dp">
+    <ImageView
+        android:id="@+id/grid_image"
+        android:cropToPadding="false"
+        android:scaleType="fitXY"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    </ImageView>
+    <ImageView
+        android:id="@+id/grid_overlay"
         android:layout_centerHorizontal="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-        <ProgressBar
-            android:id="@+id/grid_spinner"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:layout_width="75dp"
-            android:layout_height="75dp"
-            android:indeterminate="true">
-        </ProgressBar>
-        <ImageView
-            android:id="@+id/grid_image"
-            android:cropToPadding="false"
-            android:scaleType="fitXY"
-            android:layout_centerHorizontal="true"
-            android:layout_width="150dp"
-            android:layout_height="175dp">
-        </ImageView>
-        <ImageView
-            android:id="@+id/grid_overlay"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:layout_width="50dp"
-            android:layout_height="50dp">
-        </ImageView>
-    </RelativeLayout>
+        android:layout_marginTop="10dp"
+        android:layout_width="50dp"
+        android:layout_height="50dp">
+    </ImageView>
     <TextView
         android:id="@+id/grid_text"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/grid_image_layout"
-        android:layout_marginTop="10dp"
-        android:layout_centerHorizontal="true"
+        android:layout_height="match_parent"
+        android:layout_below="@id/grid_overlay"
+        android:layout_margin="5dp"
         android:gravity="center"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:scrollHorizontally="true"
-        android:textSize="18sp" >
+        android:textSize="18sp">
     </TextView>
 </RelativeLayout>

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

@@ -1,49 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:padding="10dp">
-    <RelativeLayout
-        android:id="@+id/grid_image_layout"
+    android:layout_width="100dp"
+    android:layout_height="133dp"
+    android:padding="5dp">
+    <ImageView
+        android:id="@+id/grid_image"
+        android:cropToPadding="false"
+        android:scaleType="fitXY"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+    </ImageView>
+    <ImageView
+        android:id="@+id/grid_overlay"
         android:layout_centerHorizontal="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-        <ProgressBar
-            android:id="@+id/grid_spinner"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:indeterminate="true">
-        </ProgressBar>
-        <ImageView
-            android:id="@+id/grid_image"
-            android:cropToPadding="false"
-            android:scaleType="fitXY"
-            android:layout_centerHorizontal="true"
-            android:layout_width="100dp"
-            android:layout_height="117dp">
-        </ImageView>
-        <ImageView
-            android:id="@+id/grid_overlay"
-            android:layout_centerHorizontal="true"
-            android:layout_centerVertical="true"
-            android:layout_width="33dp"
-            android:layout_height="33dp">
-        </ImageView>
-    </RelativeLayout>
+        android:layout_marginTop="10dp"
+        android:layout_width="33dp"
+        android:layout_height="33dp">
+    </ImageView>
     <TextView
         android:id="@+id/grid_text"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/grid_image_layout"
-        android:layout_marginTop="10dp"
-        android:layout_centerHorizontal="true"
+        android:layout_height="match_parent"
+        android:layout_below="@id/grid_overlay"
+        android:layout_margin="5dp"
         android:gravity="center"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:scrollHorizontally="true"
-        android:textSize="14sp" >
+        android:textSize="14sp">
     </TextView>
 </RelativeLayout>

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

@@ -4,7 +4,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:numColumns="auto_fit"
-    android:columnWidth="160dp"
+    android:columnWidth="150dp"
     android:stretchMode="spacingWidthUniform"
     android:focusable="true"
     android:focusableInTouchMode="true"

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

@@ -4,7 +4,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:numColumns="auto_fit"
-    android:columnWidth="105dp"
+    android:columnWidth="100dp"
     android:stretchMode="spacingWidthUniform"
     android:focusable="true"
     android:focusableInTouchMode="true"

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

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragmentView"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fastScrollEnabled="true"
-    android:longClickable="false"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
-    android:stackFromBottom="false"
-    android:clipToPadding="false"/>

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

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:padding="15dp">
-    <RelativeLayout
-        android:id="@+id/grid_image_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-        <ImageView
-            android:id="@+id/grid_image"
-            android:layout_centerHorizontal="true"
-            android:layout_width="75dp"
-            android:layout_height="75dp">
-        </ImageView>
-        <ImageView
-            android:id="@+id/grid_overlay"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="16dp"
-            android:layout_width="33dp"
-            android:layout_height="33dp">
-        </ImageView>
-        <ProgressBar
-            android:id="@+id/grid_spinner"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="16dp"
-            android:layout_width="33dp"
-            android:layout_height="33dp"
-            android:indeterminate="true">
-        </ProgressBar>
-    </RelativeLayout>
-    <TextView
-        android:id="@+id/grid_text"
-        android:layout_width="75dp"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/grid_image_layout"
-        android:layout_marginTop="10dp"
-        android:layout_centerHorizontal="true"
-        android:gravity="center"
-        android:textSize="14sp" >
-    </TextView>
-</RelativeLayout>

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

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<GridView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragmentView"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:numColumns="auto_fit"
-    android:columnWidth="105dp"
-    android:stretchMode="spacingWidthUniform"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
-    android:nextFocusLeft="@id/settingsButton"
-    android:clipToPadding="false"
-    android:gravity="center"/>

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

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:padding="10dp"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/grid_text"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textIsSelectable="false"
-        android:textSize="16sp" >
-    </TextView>
-
-</LinearLayout>

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string-array name="decoder_names">
+    <item>Decoder automatisch auswählen</item>
+    <item>Software Decodierung erzwingen</item>
+    <item>Hardware Decodierung erzwingen</item>
+  </string-array>
+
+  <string-array name="video_format_names">
+    <item>Verwende H.265 so fern stabile Unterstützung vorhanden ist</item>
+    <item>Immer H.265 verwenden (könnte Crashes verursachen)</item>
+    <item>Nie H.265 verwenden</item>
+  </string-array>
+</resources>

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

@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_label" translatable="false">Moonlight</string>
+    <string name="app_label_root" translatable="false">Moonlight (Root)</string>
+    <!-- Shortcut strings -->
+    <string name="scut_deleted_pc">Host gelöscht</string>
+    <string name="scut_not_paired">Host nicht gekoppelt</string>
+    <string name="scut_pc_not_found">Host nicht gefunden</string>
+    <string name="scut_invalid_uuid">Angegebener Host ist ungültig</string>
+    <string name="scut_invalid_app_id">Angegebene App ist unzulässig</string>
+    <!-- Help strings -->
+    <string name="help_loading_title">Hilfsanzeige</string>
+    <string name="help_loading_msg">Hilfe wird geladen…</string>
+    <!-- PC view menu entries -->
+    <string name="pcview_menu_app_list">Alle Apps anzeigen</string>
+    <string name="pcview_menu_pair_pc">Mit Host koppeln</string>
+    <string name="pcview_menu_unpair_pc">Kopplung trennen</string>
+    <string name="pcview_menu_send_wol">Wake-On-LAN Anfrage senden</string>
+    <string name="pcview_menu_delete_pc">Host löschen</string>
+    <string name="pcview_menu_test_network">Netzwerkverbindung testen</string>
+    <string name="pcview_menu_details">Details anzeigen</string>
+    <!-- Network test strings -->
+    <string name="nettest_title_waiting">Netzwerkverbindung wird getestet</string>
+    <string name="nettest_text_waiting">Moonlight testet Ihre Netzwerkverbindung, um festzustellen, ob NVIDIA GameStream blockiert ist.
+\n
+\nDies kann einige Sekunden dauern…</string>
+    <string name="nettest_title_done">Netzwerktest abgeschlossen</string>
+    <string name="nettest_text_success">Dein Netzwerk scheint Moonlight nicht zu blockieren. Wenn du weiterhin Probleme mit der Verbindung hast, überprüfe die Firewall-Einstellungen deines Hosts
+\n
+\nWenn du versuchst, über das Internet zu streamen, installiere das Moonlight Internet Hosting Tool auf deinem Host und führe den mitgelieferten Internet-Streaming-Tester aus, um die Internetverbindung des Hosts zu überprüfen.</string>
+    <string name="nettest_text_inconclusive">Der Netzwerktest konnte nicht durchgeführt werden, da keiner der Verbindungstestserver von Moonlight erreichbar war. Überprüfe deine Internetverbindung oder versuche es später noch einmal.</string>
+    <string name="nettest_text_failure">Die aktuelle Netzwerkverbindung deines Geräts scheint Moonlight zu blockieren. Das Streaming über das Internet funktioniert möglicherweise nicht, während du mit diesem Netzwerk verbunden bist.
+\n
+\nFolgende Netzwerkports wurden blockiert:
+\n</string>
+    <string name="nettest_text_blocked">Die aktuelle Netzwerkverbindung deines Geräts blockiert Moonlight. Das Streaming über das Internet funktioniert möglicherweise nicht, während du mit diesem Netzwerk verbunden bist.</string>
+    <!-- Pair messages -->
+    <string name="pairing">Koppeln…</string>
+    <string name="pair_pc_offline">Host ist offline</string>
+    <string name="pair_pc_ingame">Auf dem Host ist bereits eine App aktiv. Du musst die App vor dem koppeln beenden.</string>
+    <string name="pair_pairing_title">Koppeln</string>
+    <string name="pair_pairing_msg">Bitte gebe folgenden PIN auf deinem Host ein:</string>
+    <string name="pair_incorrect_pin">PIN inkorrekt</string>
+    <string name="pair_fail">Koppeln fehlgeschlagen</string>
+    <string name="pair_already_in_progress">Koppeln bereits im Gange</string>
+    <!-- WOL messages -->
+    <string name="wol_pc_online">Host ist online</string>
+    <string name="wol_no_mac">Host konnte nicht aufgeweckt werden, da GFE keine MAC-Adresse gesendet hat</string>
+    <string name="wol_waking_pc">Host wird aufgeweckt…</string>
+    <string name="wol_waking_msg">Es kann einige Momente dauern deinen Host aufzuwecken. Sollte dies fehlschlagen, stelle bitte sicher, dass Wake-On-LAN korrekt konfiguriert ist.</string>
+    <string name="wol_fail">Senden der Wake-On-LAN Pakete ist fehlgeschlagen</string>
+    <!-- Unpair messages -->
+    <string name="unpairing">Trenne Kopplung…</string>
+    <string name="unpair_success">Kopplung erfolgreich getrennt</string>
+    <string name="unpair_fail">Trennung der Kopplung fehlgeschlagen</string>
+    <string name="unpair_error">Gerät wurde nicht gekoppelt</string>
+    <!-- Errors -->
+    <string name="error_pc_offline">Host ist offline</string>
+    <string name="error_manager_not_running">Der ComputerManager Dienst läuft nicht. Bitte warte ein paar Sekunden oder starte die App neu.</string>
+    <string name="error_unknown_host">Hostname konnte nicht aufgelöst werden</string>
+    <string name="error_404">GFE ist auf einen HTTP 404 Fehler gestoßen. Stelle sicher, dass die GPU deines Hosts unterstützt wird. Die Verwendung von Remote-Desktop Software kann ebenso diesen Fehler verursachen. Starte deinen Host neu oder installiere GFE neu.</string>
+    <string name="title_decoding_error">Video Dekodierer ist abgestürzt</string>
+    <string name="message_decoding_error">Moonlight ist wegen einer Inkompatibilität zu dem Video Dekodierer deines Gerätes abgestürzt. Stelle sicher, dass die GeForce Experience Version auf deinem Host auf dem neuesten Stand ist. Sollten weiterin Abstürze auftreten, versuche deine Streaming Einstellungen zu ändern.</string>
+    <string name="title_decoding_reset">Video Einstellungen zurücksetzen</string>
+    <string name="message_decoding_reset">Der Video Dekodierer deines Geräts ist wiederholt mit den ausgewählten Einstellungen abgestürzt. Deine Streamingeinstellungen wurden zurückgesetzt.</string>
+    <string name="error_usb_prohibited">USB Zugriff ist administrativ unterbunden. Bitte überprüfen sie ihre Knox oder MDM Einstellungen.</string>
+    <string name="unable_to_pin_shortcut">Deine momentane Launcher App ünterstützt das erstellen angehefteter Shortcuts nicht.</string>
+    <string name="video_decoder_init_failed">Der Video Dekodierer konnte nicht initialisiert werden. Dein Gerät unterstützt möglicherweise die gewählte Auflösung oder Framerate nicht.</string>
+    <string name="no_video_received_error">Kein Video vom Host empfangen.</string>
+    <string name="no_frame_received_error">Deine Netzwerkverbindung funktioniert nicht gut. Reduziere die Einstellung der Videobitrate oder benutze eine schnellere Verbindung.</string>
+    <!-- Start application messages -->
+    <string name="conn_establishing_title">Verbindung herstellen</string>
+    <string name="conn_establishing_msg">Verbindung starten</string>
+    <string name="conn_metered">Warnung: Das Datentransfervolumen deiner Netzwerkverbindung ist limitiert!</string>
+    <string name="conn_client_latency">Durchschnittliche Frame-Dekodierungslatenz:</string>
+    <string name="conn_client_latency_hw">Hardware-Dekodierungslatenz:</string>
+    <string name="conn_hardware_latency">Durchschnittliche Hardware-Dekodierungslatenz:</string>
+    <string name="conn_starting">Starten</string>
+    <string name="conn_error_title">Verbindungsfehler</string>
+    <string name="conn_error_msg">Start fehlgeschlagen</string>
+    <string name="conn_terminated_title">Verbindung beendet</string>
+    <string name="conn_terminated_msg">Die Verbindung wurde beendet</string>
+    <!-- General strings -->
+    <string name="ip_hint">IP-Adresse des GeForce Host</string>
+    <string name="searching_pc">Suche nach Hosts auf denen GeForce Experience aktiv ist…
+\n
+\nStelle sicher, dass GameStream in den GeForce Experience SHIELD-Einstellungen aktiviert ist.</string>
+    <string name="yes">Ja</string>
+    <string name="no">Nein</string>
+    <string name="lost_connection">Verbindung zum Host verloren</string>
+    <string name="title_details">Details</string>
+    <string name="help">Hilfe</string>
+    <string name="delete_pc_msg">Bist du sicher, dass du diesen Host löschen möchtest\?</string>
+    <string name="slow_connection_msg">Langsame Verbindung zum Host
+\nReduziere die Bitrate</string>
+    <string name="poor_connection_msg">Sehr langsame Verbindung zum Host</string>
+    <string name="perf_overlay_text">Videodimensionen: %1$s
+\nDecoder: %2$s
+\nGeschätzte Host Bildwiederholrate: %3$.2f FPS
+\nBildwiederholrate der Netzwerkübertragung: %4$.2f FPS
+\nWiedergabe-Bildwiederholungsrate: %5$.2f FPS
+\nWegen Netzwerkübertragung ausgelassene Frames: %6$.2f%%
+\nDurchschnittliche Übertragungsdauer: %7$.2f ms
+\nDurchschnittliche Dekodierungszeit: %8$.2f ms</string>
+    <!-- AppList activity -->
+    <string name="applist_connect_msg">Verbinde mit Host…</string>
+    <string name="applist_menu_resume">Sitzung wiederherstellen</string>
+    <string name="applist_menu_quit">Sitzung beenden</string>
+    <string name="applist_menu_quit_and_start">Aktuelle App beenden und starten</string>
+    <string name="applist_menu_cancel">Abbrechen</string>
+    <string name="applist_menu_details">Details anzeigen</string>
+    <string name="applist_menu_scut">Shortcut erstellen</string>
+    <string name="applist_menu_tv_channel">Zu Kanal hinzufügen</string>
+    <string name="applist_menu_hide_app">App ausblenden</string>
+    <string name="applist_refresh_title">App Liste</string>
+    <string name="applist_refresh_msg">Apps aktualisieren…</string>
+    <string name="applist_refresh_error_title">Fehler</string>
+    <string name="applist_refresh_error_msg">Die App-Liste konnte nicht geladen werden</string>
+    <string name="applist_quit_app">Beenden</string>
+    <string name="applist_quit_success">Erfolgreich beendet</string>
+    <string name="applist_quit_fail">Beenden fehlgeschlagen</string>
+    <string name="applist_quit_confirmation">Bist du sicher, dass du die laufende App schließen möchtest\? Ungespeicherte Daten gehen verloren.</string>
+    <string name="applist_details_id">App ID:</string>
+    <!-- Add computer manually activity -->
+    <string name="title_add_pc">Host manuell hinzufügen</string>
+    <string name="msg_add_pc">Verbinde zum Host…</string>
+    <string name="addpc_fail">Verbindung fehlgeschlagen. Stelle sicher, dass die benötigten Ports von deiner Firewall nicht gesperrt sind.</string>
+    <string name="addpc_success">Host erfolgreich hinzugefügt</string>
+    <string name="addpc_unknown_host">Auflösen der Hostadresse fehlgeschlagen. Stelle sicher, dass die Adresse keine Tippfehler beinhaltet.</string>
+    <string name="addpc_enter_ip">Du musst eine IP-Adresse eingeben</string>
+    <string name="addpc_wrong_sitelocal">Diese Adresse sieht falsch aus. Du musst die öffentliche IP-Adresse deines Routers benutzen, um übers Internet zu Streamen.</string>
+    <!-- Preferences -->
+    <string name="category_basic_settings">Allgemeine Einstellungen</string>
+    <string name="title_resolution_list">Videoauflösung</string>
+    <string name="summary_resolution_list">Erhöhen für klarere Bilder. Reduzieren für flüssigere Darstellung auf langsameren Geräten und Netzwerken.</string>
+    <string name="title_fps_list">Video Framerate</string>
+    <string name="summary_fps_list">Erhöhen für einen gleichmäßigeren Video-Stream. Verringern um auf langsameren Geräten eine bessere Performance zu erzielen.</string>
+    <string name="title_seekbar_bitrate">Video Bitrate</string>
+    <string name="summary_seekbar_bitrate">Erhöhen für einen schärferen Video-Stream. Verringern um auf langsameren Geräten eine bessere Performance zu erzielen.</string>
+    <string name="suffix_seekbar_bitrate_mbps">Mbps</string>
+    <string name="title_checkbox_stretch_video">Video auf Vollbildschirm strecken</string>
+    <string name="category_audio_settings">Audio Einstellungen</string>
+    <string name="title_audio_config_list">Surround Sound Konfiguration </string>
+    <string name="summary_audio_config_list">Aktivieren von 5.1- oder 7.1-Surround-Sound für Heimkinosysteme</string>
+    <string name="category_input_settings">Controller Einstellungen</string>
+    <string name="title_checkbox_touchscreen_trackpad">Touchscreen als Trackpad</string>
+    <string name="summary_checkbox_touchscreen_trackpad">Wenn aktiviert, verhält sich der Touchscreen wie ein Trackpad. Wenn es deaktiviert ist, steuert der Touchscreen den Mauszeiger direkt.</string>
+    <string name="title_checkbox_multi_controller">Automatische Controller Erkennung</string>
+    <string name="summary_checkbox_multi_controller">Abwählen dieser Option erzwingt dass immer ein Controller präsent ist</string>
+    <string name="title_checkbox_vibrate_fallback">Vibrationsemulation aktivieren</string>
+    <string name="summary_checkbox_vibrate_fallback">Lässt das Gerät vibrieren falls der Controller keine Vibration unterstützt</string>
+    <string name="title_seekbar_deadzone">Deadzone des Analogsticks</string>
+    <string name="suffix_seekbar_deadzone">%</string>
+    <string name="title_checkbox_xb1_driver">Xbox 360/One Controller Treiber</string>
+    <string name="summary_checkbox_xb1_driver">Aktiviert den eingebauten USB Treiber für Geräte die keine Xbox-Controller Unterstützung haben</string>
+    <string name="title_checkbox_usb_bind_all">Android Controller Unterstützung überschreiben</string>
+    <string name="summary_checkbox_usb_bind_all">Erzwingt die Verwendung von Moonlights USB Treiber für alle Xbox kompatiblen Controller</string>
+    <string name="title_checkbox_mouse_emulation">Maus Emulation via Controller</string>
+    <string name="summary_checkbox_mouse_emulation">Langes gedrückt halten der Start-Taste wechselt in den Maus Modus</string>
+    <string name="title_checkbox_mouse_nav_buttons">Vor- und Zurück-Tasten aktivieren</string>
+    <string name="summary_checkbox_mouse_nav_buttons">Aktivierung dieser Option kann auf fehleranfälligen Geräten Rechts-Clicks verunmöglichen</string>
+    <string name="title_checkbox_flip_face_buttons">Tasten umkehren</string>
+    <string name="summary_checkbox_flip_face_buttons">Kehrt die Tasten A/B und X/Y für Controller und Bildschirmsteuerung um</string>
+    <string name="category_on_screen_controls_settings">On-Screen-Controller Einstellungen</string>
+    <string name="title_checkbox_show_onscreen_controls">On-Screen-Controller einblenden</string>
+    <string name="summary_checkbox_show_onscreen_controls">Blendet einen virtuellen Controller als Overlay auf dem Touchscreen ein</string>
+    <string name="title_checkbox_vibrate_osc">Vibrationen aktivieren</string>
+    <string name="summary_checkbox_vibrate_osc">Vibrieren als haptisches Feedback für den On-Screen-Controller</string>
+    <string name="title_only_l3r3">Nur L3 und R3 einblenden</string>
+    <string name="summary_only_l3r3">Alle virtuellen Tasten außer L3 und R3 ausblenden</string>
+    <string name="title_reset_osc">Gespeichertes On-Screen-Controller Layout zurücksetzen</string>
+    <string name="summary_reset_osc">Größe und Position der On-Screen-Controllertasten zurücksetzen</string>
+    <string name="dialog_title_reset_osc">Layout zurücksetzen</string>
+    <string name="dialog_text_reset_osc">Bist du sicher, dass du das gespeicherte On-Screen-Controllertsten Layout löschen willst\?</string>
+    <string name="toast_reset_osc_success">On-Screen-Controller wurde zurückgesetzt</string>
+    <string name="title_osc_opacity">Transparenz der On-Screen-Controllertasten ändern</string>
+    <string name="summary_osc_opacity">On-Screen-Controllertasten auf dem Bildschirm mehr/weniger transparent machen</string>
+    <string name="suffix_osc_opacity">%</string>
+    <string name="dialog_title_osc_opacity">Transparenz ändern</string>
+    <string name="category_ui_settings">UI Einstellungen</string>
+    <string name="title_checkbox_enable_pip">Aktivieren des Bild-in-Bild Modus</string>
+    <string name="summary_checkbox_enable_pip">Ermöglicht die Anzeige (aber nicht die Steuerung) des Streams während des Multitasking</string>
+    <string name="title_language_list">Sprache</string>
+    <string name="summary_language_list">Sprache die Moonlight verwenden soll</string>
+    <string name="title_checkbox_small_icon_mode">Verwende kleine Cover</string>
+    <string name="summary_checkbox_small_icon_mode">Verwende kleine Cover in der Rasteransicht, um mehr gleichzeitig anzeigen zu können</string>
+    <string name="category_host_settings">Host Einstellungen</string>
+    <string name="title_checkbox_enable_sops">Spieleinstellungen optimieren</string>
+    <string name="summary_checkbox_enable_sops">GFE erlauben, die Spieleinstellungen für ein optimales Streaming zu ändern</string>
+    <string name="title_checkbox_host_audio">Audio auf dem Host wiedergeben</string>
+    <string name="summary_checkbox_host_audio">Audio auf dem Host und auf diesem Gerät wiedergeben</string>
+    <string name="category_advanced_settings">Erweiterte Einstellungen</string>
+    <string name="title_disable_frame_drop">Nie Frames Überspringen</string>
+    <string name="title_unlock_fps">Alle möglichen Framerates freischalten</string>
+    <string name="summary_unlock_fps">Streaming mit 90 oder 120 FPS kann die Latenz auf High-End-Geräten verringern, kann aber bei Geräten, die dies nicht unterstützen, zu stottern oder Instabilität führen</string>
+    <string name="title_checkbox_disable_warnings">Warnhinweise deaktivieren</string>
+    <string name="summary_checkbox_disable_warnings">On-Screen Warnmeldungen während des Streaming deaktivieren</string>
+    <string name="summary_disable_frame_drop">Kann das Mikro-Ruckeln auf einigen Geräten reduzieren, allerdings erhöht dies gleichzeitig die Latenz</string>
+    <string name="title_video_format">H265 Einstellungen ändern</string>
+    <string name="summary_video_format">H265 verringert die Video-Bandbreitenanforderung, funktioniert allerdings nur auf sehr neuen Geräten</string>
+    <string name="title_enable_hdr">HDR aktivieren (experimentell)</string>
+    <string name="summary_enable_hdr">HDR-Streaming sofern dies von der Host-GPU unterstützt wird. HDR erfordert eine GPU der GTX 1000 Serie oder neuer.</string>
+    <string name="title_enable_perf_overlay">Performance Overlay aktivieren</string>
+    <string name="summary_enable_perf_overlay">Leistungsmerkmale während des Streamens in Echtzeit einblenden</string>
+    <string name="title_enable_post_stream_toast">Zeige Latenz-Informationen nach dem Streaming</string>
+    <string name="summary_enable_post_stream_toast">Anzeige einer Informationsmeldung über die Latenz nach dem Ende des Streams</string>
+    <string name="resolution_prefix_native">Nativ</string>
+    <string name="text_native_res_dialog">Native Auflösungsmodi werden von GeForce Experience nicht offiziell unterstützt, daher wird es die Auflösung deines Host-Displays nicht selbst einstellen. Du musst sie manuell im Spiel setzen.
+\n
+\nWenn du eine benutzerdefinierte Auflösung in der NVIDIA Systemsteuerung erstellst, um die Auflösung deines Geräts anzupassen, stelle bitte sicher, dass du die Warnung von NVIDIA bezüglich möglicher Monitorschäden, PC-Instabilität und anderer potenzieller Probleme gelesen und verstanden hast.
+\n
+\nWir sind nicht verantwortlich für Probleme, die aus der Erstellung einer angepassten Auflösung auf deinem PC resultieren.
+\n
+\nSchließlich kann es sein, dass dein Gerät oder dein Host das Streaming in nativer Auflösung nicht unterstützt. Wenn es auf deinem Gerät nicht funktioniert, hast du leider Pech gehabt.</string>
+    <string name="title_native_res_dialog">Native Auflösungswarnung</string>
+    <string name="check_ports_msg">Überprüfe deine Firewall und Portweiterleitungsregeln für folgende(n) Port(s):</string>
+    <string name="early_termination_error">Beim Starten des Streams auf deinem Host ist etwas schief gelaufen.
+\n
+\nStelle sicher, dass du keine DRM-geschützten Inhalte auf deinem Host geöffnet hast. Du kannst auch versuchen, deinen Host neu zu starten.
+\n
+\nWenn das Problem weiterhin besteht, versuche deinen GPU-Treiber und GeForce Experience neu zu installieren.</string>
+    <string name="pcview_menu_header_unknown">Aktualisiere</string>
+    <string name="pcview_menu_header_offline">Offline</string>
+    <string name="pcview_menu_header_online">Online</string>
+</resources>

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

@@ -88,14 +88,11 @@
     <string name="summary_resolution_list">Establecer unos valores demasiado altos puede causar lag o cierres inesperados</string>
     <string name="title_seekbar_bitrate">Seleccionar bitrate de vídeo</string>
     <string name="summary_seekbar_bitrate">Usa bitrate bajo para reducir "parpadeo". Incrementa el bitrate para mayor calidad de imagen.</string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
     <string name="title_checkbox_stretch_video">Ajustar vídeo a pantalla completa</string>
     <string name="title_checkbox_disable_warnings">Desactivar mensajes de advertencia</string>
     <string name="summary_checkbox_disable_warnings">Desactivar mensajes de advertencia en pantalla durante la transmisión</string>
 
     <string name="category_audio_settings">Configuración de audio</string>
-    <string name="title_checkbox_51_surround">Activar sonido 5.1 surround</string>
-    <string name="summary_checkbox_51_surround">Desmarcar si experimentas problemas de audio. Requiere GFE 2.7 o superior.</string>
 
     <string name="title_checkbox_multi_controller">Soporte para múltiples mandos</string>
     <string name="summary_checkbox_multi_controller">Si no está marcado, todos los mandos aparecen como uno solo</string>
@@ -113,8 +110,6 @@
     <string name="category_ui_settings">Configuración de la interfaz</string>
     <string name="title_language_list">Idioma</string>
     <string name="summary_language_list">Idioma a usar por Moonlight</string>
-    <string name="title_checkbox_list_mode">Usar listas en lugar de cuadrículas</string>
-    <string name="summary_checkbox_list_mode">Mostrar aplicaciones y PCs en listas en lugar de el cuadrículas</string>
     <string name="title_checkbox_small_icon_mode">Usar iconos pequeños</string>
     <string name="summary_checkbox_small_icon_mode">Usar iconos pequeños en las entradas de cuadrículas para permitir más entradas en la pantalla</string>
 

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="fps_names">
+        <item>30 IPS</item>
+        <item>60 IPS</item>
+        <item>90 IPS</item>
+        <item>120 IPS</item>
+    </string-array>
+    <string-array name="audio_config_names">
+        <item>Stéréo</item>
+        <item>Son surround 5.1</item>
+        <item>Son surround 7.1</item>
+    </string-array>    
+    <string-array name="decoder_names">
+        <item>Sélection automatique du décodeur</item>
+        <item>Contraindre le décodage logiciel</item>
+        <item>Contraindre le décodage matériel</item>
+    </string-array>
+    <string-array name="video_format_names">
+        <item>Utiliser H.265 uniquement s\'il est stable</item>
+        <item>Utilisez toujours H.265 (mais il peut planter)</item>
+        <item>N\'utilisez jamais H.265</item>
+    </string-array>
+</resources>

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

@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    
     <!-- Shortcut strings -->
     <string name="scut_deleted_pc">PC supprimé</string>
     <string name="scut_not_paired">PC non appairé</string>
     <string name="scut_pc_not_found">PC non trouvé</string>
     <string name="scut_invalid_uuid">Le PC fourni n\'est pas valide</string>
     <string name="scut_invalid_app_id">L\'application fournie n\'est pas valide</string>
-
     <!-- Help strings -->
     <string name="help_loading_title">Visionneuse d\'aide</string>
     <string name="help_loading_msg">Chargement de la page d\'aide…</string>
-
     <!-- PC view menu entries -->
     <string name="pcview_menu_app_list">Afficher la liste des jeux</string>
     <string name="pcview_menu_pair_pc">Appairer avec PC</string>
@@ -19,7 +16,14 @@
     <string name="pcview_menu_send_wol">Envoyer la requête Wake-On-LAN</string>
     <string name="pcview_menu_delete_pc">Supprimer PC</string>
     <string name="pcview_menu_details">Voir les détails</string>
-
+    <!-- Network test strings -->
+    <string name="nettest_title_waiting">Test de la connexion réseau</string>
+    <string name="nettest_text_waiting">Moonlight teste votre connexion réseau pour déterminer si NVIDIA GameStream est bloqué.\n\nCela peut prendre quelques secondes.</string>
+    <string name="nettest_title_done">Test du réseau terminé</string>
+    <string name="nettest_text_success">Votre réseau ne semble pas bloquer Moonlight. Si vous avez encore de la difficulté à vous connecter, vérifiez les paramètres du pare-feu de votre PC.\n\nSi vous essayez de diffuser sur Internet, installez l\'outil d\'hébergement Internet Moonlight sur votre PC et exécutez le testeur de streaming Internet inclus pour vérifier la connexion Internet de votre PC.</string>
+    <string name="nettest_text_inconclusive">Le test réseau n’a pas pu être effectué car aucun des serveurs de test de connexion Moonlight n’était accessible. Vérifiez votre connexion Internet ou réessayez plus tard.</string>
+    <string name="nettest_text_failure">La connexion réseau actuelle de votre appareil semble bloquer Moonlight. Le streaming sur Internet peut ne pas fonctionner lorsqu’il est connecté à ce réseau.\n\nLes ports réseau suivants ont été bloqués:\n</string>
+    <string name="nettest_text_blocked">La connexion réseau actuelle de votre appareil bloque Moonlight. Le streaming sur Internet peut ne pas fonctionner lorsqu’il est connecté à ce réseau.</string>
     <!-- Pair messages -->
     <string name="pairing">Appariement…</string>
     <string name="pair_pc_offline">L\'ordinateur est hors ligne</string>
@@ -29,7 +33,6 @@
     <string name="pair_incorrect_pin">Code PIN incorrect</string>
     <string name="pair_fail">Échec de l\'appariement</string>
     <string name="pair_already_in_progress">Appariement déjà en cours</string>
-
     <!-- WOL messages -->
     <string name="wol_pc_online">L\'ordinateur est en ligne</string>
     <string name="wol_no_mac">Impossible de réveiller le PC car GFE n\'a pas envoyé d\'adresse MAC</string>
@@ -38,13 +41,11 @@
         Si ce n\'est pas le cas, assurez-vous qu\'il est correctement configuré pour Wake-On-LAN.
     </string>
     <string name="wol_fail">Échec de l\'envoi des paquets Wake-On-LAN</string>
-
     <!-- Unpair messages -->
     <string name="unpairing">Désappariage…</string>
     <string name="unpair_success">Désapparié avec succès</string>
     <string name="unpair_fail">Échec de désappariement</string>
     <string name="unpair_error">Le périphérique n\'a pas été appareillé</string>
-
     <!-- Errors -->
     <string name="error_pc_offline">L\'ordinateur est déconnecté</string>
     <string name="error_manager_not_running">Le service ComputerManager n\'est pas en cours d\'exécution. Veuillez patienter quelques secondes ou redémarrer l\'application.</string>
@@ -53,12 +54,11 @@
         L\'utilisation d\'un logiciel de bureau à distance peut également provoquer cette erreur. Essayez de redémarrer votre machine ou de réinstaller GFE.
     </string>
     <string name="title_decoding_error">Le décodeur vidéo s\'est écrasé</string>
-    <string name="message_decoding_error">Moonlight s\'est écrasé en raison d\'une incompatibilité avec le décodeur vidéo de cet appareil. Assurez-vous que GeForce Experience soit mis à jour vers la dernière version sur votre PC. Essayez de régler les paramètres de diffusion si les plantages continuent.</string>
+    <string name="message_decoding_error">Moonlight s\'est arrêté en raison d\'une incompatibilité avec le décodeur vidéo de cet appareil. Assurez-vous que GeForce Experience soit mis à jour vers la dernière version sur votre PC. Essayez de régler les paramètres de diffusion si les plantages continuent.</string>
     <string name="title_decoding_reset">Paramètres vidéo réinitialiser</string>
     <string name="message_decoding_reset">Le décodeur vidéo de votre appareil continue de planter avec les paramètres de diffusion sélectionnés. Vos paramètres de diffusion ont été réinitialisés par défaut.</string>
     <string name="error_usb_prohibited">L\'accès USB est interdit par votre appareil. Vérifiez vos paramètres Knox ou MDM.</string>
     <string name="unable_to_pin_shortcut">Votre lanceur actuel ne permet pas de créer des raccourcis épinglés.</string>
-
     <!-- Start application messages -->
     <string name="conn_establishing_title">Établissement de la connexion</string>
     <string name="conn_establishing_msg">Démarrage de la connection</string>
@@ -71,7 +71,6 @@
     <string name="conn_error_msg">Impossible de démarrer</string>
     <string name="conn_terminated_title">Connexion terminée</string>
     <string name="conn_terminated_msg">La connexion a été interrompue</string>
-
     <!-- General strings -->
     <string name="ip_hint">Adresse IP de GeForce PC</string>
     <string name="searching_pc">Recherche de PC avec GameStream en cours…\n\n
@@ -85,7 +84,6 @@
     <string name="slow_connection_msg">Connexion lente au PC\nRéduisez votre débit</string>
     <string name="poor_connection_msg">Mauvaise connexion au PC</string>
     <string name="perf_overlay_text">Video dimensions: %1$s\nDécodeur: %2$s\nEstimation de la fréquence d\'images de l\'ordinateur hôte: %3$.2f FPS\nFréquence d\'images entrantes du réseau: %4$.2f FPS\nTaux de rendu: %5$.2f FPS\nImages envoyé par votre connexion réseau: %6$.2f%%\nTemps moyen de réception: %7$.2f ms\nTemps de décodage moyen: %8$.2f ms</string>
-
     <!-- AppList activity -->
     <string name="applist_connect_msg">Connexion au PC…</string>
     <string name="applist_menu_resume">Reprise de la session</string>
@@ -104,7 +102,6 @@
     <string name="applist_quit_fail">Échec de la fermeture</string>
     <string name="applist_quit_confirmation">Voulez-vous vraiment quitter l\'application en cours d\'exécution? Toutes les données non enregistrées seront perdues.</string>
     <string name="applist_details_id">ID app:</string>
-
     <!-- Add computer manually activity -->
     <string name="title_add_pc">Ajouter un PC manuellement</string>
     <string name="msg_add_pc">Connexion au PC…</string>
@@ -113,7 +110,6 @@
     <string name="addpc_unknown_host">Impossible de résoudre l\'adresse du PC. Assurez-vous que vous n\'avez pas fait une faute de frappe dans l\'adresse.</string>
     <string name="addpc_enter_ip">Vous devez entrer une adresse IP</string>
     <string name="addpc_wrong_sitelocal">Cette adresse ne semble pas correcte. Vous devez utiliser l\'adresse IP publique de votre routeur pour la diffusion en continu sur Internet..</string>
-
     <!-- Preferences -->
     <string name="category_basic_settings">Paramètres de base</string>
     <string name="title_resolution_list">Résolution vidéo</string>
@@ -122,24 +118,20 @@
     <string name="summary_fps_list">Augmenter pour un flux vidéo plus lisse. Diminution pour de meilleures performances sur les périphériques bas de gamme.</string>
     <string name="title_seekbar_bitrate">Sélectionnez le bitrate vidéo à obtenir</string>
     <string name="summary_seekbar_bitrate">Bitrate inférieur pour réduire la saccade. Augmentez le bitrate pour augmenter la qualité de l\'image.</string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
-    <string name="title_unlock_fps">Débloquer tous les taux d\'images possibles</string>
-    <string name="summary_unlock_fps">La diffusion en continu à 90 ou 120 FPS peut réduire la latence sur les périphériques haut de gamme, mais peut provoquer des retards ou des blocages sur les périphériques qui ne peuvent \pas le prendre en charge</string>
     <string name="title_checkbox_stretch_video">Étirez la vidéo en plein écran</string>
     <string name="title_checkbox_disable_warnings">Désactiver les messages d\'avertissement</string>
-    <string name="summary_checkbox_disable_warnings">Désactiver les messages d\'avertissement de connexion à l\'écran pendant le streaming</string>
     <string name="title_checkbox_enable_pip">Activer le mode observateur dans l\'image</string>
     <string name="summary_checkbox_enable_pip">Permet de visualiser le flux (sans le contrôleur) tout en multitâche</string>
-
     <string name="category_audio_settings">Paramètres audio</string>
-    <string name="title_checkbox_51_surround">Activer son surround 5.1</string>
-    <string name="summary_checkbox_51_surround">Décochez si vous rencontrez des problèmes audio. Nécessite GFE 2.7 ou supérieur.</string>
-
+    <string name="title_audio_config_list">Configuration son surround</string>
+    <string name="summary_audio_config_list">Activer le son surround 5.1 ou 7.1 pour les systèmes home cinéma</string>
     <string name="category_input_settings">Paramètres d\'entrée</string>
+    <string name="title_checkbox_touchscreen_trackpad">Utilisez l\'écran tactile comme trackpad</string>
+    <string name="summary_checkbox_touchscreen_trackpad">S\'il est activé, l\'écran tactile agit comme un trackpad. S\'il est désactivé, l\'écran tactile contrôle directement le curseur de la souris.</string>
     <string name="title_checkbox_multi_controller">Prise en charge de plusieurs contrôleurs</string>
     <string name="summary_checkbox_multi_controller">Lorsqu\'elle n\'est pas cochée, tous les contrôleurs sont regroupés</string>
-    <string name="title_checkbox_vibrate_fallback">Emuler le support vibration</string>
-    <string name="summary_checkbox_vibrate_fallback">Vibre votre appareil pour émuler une vibration si votre manette ne le prend pas en charge</string>
+    <string name="title_checkbox_vibrate_fallback">Emuler support vibration de secours</string>
+    <string name="summary_checkbox_vibrate_fallback">Emuler des tremblements si votre manette ne le prend pas en charge</string>
     <string name="title_seekbar_deadzone">Régler la zone morte du stick analogique</string>
     <string name="suffix_seekbar_deadzone">%</string>
     <string name="title_checkbox_xb1_driver">Pilote de contrôleur Xbox 360/One</string>
@@ -148,14 +140,15 @@
     <string name="summary_checkbox_usb_bind_all">Force le pilote USB de Moonlight à prendre en charge tous les gamepads Xbox pris en charge</string>
     <string name="title_checkbox_mouse_emulation">Emulation de la souris via le gamepad</string>
     <string name="summary_checkbox_mouse_emulation">Appuyez longuement sur le bouton Start pour faire basculer la manette de jeu en mode souris.</string>
-    <string name="title_checkbox_mouse_nav_buttons">Activer les boutons de souris arrière et avant</string>
-    <string name="summary_checkbox_mouse_nav_buttons">L\'activation de cette option peut entraîner un clic droit sur certains périphériques.</string>
-
+    <string name="title_checkbox_mouse_nav_buttons">Activer les boutons de la souris arrière et avant</string>
+    <string name="summary_checkbox_mouse_nav_buttons">L\' activation de cette option peut entraîner un clic droit sur certains périphériques.</string>
+    <string name="title_checkbox_flip_face_buttons">Boutons de face inversé</string>
+    <string name="summary_checkbox_flip_face_buttons">Commute les boutons de face A/B et X/Y pour les manettes de jeu et les commandes à l\'écran</string>
     <string name="category_on_screen_controls_settings">Paramètres des contrôles à l\'écran</string>
     <string name="title_checkbox_show_onscreen_controls">Afficher les commandes à l\'écran</string>
     <string name="summary_checkbox_show_onscreen_controls">Afficher la superposition du contrôleur virtuel sur l\'écran tactile</string>
     <string name="title_checkbox_vibrate_osc">Activer les vibrations</string>
-    <string name="summary_checkbox_vibrate_osc">Vibre votre appareil pour émuler les vibrations des commandes à l\'écran</string>
+    <string name="summary_checkbox_vibrate_osc">Emuler des tremblements des commandes à l\'écran</string>
     <string name="title_only_l3r3">Montre seulement L3 et R3</string>
     <string name="summary_only_l3r3">Cacher tout sauf L3 et R3</string>
     <string name="title_reset_osc">Effacer la disposition des commandes à l\'écran sauvegardée</string>
@@ -163,23 +156,25 @@
     <string name="dialog_title_reset_osc">Réinitialiser la mise en page</string>
     <string name="dialog_text_reset_osc">Êtes-vous sûr de vouloir supprimer la disposition des commandes à l\'écran que vous avez sauvegardée?</string>
     <string name="toast_reset_osc_success">Les contrôles à l\'écran sont réinitialisés</string>
-
+    <string name="title_osc_opacity">Modifier l\'opacité des contrôles à l\'écran</string>
+    <string name="summary_osc_opacity">Rendre les contrôles à l\'écran plus/moins transparents</string>
+    <string name="dialog_title_osc_opacity">Modifiez l\'opacité</string>
+    <string name="suffix_osc_opacity">%</string>
     <string name="category_ui_settings">Paramètres de l\'interface utilisateur</string>
     <string name="title_language_list">Langue</string>
     <string name="summary_language_list">Langue à utiliser pour Moonlight</string>
-    <string name="title_checkbox_list_mode">Utiliser des listes au lieu des grilles</string>
-    <string name="summary_checkbox_list_mode">Afficher les applications et les PC en listes au lieu de grilles</string>
     <string name="title_checkbox_small_icon_mode">Utiliser des petites icônes</string>
     <string name="summary_checkbox_small_icon_mode">Utilisez les petites icônes dans les éléments de la grille pour permettre plus d\'éléments à l\'écran</string>
-
     <string name="category_host_settings">Paramètres de l\'hôte</string>
     <string name="title_checkbox_enable_sops">Optimiser les paramètres de jeu</string>
     <string name="summary_checkbox_enable_sops">Autoriser GFE à modifier les paramètres de jeu pour une diffusion optimale</string>
     <string name="title_checkbox_host_audio">Jouer l\'audio sur le PC</string>
     <string name="summary_checkbox_host_audio">Lire l\'audio de l\'ordinateur et de ce périphérique</string>
-
     <string name="category_advanced_settings">Réglages avancés</string>
-    <string name="title_disable_frame_drop">Désactiver la suppression d\'image</string>
+    <string name="title_unlock_fps">Débloquez toutes les fréquences d\'images possibles</string>
+    <string name="summary_unlock_fps">Le streaming à 90 ou 120 FPS peut réduire la latence sur les appareils haut de gamme, mais peut entraîner un décalage ou une instabilité sur les appareils qui ne peuvent pas le prendre en charge</string>
+    <string name="summary_checkbox_disable_warnings">Désactiver les messages d\'avertissement de connexion à l\'écran pendant la diffusion</string>
+    <string name="title_disable_frame_drop">Ne jamais laisser tomber les frames</string>
     <string name="summary_disable_frame_drop">Peut réduire les micro-saccades sur certains appareils, mais peut augmenter la latence</string>
     <string name="title_video_format">Modifier les paramètres H.265</string>
     <string name="summary_video_format">H.265 réduit les besoins en bande passante vidéo mais nécessite un périphérique très récent</string>
@@ -187,5 +182,12 @@
     <string name="summary_enable_hdr">Diffuser du HDR lorsque le jeu et le processeur graphique du PC le prennent en charge. HDR nécessite un GPU série GTX 1000 ou une version ultérieure.</string>
     <string name="title_enable_perf_overlay">Activer la superposition de performance</string>
     <string name="summary_enable_perf_overlay">Afficher une superposition à l\'écran avec des informations de performance en temps réel pendant la lecture en continu</string>
-
-</resources>
+    <string name="title_enable_post_stream_toast">Afficher le message de latence après la diffusion en continu</string>
+    <string name="summary_enable_post_stream_toast">Afficher un message d’informations de latence après la fin du flux</string>
+    <string name="no_video_received_error">Aucune vidéo reçue depuis l\'hôte.</string>
+    <string name="video_decoder_init_failed">Le décodeur vidéo n\'a pas pu démarrer. Vérifiez que votre appareil supporte la résolution ou la fréquence d\'images choisie.</string>
+    <string name="pcview_menu_test_network">Tester la connection réseau</string>
+    <string name="pcview_menu_header_unknown">Actualisation</string>
+    <string name="pcview_menu_header_offline">Hors ligne</string>
+    <string name="pcview_menu_header_online">En ligne</string>
+</resources>

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

@@ -105,7 +105,6 @@
     <string name="summary_resolution_list">Valori troppo elevati possono causare lag o crash</string>
     <string name="title_seekbar_bitrate">Velocità di trasmissione video</string>
     <string name="summary_seekbar_bitrate">Abbassa la velocità di trasmissione per ridurre lo stuttering; alzala per migliorare la qualità dell\'immagine</string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
     <string name="title_checkbox_stretch_video">Forza video a schermo intero</string>
     <string name="title_checkbox_disable_warnings">Disabilita messaggi di warning</string>
     <string name="summary_checkbox_disable_warnings">Disabilita i messaggi di warning sullo schermo durante lo streaming</string>
@@ -113,8 +112,6 @@
     <string name="summary_checkbox_enable_pip">Permette di osservare (ma non di controllare) la stream in multitasking</string>
 
     <string name="category_audio_settings">Impostazioni audio</string>
-    <string name="title_checkbox_51_surround">Abilita l\'audio 5.1 surround</string>
-    <string name="summary_checkbox_51_surround">Se riscontri problemi, disabilitalo. Richiede GFE 2.7 o versioni sucessive.</string>
 
     <string name="title_checkbox_multi_controller">Supporto a più controller</string>
     <string name="summary_checkbox_multi_controller">Quando disabilitato, tutti i controller appaiono come uno solo</string>
@@ -141,8 +138,6 @@
     <string name="category_ui_settings">Impostazioni dell\'interfaccia</string>
     <string name="title_language_list">Lingua</string>
     <string name="summary_language_list">Lingua da usare in Moonlight</string>
-    <string name="title_checkbox_list_mode">Usa lista invece della griglia</string>
-    <string name="summary_checkbox_list_mode">Visualizza le applicazioni e i PC in una lista invece di una griglia</string>
     <string name="title_checkbox_small_icon_mode">Usa icone piccole</string>
     <string name="summary_checkbox_small_icon_mode">Usa icone piccole nella griglia per avere più oggetti a schermo</string>
 
@@ -159,5 +154,6 @@
     <string name="summary_video_format">H.265 riduce i requisiti di larghezza di banda video ma richiede un dispositivo molto recente</string>
     <string name="title_enable_hdr">Abilita HDR (sperimentale)</string>
     <string name="summary_enable_hdr">Utilizza l\'HDR quando il gioco e la scheda video del PC lo supportano. L\'HDR richiede una scheda video serie GTX 1000 o sucessive.</string>
-	
+    <string name="suffix_osc_opacity">%</string>
+
 </resources>

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

@@ -84,14 +84,11 @@
     <string name="summary_resolution_list">品質が高いほどラグとクラッシュが発生しやすくなります</string>
     <string name="title_seekbar_bitrate">映像のビットレート</string>
     <string name="summary_seekbar_bitrate">ビットレートを低くすればカクつきが抑制され、高くすれば画質が向上します</string>
-    <string name="suffix_seekbar_bitrate">Kbps</string>
     <string name="title_checkbox_stretch_video">映像を全画面に拡大</string>
     <string name="title_checkbox_disable_warnings">警告を無効化</string>
     <string name="summary_checkbox_disable_warnings">ストリーミング中に画面に警告メッセージを表示しない</string>
 
     <string name="category_audio_settings">音声</string>
-    <string name="title_checkbox_51_surround">5.1chサラウンド</string>
-    <string name="summary_checkbox_51_surround">音声に問題が生じる場合はチェックを外してください。バージョン2.7以降のGFEが必要です</string>
 
     <string name="title_checkbox_multi_controller">複数のゲームコントローラ</string>
     <string name="summary_checkbox_multi_controller">チェックを外すと、全てのゲームコントローラが単一の物として認識されます</string>
@@ -107,8 +104,6 @@
     <string name="category_ui_settings">インターフェース</string>
     <string name="title_language_list">言語</string>
     <string name="summary_language_list">Moonlightで使用する言語</string>
-    <string name="title_checkbox_list_mode">リストメニュー</string>
-    <string name="summary_checkbox_list_mode">ゲームをグリッドではなく、リストで表示します</string>
     <string name="title_checkbox_small_icon_mode">小さなアイコン</string>
     <string name="summary_checkbox_small_icon_mode">グリッドで小さなアイコンを使用します</string>
 
@@ -121,5 +116,18 @@
     <string name="category_advanced_settings">高度な設定</string>
     <string name="title_video_format">H.265</string>
     <string name="summary_video_format">H.265は動画に必要な帯域幅を圧縮します。この機能にはなるべく新しいデバイスが必要です</string>
+    <string name="suffix_osc_opacity">%</string>
+    <string name="dialog_title_osc_opacity">透過率</string>
+    <string name="title_osc_opacity">透過率</string>
+    <string name="summary_osc_opacity">オンスクリーンコントローラの透過率を調整します</string>
+    <string name="title_only_l3r3">L3 と R3 のみ表示します</string>
+    <string name="summary_only_l3r3">L3 と R3 以外のボタンを表示しない</string>
+    <string name="title_reset_osc">オンスクリーンコントローラをデフォルトに戻します</string>
+    <string name="summary_reset_osc">サイズやレイアウトを戻します</string>
+    <string name="dialog_title_reset_osc">デフォルトに戻します</string>
+    <string name="dialog_text_reset_osc">本当にデフォルトに戻しますか？</string>
+    <string name="toast_reset_osc_success">オンスクリーンコントローラをデフォルトに戻しました</string>
+    <string name="title_checkbox_vibrate_osc">振動</string>
+    <string name="summary_checkbox_vibrate_osc">コントローラの振動を真似します</string>
 
 </resources>