Version 7.3.1

It doesn't actually fix the bug.

This reverts commit 16b845ab84.

app/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 28
 
-        versionName "6.0.1"
-        versionCode = 181
+        versionName "7.3.1"
+        versionCode = 194
     }
 
     flavorDimensions "root"

app/proguard-rules.pro

@@ -25,3 +25,4 @@
 
 # jMDNS
 -dontwarn javax.jmdns.impl.DNSCache
+-dontwarn org.slf4j.**

app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

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

@@ -1,8 +1,8 @@
 package com.limelight;
 
+import java.io.IOException;
 import java.io.StringReader;
 import java.util.List;
-import java.util.UUID;
 
 import com.limelight.computers.ComputerManagerListener;
 import com.limelight.computers.ComputerManagerService;
@@ -28,7 +28,6 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -45,6 +44,8 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 
+import org.xmlpull.v1.XmlPullParserException;
+
 public class AppView extends Activity implements AdapterFragmentCallbacks {
     private AppGridAdapter appGridAdapter;
     private String uuidString;
@@ -82,7 +83,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                     localBinder.waitForReady();
 
                     // Get the computer object
-                    computer = localBinder.getComputer(UUID.fromString(uuidString));
+                    computer = localBinder.getComputer(uuidString);
                     if (computer == null) {
                         finish();
                         return;
@@ -156,7 +157,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                 }
 
                 // Don't care about other computers
-                if (!details.uuid.toString().equalsIgnoreCase(uuidString)) {
+                if (!details.uuid.equalsIgnoreCase(uuidString)) {
                     return;
                 }
 
@@ -180,7 +181,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                         @Override
                         public void run() {
                             // Disable shortcuts referencing this PC for now
-                            shortcutHelper.disableShortcut(details.uuid.toString(),
+                            shortcutHelper.disableShortcut(details.uuid,
                                     getResources().getString(R.string.scut_not_paired));
 
                             // Display a toast to the user and quit the activity
@@ -216,7 +217,9 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                         blockingLoadSpinner.dismiss();
                         blockingLoadSpinner = null;
                     }
-                } catch (Exception ignored) {}
+                } catch (XmlPullParserException | IOException e) {
+                    e.printStackTrace();
+                }
             }
         });
 
@@ -280,7 +283,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
             List<NvApp> applist = NvHTTP.getAppListByReader(new StringReader(lastRawApplist));
             updateUiWithAppList(applist);
             LimeLog.info("Loaded applist from cache");
-        } catch (Exception e) {
+        } catch (IOException | XmlPullParserException e) {
             if (lastRawApplist != null) {
                 LimeLog.warning("Saved applist corrupted: "+lastRawApplist);
                 e.printStackTrace();
@@ -390,8 +393,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                     @Override
                     public void run() {
                         suspendGridUpdates = true;
-                        ServerHelper.doQuit(AppView.this,
-                                ServerHelper.getCurrentAddressFromComputer(computer),
+                        ServerHelper.doQuit(AppView.this, computer,
                                 app.app, managerBinder, new Runnable() {
                             @Override
                             public void run() {

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

@@ -66,8 +66,15 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.TextView;
 import android.widget.Toast;
 
+import java.io.ByteArrayInputStream;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.Locale;
+
 
 public class Game extends Activity implements SurfaceHolder.Callback,
     OnGenericMotionListener, OnTouchListener, NvConnectionListener, EvdevListener,
@@ -105,6 +112,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     private boolean grabbedInput = true;
     private boolean grabComboDown = false;
     private StreamView streamView;
+    private TextView notificationOverlayView;
 
     private ShortcutHelper shortcutHelper;
 
@@ -135,6 +143,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     public static final String EXTRA_PC_UUID = "UUID";
     public static final String EXTRA_PC_NAME = "PcName";
     public static final String EXTRA_APP_HDR = "HDR";
+    public static final String EXTRA_SERVER_CERT = "ServerCert";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -195,6 +204,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         streamView.setOnTouchListener(this);
         streamView.setInputCallbacks(this);
 
+        notificationOverlayView = findViewById(R.id.notificationOverlay);
+
         inputCaptureProvider = InputCaptureManager.getInputCaptureProvider(this, this);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
@@ -228,6 +239,17 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         String uuid = Game.this.getIntent().getStringExtra(EXTRA_PC_UUID);
         String pcName = Game.this.getIntent().getStringExtra(EXTRA_PC_NAME);
         boolean willStreamHdr = Game.this.getIntent().getBooleanExtra(EXTRA_APP_HDR, false);
+        byte[] derCertData = Game.this.getIntent().getByteArrayExtra(EXTRA_SERVER_CERT);
+
+        X509Certificate serverCert = null;
+        try {
+            if (derCertData != null) {
+                serverCert = (X509Certificate) CertificateFactory.getInstance("X.509")
+                        .generateCertificate(new ByteArrayInputStream(derCertData));
+            }
+        } catch (CertificateException e) {
+            e.printStackTrace();
+        }
 
         if (appId == StreamConfiguration.INVALID_APP_ID) {
             finish();
@@ -386,7 +408,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 .build();
 
         // Initialize the connection
-        conn = new NvConnection(host, uniqueId, config, PlatformBinding.getCryptoProvider(this));
+        conn = new NvConnection(host, uniqueId, config, PlatformBinding.getCryptoProvider(this), serverCert);
         controllerHandler = new ControllerHandler(this, conn, this, prefConfig);
 
         InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
@@ -407,7 +429,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
         if (prefConfig.onscreenController) {
             // create virtual onscreen controller
-            virtualController = new VirtualController(conn,
+            virtualController = new VirtualController(controllerHandler,
                     (FrameLayout)streamView.getParent(),
                     this);
             virtualController.refreshLayout();
@@ -891,7 +913,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 return false;
             }
 
-            conn.sendKeyboardInput(translated, KeyboardPacket.KEY_DOWN, getModifierState(event));
+            byte modifiers = getModifierState(event);
+            if (KeyboardTranslator.needsShift(event.getKeyCode())) {
+                modifiers |= KeyboardPacket.MODIFIER_SHIFT;
+                conn.sendKeyboardInput((short) 0x8010, KeyboardPacket.KEY_DOWN, modifiers);
+            }
+            conn.sendKeyboardInput(translated, KeyboardPacket.KEY_DOWN, modifiers);
         }
 
         return true;
@@ -942,7 +969,14 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 return false;
             }
 
-            conn.sendKeyboardInput(translated, KeyboardPacket.KEY_UP, getModifierState(event));
+            byte modifiers = getModifierState(event);
+            if (KeyboardTranslator.needsShift(event.getKeyCode())) {
+                modifiers |= KeyboardPacket.MODIFIER_SHIFT;
+            }
+            conn.sendKeyboardInput(translated, KeyboardPacket.KEY_UP, modifiers);
+            if (KeyboardTranslator.needsShift(event.getKeyCode())) {
+                conn.sendKeyboardInput((short) 0x8010, KeyboardPacket.KEY_UP, getModifierState(event));
+            }
         }
 
         return true;
@@ -1238,6 +1272,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         if (connecting || connected) {
             connecting = connected = false;
 
+            controllerHandler.stop();
+
             // Stop may take a few hundred ms to do some network I/O to tell
             // the server we're going away and clean up. Let it run in a separate
             // thread to keep things smooth for the UI. Inside moonlight-common,
@@ -1293,8 +1329,41 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                     LimeLog.severe("Connection terminated: " + errorCode);
                     stopConnection();
 
-                    Dialog.displayDialog(Game.this, getResources().getString(R.string.conn_terminated_title),
-                            getResources().getString(R.string.conn_terminated_msg), true);
+                    // Display the error dialog if it was an unexpected termination.
+                    // Otherwise, just finish the activity immediately.
+                    if (errorCode != 0) {
+                        Dialog.displayDialog(Game.this, getResources().getString(R.string.conn_terminated_title),
+                                getResources().getString(R.string.conn_terminated_msg), true);
+                    }
+                    else {
+                        finish();
+                    }
+                }
+            }
+        });
+    }
+
+    @Override
+    public void connectionStatusUpdate(final int connectionStatus) {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (prefConfig.disableWarnings) {
+                    return;
+                }
+
+                if (connectionStatus == MoonBridge.CONN_STATUS_POOR) {
+                    if (prefConfig.bitrate > 5000) {
+                        notificationOverlayView.setText(getResources().getString(R.string.slow_connection_msg));
+                    }
+                    else {
+                        notificationOverlayView.setText(getResources().getString(R.string.poor_connection_msg));
+                    }
+
+                    notificationOverlayView.setVisibility(View.VISIBLE);
+                }
+                else if (connectionStatus == MoonBridge.CONN_STATUS_OKAY) {
+                    notificationOverlayView.setVisibility(View.GONE);
                 }
             }
         });
@@ -1313,10 +1382,18 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 connected = true;
                 connecting = false;
 
-                // Hide the mouse cursor now. Doing it before
-                // dismissing the spinner seems to be undone
-                // when the spinner gets displayed.
-                inputCaptureProvider.enableCapture();
+                // Hide the mouse cursor now after a short delay.
+                // Doing it before dismissing the spinner seems to be undone
+                // when the spinner gets displayed. On Android Q, even now
+                // is too early to capture. We will delay a second to allow
+                // the spinner to dismiss before capturing.
+                Handler h = new Handler();
+                h.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        inputCaptureProvider.enableCapture();
+                    }
+                }, 1000);
 
                 // Keep the display on
                 getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
@@ -1348,6 +1425,13 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         }
     }
 
+    @Override
+    public void rumble(short controllerNumber, short lowFreqMotor, short highFreqMotor) {
+        LimeLog.info(String.format((Locale)null, "Rumble on gamepad %d: %04x %04x", controllerNumber, lowFreqMotor, highFreqMotor));
+
+        controllerHandler.handleRumble(controllerNumber, lowFreqMotor, highFreqMotor);
+    }
+
     @Override
     public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
         if (!surfaceCreated) {

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

@@ -53,6 +53,8 @@ import android.widget.RelativeLayout;
 import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 
+import org.xmlpull.v1.XmlPullParserException;
+
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.opengles.GL10;
 
@@ -373,9 +375,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
                     httpConn = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer),
                             managerBinder.getUniqueId(),
-                            PlatformBinding.getDeviceName(),
+                            computer.serverCert,
                             PlatformBinding.getCryptoProvider(PcView.this));
-                    if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
+                    if (httpConn.getPairState() == PairState.PAIRED) {
                         // Don't display any toast, but open the app list
                         message = null;
                         success = true;
@@ -387,21 +389,26 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                         Dialog.displayDialog(PcView.this, getResources().getString(R.string.pair_pairing_title),
                                 getResources().getString(R.string.pair_pairing_msg)+" "+pinStr, false);
 
-                        PairingManager.PairState pairState = httpConn.pair(httpConn.getServerInfo(), pinStr);
-                        if (pairState == PairingManager.PairState.PIN_WRONG) {
+                        PairingManager pm = httpConn.getPairingManager();
+
+                        PairState pairState = pm.pair(httpConn.getServerInfo(), pinStr);
+                        if (pairState == PairState.PIN_WRONG) {
                             message = getResources().getString(R.string.pair_incorrect_pin);
                         }
-                        else if (pairState == PairingManager.PairState.FAILED) {
+                        else if (pairState == PairState.FAILED) {
                             message = getResources().getString(R.string.pair_fail);
                         }
-                        else if (pairState == PairingManager.PairState.ALREADY_IN_PROGRESS) {
+                        else if (pairState == PairState.ALREADY_IN_PROGRESS) {
                             message = getResources().getString(R.string.pair_already_in_progress);
                         }
-                        else if (pairState == PairingManager.PairState.PAIRED) {
+                        else if (pairState == PairState.PAIRED) {
                             // Just navigate to the app view without displaying a toast
                             message = null;
                             success = true;
 
+                            // Pin this certificate for later HTTPS use
+                            managerBinder.getComputer(computer.uuid).serverCert = pm.getPairedCert();
+
                             // Invalidate reachability information after pairing to force
                             // a refresh before reading pair state again
                             managerBinder.invalidateStateForComputer(computer.uuid);
@@ -415,7 +422,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                     message = getResources().getString(R.string.error_unknown_host);
                 } catch (FileNotFoundException e) {
                     message = getResources().getString(R.string.error_404);
-                } catch (Exception e) {
+                } catch (XmlPullParserException | IOException e) {
                     e.printStackTrace();
                     message = e.getMessage();
                 }
@@ -498,7 +505,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 try {
                     httpConn = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer),
                             managerBinder.getUniqueId(),
-                            PlatformBinding.getDeviceName(),
+                            computer.serverCert,
                             PlatformBinding.getCryptoProvider(PcView.this));
                     if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
                         httpConn.unpair();
@@ -516,8 +523,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                     message = getResources().getString(R.string.error_unknown_host);
                 } catch (FileNotFoundException e) {
                     message = getResources().getString(R.string.error_404);
-                } catch (Exception e) {
+                } catch (XmlPullParserException | IOException e) {
                     message = e.getMessage();
+                    e.printStackTrace();
                 }
 
                 final String toastMessage = message;
@@ -543,7 +551,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
         Intent i = new Intent(this, AppView.class);
         i.putExtra(AppView.NAME_EXTRA, computer.name);
-        i.putExtra(AppView.UUID_EXTRA, computer.uuid.toString());
+        i.putExtra(AppView.UUID_EXTRA, computer.uuid);
         startActivity(i);
     }
 
@@ -605,8 +613,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                 UiHelper.displayQuitConfirmationDialog(this, new Runnable() {
                     @Override
                     public void run() {
-                        ServerHelper.doQuit(PcView.this,
-                                ServerHelper.getCurrentAddressFromComputer(computer.details),
+                        ServerHelper.doQuit(PcView.this, computer.details,
                                 new NvApp("app", 0, false), managerBinder, null);
                     }
                 }, null);
@@ -627,7 +634,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
             if (details.equals(computer.details)) {
                 // Disable or delete shortcuts referencing this PC
-                shortcutHelper.disableShortcut(details.uuid.toString(),
+                shortcutHelper.disableShortcut(details.uuid,
                         getResources().getString(R.string.scut_deleted_pc));
 
                 pcGridAdapter.removeComputer(computer);
@@ -658,7 +665,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
 
         // Add a launcher shortcut for this PC
         if (details.pairState == PairState.PAIRED) {
-            shortcutHelper.createAppViewShortcut(details.uuid.toString(), details, false);
+            shortcutHelper.createAppViewShortcut(details.uuid, details, false);
         }
 
         if (existingEntry != null) {

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

@@ -48,7 +48,7 @@ public class ShortcutTrampoline extends Activity {
                     managerBinder = localBinder;
 
                     // Get the computer object
-                    computer = managerBinder.getComputer(UUID.fromString(uuidString));
+                    computer = managerBinder.getComputer(uuidString);
 
                     if (computer == null) {
                         Dialog.displayDialog(ShortcutTrampoline.this,
@@ -77,7 +77,7 @@ public class ShortcutTrampoline extends Activity {
                         @Override
                         public void notifyComputerUpdated(final ComputerDetails details) {
                             // Don't care about other computers
-                            if (!details.uuid.toString().equalsIgnoreCase(uuidString)) {
+                            if (!details.uuid.equalsIgnoreCase(uuidString)) {
                                 return;
                             }
 
@@ -200,6 +200,14 @@ public class ShortcutTrampoline extends Activity {
 
     protected boolean validateInput() {
         // Validate UUID
+        if (uuidString == null) {
+            Dialog.displayDialog(ShortcutTrampoline.this,
+                    getResources().getString(R.string.conn_error_title),
+                    getResources().getString(R.string.scut_invalid_uuid),
+                    true);
+            return false;
+        }
+
         try {
             UUID.fromString(uuidString);
         } catch (IllegalArgumentException ex) {

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

@@ -168,8 +168,17 @@ public class AndroidAudioRenderer implements AudioRenderer {
     }
 
     @Override
-    public void playDecodedAudio(byte[] audioData) {
-        track.write(audioData, 0, audioData.length);
+    public void playDecodedAudio(short[] audioData) {
+        // Only queue up to 40 ms of pending audio data in addition to what AudioTrack is buffering for us.
+        if (MoonBridge.getPendingAudioFrames() < 8) {
+            // This will block until the write is completed. That can cause a backlog
+            // of pending audio data, so we do the above check to be able to bound
+            // latency at 40 ms in that situation.
+            track.write(audioData, 0, audioData.length);
+        }
+        else {
+            LimeLog.info("Too many pending audio frames: " + MoonBridge.getPendingAudioFrames());
+        }
     }
 
     @Override

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

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

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

@@ -4,8 +4,11 @@ import android.content.Context;
 import android.hardware.input.InputManager;
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbManager;
+import android.media.AudioAttributes;
 import android.os.Build;
 import android.os.SystemClock;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
 import android.util.SparseArray;
 import android.view.InputDevice;
 import android.view.InputEvent;
@@ -14,6 +17,7 @@ import android.view.MotionEvent;
 import android.widget.Toast;
 
 import com.limelight.LimeLog;
+import com.limelight.binding.input.driver.AbstractController;
 import com.limelight.binding.input.driver.UsbDriverListener;
 import com.limelight.binding.input.driver.UsbDriverService;
 import com.limelight.nvstream.NvConnection;
@@ -51,6 +55,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     private final double stickDeadzone;
     private final InputDeviceContext defaultContext = new InputDeviceContext();
     private final GameGestures gestures;
+    private final Vibrator deviceVibrator;
     private boolean hasGameController;
 
     private final PreferenceConfiguration prefConfig;
@@ -61,10 +66,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         this.conn = conn;
         this.gestures = gestures;
         this.prefConfig = prefConfig;
+        this.deviceVibrator = (Vibrator) activityContext.getSystemService(Context.VIBRATOR_SERVICE);
 
-        // HACK: For now we're hardcoding a 10% deadzone. Some deadzone
+        // HACK: For now we're hardcoding a 7% deadzone. Some deadzone
         // is required for controller batching support to work.
-        int deadzonePercentage = 10;
+        int deadzonePercentage = 7;
 
         int[] ids = InputDevice.getDeviceIds();
         for (int id : ids) {
@@ -151,6 +157,18 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         onInputDeviceAdded(deviceId);
     }
 
+    public void stop() {
+        for (int i = 0; i < inputDeviceContexts.size(); i++) {
+            InputDeviceContext deviceContext = inputDeviceContexts.valueAt(i);
+
+            if (deviceContext.vibrator != null) {
+                deviceContext.vibrator.cancel();
+            }
+        }
+
+        deviceVibrator.cancel();
+    }
+
     private static boolean hasJoystickAxes(InputDevice device) {
         return (device.getSources() & InputDevice.SOURCE_JOYSTICK) == InputDevice.SOURCE_JOYSTICK &&
                 getMotionRangeForJoystickAxis(device, MotionEvent.AXIS_X) != null &&
@@ -206,6 +224,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
             }
         }
 
+        if (PreferenceConfiguration.readPreferences(context).onscreenController) {
+            LimeLog.info("Counting OSC gamepad");
+            mask |= 1;
+        }
+
         LimeLog.info("Enumerated "+count+" gamepads");
         return mask;
     }
@@ -298,10 +321,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         context.assignedControllerNumber = true;
     }
 
-    private UsbDeviceContext createUsbDeviceContextForDevice(int deviceId) {
+    private UsbDeviceContext createUsbDeviceContextForDevice(AbstractController device) {
         UsbDeviceContext context = new UsbDeviceContext();
 
-        context.id = deviceId;
+        context.id = device.getControllerId();
+        context.device = device;
 
         context.leftStickDeadzoneRadius = (float) stickDeadzone;
         context.rightStickDeadzoneRadius = (float) stickDeadzone;
@@ -393,6 +417,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         context.name = devName;
         context.id = dev.getId();
 
+        if (dev.getVibrator().hasVibrator()) {
+            context.vibrator = dev.getVibrator();
+        }
+
         context.leftStickXAxis = MotionEvent.AXIS_X;
         context.leftStickYAxis = MotionEvent.AXIS_Y;
         if (getMotionRangeForJoystickAxis(dev, context.leftStickXAxis) != null &&
@@ -614,7 +642,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
 
     private short getActiveControllerMask() {
         if (prefConfig.multiController) {
-            return (short)(currentControllers | initialControllers);
+            return (short)(currentControllers | initialControllers | (prefConfig.onscreenController ? 1 : 0));
         }
         else {
             // Only Player 1 is active with multi-controller disabled
@@ -1043,6 +1071,94 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         }
     }
 
+    private void rumbleVibrator(Vibrator vibrator, short lowFreqMotor, short highFreqMotor) {
+        // Since we can only use a single amplitude value, compute the desired amplitude
+        // by taking 80% of the big motor and 33% of the small motor, then capping to 255.
+        // NB: This value is now 0-255 as required by VibrationEffect.
+        short lowFreqMotorMSB = (short)((lowFreqMotor >> 8) & 0xFF);
+        short highFreqMotorMSB = (short)((highFreqMotor >> 8) & 0xFF);
+        int simulatedAmplitude = Math.min(255, (int)((lowFreqMotorMSB * 0.80) + (highFreqMotorMSB * 0.33)));
+
+        if (simulatedAmplitude == 0) {
+            // This case is easy - just cancel the current effect and get out.
+            // NB: We cannot simply check lowFreqMotor == highFreqMotor == 0
+            // because our simulatedAmplitude could be 0 even though our inputs
+            // are not (ex: lowFreqMotor == 0 && highFreqMotor == 1).
+            vibrator.cancel();
+            return;
+        }
+
+        // Attempt to use amplitude-based control if we're on Oreo and the device
+        // supports amplitude-based vibration control.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (vibrator.hasAmplitudeControl()) {
+                VibrationEffect effect = VibrationEffect.createOneShot(60000, simulatedAmplitude);
+                AudioAttributes audioAttributes = new AudioAttributes.Builder()
+                        .setUsage(AudioAttributes.USAGE_GAME)
+                        .build();
+                vibrator.vibrate(effect, audioAttributes);
+                return;
+            }
+        }
+
+        // If we reach this point, we don't have amplitude controls available, so
+        // we must emulate it by PWMing the vibration. Ick.
+        long pwmPeriod = 20;
+        long onTime = (long)((simulatedAmplitude / 255.0) * pwmPeriod);
+        long offTime = pwmPeriod - onTime;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            AudioAttributes audioAttributes = new AudioAttributes.Builder()
+                    .setUsage(AudioAttributes.USAGE_GAME)
+                    .build();
+            vibrator.vibrate(new long[]{0, onTime, offTime}, 0, audioAttributes);
+        }
+        else {
+            vibrator.vibrate(new long[]{0, onTime, offTime}, 0);
+        }
+    }
+
+    public void handleRumble(short controllerNumber, short lowFreqMotor, short highFreqMotor) {
+        boolean foundMatchingDevice = false;
+        boolean vibrated = false;
+
+        for (int i = 0; i < inputDeviceContexts.size(); i++) {
+            InputDeviceContext deviceContext = inputDeviceContexts.valueAt(i);
+
+            if (deviceContext.controllerNumber == controllerNumber) {
+                foundMatchingDevice = true;
+
+                if (deviceContext.vibrator != null) {
+                    vibrated = true;
+                    rumbleVibrator(deviceContext.vibrator, lowFreqMotor, highFreqMotor);
+                }
+            }
+        }
+
+        for (int i = 0; i < usbDeviceContexts.size(); i++) {
+            UsbDeviceContext deviceContext = usbDeviceContexts.valueAt(i);
+
+            if (deviceContext.controllerNumber == controllerNumber) {
+                foundMatchingDevice = vibrated = true;
+                deviceContext.device.rumble((short)lowFreqMotor, (short)highFreqMotor);
+            }
+        }
+
+        // We may decide to rumble the device for player 1
+        if (controllerNumber == 0) {
+            // If we didn't find a matching device, it must be the on-screen
+            // controls that triggered the rumble. Vibrate the device if
+            // the user has requested that behavior.
+            if (!foundMatchingDevice && prefConfig.onscreenController && !prefConfig.onlyL3R3 && prefConfig.vibrateOsc) {
+                rumbleVibrator(deviceVibrator, lowFreqMotor, highFreqMotor);
+            }
+            else if (foundMatchingDevice && !vibrated && prefConfig.vibrateFallbackToDevice) {
+                // We found a device to vibrate but it didn't have rumble support. The user
+                // has requested us to vibrate the device in this case.
+                rumbleVibrator(deviceVibrator, lowFreqMotor, highFreqMotor);
+            }
+        }
+    }
+
     public boolean handleButtonUp(KeyEvent event) {
         InputDeviceContext context = getContextForEvent(event);
         if (context == null) {
@@ -1294,12 +1410,30 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         return true;
     }
 
+    public void reportOscState(short buttonFlags,
+                               short leftStickX, short leftStickY,
+                               short rightStickX, short rightStickY,
+                               byte leftTrigger, byte rightTrigger) {
+        defaultContext.leftStickX = leftStickX;
+        defaultContext.leftStickY = leftStickY;
+
+        defaultContext.rightStickX = rightStickX;
+        defaultContext.rightStickY = rightStickY;
+
+        defaultContext.leftTrigger = leftTrigger;
+        defaultContext.rightTrigger = rightTrigger;
+
+        defaultContext.inputMap = buttonFlags;
+
+        sendControllerInputPacket(defaultContext);
+    }
+
     @Override
     public void reportControllerState(int controllerId, short buttonFlags,
                                       float leftStickX, float leftStickY,
                                       float rightStickX, float rightStickY,
                                       float leftTrigger, float rightTrigger) {
-        UsbDeviceContext context = usbDeviceContexts.get(controllerId);
+        GenericControllerContext context = usbDeviceContexts.get(controllerId);
         if (context == null) {
             return;
         }
@@ -1334,19 +1468,19 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
     }
 
     @Override
-    public void deviceRemoved(int controllerId) {
-        UsbDeviceContext context = usbDeviceContexts.get(controllerId);
+    public void deviceRemoved(AbstractController controller) {
+        UsbDeviceContext context = usbDeviceContexts.get(controller.getControllerId());
         if (context != null) {
-            LimeLog.info("Removed controller: "+controllerId);
+            LimeLog.info("Removed controller: "+controller.getControllerId());
             releaseControllerNumber(context);
-            usbDeviceContexts.remove(controllerId);
+            usbDeviceContexts.remove(controller.getControllerId());
         }
     }
 
     @Override
-    public void deviceAdded(int controllerId) {
-        UsbDeviceContext context = createUsbDeviceContextForDevice(controllerId);
-        usbDeviceContexts.put(controllerId, context);
+    public void deviceAdded(AbstractController controller) {
+        UsbDeviceContext context = createUsbDeviceContextForDevice(controller);
+        usbDeviceContexts.put(controller.getControllerId(), context);
     }
 
     class GenericControllerContext {
@@ -1375,6 +1509,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
 
     class InputDeviceContext extends GenericControllerContext {
         public String name;
+        public Vibrator vibrator;
 
         public int leftStickXAxis = -1;
         public int leftStickYAxis = -1;
@@ -1412,5 +1547,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
         public long startDownTime = 0;
     }
 
-    class UsbDeviceContext extends GenericControllerContext {}
+    class UsbDeviceContext extends GenericControllerContext {
+        public AbstractController device;
+    }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -13,6 +13,7 @@ import android.widget.RelativeLayout;
 import android.widget.Toast;
 
 import com.limelight.R;
+import com.limelight.binding.input.ControllerHandler;
 import com.limelight.nvstream.NvConnection;
 
 import java.util.ArrayList;
@@ -38,7 +39,7 @@ public class VirtualController {
 
     private static final boolean _PRINT_DEBUG_INFORMATION = false;
 
-    private NvConnection connection = null;
+    private ControllerHandler controllerHandler;
     private Context context = null;
 
     private FrameLayout frame_layout = null;
@@ -53,8 +54,8 @@ public class VirtualController {
 
     private List<VirtualControllerElement> elements = new ArrayList<>();
 
-    public VirtualController(final NvConnection conn, FrameLayout layout, final Context context) {
-        this.connection = conn;
+    public VirtualController(final ControllerHandler controllerHandler, FrameLayout layout, final Context context) {
+        this.controllerHandler = controllerHandler;
         this.frame_layout = layout;
         this.context = context;
 
@@ -167,26 +168,22 @@ public class VirtualController {
     }
 
     void sendControllerInputContext() {
-        try {
-            _DBG("INPUT_MAP + " + inputContext.inputMap);
-            _DBG("LEFT_TRIGGER " + inputContext.leftTrigger);
-            _DBG("RIGHT_TRIGGER " + inputContext.rightTrigger);
-            _DBG("LEFT STICK X: " + inputContext.leftStickX + " Y: " + inputContext.leftStickY);
-            _DBG("RIGHT STICK X: " + inputContext.rightStickX + " Y: " + inputContext.rightStickY);
+        _DBG("INPUT_MAP + " + inputContext.inputMap);
+        _DBG("LEFT_TRIGGER " + inputContext.leftTrigger);
+        _DBG("RIGHT_TRIGGER " + inputContext.rightTrigger);
+        _DBG("LEFT STICK X: " + inputContext.leftStickX + " Y: " + inputContext.leftStickY);
+        _DBG("RIGHT STICK X: " + inputContext.rightStickX + " Y: " + inputContext.rightStickY);
 
-            if (connection != null) {
-                connection.sendControllerInput(
-                        inputContext.inputMap,
-                        inputContext.leftTrigger,
-                        inputContext.rightTrigger,
-                        inputContext.leftStickX,
-                        inputContext.leftStickY,
-                        inputContext.rightStickX,
-                        inputContext.rightStickY
-                );
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
+        if (controllerHandler != null) {
+            controllerHandler.reportOscState(
+                    inputContext.inputMap,
+                    inputContext.leftStickX,
+                    inputContext.leftStickY,
+                    inputContext.rightStickX,
+                    inputContext.rightStickY,
+                    inputContext.leftTrigger,
+                    inputContext.rightTrigger
+            );
         }
     }
 }

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

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

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

@@ -1,11 +1,14 @@
 package com.limelight.computers;
 
+import java.io.ByteArrayInputStream;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
-import java.util.UUID;
 
-import com.limelight.LimeLog;
 import com.limelight.nvstream.http.ComputerDetails;
 
 import android.content.ContentValues;
@@ -23,6 +26,7 @@ public class ComputerDatabaseManager {
     private static final String REMOTE_ADDRESS_COLUMN_NAME = "RemoteAddress";
     private static final String MANUAL_ADDRESS_COLUMN_NAME = "ManualAddress";
     private static final String MAC_ADDRESS_COLUMN_NAME = "MacAddress";
+    private static final String SERVER_CERT_COLUMN_NAME = "ServerCert";
 
     private SQLiteDatabase computerDb;
 
@@ -43,13 +47,21 @@ public class ComputerDatabaseManager {
     }
 
     private void initializeDb(Context c) {
+        // Add cert column to the table if not present
+        try {
+            computerDb.execSQL(String.format((Locale)null,
+                    "ALTER TABLE %s ADD COLUMN %s TEXT",
+                    COMPUTER_TABLE_NAME, SERVER_CERT_COLUMN_NAME));
+        } catch (SQLiteException e) {}
+
+
         // Create tables if they aren't already there
         computerDb.execSQL(String.format((Locale)null,
-                "CREATE TABLE IF NOT EXISTS %s(%s TEXT PRIMARY KEY, %s TEXT NOT NULL, %s TEXT, %s TEXT, %s TEXT, %s TEXT)",
+                "CREATE TABLE IF NOT EXISTS %s(%s TEXT PRIMARY KEY, %s TEXT NOT NULL, %s TEXT, %s TEXT, %s TEXT, %s TEXT, %s TEXT)",
                 COMPUTER_TABLE_NAME,
                 COMPUTER_UUID_COLUMN_NAME, COMPUTER_NAME_COLUMN_NAME,
                 LOCAL_ADDRESS_COLUMN_NAME, REMOTE_ADDRESS_COLUMN_NAME, MANUAL_ADDRESS_COLUMN_NAME,
-                MAC_ADDRESS_COLUMN_NAME));
+                MAC_ADDRESS_COLUMN_NAME, SERVER_CERT_COLUMN_NAME));
 
         // Move all computers from the old DB (if any) to the new one
         List<ComputerDetails> oldComputers = LegacyDatabaseReader.migrateAllComputers(c);
@@ -64,32 +76,47 @@ public class ComputerDatabaseManager {
 
     public boolean updateComputer(ComputerDetails details) {
         ContentValues values = new ContentValues();
-        values.put(COMPUTER_UUID_COLUMN_NAME, details.uuid.toString());
+        values.put(COMPUTER_UUID_COLUMN_NAME, details.uuid);
         values.put(COMPUTER_NAME_COLUMN_NAME, details.name);
         values.put(LOCAL_ADDRESS_COLUMN_NAME, details.localAddress);
         values.put(REMOTE_ADDRESS_COLUMN_NAME, details.remoteAddress);
         values.put(MANUAL_ADDRESS_COLUMN_NAME, details.manualAddress);
         values.put(MAC_ADDRESS_COLUMN_NAME, details.macAddress);
+        try {
+            if (details.serverCert != null) {
+                values.put(SERVER_CERT_COLUMN_NAME, details.serverCert.getEncoded());
+            }
+            else {
+                values.put(SERVER_CERT_COLUMN_NAME, (byte[])null);
+            }
+        } catch (CertificateEncodingException e) {
+            values.put(SERVER_CERT_COLUMN_NAME, (byte[])null);
+            e.printStackTrace();
+        }
         return -1 != computerDb.insertWithOnConflict(COMPUTER_TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
     }
 
     private ComputerDetails getComputerFromCursor(Cursor c) {
         ComputerDetails details = new ComputerDetails();
 
-        String uuidStr = c.getString(0);
-        try {
-            details.uuid = UUID.fromString(uuidStr);
-        } catch (IllegalArgumentException e) {
-            // We'll delete this entry
-            LimeLog.severe("DB: Corrupted UUID for "+details.name);
-        }
-
+        details.uuid = c.getString(0);
         details.name = c.getString(1);
         details.localAddress = c.getString(2);
         details.remoteAddress = c.getString(3);
         details.manualAddress = c.getString(4);
         details.macAddress = c.getString(5);
 
+        try {
+            byte[] derCertData = c.getBlob(6);
+
+            if (derCertData != null) {
+                details.serverCert = (X509Certificate) CertificateFactory.getInstance("X.509")
+                        .generateCertificate(new ByteArrayInputStream(derCertData));
+            }
+        } catch (CertificateException e) {
+            e.printStackTrace();
+        }
+
         // This signifies we don't have dynamic state (like pair state)
         details.state = ComputerDetails.State.UNKNOWN;
 
@@ -115,8 +142,8 @@ public class ComputerDatabaseManager {
         return computerList;
     }
 
-    public ComputerDetails getComputerByUUID(UUID uuid) {
-        Cursor c = computerDb.query(COMPUTER_TABLE_NAME, null, COMPUTER_UUID_COLUMN_NAME+"=?", new String[]{ uuid.toString() }, null, null, null);
+    public ComputerDetails getComputerByUUID(String uuid) {
+        Cursor c = computerDb.query(COMPUTER_TABLE_NAME, null, COMPUTER_UUID_COLUMN_NAME+"=?", new String[]{ uuid }, null, null, null);
         if (!c.moveToFirst()) {
             // No matching computer
             c.close();

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

@@ -8,7 +8,6 @@ import java.net.Socket;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.limelight.LimeLog;
@@ -18,6 +17,7 @@ import com.limelight.nvstream.NvConnection;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
+import com.limelight.nvstream.http.PairingManager;
 import com.limelight.nvstream.mdns.MdnsComputer;
 import com.limelight.nvstream.mdns.MdnsDiscoveryListener;
 import com.limelight.utils.CacheHelper;
@@ -241,7 +241,7 @@ public class ComputerManagerService extends Service {
             return idManager.getUniqueId();
         }
 
-        public ComputerDetails getComputer(UUID uuid) {
+        public ComputerDetails getComputer(String uuid) {
             synchronized (pollingTuples) {
                 for (PollingTuple tuple : pollingTuples) {
                     if (uuid.equals(tuple.computer.uuid)) {
@@ -253,7 +253,7 @@ public class ComputerManagerService extends Service {
             return null;
         }
 
-        public void invalidateStateForComputer(UUID uuid) {
+        public void invalidateStateForComputer(String uuid) {
             synchronized (pollingTuples) {
                 for (PollingTuple tuple : pollingTuples) {
                     if (uuid.equals(tuple.computer.uuid)) {
@@ -360,12 +360,28 @@ public class ComputerManagerService extends Service {
             // Since we're on the same network, we can use STUN to find
             // our WAN address, which is also very likely the WAN address
             // of the PC. We can use this later to connect remotely.
-            fakeDetails.remoteAddress = NvConnection.findExternalAddressForMdns();
+            fakeDetails.remoteAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
         }
 
         // Block while we try to fill the details
         try {
-            runPoll(fakeDetails, true, 0);
+            // We cannot use runPoll() here because it will attempt to persist the state of the machine
+            // in the database, which would be bad because we don't have our pinned cert loaded yet.
+            if (pollComputer(fakeDetails)) {
+                // See if we have record of this PC to pull its pinned cert
+                synchronized (pollingTuples) {
+                    for (PollingTuple tuple : pollingTuples) {
+                        if (tuple.computer.uuid.equals(fakeDetails.uuid)) {
+                            fakeDetails.serverCert = tuple.computer.serverCert;
+                            break;
+                        }
+                    }
+                }
+
+                // Poll again, possibly with the pinned cert, to get accurate pairing information.
+                // This will insert the host into the database too.
+                runPoll(fakeDetails, true, 0);
+            }
         } catch (InterruptedException e) {
             return false;
         }
@@ -435,14 +451,18 @@ public class ComputerManagerService extends Service {
         }
 
         try {
-            NvHTTP http = new NvHTTP(address, idManager.getUniqueId(),
-                    null, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
+            NvHTTP http = new NvHTTP(address, idManager.getUniqueId(), details.serverCert,
+                    PlatformBinding.getCryptoProvider(ComputerManagerService.this));
 
             ComputerDetails newDetails = http.getComputerDetails();
 
             // Check if this is the PC we expected
-            if (details.uuid != null && newDetails.uuid != null &&
-                    !details.uuid.equals(newDetails.uuid)) {
+            if (newDetails.uuid == null) {
+                LimeLog.severe("Polling returned no UUID!");
+                return null;
+            }
+            // details.uuid can be null on initial PC add
+            else if (details.uuid != null && !details.uuid.equals(newDetails.uuid)) {
                 // We got the wrong PC!
                 LimeLog.info("Polling returned the wrong PC!");
                 return null;
@@ -452,7 +472,8 @@ public class ComputerManagerService extends Service {
             newDetails.activeAddress = address;
 
             return newDetails;
-        } catch (Exception e) {
+        } catch (XmlPullParserException | IOException e) {
+            e.printStackTrace();
             return null;
         }
     }
@@ -681,8 +702,9 @@ public class ComputerManagerService extends Service {
                 public void run() {
                     int emptyAppListResponses = 0;
                     do {
-                        // Can't poll if it's not online
-                        if (computer.state != ComputerDetails.State.ONLINE) {
+                        // Can't poll if it's not online or paired
+                        if (computer.state != ComputerDetails.State.ONLINE ||
+                                computer.pairState != PairingManager.PairState.PAIRED) {
                             if (listener != null) {
                                 listener.notifyComputerUpdated(computer);
                             }
@@ -698,7 +720,7 @@ public class ComputerManagerService extends Service {
 
                         try {
                             NvHTTP http = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer), idManager.getUniqueId(),
-                                    null, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
+                                    computer.serverCert, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
 
                             String appList;
                             if (tuple != null) {
@@ -722,12 +744,12 @@ public class ComputerManagerService extends Service {
                                 // in a row, we'll go ahead and believe it.
                                 emptyAppListResponses++;
                             }
-                            if (appList != null && !appList.isEmpty() &&
+                            if (!appList.isEmpty() &&
                                     (!list.isEmpty() || emptyAppListResponses >= EMPTY_LIST_THRESHOLD)) {
                                 // Open the cache file
                                 OutputStream cacheOut = null;
                                 try {
-                                    cacheOut = CacheHelper.openCacheFileForOutput(getCacheDir(), "applist", computer.uuid.toString());
+                                    cacheOut = CacheHelper.openCacheFileForOutput(getCacheDir(), "applist", computer.uuid);
                                     CacheHelper.writeStringToOutputStream(cacheOut, appList);
                                 } catch (IOException e) {
                                     e.printStackTrace();
@@ -754,7 +776,7 @@ public class ComputerManagerService extends Service {
                                     listener.notifyComputerUpdated(computer);
                                 }
                             }
-                            else if (appList == null || appList.isEmpty()) {
+                            else if (appList.isEmpty()) {
                                 LimeLog.warning("Null app list received from "+computer.uuid);
                             }
                         } catch (IOException e) {

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

@@ -12,7 +12,6 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.UUID;
 
 public class LegacyDatabaseReader {
     private static final String COMPUTER_DB_NAME = "computers.db";
@@ -24,14 +23,7 @@ public class LegacyDatabaseReader {
         ComputerDetails details = new ComputerDetails();
 
         details.name = c.getString(0);
-
-        String uuidStr = c.getString(1);
-        try {
-            details.uuid = UUID.fromString(uuidStr);
-        } catch (IllegalArgumentException e) {
-            // We'll delete this entry
-            LimeLog.severe("DB: Corrupted UUID for " + details.name);
-        }
+        details.uuid = c.getString(1);
 
         // An earlier schema defined addresses as byte blobs. We'll
         // gracefully migrate those to strings so we can store DNS names

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

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

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

@@ -39,7 +39,7 @@ public class DiskAssetLoader {
     }
 
     public boolean checkCacheExists(CachedAppAssetLoader.LoaderTuple tuple) {
-        return CacheHelper.cacheFileExists(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
+        return CacheHelper.cacheFileExists(cacheDir, "boxart", tuple.computer.uuid, tuple.app.getAppId() + ".png");
     }
 
     // https://developer.android.com/topic/performance/graphics/load-bitmap.html
@@ -65,7 +65,7 @@ public class DiskAssetLoader {
     }
 
     public Bitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple, int sampleSize) {
-        File file = CacheHelper.openPath(false, cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
+        File file = CacheHelper.openPath(false, cacheDir, "boxart", tuple.computer.uuid, tuple.app.getAppId() + ".png");
 
         // Don't bother with anything if it doesn't exist
         if (!file.exists()) {
@@ -137,7 +137,7 @@ public class DiskAssetLoader {
         OutputStream out = null;
         boolean success = false;
         try {
-            out = CacheHelper.openCacheFileForOutput(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
+            out = CacheHelper.openCacheFileForOutput(cacheDir, "boxart", tuple.computer.uuid, tuple.app.getAppId() + ".png");
             CacheHelper.writeInputStreamToOutputStream(input, out, MAX_ASSET_SIZE);
             success = true;
         } catch (IOException e) {
@@ -151,7 +151,7 @@ public class DiskAssetLoader {
 
             if (!success) {
                 LimeLog.warning("Unable to populate cache with tuple: "+tuple);
-                CacheHelper.deleteCacheFile(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
+                CacheHelper.deleteCacheFile(cacheDir, "boxart", tuple.computer.uuid, tuple.app.getAppId() + ".png");
             }
         }
     }

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

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

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

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

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

@@ -91,14 +91,20 @@ public class AddComputerManually extends Activity {
     }
 
     private void doAddPc(String host) {
-        String msg;
         boolean wrongSiteLocal = false;
         boolean success;
 
         SpinnerDialog dialog = SpinnerDialog.displayDialog(this, getResources().getString(R.string.title_add_pc),
             getResources().getString(R.string.msg_add_pc), false);
 
-        success = managerBinder.addComputerBlocking(host, true);
+        try {
+            success = managerBinder.addComputerBlocking(host, true);
+        } catch (IllegalArgumentException e) {
+            // This can be thrown from OkHttp if the host fails to canonicalize to a valid name.
+            // https://github.com/square/okhttp/blob/okhttp_27/okhttp/src/main/java/com/squareup/okhttp/HttpUrl.java#L705
+            e.printStackTrace();
+            success = false;
+        }
         if (!success){
             wrongSiteLocal = isWrongSubnetSiteLocalAddress(host);
         }

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

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

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

@@ -35,6 +35,8 @@ public class PreferenceConfiguration {
     private static final String MOUSE_EMULATION_STRING = "checkbox_mouse_emulation";
     private static final String MOUSE_NAV_BUTTONS_STRING = "checkbox_mouse_nav_buttons";
     static final String UNLOCK_FPS_STRING = "checkbox_unlock_fps";
+    private static final String VIBRATE_OSC_PREF_STRING = "checkbox_vibrate_osc";
+    private static final String VIBRATE_FALLBACK_PREF_STRING = "checkbox_vibrate_fallback";
 
     static final String DEFAULT_RESOLUTION = "720p";
     static final String DEFAULT_FPS = "60";
@@ -58,6 +60,8 @@ public class PreferenceConfiguration {
     private static final boolean DEFAULT_MOUSE_EMULATION = true;
     private static final boolean DEFAULT_MOUSE_NAV_BUTTONS = false;
     private static final boolean DEFAULT_UNLOCK_FPS = false;
+    private static final boolean DEFAULT_VIBRATE_OSC = true;
+    private static final boolean DEFAULT_VIBRATE_FALLBACK = false;
 
     public static final int FORCE_H265_ON = -1;
     public static final int AUTOSELECT_H265 = 0;
@@ -79,11 +83,16 @@ public class PreferenceConfiguration {
     public boolean mouseEmulation;
     public boolean mouseNavButtons;
     public boolean unlockFps;
+    public boolean vibrateOsc;
+    public boolean vibrateFallbackToDevice;
 
     private static int getHeightFromResolutionString(String resString) {
         if (resString.equalsIgnoreCase("360p")) {
             return 360;
         }
+        else if (resString.equalsIgnoreCase("480p")) {
+            return 480;
+        }
         else if (resString.equalsIgnoreCase("720p")) {
             return 720;
         }
@@ -103,13 +112,22 @@ public class PreferenceConfiguration {
     }
 
     private static int getWidthFromResolutionString(String resString) {
-        return (getHeightFromResolutionString(resString) * 16) / 9;
+        int height = getHeightFromResolutionString(resString);
+        if (height == 480) {
+            // This isn't an exact 16:9 resolution
+            return 854;
+        }
+        else {
+            return (height * 16) / 9;
+        }
     }
 
     private static String getResolutionString(int width, int height) {
         switch (height) {
             case 360:
                 return "360p";
+            case 480:
+                return "480p";
             default:
             case 720:
                 return "720p";
@@ -139,6 +157,9 @@ public class PreferenceConfiguration {
         if (width * height <= 640 * 360) {
             return (int)(1000 * (fps / 30.0));
         }
+        else if (width * height <= 854 * 480) {
+            return (int)(1500 * (fps / 30.0));
+        }
         // This covers 1280x720 and 1280x800 too
         else if (width * height <= 1366 * 768) {
             return (int)(5000 * (fps / 30.0));
@@ -314,6 +335,8 @@ public class PreferenceConfiguration {
         config.mouseEmulation = prefs.getBoolean(MOUSE_EMULATION_STRING, DEFAULT_MOUSE_EMULATION);
         config.mouseNavButtons = prefs.getBoolean(MOUSE_NAV_BUTTONS_STRING, DEFAULT_MOUSE_NAV_BUTTONS);
         config.unlockFps = prefs.getBoolean(UNLOCK_FPS_STRING, DEFAULT_UNLOCK_FPS);
+        config.vibrateOsc = prefs.getBoolean(VIBRATE_OSC_PREF_STRING, DEFAULT_VIBRATE_OSC);
+        config.vibrateFallbackToDevice = prefs.getBoolean(VIBRATE_FALLBACK_PREF_STRING, DEFAULT_VIBRATE_FALLBACK);
 
         return config;
     }

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

@@ -13,8 +13,12 @@ import com.limelight.nvstream.http.GfeHttpResponseException;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
 
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.net.UnknownHostException;
+import java.security.cert.CertificateEncodingException;
 
 public class ServerHelper {
     public static String getCurrentAddressFromComputer(ComputerDetails computer) {
@@ -29,8 +33,15 @@ public class ServerHelper {
         intent.putExtra(Game.EXTRA_APP_ID, app.getAppId());
         intent.putExtra(Game.EXTRA_APP_HDR, app.isHdrSupported());
         intent.putExtra(Game.EXTRA_UNIQUEID, managerBinder.getUniqueId());
-        intent.putExtra(Game.EXTRA_PC_UUID, computer.uuid.toString());
+        intent.putExtra(Game.EXTRA_PC_UUID, computer.uuid);
         intent.putExtra(Game.EXTRA_PC_NAME, computer.name);
+        try {
+            if (computer.serverCert != null) {
+                intent.putExtra(Game.EXTRA_SERVER_CERT, computer.serverCert.getEncoded());
+            }
+        } catch (CertificateEncodingException e) {
+            e.printStackTrace();
+        }
         return intent;
     }
 
@@ -45,7 +56,7 @@ public class ServerHelper {
     }
 
     public static void doQuit(final Activity parent,
-                              final String address,
+                              final ComputerDetails computer,
                               final NvApp app,
                               final ComputerManagerService.ComputerManagerBinder managerBinder,
                               final Runnable onComplete) {
@@ -56,8 +67,8 @@ public class ServerHelper {
                 NvHTTP httpConn;
                 String message;
                 try {
-                    httpConn = new NvHTTP(address,
-                            managerBinder.getUniqueId(), null, PlatformBinding.getCryptoProvider(parent));
+                    httpConn = new NvHTTP(ServerHelper.getCurrentAddressFromComputer(computer),
+                            managerBinder.getUniqueId(), computer.serverCert, PlatformBinding.getCryptoProvider(parent));
                     if (httpConn.quitApp()) {
                         message = parent.getResources().getString(R.string.applist_quit_success) + " " + app.getAppName();
                     } else {
@@ -76,8 +87,9 @@ public class ServerHelper {
                     message = parent.getResources().getString(R.string.error_unknown_host);
                 } catch (FileNotFoundException e) {
                     message = parent.getResources().getString(R.string.error_404);
-                } catch (Exception e) {
+                } catch (IOException | XmlPullParserException e) {
                     message = e.getMessage();
+                    e.printStackTrace();
                 } finally {
                     if (onComplete != null) {
                         onComplete.run();

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

@@ -125,7 +125,7 @@ public class ShortcutHelper {
     }
 
     public void createAppViewShortcut(String id, ComputerDetails details, boolean forceAdd) {
-        createAppViewShortcut(id, details.name, details.uuid.toString(), forceAdd);
+        createAppViewShortcut(id, details.name, details.uuid, forceAdd);
     }
 
     @TargetApi(Build.VERSION_CODES.O)
@@ -158,7 +158,7 @@ public class ShortcutHelper {
     }
 
     public boolean createPinnedGameShortcut(String id, Bitmap iconBits, ComputerDetails cDetails, NvApp app) {
-        return createPinnedGameShortcut(id, iconBits, cDetails.name, cDetails.uuid.toString(), app.getAppName(), Integer.valueOf(app.getAppId()).toString());
+        return createPinnedGameShortcut(id, iconBits, cDetails.name, cDetails.uuid, app.getAppName(), Integer.valueOf(app.getAppId()).toString());
     }
 
     public void disableShortcut(String id, CharSequence reason) {

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

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

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

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

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

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

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

@@ -1,5 +1,6 @@
 <?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>
@@ -111,11 +112,15 @@
 
     <!-- Preferences -->
     <string name="category_basic_settings">Paramètres de base</string>
-    <string name="title_resolution_list">Sélectionner la résolution et les FPS à atteindre</string>
+    <string name="title_resolution_list">Résolution vidéo</string>
     <string name="summary_resolution_list">Le réglage de valeurs trop élevées pour votre appareil peut provoquer un retard ou un plantage</string>
+    <string name="title_fps_list">Fréquence d\'images vidéo</string>
+    <string name="summary_fps_list">Augmenter pour un flux vidéo plus lisse. Diminution pour de meilleures performances sur les périphériques bas de gamme.</string>
     <string name="title_seekbar_bitrate">Sélectionnez le bitrate vidéo à obtenir</string>
     <string name="summary_seekbar_bitrate">Bitrate inférieur pour réduire la saccade. Augmentez le bitrate pour augmenter la qualité de l\'image.</string>
     <string name="suffix_seekbar_bitrate">Kbps</string>
+    <string name="title_unlock_fps">Débloquer tous les taux d\'images possibles</string>
+    <string name="summary_unlock_fps">La diffusion en continu à 90 ou 120 FPS peut réduire la latence sur les périphériques haut de gamme, mais peut provoquer des retards ou des blocages sur les périphériques qui ne peuvent \pas le prendre en charge</string>
     <string name="title_checkbox_stretch_video">Étirez la vidéo en plein écran</string>
     <string name="title_checkbox_disable_warnings">Désactiver les messages d\'avertissement</string>
     <string name="summary_checkbox_disable_warnings">Désactiver les messages d\'avertissement de connexion à l\'écran pendant le streaming</string>
@@ -126,8 +131,11 @@
     <string name="title_checkbox_51_surround">Activer son surround 5.1</string>
     <string name="summary_checkbox_51_surround">Décochez si vous rencontrez des problèmes audio. Nécessite GFE 2.7 ou supérieur.</string>
 
+    <string name="category_input_settings">Paramètres d\'entrée</string>
     <string name="title_checkbox_multi_controller">Prise en charge de plusieurs contrôleurs</string>
     <string name="summary_checkbox_multi_controller">Lorsqu\'elle n\'est pas cochée, tous les contrôleurs sont regroupés</string>
+    <string name="title_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_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>
@@ -136,10 +144,14 @@
     <string name="summary_checkbox_usb_bind_all">Force le pilote USB de Moonlight à prendre en charge tous les gamepads Xbox pris en charge</string>
     <string name="title_checkbox_mouse_emulation">Emulation de la souris via le gamepad</string>
     <string name="summary_checkbox_mouse_emulation">Appuyez longuement sur le bouton Start pour faire basculer la manette de jeu en mode souris.</string>
+    <string name="title_checkbox_mouse_nav_buttons">Activer les boutons de souris arrière et avant</string>
+    <string name="summary_checkbox_mouse_nav_buttons">L\'activation de cette option peut entraîner un clic droit sur certains périphériques.</string>
 
     <string name="category_on_screen_controls_settings">Paramètres des contrôles à l\'écran</string>
     <string name="title_checkbox_show_onscreen_controls">Afficher les commandes à l\'écran</string>
     <string name="summary_checkbox_show_onscreen_controls">Afficher la superposition du contrôleur virtuel sur l\'écran tactile</string>
+    <string name="title_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="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>

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

@@ -97,27 +97,51 @@
     <string name="category_basic_settings"> 基本設置 </string>
     <string name="title_resolution_list"> 選擇目標解析度和幀數 </string>
     <string name="summary_resolution_list"> 過高的設定會引起串流卡頓甚至軟體閃退 </string>
-    <string name="title_seekbar_bitrate"> 選擇目標視頻碼率 </string>
+    <string name="title_fps_list">影像幀數</string>
+    <string name="summary_fps_list">增加以提供更流暢的影像串流. 減少以在較低的配備上獲得較好的效能.</string>
+    <string name="title_seekbar_bitrate"> 選擇目標影像碼率 </string>
     <string name="summary_seekbar_bitrate"> 低碼率減少卡頓，高碼率提高畫質 </string>
     <string name="suffix_seekbar_bitrate">Kbps</string>
+    <string name="title_unlock_fps">解鎖所有可使用的幀率</string>
+    <string name="summary_unlock_fps">串流於90或120幀下可以減少高級配備的延遲, 但可能導致無法支持的配備出現延遲或崩潰</string>
     <string name="title_checkbox_stretch_video"> 將畫面拉伸至全屏 </string>
     <string name="title_checkbox_disable_warnings"> 禁用錯誤提示 </string>
     <string name="summary_checkbox_disable_warnings"> 串流過程中禁用連接錯誤提示 </string>
+    <string name="title_checkbox_enable_pip">啟用子母畫面</string>
+    <string name="summary_checkbox_enable_pip">當多工處理時, 允許觀看串流畫面(無法控制)</string>
 
     <string name="category_audio_settings"> 音頻設置 </string>
     <string name="title_checkbox_51_surround"> 啟用 5.1 環繞音效 </string>
     <string name="summary_checkbox_51_surround"> 如果你的聲音聽起來有問題請禁用。\n\n需要GeForce Experience 2.7 或更高版本 </string>
 
+    <string name="category_input_settings">輸入設定</string>
     <string name="title_checkbox_multi_controller"> 啟用多手柄支持 </string>
     <string name="summary_checkbox_multi_controller"> 如果禁用，所有手柄將會認作一個手柄 </string>
-    <string name="title_seekbar_deadzone"> 調整搖桿死區 </string>
+    <string name="title_checkbox_vibrate_fallback">以手機模擬手柄震動</string>
+    <string name="summary_checkbox_vibrate_fallback">當手柄不支援震動時, 以手機來模擬</string>
+    <string name="title_seekbar_deadzone"> 調整手柄死區 </string>
     <string name="suffix_seekbar_deadzone">%</string>
     <string name="title_checkbox_xb1_driver">Xbox 360/One 手柄驅動 </string>
     <string name="summary_checkbox_xb1_driver"> 若要在那些沒有原生Xbox手柄驅動的設備上使用Xbox手柄，請勾上此複選框 </string>
+    <string name="title_checkbox_usb_bind_all">覆蓋Android控制器支援</string>
+    <string name="summary_checkbox_usb_bind_all">強制 Moonlight USB驅動程式接管所有支持的Xbox手柄</string>
+    <string name="title_checkbox_mouse_emulation">透過手柄模擬滑鼠</string>
+    <string name="summary_checkbox_mouse_emulation">長按 [Start] 鍵將會切換至滑鼠模式</string>
+    <string name="title_checkbox_mouse_nav_buttons">Enable back and forward mouse buttons</string>
+    <string name="summary_checkbox_mouse_nav_buttons">Enabling this option may break right clicking on some buggy devices</string>
 
-    <string name="category_on_screen_controls_settings"> 觸屏設置 </string>
+    <string name="category_on_screen_controls_settings"> 觸控設置 </string>
     <string name="title_checkbox_show_onscreen_controls"> 啟用虛擬手柄 </string>
     <string name="summary_checkbox_show_onscreen_controls"> 將在串流畫面上顯示一層虛擬手柄 </string>
+    <string name="title_checkbox_vibrate_osc">啟用震動</string>
+    <string name="summary_checkbox_vibrate_osc">在手機上模擬搖桿震動</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="category_ui_settings"> 界面設置 </string>
     <string name="title_language_list">語言</string>
@@ -134,7 +158,10 @@
     <string name="summary_checkbox_host_audio"> 將在電腦和本設備同時輸出聲音 </string>
 
     <string name="category_advanced_settings"> 高級設置 </string>
+    <string name="title_disable_frame_drop">永遠不掉幀</string>
+    <string name="summary_disable_frame_drop">在一些手機上可能可以減少micro-stuttering, 但可能導致延遲</string>
     <string name="title_video_format"> H.265設置 </string>
-    <string name="summary_video_format">H.265能降低帶寬需求，但是需要設備支持 </string>
-
+    <string name="summary_video_format">H.265能降低頻寬需求，但是需要設備支持 </string>
+    <string name="title_enable_hdr">啟用 HDR (實驗中)</string>
+    <string name="summary_enable_hdr">啟用 HDR 當遊戲與電腦的顯示卡支援時. HDR 需要 GTX 1000 系列之顯示卡或更高.</string>
 </resources>

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

@@ -2,6 +2,7 @@
 <resources>
     <string-array name="resolution_names">
         <item>360p</item>
+        <item>480p</item>
         <item>720p</item>
         <item>1080p</item>
         <item>1440p</item>
@@ -9,6 +10,7 @@
     </string-array>
     <string-array name="resolution_values" translatable="false">
         <item>360p</item>
+        <item>480p</item>
         <item>720p</item>
         <item>1080p</item>
         <item>1440p</item>

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

@@ -84,6 +84,8 @@
     <string name="title_details">Details</string>
     <string name="help">Help</string>
     <string name="delete_pc_msg">Are you sure you want to delete this PC?</string>
+    <string name="slow_connection_msg">Slow connection to PC\nReduce your bitrate</string>
+    <string name="poor_connection_msg">Poor connection to PC</string>
 
     <!-- AppList activity -->
     <string name="applist_connect_msg">Connecting to PC…</string>
@@ -136,6 +138,8 @@
     <string name="category_input_settings">Input Settings</string>
     <string name="title_checkbox_multi_controller">Automatic gamepad presence detection</string>
     <string name="summary_checkbox_multi_controller">Unchecking this option forces a gamepad to always be present</string>
+    <string name="title_checkbox_vibrate_fallback">Emulate rumble support with vibration</string>
+    <string name="summary_checkbox_vibrate_fallback">Vibrates your device to emulate rumble if your gamepad does not support it</string>
     <string name="title_seekbar_deadzone">Adjust analog stick deadzone</string>
     <string name="suffix_seekbar_deadzone">%</string>
     <string name="title_checkbox_xb1_driver">Xbox 360/One controller driver</string>
@@ -150,6 +154,8 @@
     <string name="category_on_screen_controls_settings">On-screen Controls Settings</string>
     <string name="title_checkbox_show_onscreen_controls">Show on-screen controls</string>
     <string name="summary_checkbox_show_onscreen_controls">Show virtual controller overlay on touchscreen</string>
+    <string name="title_checkbox_vibrate_osc">Enable vibration</string>
+    <string name="summary_checkbox_vibrate_osc">Vibrates your device to emulate rumble for the on-screen controls</string>
     <string name="title_only_l3r3">Only show L3 and R3</string>
     <string name="summary_only_l3r3">Hide all virtual buttons except L3 and R3</string>
     <string name="title_reset_osc">Clear saved on-screen controls layout</string>

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

@@ -82,6 +82,11 @@
             android:title="@string/title_checkbox_mouse_emulation"
             android:summary="@string/summary_checkbox_mouse_emulation"
             android:defaultValue="true" />
+        <CheckBoxPreference
+            android:key="checkbox_vibrate_fallback"
+            android:title="@string/title_checkbox_vibrate_fallback"
+            android:summary="@string/summary_checkbox_vibrate_fallback"
+            android:defaultValue="false" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_on_screen_controls_settings"
         android:key="category_onscreen_controls">
@@ -90,6 +95,12 @@
             android:key="checkbox_show_onscreen_controls"
             android:summary="@string/summary_checkbox_show_onscreen_controls"
             android:title="@string/title_checkbox_show_onscreen_controls" />
+        <CheckBoxPreference
+            android:key="checkbox_vibrate_osc"
+            android:dependency="checkbox_show_onscreen_controls"
+            android:title="@string/title_checkbox_vibrate_osc"
+            android:summary="@string/summary_checkbox_vibrate_osc"
+            android:defaultValue="true" />
         <CheckBoxPreference
             android:defaultValue="false"
             android:dependency="checkbox_show_onscreen_controls"
@@ -138,6 +149,11 @@
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_advanced_settings"
         android:key="category_advanced_settings">
+        <CheckBoxPreference
+            android:key="checkbox_disable_warnings"
+            android:title="@string/title_checkbox_disable_warnings"
+            android:summary="@string/summary_checkbox_disable_warnings"
+            android:defaultValue="false" />
         <ListPreference
             android:key="video_format"
             android:title="@string/title_video_format"

build.gradle

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue May 08 18:56:31 PDT 2018
+#Fri Apr 26 18:29:34 PDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip